openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject svn commit: r1441909 [31/45] - in /openoffice/branches/l10n: ./ ext_libraries/apr-util/ ext_libraries/apr/ ext_libraries/hunspell/ ext_sources/ extras/l10n/source/ast/ extras/l10n/source/da/ extras/l10n/source/eu/ extras/l10n/source/gd/ extras/l10n/sou...
Date Sun, 03 Feb 2013 13:24:38 GMT
Modified: openoffice/branches/l10n/main/shell/source/cmdmail/cmdmailmsg.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/shell/source/cmdmail/cmdmailmsg.hxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/shell/source/cmdmail/cmdmailmsg.hxx (original)
+++ openoffice/branches/l10n/main/shell/source/cmdmail/cmdmailmsg.hxx Sun Feb  3 13:23:59 2013
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,125 +7,89 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
-
-
 #ifndef _CMDMAILMSG_HXX_
 #define _CMDMAILMSG_HXX_
 
-#include <cppuhelper/implbase2.hxx>
-#include <com/sun/star/lang/IllegalArgumentException.hpp>
-#include <com/sun/star/container/XNameAccess.hpp>
+#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/basemutex.hxx>
 
-#ifndef _COM_SUN_STAR_SYS_SHELL_XSYSTEMSHELLEXECUTE_HPP_
-#include <com/sun/star/system/XSimpleMailMessage2.hpp>
-#endif
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/uno/Reference.hxx>
+#include <com/sun/star/system/XMailMessage.hpp>
 
-//----------------------------------------------------------
-// class declaration		
-//----------------------------------------------------------
-
-class CmdMailMsg : 
-	public  cppu::WeakImplHelper2< 
-        ::com::sun::star::system::XSimpleMailMessage2,
-        ::com::sun::star::container::XNameAccess >
+namespace shell
 {
-    ::rtl::OUString                                   m_aBody;
-    ::rtl::OUString                                   m_aRecipient;
-    ::rtl::OUString                                   m_aOriginator;
-    ::rtl::OUString                                   m_aSubject;
-    ::com::sun::star::uno::Sequence< rtl::OUString >  m_CcRecipients;
-    ::com::sun::star::uno::Sequence< rtl::OUString >  m_BccRecipients;    
-    ::com::sun::star::uno::Sequence< rtl::OUString >  m_Attachments;    
-
-    ::osl::Mutex m_aMutex;
-
-public:
-
-    CmdMailMsg() {};
-
-    //------------------------------------------------
-    // XSimpleMailMessage
-    //------------------------------------------------ 
+    typedef cppu::WeakImplHelper1<
+            com::sun::star::system::XMailMessage > CmdMailMsg_Base;
 
-    virtual void SAL_CALL setBody( const ::rtl::OUString& aBody )
-        throw (::com::sun::star::uno::RuntimeException);
+    class CmdMailMsg : protected cppu::BaseMutex,
+                       public  CmdMailMsg_Base
+    {
+    private:
+        ::rtl::OUString                                   m_aBody;
+        ::rtl::OUString                                   m_aRecipient;
+        ::rtl::OUString                                   m_aOriginator;
+        ::rtl::OUString                                   m_aSubject;
+        ::com::sun::star::uno::Sequence< rtl::OUString >  m_CcRecipients;
+        ::com::sun::star::uno::Sequence< rtl::OUString >  m_BccRecipients;
+        ::com::sun::star::uno::Sequence< rtl::OUString >  m_Attachments;
 
-    virtual ::rtl::OUString SAL_CALL getBody(  )
-        throw (::com::sun::star::uno::RuntimeException);
+    public:
+        CmdMailMsg();
 
-    virtual void SAL_CALL setRecipient( const ::rtl::OUString& aRecipient ) 
-        throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL setBody( const ::rtl::OUString& aBody )
+            throw (::com::sun::star::uno::RuntimeException);
 
-    virtual ::rtl::OUString SAL_CALL getRecipient(  ) 
-        throw (::com::sun::star::uno::RuntimeException);
+        virtual ::rtl::OUString SAL_CALL getBody(  )
+            throw (::com::sun::star::uno::RuntimeException);
 
-    virtual void SAL_CALL setCcRecipient( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aCcRecipient ) 
-        throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL setRecipient( const ::rtl::OUString& aRecipient )
+            throw (::com::sun::star::uno::RuntimeException);
 
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getCcRecipient(  ) 
-        throw (::com::sun::star::uno::RuntimeException);
+        virtual ::rtl::OUString SAL_CALL getRecipient(  )
+            throw (::com::sun::star::uno::RuntimeException);
 
-    virtual void SAL_CALL setBccRecipient( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aBccRecipient ) 
-        throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL setCcRecipient( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aCcRecipient )
+            throw (::com::sun::star::uno::RuntimeException);
 
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getBccRecipient(  ) 
-        throw (::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getCcRecipient(  )
+            throw (::com::sun::star::uno::RuntimeException);
 
-    virtual void SAL_CALL setOriginator( const ::rtl::OUString& aOriginator ) 
-        throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL setBccRecipient( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aBccRecipient )
+            throw (::com::sun::star::uno::RuntimeException);
 
-    virtual ::rtl::OUString SAL_CALL getOriginator(  ) 
-        throw (::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getBccRecipient(  )
+            throw (::com::sun::star::uno::RuntimeException);
 
-    virtual void SAL_CALL setSubject( const ::rtl::OUString& aSubject ) 
-        throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL setOriginator( const ::rtl::OUString& aOriginator )
+            throw (::com::sun::star::uno::RuntimeException);
 
-    virtual ::rtl::OUString SAL_CALL getSubject(  ) 
-        throw (::com::sun::star::uno::RuntimeException);
+        virtual ::rtl::OUString SAL_CALL getOriginator(  )
+            throw (::com::sun::star::uno::RuntimeException);
 
-    virtual void SAL_CALL setAttachement( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aAttachement ) 
-        throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL setSubject( const ::rtl::OUString& aSubject )
+            throw (::com::sun::star::uno::RuntimeException);
 
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAttachement(  ) 
-        throw (::com::sun::star::uno::RuntimeException);
+        virtual ::rtl::OUString SAL_CALL getSubject(  )
+            throw (::com::sun::star::uno::RuntimeException);
 
-    //------------------------------------------------
-    // XNameAccess
-    //------------------------------------------------
+        virtual void SAL_CALL setAttachement( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aAttachement )
+            throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
 
-    virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) 
-        throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAttachement(  )
+            throw (::com::sun::star::uno::RuntimeException);
 
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames(  ) 
-        throw (::com::sun::star::uno::RuntimeException) ;
+    };
+}
 
-    virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) 
-        throw (::com::sun::star::uno::RuntimeException);
-
-    //------------------------------------------------
-    // XElementAccess
-    //------------------------------------------------
-
-    virtual ::com::sun::star::uno::Type SAL_CALL getElementType(  ) 
-        throw (::com::sun::star::uno::RuntimeException);
-
-    virtual sal_Bool SAL_CALL hasElements(  ) 
-        throw (::com::sun::star::uno::RuntimeException);
-
-}; 
-
-#endif 
+#endif

Modified: openoffice/branches/l10n/main/shell/source/cmdmail/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/shell/source/cmdmail/makefile.mk?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/shell/source/cmdmail/makefile.mk (original)
+++ openoffice/branches/l10n/main/shell/source/cmdmail/makefile.mk Sun Feb  3 13:23:59 2013
@@ -37,7 +37,7 @@ COMP1TYPELIST=$(TARGET)
 DLLPRE=
 
 SLOFILES= \
-    $(SLO)$/cmdmailsuppl.obj \
+    $(SLO)$/syscmdmail.obj \
     $(SLO)$/cmdmailmsg.obj \
     $(SLO)$/cmdmailentry.obj
 SHL1OBJS=$(SLOFILES) 

Modified: openoffice/branches/l10n/main/shell/source/unix/sysshell/recently_used_file_handler.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/shell/source/unix/sysshell/recently_used_file_handler.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/shell/source/unix/sysshell/recently_used_file_handler.cxx (original)
+++ openoffice/branches/l10n/main/shell/source/unix/sysshell/recently_used_file_handler.cxx Sun Feb  3 13:23:59 2013
@@ -405,7 +405,7 @@ namespace /* private */ {
     };
     
     //------------------------------------------------
-    const char* GROUP_OOO         = "openoffice.org";
+    const char* GROUP_OOO         = "apacheopenoffice";
     const char* GROUP_STAR_OFFICE = "staroffice";
     const char* GROUP_STAR_SUITE  = "starsuite";
     

Modified: openoffice/branches/l10n/main/shell/source/win32/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/shell/source/win32/makefile.mk?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/shell/source/win32/makefile.mk (original)
+++ openoffice/branches/l10n/main/shell/source/win32/makefile.mk Sun Feb  3 13:23:59 2013
@@ -61,7 +61,7 @@ DEF1EXPORTFILE=	exports.dxp
 
 .INCLUDE :	target.mk
 INCLUDE!:=$(subst,/stl, $(INCLUDE))
-.EXPORT : INCLUDE
+
 
 
 ALLTAR : $(MISC)/syssh.component

Modified: openoffice/branches/l10n/main/shell/source/win32/shlxthandler/columninfo/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/shell/source/win32/shlxthandler/columninfo/makefile.mk?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/shell/source/win32/shlxthandler/columninfo/makefile.mk (original)
+++ openoffice/branches/l10n/main/shell/source/win32/shlxthandler/columninfo/makefile.mk Sun Feb  3 13:23:59 2013
@@ -51,5 +51,5 @@ SLOFILES_X64=$(SLO_X64)$/$(TARGET).obj
 .INCLUDE :  set_wntx64.mk
 .INCLUDE :	target.mk
 INCLUDE!:=$(subst,/stl, $(INCLUDE))
-.EXPORT : INCLUDE
-.INCLUDE :  tg_wntx64.mk
\ No newline at end of file
+
+.INCLUDE :  tg_wntx64.mk

Modified: openoffice/branches/l10n/main/shell/source/win32/shlxthandler/infotips/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/shell/source/win32/shlxthandler/infotips/makefile.mk?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/shell/source/win32/shlxthandler/infotips/makefile.mk (original)
+++ openoffice/branches/l10n/main/shell/source/win32/shlxthandler/infotips/makefile.mk Sun Feb  3 13:23:59 2013
@@ -52,5 +52,5 @@ SLOFILES_X64=$(SLO_X64)$/$(TARGET).obj
 .INCLUDE :	set_wntx64.mk
 .INCLUDE :	target.mk
 INCLUDE!:=$(subst,/stl, $(INCLUDE))
-.EXPORT : INCLUDE 
-.INCLUDE :	tg_wntx64.mk
\ No newline at end of file
+ 
+.INCLUDE :	tg_wntx64.mk

Modified: openoffice/branches/l10n/main/shell/source/win32/shlxthandler/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/shell/source/win32/shlxthandler/makefile.mk?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/shell/source/win32/shlxthandler/makefile.mk (original)
+++ openoffice/branches/l10n/main/shell/source/win32/shlxthandler/makefile.mk Sun Feb  3 13:23:59 2013
@@ -148,6 +148,6 @@ DEF1EXPORTFILE_X64=exports.dxp
 .INCLUDE :	set_wntx64.mk
 .INCLUDE :	target.mk
 INCLUDE!:=$(subst,/stl, $(INCLUDE))
-.EXPORT : INCLUDE
+
 .INCLUDE :	tg_wntx64.mk
 

Modified: openoffice/branches/l10n/main/shell/source/win32/shlxthandler/ooofilt/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/shell/source/win32/shlxthandler/ooofilt/makefile.mk?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/shell/source/win32/shlxthandler/ooofilt/makefile.mk (original)
+++ openoffice/branches/l10n/main/shell/source/win32/shlxthandler/ooofilt/makefile.mk Sun Feb  3 13:23:59 2013
@@ -133,5 +133,5 @@ DEF1EXPORTFILE_X64=exports.dxp
 .INCLUDE :	set_wntx64.mk
 .INCLUDE :	target.mk
 INCLUDE!:=$(subst,/stl, $(INCLUDE))
-.EXPORT : INCLUDE
+
 .INCLUDE :	tg_wntx64.mk

Modified: openoffice/branches/l10n/main/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx (original)
+++ openoffice/branches/l10n/main/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx Sun Feb  3 13:23:59 2013
@@ -1197,7 +1197,7 @@ namespace /* private */
         std::string ClsidEntry = CLSID_GUID_ENTRY;
         SubstitutePlaceholder(ClsidEntry, GUID_PLACEHOLDER, ClsidToString(FilterGuid));
     
-		if (!SetRegistryKey(HKEY_CLASSES_ROOT, ClsidEntry.c_str(), "", "OpenOffice.org Filter"))
+		if (!SetRegistryKey(HKEY_CLASSES_ROOT, ClsidEntry.c_str(), "", "OpenOffice.org XML Filter"))
             return E_FAIL;	
         
         ClsidEntry = CLSID_GUID_INPROC_ENTRY;
@@ -1225,7 +1225,7 @@ namespace /* private */
         SubstitutePlaceholder(ClsidEntry_Persist, GUID_PLACEHOLDER, ClsidToString(PersistentGuid));
     
 		
-		if (!SetRegistryKey(HKEY_CLASSES_ROOT, ClsidEntry_Persist.c_str(), "", "OpenOffice.org Persistent Handler"))
+		if (!SetRegistryKey(HKEY_CLASSES_ROOT, ClsidEntry_Persist.c_str(), "", "Apache OpenOffice Persistent Handler"))
             return E_FAIL;	
 
 		// Add missing entry 

Modified: openoffice/branches/l10n/main/shell/source/win32/shlxthandler/prophdl/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/shell/source/win32/shlxthandler/prophdl/makefile.mk?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/shell/source/win32/shlxthandler/prophdl/makefile.mk (original)
+++ openoffice/branches/l10n/main/shell/source/win32/shlxthandler/prophdl/makefile.mk Sun Feb  3 13:23:59 2013
@@ -134,5 +134,5 @@ DEF1EXPORTFILE_X64=exports.dxp
 .INCLUDE :  set_wntx64.mk
 .INCLUDE :	target.mk
 INCLUDE!:=$(subst,/stl, $(INCLUDE))
-.EXPORT : INCLUDE
+
 .INCLUDE :  tg_wntx64.mk

Modified: openoffice/branches/l10n/main/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx (original)
+++ openoffice/branches/l10n/main/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx Sun Feb  3 13:23:59 2013
@@ -56,11 +56,11 @@ struct PROPERTYMAP
 
 PROPERTYMAP g_rgPROPERTYMAP[] =
 {
-    { PKEY_Title,          L"OpenOffice.org",          L"Title" },
-    { PKEY_Author,         L"OpenOffice.org",          L"Author" },
-    { PKEY_Subject,        L"OpenOffice.org",          L"Subject" },
-    { PKEY_Keywords,       L"OpenOffice.org",          L"Keyword" },
-    { PKEY_Comment,        L"OpenOffice.org",          L"Comments" },
+    { PKEY_Title,          L"Apache OpenOffice",          L"Title" },
+    { PKEY_Author,         L"Apache OpenOffice",          L"Author" },
+    { PKEY_Subject,        L"Apache OpenOffice",          L"Subject" },
+    { PKEY_Keywords,       L"Apache OpenOffice",          L"Keyword" },
+    { PKEY_Comment,        L"Apache OpenOffice",          L"Comments" },
 };
 
 size_t gPropertyMapTableSize = sizeof(g_rgPROPERTYMAP)/sizeof(g_rgPROPERTYMAP[0]);

Modified: openoffice/branches/l10n/main/shell/source/win32/shlxthandler/propsheets/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/shell/source/win32/shlxthandler/propsheets/makefile.mk?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/shell/source/win32/shlxthandler/propsheets/makefile.mk (original)
+++ openoffice/branches/l10n/main/shell/source/win32/shlxthandler/propsheets/makefile.mk Sun Feb  3 13:23:59 2013
@@ -57,5 +57,5 @@ SLOFILES_X64=$(SLO_X64)$/propsheets.obj\
 .INCLUDE :	set_wntx64.mk
 .INCLUDE :	target.mk
 INCLUDE!:=$(subst,/stl, $(INCLUDE))
-.EXPORT : INCLUDE
-.INCLUDE :	tg_wntx64.mk
\ No newline at end of file
+
+.INCLUDE :	tg_wntx64.mk

Modified: openoffice/branches/l10n/main/shell/source/win32/shlxthandler/res/shlxthdl.manifest
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/shell/source/win32/shlxthandler/res/shlxthdl.manifest?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/shell/source/win32/shlxthandler/res/shlxthdl.manifest (original)
+++ openoffice/branches/l10n/main/shell/source/win32/shlxthandler/res/shlxthdl.manifest Sun Feb  3 13:23:59 2013
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-<assemblyIdentity version="1.0.0.0" processorArchitecture="x86" name="OpenOffice.shlxthdl" type="win32" />
-<description>OpenOffice Shell Extension</description>
+<assemblyIdentity version="1.0.0.0" processorArchitecture="x86" name="Apache_OpenOffice.shlxthdl" type="win32" />
+<description>Apache OpenOffice Shell Extension</description>
 <dependency>
 <dependentAssembly>
 <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="X86"

Modified: openoffice/branches/l10n/main/shell/source/win32/shlxthandler/thumbviewer/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/shell/source/win32/shlxthandler/thumbviewer/makefile.mk?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/shell/source/win32/shlxthandler/thumbviewer/makefile.mk (original)
+++ openoffice/branches/l10n/main/shell/source/win32/shlxthandler/thumbviewer/makefile.mk Sun Feb  3 13:23:59 2013
@@ -53,6 +53,6 @@ SLOFILES_X64=$(SLO_X64)$/$(TARGET).obj
 .INCLUDE :	set_wntx64.mk
 .INCLUDE :	target.mk
 INCLUDE!:=$(subst,/stl, $(INCLUDE))
-.EXPORT : INCLUDE 
+ 
 .INCLUDE :	tg_wntx64.mk
 

Modified: openoffice/branches/l10n/main/shell/source/win32/shlxthandler/util/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/shell/source/win32/shlxthandler/util/makefile.mk?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/shell/source/win32/shlxthandler/util/makefile.mk (original)
+++ openoffice/branches/l10n/main/shell/source/win32/shlxthandler/util/makefile.mk Sun Feb  3 13:23:59 2013
@@ -59,6 +59,6 @@ SLOFILES_X64=$(SLO_X64)$/dbgmacros.obj\
 .INCLUDE :	set_wntx64.mk
 .INCLUDE :	target.mk
 INCLUDE!:=$(subst,/stl, $(INCLUDE))
-.EXPORT : INCLUDE
+
 .INCLUDE :	tg_wntx64.mk
 

Modified: openoffice/branches/l10n/main/shell/source/win32/workbench/TestSmplMail.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/shell/source/win32/workbench/TestSmplMail.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/shell/source/win32/workbench/TestSmplMail.cxx (original)
+++ openoffice/branches/l10n/main/shell/source/win32/workbench/TestSmplMail.cxx Sun Feb  3 13:23:59 2013
@@ -30,7 +30,7 @@
 //-----------------------------------------------------------
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/registry/XSimpleRegistry.hpp>
-#include <com/sun/star/system/XSimpleMailClientSupplier.hpp>
+#include <com/sun/star/system/XSystemMailProvider.hpp>
 #include <cppuhelper/servicefactory.hxx>
 #include <cppuhelper/servicefactory.hxx>
 #include <rtl/ustring.hxx>
@@ -103,7 +103,7 @@ int SAL_CALL main(int , char*, char* )
 
     try
     {
-	    Reference< XSimpleMailClientSupplier > xSmplMailClientSuppl(
+	    Reference< XSystemMailProvider > xSmplMailClientSuppl(
             g_xFactory->createInstance( OUString::createFromAscii( "com.sun.star.system.SimpleSystemMail" ) ), UNO_QUERY );
 	
 	    if ( !xSmplMailClientSuppl.is() )
@@ -112,13 +112,13 @@ int SAL_CALL main(int , char*, char* )
 		    return(-1);
 	    }	
 
-        Reference< XSimpleMailClient > xSmplMailClient( 
-            xSmplMailClientSuppl->querySimpleMailClient( ) );
+        Reference< XMailClient > xSmplMailClient(
+            xSmplMailClientSuppl->queryMailClient( ) );
 
         if ( xSmplMailClient.is( ) )
         {
-            Reference< XSimpleMailMessage > xSmplMailMsg(
-                xSmplMailClient->createSimpleMailMessage( ) );
+            Reference< XMailMessage > xSmplMailMsg(
+                xSmplMailClient->createMailMessage( ) );
 
             if ( xSmplMailMsg.is( ) )
             {
@@ -152,7 +152,7 @@ int SAL_CALL main(int , char*, char* )
 
                 xSmplMailMsg->setAttachement( attachements );
 
-                xSmplMailClient->sendSimpleMailMessage( xSmplMailMsg, 0 );
+                xSmplMailClient->sendMailMessage( xSmplMailMsg, 0 );
             }
         }
     }

Modified: openoffice/branches/l10n/main/shell/source/win32/workbench/TestSysShExec.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/shell/source/win32/workbench/TestSysShExec.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/shell/source/win32/workbench/TestSysShExec.cxx (original)
+++ openoffice/branches/l10n/main/shell/source/win32/workbench/TestSysShExec.cxx Sun Feb  3 13:23:59 2013
@@ -30,10 +30,7 @@
 //-----------------------------------------------------------
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/registry/XSimpleRegistry.hpp>
-
-#ifndef _COM_SUN_STAR_SYS_SHELL_XSYSTEMSHELLEXECUTE_HPP_
 #include <com/sun/star/system/XSystemShellExecute.hpp>
-#endif
 #include <cppuhelper/servicefactory.hxx>
 
 

Modified: openoffice/branches/l10n/main/shell/source/win32/workbench/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/shell/source/win32/workbench/makefile.mk?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/shell/source/win32/workbench/makefile.mk (original)
+++ openoffice/branches/l10n/main/shell/source/win32/workbench/makefile.mk Sun Feb  3 13:23:59 2013
@@ -41,7 +41,6 @@ CFLAGS+=/GX
 
 OBJFILES1=$(OBJ)$/TestSysShExec.obj
 OBJFILES2=$(OBJ)$/TestSmplMail.obj
-OBJFILES3=$(OBJ)$/TestProxySet.obj
 OBJFILES4=$(OBJ)$/Testfopen.obj
 
 OBJFILES=$(OBJFILES1)\
@@ -70,17 +69,6 @@ APP2STDLIBS+=	$(CPPULIB)			\
 
 APP2DEF=		$(MISC)$/$(APP2TARGET).def
 
-# --- TestProxy ---
-
-APP3TARGET=$(TARGET2)
-APP3OBJS=$(OBJFILES3)
-
-APP3STDLIBS+=	$(CPPULIB)			\
-				$(CPPUHELPERLIB)	\
-				$(SALLIB)
-
-APP3DEF=		$(MISC)$/$(APP3TARGET).def
-
 # --- Testfopen ---
 
 APP4TARGET=$(TARGET4)

Modified: openoffice/branches/l10n/main/solenv/bin/cwstouched.py
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/solenv/bin/cwstouched.py?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/solenv/bin/cwstouched.py (original)
+++ openoffice/branches/l10n/main/solenv/bin/cwstouched.py Sun Feb  3 13:23:59 2013
@@ -103,4 +103,4 @@ for outline in output.readlines():
             modules.append(newModule)
 
 for module in modules:
-    print module
+    print(module)

Modified: openoffice/branches/l10n/main/solenv/bin/modules/installer/download.pm
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/solenv/bin/modules/installer/download.pm?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/solenv/bin/modules/installer/download.pm (original)
+++ openoffice/branches/l10n/main/solenv/bin/modules/installer/download.pm Sun Feb  3 13:23:59 2013
@@ -461,21 +461,44 @@ sub get_downloadname_language
 
 sub get_downloadname_productname
 {
-	my ($allvariables) = @_;
-
-	my $start = "Apache_OpenOffice";
-
-	if ( $allvariables->{'PRODUCTNAME'} eq "OpenOffice.org" ) { $start .= ""; }
-
-	if ( $allvariables->{'PRODUCTNAME'} eq "OOo-dev" ) { $start .= "-Dev"; }
-
-	if (( $allvariables->{'PRODUCTNAME'} eq "OpenOffice.org" ) && ( $allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )) { $start .= "-SDK"; }
+    my ($allvariables) = @_;
 
-	if (( $allvariables->{'PRODUCTNAME'} eq "OOo-dev" ) && ( $allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )) { $start .= "-Dev-SDK"; }
+    my $start;
 
-	if ( $allvariables->{'PRODUCTNAME'} eq "URE" ) { $start .= "-URE"; }
+    if ( $allvariables->{'AOODOWNLOADNAMEPREFIX'} )
+    {
+        $start = $allvariables->{'AOODOWNLOADNAMEPREFIX'};
+    }
+    else
+    {
+        $start = "Apache_OpenOffice";
+        if ( $allvariables->{'PRODUCTNAME'} eq "Apache OpenOffice" ) 
+        {
+            if ( $allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )
+            {
+                $start .= "-SDK"; 
+            }
+        }
+
+        if ( $allvariables->{'PRODUCTNAME'} eq "AOO-Developer-Build" ) 
+        {
+            if ( $allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )
+            {
+                $start .= "-Dev-SDK"; 
+            }
+            else
+            {
+                $start .= "-Dev";
+            }
+        }
+
+        if ( $allvariables->{'PRODUCTNAME'} eq "URE" )
+        {
+            $start .= "-URE";
+        }
+    }
 
-	return $start;
+    return $start;
 }
 
 #########################################################
@@ -1968,8 +1991,14 @@ sub create_download_sets
 
 	# evaluating the name of the download file
 
-	if ( $allvariableshashref->{'OOODOWNLOADNAME'} ) { $downloadname = set_download_filename($languagestringref, $allvariableshashref); }
-	else { $downloadname = resolve_variables_in_downloadname($allvariableshashref, $downloadname, $languagestringref); }
+	if ( $allvariableshashref->{'AOODOWNLOADNAME'} ) 
+    { 
+        $downloadname = set_download_filename($languagestringref, $allvariableshashref); 
+    }
+	else 
+    { 
+        $downloadname = resolve_variables_in_downloadname($allvariableshashref, $downloadname, $languagestringref); 
+    }
 
 	if ( ! $installer::globals::iswindowsbuild )	# Unix specific part
 	{
@@ -1978,7 +2007,7 @@ sub create_download_sets
 		my $getuidlibrary = "";
 		if (( $installer::globals::issolarisbuild ) || ( $installer::globals::islinuxbuild )) {	$getuidlibrary = get_path_for_library($includepatharrayref); }
 
-		if ( $allvariableshashref->{'OOODOWNLOADNAME'} )
+		if ( $allvariableshashref->{'AOODOWNLOADNAME'} )
 		{
 			my $downloadfile = create_tar_gz_file_from_directory($installationdir, $getuidlibrary, $downloaddir, $downloadname);
 		}

Modified: openoffice/branches/l10n/main/solenv/bin/modules/installer/epmfile.pm
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/solenv/bin/modules/installer/epmfile.pm?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/solenv/bin/modules/installer/epmfile.pm (original)
+++ openoffice/branches/l10n/main/solenv/bin/modules/installer/epmfile.pm Sun Feb  3 13:23:59 2013
@@ -326,11 +326,11 @@ sub create_epm_header
 	my $line = "";
 	my $infoline = "";
 		
-	# %product OpenOffice.org Software
+	# %product Apache OpenOffice Software
 	# %version 2.0
 	# %description A really great software
 	# %copyright 1999-2003 by OOo
-	# %vendor OpenOffice.org
+	# %vendor Apache OpenOffice project
 	# %license /test/replace/01/LICENSE01
 	# %readme /test/replace/01/README01
 	# %requires foo
@@ -492,7 +492,7 @@ sub create_epm_header
 	{
 		# refer to the license in the matching AOO installation
 		# TODO: sync AOO dest license full path with lpacks/sdks/exts
-		my $licpath = "openoffice.org3/program/" . $licensefilename;
+		my $licpath = "apacheopenoffice3/program/" . $licensefilename;
 		$foundlicensefile = 1;
 		$line = "%license " . $licpath . "\n";
 		push(@epmheader, $line);
@@ -550,7 +550,7 @@ sub create_epm_header
 				}
 			}
 
-			if ( $installer::globals::debian && $variableshashref->{'UNIXPRODUCTNAME'} eq 'openoffice.org' )
+			if ( $installer::globals::debian && $variableshashref->{'UNIXPRODUCTNAME'} eq 'apache openoffice' )
 			{
 				$line = "%provides" . " openoffice.org-unbundled\n";
 				push(@epmheader, $line);

Modified: openoffice/branches/l10n/main/solenv/bin/modules/installer/simplepackage.pm
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/solenv/bin/modules/installer/simplepackage.pm?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/solenv/bin/modules/installer/simplepackage.pm (original)
+++ openoffice/branches/l10n/main/solenv/bin/modules/installer/simplepackage.pm Sun Feb  3 13:23:59 2013
@@ -333,7 +333,10 @@ sub replace_variables_in_scriptfile
 	replace_one_variable_in_shellscript($scriptfile, $allvariables->{'PRODUCTVERSION'}, "PRODUCTVERSION" );
 	
 	my $scriptname = lc($allvariables->{'PRODUCTNAME'}) . "\.script";
-	if ( $allvariables->{'PRODUCTNAME'} eq "OpenOffice.org" ) { $scriptname = "org.openoffice.script"; }
+	if ( $allvariables->{'PRODUCTNAME'} eq "Apache OpenOffice" )
+    {
+        $scriptname = "org.openoffice.script";
+    }
 
 	replace_one_variable_in_shellscript($scriptfile, $scriptname, "SEARCHSCRIPTNAME" );
 }
@@ -616,7 +619,7 @@ sub create_simple_package
 
 		my $locallanguage = $installer::globals::csp_languagestring;
 
-		if ( $allvariables->{'OOODOWNLOADNAME'} )
+		if ( $allvariables->{'AOODOWNLOADNAME'} )
 		{
 			$packagename = installer::download::set_download_filename(\$locallanguage, $allvariables);
 		}

Modified: openoffice/branches/l10n/main/solenv/bin/modules/installer/windows/msp.pm
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/solenv/bin/modules/installer/windows/msp.pm?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/solenv/bin/modules/installer/windows/msp.pm (original)
+++ openoffice/branches/l10n/main/solenv/bin/modules/installer/windows/msp.pm Sun Feb  3 13:23:59 2013
@@ -884,7 +884,7 @@ sub change_patchmetadata_table
 	if ( $allvariables->{'PROPERTYTABLEPRODUCTNAME'} ) { $targetproductnamevalue = $allvariables->{'PROPERTYTABLEPRODUCTNAME'}; }
 
 	my $manufacturerstring = "ManufacturerName";
-	my $manufacturervalue = "OpenOffice.org";
+	my $manufacturervalue = "Apache OpenOffice";
 	if ( $installer::globals::longmanufacturer ) { $manufacturervalue = $installer::globals::longmanufacturer; }
 
 	my $displaynamestring = "DisplayName";

Modified: openoffice/branches/l10n/main/solenv/bin/modules/installer/ziplist.pm
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/solenv/bin/modules/installer/ziplist.pm?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/solenv/bin/modules/installer/ziplist.pm (original)
+++ openoffice/branches/l10n/main/solenv/bin/modules/installer/ziplist.pm Sun Feb  3 13:23:59 2013
@@ -639,7 +639,7 @@ sub set_manufacturer
 {
 	my ($allvariables) = @_;
 	
-	my $openofficeproductname = "OpenOffice.org";
+	my $openofficeproductname = "Apache OpenOffice";
 	my $sunname = "";
 	
 	
@@ -674,13 +674,6 @@ sub set_default_productversion_if_requir
 	{
 		$allvariables->{'PRODUCTVERSION'} = 1;	# FAKE
 	}
-	
-	# Creating differentiators for BUILD_SPECIAL in layering
-	if ( ! $ENV{'BUILD_SPECIAL'} )
-	{
-		if ( $allvariables->{'REGISTRYLAYERNAME'} ) { $allvariables->{'REGISTRYLAYERNAME'} = $allvariables->{'REGISTRYLAYERNAME'} . "_"; }
-		if (( $installer::globals::iswindowsbuild ) && ( $allvariables->{'BASISROOTNAME'} )) { $allvariables->{'BASISROOTNAME'} = $allvariables->{'BASISROOTNAME'} . "_"; }
-	} 
 }
 
 ####################################################

Modified: openoffice/branches/l10n/main/solenv/bin/pchdelta.py
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/solenv/bin/pchdelta.py?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/solenv/bin/pchdelta.py (original)
+++ openoffice/branches/l10n/main/solenv/bin/pchdelta.py Sun Feb  3 13:23:59 2013
@@ -101,7 +101,7 @@ def binaryTest(dirlist, lines, pchname, 
 
     # Reject one liners
     if linecount == 1:
-        print indent + "Rejected: " + lines[0]
+        print(indent + "Rejected: " + lines[0])
         return acceptedlines
 
     # Recurse with multiline slices
@@ -117,7 +117,7 @@ def binaryTest(dirlist, lines, pchname, 
         if (splitend - splitstart) == 0:
             continue
         splitslice = lines[splitstart:splitend]
-        print indent + "[" + str(startpoint + splitstart) + ":" + str(startpoint + splitend) + "] (" + str(splitend - splitstart) + ")"
+        print(indent + "[" + str(startpoint + splitstart) + ":" + str(startpoint + splitend) + "] (" + str(splitend - splitstart) + ")")
         acceptedlines = binaryTest(dirlist, splitslice, pchname, header, footer, acceptedlines, indent + " ", startpoint + splitstart)
         splitstart = splitend
 
@@ -127,7 +127,7 @@ def binaryTest(dirlist, lines, pchname, 
 # Main entry point
 
 if len(sys.argv) < 3:
-    print "Usage: " + sys.argv[0] + " <pch_target> <dir1> [<dir2> <dir3> ...]"
+    print("Usage: " + sys.argv[0] + " <pch_target> <dir1> [<dir2> <dir3> ...]")
     sys.exit(1)
 
 pchname = os.path.abspath(sys.argv[1])
@@ -139,7 +139,7 @@ if os.path.exists("buildlog.txt"):
 
 # test for corner case of everything working from the start
 if testSequenceBuild(dirlist):
-    print "pch working, nothing to do."
+    print("pch working, nothing to do.")
     sys.exit(0)
 
 # Open the header file for reading
@@ -158,10 +158,10 @@ writePch(pchname + "_backup", header, fo
 writePch(pchname, header, footer, [], [])
 if not testSequenceBuild(dirlist):
     writePch(pchname, header, footer, lines, [])
-    print "Building with no candidate lines failed. Convergence questionable, aborting."
+    print("Building with no candidate lines failed. Convergence questionable, aborting.")
     sys.exit(0)
 
 # Starting pruning
-print "Starting evaluation of " + str(len(lines)) + " lines"
+print("Starting evaluation of " + str(len(lines)) + " lines")
 acceptedlines = binaryTest(dirlist, lines, pchname, header, footer, [], "", 0)
 writePch(pchname, header, footer, acceptedlines, [])

Modified: openoffice/branches/l10n/main/solenv/bin/srcrelease.xml
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/solenv/bin/srcrelease.xml?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/solenv/bin/srcrelease.xml (original)
+++ openoffice/branches/l10n/main/solenv/bin/srcrelease.xml Sun Feb  3 13:23:59 2013
@@ -21,23 +21,35 @@
  ***********************************************************-->
 <project name="Apache OpenOffice" basedir="." default="pack">
 
+  <property environment="env"/>
+  <property name="getrevision.script" value="${env.SOLARENV}/bin/getrevision.pl"/>
+
   <property name="out.dir" value="."/>
   <property name="aoo.name" value="aoo"/>
-  <property name="aoo.ver" value="3.5.0"/>
-  <property name="release.dir.name" value="${aoo.name}-${aoo.ver}"/>
-  <property name="release.file.name" value="${release.dir.name}-src"/>
-  <property name="release.zip" value="${out.dir}/${release.file.name}.zip"/>
-  <property name="release.tar" value="${out.dir}/${release.file.name}.tar"/>
-  <property name="release.tar.gz" value="${out.dir}/${release.file.name}.tar.gz"/>
-  <property name="release.tar.bz2" value="${out.dir}/${release.file.name}.tar.bz2"/>
-  
+  <property name="aoo.ver" value="4.0.0"/>
+
   <property name="excludes.list" value="configure, moz/zipped/*.zip, **/.svn **/.gitignore, **/.git, warn, set_soenv, solver/**, makefile.mk, config.log, config.parms, config.status, bootstrap, autom4te.cache/**, MacOSXX86Env.*, external/unowinreg/unowinreg.dll" />
   <property name="excludes.executables" value="solenv/bin/macosx-create-bundle, solenv/bin/linkoo, solenv/bin/localize, solenv/bin/createpdbrelocators, solenv/bin/langwrap, solenv/bin/makedepn, solenv/bin/packmodule, solenv/bin/rpm-wrapper, solenv/bin/relocate, solenv/bin/receditor, solenv/bin/subsequenttests, **/*.sh, **/*.bat, **/*.exe, configure.cmd, oowintool, config.sub, config.guess, **/*.pl"/>
   <property name="includes.mk" value="inc/unxmac*.mk inc/unxlng*.mk inc/wntmsci*.mk inc/unxsol*.mk" />
   <property name="excludes.outdirs" value="**/unxmacx*/**, **/unxlng*/**, **/unxsol*/**, **/wntmsci*/**" />
   
   
-  <target name="clean">
+  <target name="getrevision">
+    <exec executable="perl" outputproperty="scm.revision">
+      <arg value="${getrevision.script}" />
+    </exec>
+  </target>
+ 
+  <target name="declarenames" depends="getrevision">
+    <property name="release.dir.name" value="${aoo.name}-${aoo.ver}"/>
+    <property name="release.file.name" value="${release.dir.name}-r${scm.revision}-src"/>
+    <property name="release.zip" value="${out.dir}/${release.file.name}.zip"/>
+    <property name="release.tar" value="${out.dir}/${release.file.name}.tar"/>
+    <property name="release.tar.gz" value="${out.dir}/${release.file.name}.tar.gz"/>
+    <property name="release.tar.bz2" value="${out.dir}/${release.file.name}.tar.bz2"/>
+  </target>
+
+  <target name="clean" depends="declarenames">
     <echo level="verbose" message="### clean output files:"/>
     <delete file="${release.zip}" verbose="true"/>
     <delete file="${release.tar}" verbose="true"/>
@@ -45,7 +57,7 @@
     <delete file="${release.tar.bz2}" verbose="true"/>
   </target>
 
-  <target name="source.zip">
+  <target name="source.zip" depends="declarenames">
     <echo level="verbose" message="### creating ${release.zip} ..."/>
     <echo level="verbose" message="### basedir=${basedir}"/>
     <echo level="verbose" message="### source.root=${source.root}"/>
@@ -65,7 +77,7 @@
     <echo level="verbose" message="   ... DONE"/>
   </target>
 
-  <target name="source.tar">
+  <target name="source.tar" depends="declarenames">
     <echo level="verbose" message="### creating intermediate ${release.tar} ..."/>
     <tar destfile="${release.tar}" longfile="gnu">
       <tarfileset file="main/NOTICE" fullpath="${release.dir.name}/NOTICE"/>
@@ -93,13 +105,6 @@
     <echo level="verbose" message="   ... DONE"/>
   </target>
 
-  <target name="dummy">
-    <zip destfile="${release.zip}">
-      <zipfileset file="main/NOTICE" fullpath="${release.dir.name}/NOTICE"/>
-      <zipfileset file="main/LICENSE" fullpath="${release.dir.name}/LICENSE"/>
-    </zip>
-  </target>
- 
   <target name="pack" depends="clean,source.zip,source.tar.gz,source.tar.bz2">
     <echo level="info" message="### Create source release files for Apache OpenOffice ${aoo.ver} ..."/>
   </target>

Modified: openoffice/branches/l10n/main/solenv/gbuild/platform/os2.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/solenv/gbuild/platform/os2.mk?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/solenv/gbuild/platform/os2.mk (original)
+++ openoffice/branches/l10n/main/solenv/gbuild/platform/os2.mk Sun Feb  3 13:23:59 2013
@@ -317,6 +317,8 @@ $(call gb_Helper_abbreviate_dirs_native,
 		$(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
 		$(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \
 		$(PCHOBJS))) && \
+	$(if $(DLLTARGET), echo EXPORTS >> $(DLLDEF) &&) \
+	$(if $(DLLTARGET), emxexp @$${RESPONSEFILE} | fix_exp_file | sort | uniq | fix_def_ord >> $(DLLDEF) &&) \
 	$(gb_LINK) \
 		$(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
 		$(if $(filter StaticLibrary,$(TARGETTYPE)),$(gb_StaticLibrary_TARGETTYPEFLAGS)) \
@@ -330,7 +332,7 @@ $(call gb_Helper_abbreviate_dirs_native,
 		$(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) \
 		$(if $(DLLTARGET),-o $(DLLTARGET), -o $(1) ); \
 		RC=$$?; rm $${RESPONSEFILE} \
-	$(if $(DLLTARGET),; emximp -p2048 -o $(1) $(DLLTARGET) ) \
+	$(if $(DLLTARGET),; emximp -p2048 -o $(1) $(DLLDEF) ) \
 	$(if $(DLLTARGET),; if [ ! -f $(DLLTARGET) ]; then rm -f $(1) && false; fi) ; exit $$RC)
 endef
 

Modified: openoffice/branches/l10n/main/solenv/inc/_tg_def.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/solenv/inc/_tg_def.mk?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/solenv/inc/_tg_def.mk (original)
+++ openoffice/branches/l10n/main/solenv/inc/_tg_def.mk Sun Feb  3 13:23:59 2013
@@ -283,8 +283,12 @@ $(DEF1TARGETN) .PHONY :
 	$(COMMAND_ECHO)+$(RENAME) $@.tmpfile $@
 	@+-$(RM) $@.tmp_ord
 	@+-$(RM) $@.exptmpfile
-	$(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(SHL1IMPLIBN:s/.lib/.a/) $@
-	$(COMMAND_ECHO)+emxomf -o $(SHL1IMPLIBN) $(SHL1IMPLIBN:s/.lib/.a/) 
+.IF "$(SHL1USE_EXPORTS)"=="" || "$(SHL1USE_EXPORTS)"=="ordinal"
+#03/11/2012  if 'name' is not used, export from def file (with ordinals)
+	@echo Build import library from DEF file.
+	@+-$(RM) $(LB)/$(SHL1TARGETN:b).lib
+	$(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(LB)/$(SHL1TARGETN:b).lib $@
+.ENDIF			# "$(SHL1USE_EXPORTS)"==""
 
 .ENDIF			# "$(GUI)"=="OS2"
 
@@ -563,8 +567,12 @@ $(DEF2TARGETN) .PHONY :
 	$(COMMAND_ECHO)+$(RENAME) $@.tmpfile $@
 	@+-$(RM) $@.tmp_ord
 	@+-$(RM) $@.exptmpfile
-	$(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(SHL2IMPLIBN:s/.lib/.a/) $@
-	$(COMMAND_ECHO)+emxomf -o $(SHL2IMPLIBN) $(SHL2IMPLIBN:s/.lib/.a/) 
+.IF "$(SHL2USE_EXPORTS)"=="" || "$(SHL2USE_EXPORTS)"=="ordinal"
+#03/11/2012  if 'name' is not used, export from def file (with ordinals)
+	@echo Build import library from DEF file.
+	@+-$(RM) $(LB)/$(SHL2TARGETN:b).lib
+	$(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(LB)/$(SHL2TARGETN:b).lib $@
+.ENDIF			# "$(SHL2USE_EXPORTS)"==""
 
 .ENDIF			# "$(GUI)"=="OS2"
 
@@ -843,8 +851,12 @@ $(DEF3TARGETN) .PHONY :
 	$(COMMAND_ECHO)+$(RENAME) $@.tmpfile $@
 	@+-$(RM) $@.tmp_ord
 	@+-$(RM) $@.exptmpfile
-	$(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(SHL3IMPLIBN:s/.lib/.a/) $@
-	$(COMMAND_ECHO)+emxomf -o $(SHL3IMPLIBN) $(SHL3IMPLIBN:s/.lib/.a/) 
+.IF "$(SHL3USE_EXPORTS)"=="" || "$(SHL3USE_EXPORTS)"=="ordinal"
+#03/11/2012  if 'name' is not used, export from def file (with ordinals)
+	@echo Build import library from DEF file.
+	@+-$(RM) $(LB)/$(SHL3TARGETN:b).lib
+	$(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(LB)/$(SHL3TARGETN:b).lib $@
+.ENDIF			# "$(SHL3USE_EXPORTS)"==""
 
 .ENDIF			# "$(GUI)"=="OS2"
 
@@ -1123,8 +1135,12 @@ $(DEF4TARGETN) .PHONY :
 	$(COMMAND_ECHO)+$(RENAME) $@.tmpfile $@
 	@+-$(RM) $@.tmp_ord
 	@+-$(RM) $@.exptmpfile
-	$(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(SHL4IMPLIBN:s/.lib/.a/) $@
-	$(COMMAND_ECHO)+emxomf -o $(SHL4IMPLIBN) $(SHL4IMPLIBN:s/.lib/.a/) 
+.IF "$(SHL4USE_EXPORTS)"=="" || "$(SHL4USE_EXPORTS)"=="ordinal"
+#03/11/2012  if 'name' is not used, export from def file (with ordinals)
+	@echo Build import library from DEF file.
+	@+-$(RM) $(LB)/$(SHL4TARGETN:b).lib
+	$(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(LB)/$(SHL4TARGETN:b).lib $@
+.ENDIF			# "$(SHL4USE_EXPORTS)"==""
 
 .ENDIF			# "$(GUI)"=="OS2"
 
@@ -1403,8 +1419,12 @@ $(DEF5TARGETN) .PHONY :
 	$(COMMAND_ECHO)+$(RENAME) $@.tmpfile $@
 	@+-$(RM) $@.tmp_ord
 	@+-$(RM) $@.exptmpfile
-	$(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(SHL5IMPLIBN:s/.lib/.a/) $@
-	$(COMMAND_ECHO)+emxomf -o $(SHL5IMPLIBN) $(SHL5IMPLIBN:s/.lib/.a/) 
+.IF "$(SHL5USE_EXPORTS)"=="" || "$(SHL5USE_EXPORTS)"=="ordinal"
+#03/11/2012  if 'name' is not used, export from def file (with ordinals)
+	@echo Build import library from DEF file.
+	@+-$(RM) $(LB)/$(SHL5TARGETN:b).lib
+	$(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(LB)/$(SHL5TARGETN:b).lib $@
+.ENDIF			# "$(SHL5USE_EXPORTS)"==""
 
 .ENDIF			# "$(GUI)"=="OS2"
 
@@ -1683,8 +1703,12 @@ $(DEF6TARGETN) .PHONY :
 	$(COMMAND_ECHO)+$(RENAME) $@.tmpfile $@
 	@+-$(RM) $@.tmp_ord
 	@+-$(RM) $@.exptmpfile
-	$(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(SHL6IMPLIBN:s/.lib/.a/) $@
-	$(COMMAND_ECHO)+emxomf -o $(SHL6IMPLIBN) $(SHL6IMPLIBN:s/.lib/.a/) 
+.IF "$(SHL6USE_EXPORTS)"=="" || "$(SHL6USE_EXPORTS)"=="ordinal"
+#03/11/2012  if 'name' is not used, export from def file (with ordinals)
+	@echo Build import library from DEF file.
+	@+-$(RM) $(LB)/$(SHL6TARGETN:b).lib
+	$(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(LB)/$(SHL6TARGETN:b).lib $@
+.ENDIF			# "$(SHL6USE_EXPORTS)"==""
 
 .ENDIF			# "$(GUI)"=="OS2"
 
@@ -1963,8 +1987,12 @@ $(DEF7TARGETN) .PHONY :
 	$(COMMAND_ECHO)+$(RENAME) $@.tmpfile $@
 	@+-$(RM) $@.tmp_ord
 	@+-$(RM) $@.exptmpfile
-	$(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(SHL7IMPLIBN:s/.lib/.a/) $@
-	$(COMMAND_ECHO)+emxomf -o $(SHL7IMPLIBN) $(SHL7IMPLIBN:s/.lib/.a/) 
+.IF "$(SHL7USE_EXPORTS)"=="" || "$(SHL7USE_EXPORTS)"=="ordinal"
+#03/11/2012  if 'name' is not used, export from def file (with ordinals)
+	@echo Build import library from DEF file.
+	@+-$(RM) $(LB)/$(SHL7TARGETN:b).lib
+	$(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(LB)/$(SHL7TARGETN:b).lib $@
+.ENDIF			# "$(SHL7USE_EXPORTS)"==""
 
 .ENDIF			# "$(GUI)"=="OS2"
 
@@ -2243,8 +2271,12 @@ $(DEF8TARGETN) .PHONY :
 	$(COMMAND_ECHO)+$(RENAME) $@.tmpfile $@
 	@+-$(RM) $@.tmp_ord
 	@+-$(RM) $@.exptmpfile
-	$(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(SHL8IMPLIBN:s/.lib/.a/) $@
-	$(COMMAND_ECHO)+emxomf -o $(SHL8IMPLIBN) $(SHL8IMPLIBN:s/.lib/.a/) 
+.IF "$(SHL8USE_EXPORTS)"=="" || "$(SHL8USE_EXPORTS)"=="ordinal"
+#03/11/2012  if 'name' is not used, export from def file (with ordinals)
+	@echo Build import library from DEF file.
+	@+-$(RM) $(LB)/$(SHL8TARGETN:b).lib
+	$(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(LB)/$(SHL8TARGETN:b).lib $@
+.ENDIF			# "$(SHL8USE_EXPORTS)"==""
 
 .ENDIF			# "$(GUI)"=="OS2"
 
@@ -2523,8 +2555,12 @@ $(DEF9TARGETN) .PHONY :
 	$(COMMAND_ECHO)+$(RENAME) $@.tmpfile $@
 	@+-$(RM) $@.tmp_ord
 	@+-$(RM) $@.exptmpfile
-	$(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(SHL9IMPLIBN:s/.lib/.a/) $@
-	$(COMMAND_ECHO)+emxomf -o $(SHL9IMPLIBN) $(SHL9IMPLIBN:s/.lib/.a/) 
+.IF "$(SHL9USE_EXPORTS)"=="" || "$(SHL9USE_EXPORTS)"=="ordinal"
+#03/11/2012  if 'name' is not used, export from def file (with ordinals)
+	@echo Build import library from DEF file.
+	@+-$(RM) $(LB)/$(SHL9TARGETN:b).lib
+	$(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(LB)/$(SHL9TARGETN:b).lib $@
+.ENDIF			# "$(SHL9USE_EXPORTS)"==""
 
 .ENDIF			# "$(GUI)"=="OS2"
 
@@ -2803,8 +2839,12 @@ $(DEF10TARGETN) .PHONY :
 	$(COMMAND_ECHO)+$(RENAME) $@.tmpfile $@
 	@+-$(RM) $@.tmp_ord
 	@+-$(RM) $@.exptmpfile
-	$(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(SHL10IMPLIBN:s/.lib/.a/) $@
-	$(COMMAND_ECHO)+emxomf -o $(SHL10IMPLIBN) $(SHL10IMPLIBN:s/.lib/.a/) 
+.IF "$(SHL10USE_EXPORTS)"=="" || "$(SHL10USE_EXPORTS)"=="ordinal"
+#03/11/2012  if 'name' is not used, export from def file (with ordinals)
+	@echo Build import library from DEF file.
+	@+-$(RM) $(LB)/$(SHL10TARGETN:b).lib
+	$(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(LB)/$(SHL10TARGETN:b).lib $@
+.ENDIF			# "$(SHL10USE_EXPORTS)"==""
 
 .ENDIF			# "$(GUI)"=="OS2"
 

Modified: openoffice/branches/l10n/main/solenv/inc/_tg_shl.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/solenv/inc/_tg_shl.mk?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/solenv/inc/_tg_shl.mk (original)
+++ openoffice/branches/l10n/main/solenv/inc/_tg_shl.mk Sun Feb  3 13:23:59 2013
@@ -48,7 +48,7 @@ SHL1RPATH*=OOO
 LINKFLAGSRUNPATH_$(SHL1RPATH)*=/ERROR:/Bad_SHL1RPATH_value
 SHL1LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL1RPATH))
 
-.IF "$(SHL1USE_EXPORTS)"==""
+.IF "$(SHL1USE_EXPORTS)"=="" || "$(GUI)"=="OS2"
 SHL1DEF*=$(MISC)/$(SHL1TARGET).def
 .ENDIF			# "$(SHL1USE_EXPORTS)"==""
 
@@ -544,8 +544,11 @@ $(SHL1TARGETN) : \
 
 .ENDIF			# "$(USE_DEFFILE)"!=""
 
-	$(COMMAND_ECHO)+$(IMPLIB) -p256 $(IMPLIBFLAGS) $(SHL1IMPLIBN) $@
-	$(COMMAND_ECHO)+$(IMPLIB) -p256 $(IMPLIBFLAGS) $(LB)/$(SHL1TARGET).lib $@
+.IF "$(SHL1USE_EXPORTS)"=="name"
+#03/11/2012  if 'name' is used, export from DLL file (only names, no ordinals)
+	@echo Build import library from DLL file.
+	$(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(LB)/$(SHL1TARGETN:b).lib $@
+.ENDIF			# "$(SHL1USE_EXPORTS)"==""
 
 .IF "$(SHL1TARGET8)" != "$(SHL1TARGET)"
 	$(COMMAND_ECHO)+$(COPY) $@ $(@:d)$(SHL1TARGET8).dll
@@ -585,7 +588,7 @@ SHL2RPATH*=OOO
 LINKFLAGSRUNPATH_$(SHL2RPATH)*=/ERROR:/Bad_SHL2RPATH_value
 SHL2LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL2RPATH))
 
-.IF "$(SHL2USE_EXPORTS)"==""
+.IF "$(SHL2USE_EXPORTS)"=="" || "$(GUI)"=="OS2"
 SHL2DEF*=$(MISC)/$(SHL2TARGET).def
 .ENDIF			# "$(SHL2USE_EXPORTS)"==""
 
@@ -1081,8 +1084,11 @@ $(SHL2TARGETN) : \
 
 .ENDIF			# "$(USE_DEFFILE)"!=""
 
-	$(COMMAND_ECHO)+$(IMPLIB) -p256 $(IMPLIBFLAGS) $(SHL2IMPLIBN) $@
-	$(COMMAND_ECHO)+$(IMPLIB) -p256 $(IMPLIBFLAGS) $(LB)/$(SHL2TARGET).lib $@
+.IF "$(SHL2USE_EXPORTS)"=="name"
+#03/11/2012  if 'name' is used, export from DLL file (only names, no ordinals)
+	@echo Build import library from DLL file.
+	$(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(LB)/$(SHL2TARGETN:b).lib $@
+.ENDIF			# "$(SHL2USE_EXPORTS)"==""
 
 .IF "$(SHL2TARGET8)" != "$(SHL2TARGET)"
 	$(COMMAND_ECHO)+$(COPY) $@ $(@:d)$(SHL2TARGET8).dll
@@ -1122,7 +1128,7 @@ SHL3RPATH*=OOO
 LINKFLAGSRUNPATH_$(SHL3RPATH)*=/ERROR:/Bad_SHL3RPATH_value
 SHL3LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL3RPATH))
 
-.IF "$(SHL3USE_EXPORTS)"==""
+.IF "$(SHL3USE_EXPORTS)"=="" || "$(GUI)"=="OS2"
 SHL3DEF*=$(MISC)/$(SHL3TARGET).def
 .ENDIF			# "$(SHL3USE_EXPORTS)"==""
 
@@ -1618,8 +1624,11 @@ $(SHL3TARGETN) : \
 
 .ENDIF			# "$(USE_DEFFILE)"!=""
 
-	$(COMMAND_ECHO)+$(IMPLIB) -p256 $(IMPLIBFLAGS) $(SHL3IMPLIBN) $@
-	$(COMMAND_ECHO)+$(IMPLIB) -p256 $(IMPLIBFLAGS) $(LB)/$(SHL3TARGET).lib $@
+.IF "$(SHL3USE_EXPORTS)"=="name"
+#03/11/2012  if 'name' is used, export from DLL file (only names, no ordinals)
+	@echo Build import library from DLL file.
+	$(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(LB)/$(SHL3TARGETN:b).lib $@
+.ENDIF			# "$(SHL3USE_EXPORTS)"==""
 
 .IF "$(SHL3TARGET8)" != "$(SHL3TARGET)"
 	$(COMMAND_ECHO)+$(COPY) $@ $(@:d)$(SHL3TARGET8).dll
@@ -1659,7 +1668,7 @@ SHL4RPATH*=OOO
 LINKFLAGSRUNPATH_$(SHL4RPATH)*=/ERROR:/Bad_SHL4RPATH_value
 SHL4LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL4RPATH))
 
-.IF "$(SHL4USE_EXPORTS)"==""
+.IF "$(SHL4USE_EXPORTS)"=="" || "$(GUI)"=="OS2"
 SHL4DEF*=$(MISC)/$(SHL4TARGET).def
 .ENDIF			# "$(SHL4USE_EXPORTS)"==""
 
@@ -2155,8 +2164,11 @@ $(SHL4TARGETN) : \
 
 .ENDIF			# "$(USE_DEFFILE)"!=""
 
-	$(COMMAND_ECHO)+$(IMPLIB) -p256 $(IMPLIBFLAGS) $(SHL4IMPLIBN) $@
-	$(COMMAND_ECHO)+$(IMPLIB) -p256 $(IMPLIBFLAGS) $(LB)/$(SHL4TARGET).lib $@
+.IF "$(SHL4USE_EXPORTS)"=="name"
+#03/11/2012  if 'name' is used, export from DLL file (only names, no ordinals)
+	@echo Build import library from DLL file.
+	$(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(LB)/$(SHL4TARGETN:b).lib $@
+.ENDIF			# "$(SHL4USE_EXPORTS)"==""
 
 .IF "$(SHL4TARGET8)" != "$(SHL4TARGET)"
 	$(COMMAND_ECHO)+$(COPY) $@ $(@:d)$(SHL4TARGET8).dll
@@ -2196,7 +2208,7 @@ SHL5RPATH*=OOO
 LINKFLAGSRUNPATH_$(SHL5RPATH)*=/ERROR:/Bad_SHL5RPATH_value
 SHL5LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL5RPATH))
 
-.IF "$(SHL5USE_EXPORTS)"==""
+.IF "$(SHL5USE_EXPORTS)"=="" || "$(GUI)"=="OS2"
 SHL5DEF*=$(MISC)/$(SHL5TARGET).def
 .ENDIF			# "$(SHL5USE_EXPORTS)"==""
 
@@ -2692,8 +2704,11 @@ $(SHL5TARGETN) : \
 
 .ENDIF			# "$(USE_DEFFILE)"!=""
 
-	$(COMMAND_ECHO)+$(IMPLIB) -p256 $(IMPLIBFLAGS) $(SHL5IMPLIBN) $@
-	$(COMMAND_ECHO)+$(IMPLIB) -p256 $(IMPLIBFLAGS) $(LB)/$(SHL5TARGET).lib $@
+.IF "$(SHL5USE_EXPORTS)"=="name"
+#03/11/2012  if 'name' is used, export from DLL file (only names, no ordinals)
+	@echo Build import library from DLL file.
+	$(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(LB)/$(SHL5TARGETN:b).lib $@
+.ENDIF			# "$(SHL5USE_EXPORTS)"==""
 
 .IF "$(SHL5TARGET8)" != "$(SHL5TARGET)"
 	$(COMMAND_ECHO)+$(COPY) $@ $(@:d)$(SHL5TARGET8).dll
@@ -2733,7 +2748,7 @@ SHL6RPATH*=OOO
 LINKFLAGSRUNPATH_$(SHL6RPATH)*=/ERROR:/Bad_SHL6RPATH_value
 SHL6LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL6RPATH))
 
-.IF "$(SHL6USE_EXPORTS)"==""
+.IF "$(SHL6USE_EXPORTS)"=="" || "$(GUI)"=="OS2"
 SHL6DEF*=$(MISC)/$(SHL6TARGET).def
 .ENDIF			# "$(SHL6USE_EXPORTS)"==""
 
@@ -3229,8 +3244,11 @@ $(SHL6TARGETN) : \
 
 .ENDIF			# "$(USE_DEFFILE)"!=""
 
-	$(COMMAND_ECHO)+$(IMPLIB) -p256 $(IMPLIBFLAGS) $(SHL6IMPLIBN) $@
-	$(COMMAND_ECHO)+$(IMPLIB) -p256 $(IMPLIBFLAGS) $(LB)/$(SHL6TARGET).lib $@
+.IF "$(SHL6USE_EXPORTS)"=="name"
+#03/11/2012  if 'name' is used, export from DLL file (only names, no ordinals)
+	@echo Build import library from DLL file.
+	$(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(LB)/$(SHL6TARGETN:b).lib $@
+.ENDIF			# "$(SHL6USE_EXPORTS)"==""
 
 .IF "$(SHL6TARGET8)" != "$(SHL6TARGET)"
 	$(COMMAND_ECHO)+$(COPY) $@ $(@:d)$(SHL6TARGET8).dll
@@ -3270,7 +3288,7 @@ SHL7RPATH*=OOO
 LINKFLAGSRUNPATH_$(SHL7RPATH)*=/ERROR:/Bad_SHL7RPATH_value
 SHL7LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL7RPATH))
 
-.IF "$(SHL7USE_EXPORTS)"==""
+.IF "$(SHL7USE_EXPORTS)"=="" || "$(GUI)"=="OS2"
 SHL7DEF*=$(MISC)/$(SHL7TARGET).def
 .ENDIF			# "$(SHL7USE_EXPORTS)"==""
 
@@ -3766,8 +3784,11 @@ $(SHL7TARGETN) : \
 
 .ENDIF			# "$(USE_DEFFILE)"!=""
 
-	$(COMMAND_ECHO)+$(IMPLIB) -p256 $(IMPLIBFLAGS) $(SHL7IMPLIBN) $@
-	$(COMMAND_ECHO)+$(IMPLIB) -p256 $(IMPLIBFLAGS) $(LB)/$(SHL7TARGET).lib $@
+.IF "$(SHL7USE_EXPORTS)"=="name"
+#03/11/2012  if 'name' is used, export from DLL file (only names, no ordinals)
+	@echo Build import library from DLL file.
+	$(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(LB)/$(SHL7TARGETN:b).lib $@
+.ENDIF			# "$(SHL7USE_EXPORTS)"==""
 
 .IF "$(SHL7TARGET8)" != "$(SHL7TARGET)"
 	$(COMMAND_ECHO)+$(COPY) $@ $(@:d)$(SHL7TARGET8).dll
@@ -3807,7 +3828,7 @@ SHL8RPATH*=OOO
 LINKFLAGSRUNPATH_$(SHL8RPATH)*=/ERROR:/Bad_SHL8RPATH_value
 SHL8LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL8RPATH))
 
-.IF "$(SHL8USE_EXPORTS)"==""
+.IF "$(SHL8USE_EXPORTS)"=="" || "$(GUI)"=="OS2"
 SHL8DEF*=$(MISC)/$(SHL8TARGET).def
 .ENDIF			# "$(SHL8USE_EXPORTS)"==""
 
@@ -4303,8 +4324,11 @@ $(SHL8TARGETN) : \
 
 .ENDIF			# "$(USE_DEFFILE)"!=""
 
-	$(COMMAND_ECHO)+$(IMPLIB) -p256 $(IMPLIBFLAGS) $(SHL8IMPLIBN) $@
-	$(COMMAND_ECHO)+$(IMPLIB) -p256 $(IMPLIBFLAGS) $(LB)/$(SHL8TARGET).lib $@
+.IF "$(SHL8USE_EXPORTS)"=="name"
+#03/11/2012  if 'name' is used, export from DLL file (only names, no ordinals)
+	@echo Build import library from DLL file.
+	$(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(LB)/$(SHL8TARGETN:b).lib $@
+.ENDIF			# "$(SHL8USE_EXPORTS)"==""
 
 .IF "$(SHL8TARGET8)" != "$(SHL8TARGET)"
 	$(COMMAND_ECHO)+$(COPY) $@ $(@:d)$(SHL8TARGET8).dll
@@ -4344,7 +4368,7 @@ SHL9RPATH*=OOO
 LINKFLAGSRUNPATH_$(SHL9RPATH)*=/ERROR:/Bad_SHL9RPATH_value
 SHL9LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL9RPATH))
 
-.IF "$(SHL9USE_EXPORTS)"==""
+.IF "$(SHL9USE_EXPORTS)"=="" || "$(GUI)"=="OS2"
 SHL9DEF*=$(MISC)/$(SHL9TARGET).def
 .ENDIF			# "$(SHL9USE_EXPORTS)"==""
 
@@ -4840,8 +4864,11 @@ $(SHL9TARGETN) : \
 
 .ENDIF			# "$(USE_DEFFILE)"!=""
 
-	$(COMMAND_ECHO)+$(IMPLIB) -p256 $(IMPLIBFLAGS) $(SHL9IMPLIBN) $@
-	$(COMMAND_ECHO)+$(IMPLIB) -p256 $(IMPLIBFLAGS) $(LB)/$(SHL9TARGET).lib $@
+.IF "$(SHL9USE_EXPORTS)"=="name"
+#03/11/2012  if 'name' is used, export from DLL file (only names, no ordinals)
+	@echo Build import library from DLL file.
+	$(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(LB)/$(SHL9TARGETN:b).lib $@
+.ENDIF			# "$(SHL9USE_EXPORTS)"==""
 
 .IF "$(SHL9TARGET8)" != "$(SHL9TARGET)"
 	$(COMMAND_ECHO)+$(COPY) $@ $(@:d)$(SHL9TARGET8).dll
@@ -4881,7 +4908,7 @@ SHL10RPATH*=OOO
 LINKFLAGSRUNPATH_$(SHL10RPATH)*=/ERROR:/Bad_SHL10RPATH_value
 SHL10LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL10RPATH))
 
-.IF "$(SHL10USE_EXPORTS)"==""
+.IF "$(SHL10USE_EXPORTS)"=="" || "$(GUI)"=="OS2"
 SHL10DEF*=$(MISC)/$(SHL10TARGET).def
 .ENDIF			# "$(SHL10USE_EXPORTS)"==""
 
@@ -5377,8 +5404,11 @@ $(SHL10TARGETN) : \
 
 .ENDIF			# "$(USE_DEFFILE)"!=""
 
-	$(COMMAND_ECHO)+$(IMPLIB) -p256 $(IMPLIBFLAGS) $(SHL10IMPLIBN) $@
-	$(COMMAND_ECHO)+$(IMPLIB) -p256 $(IMPLIBFLAGS) $(LB)/$(SHL10TARGET).lib $@
+.IF "$(SHL10USE_EXPORTS)"=="name"
+#03/11/2012  if 'name' is used, export from DLL file (only names, no ordinals)
+	@echo Build import library from DLL file.
+	$(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(LB)/$(SHL10TARGETN:b).lib $@
+.ENDIF			# "$(SHL10USE_EXPORTS)"==""
 
 .IF "$(SHL10TARGET8)" != "$(SHL10TARGET)"
 	$(COMMAND_ECHO)+$(COPY) $@ $(@:d)$(SHL10TARGET8).dll
@@ -5430,10 +5460,10 @@ $(SHL1IMPLIBN):	\
 
 .ELIF "$(GUI)" == "OS2"
 
-# touch creates an empty file, but this is not good for emxomfar, so
-# create a dummy lib here
-	$(COMMAND_ECHO)-$(LIBMGR) $(LIBFLAGS) $@ $(SHL1VERSIONOBJ)
-	+@echo build of $(SHL1TARGETN) creates $@
+	@echo Import libs generated with .def file or with .dll file.
+# make 'dmake' happy
+	@-$(RM) $@
+	@$(TOUCH) $@
 
 .ELSE
 	@echo no ImportLibs on Mac and *ix
@@ -5484,10 +5514,10 @@ $(SHL2IMPLIBN):	\
 
 .ELIF "$(GUI)" == "OS2"
 
-# touch creates an empty file, but this is not good for emxomfar, so
-# create a dummy lib here
-	$(COMMAND_ECHO)-$(LIBMGR) $(LIBFLAGS) $@ $(SHL2VERSIONOBJ)
-	+@echo build of $(SHL2TARGETN) creates $@
+	@echo Import libs generated with .def file or with .dll file.
+# make 'dmake' happy
+	@-$(RM) $@
+	@$(TOUCH) $@
 
 .ELSE
 	@echo no ImportLibs on Mac and *ix
@@ -5538,10 +5568,10 @@ $(SHL3IMPLIBN):	\
 
 .ELIF "$(GUI)" == "OS2"
 
-# touch creates an empty file, but this is not good for emxomfar, so
-# create a dummy lib here
-	$(COMMAND_ECHO)-$(LIBMGR) $(LIBFLAGS) $@ $(SHL3VERSIONOBJ)
-	+@echo build of $(SHL3TARGETN) creates $@
+	@echo Import libs generated with .def file or with .dll file.
+# make 'dmake' happy
+	@-$(RM) $@
+	@$(TOUCH) $@
 
 .ELSE
 	@echo no ImportLibs on Mac and *ix
@@ -5592,10 +5622,10 @@ $(SHL4IMPLIBN):	\
 
 .ELIF "$(GUI)" == "OS2"
 
-# touch creates an empty file, but this is not good for emxomfar, so
-# create a dummy lib here
-	$(COMMAND_ECHO)-$(LIBMGR) $(LIBFLAGS) $@ $(SHL4VERSIONOBJ)
-	+@echo build of $(SHL4TARGETN) creates $@
+	@echo Import libs generated with .def file or with .dll file.
+# make 'dmake' happy
+	@-$(RM) $@
+	@$(TOUCH) $@
 
 .ELSE
 	@echo no ImportLibs on Mac and *ix
@@ -5646,10 +5676,10 @@ $(SHL5IMPLIBN):	\
 
 .ELIF "$(GUI)" == "OS2"
 
-# touch creates an empty file, but this is not good for emxomfar, so
-# create a dummy lib here
-	$(COMMAND_ECHO)-$(LIBMGR) $(LIBFLAGS) $@ $(SHL5VERSIONOBJ)
-	+@echo build of $(SHL5TARGETN) creates $@
+	@echo Import libs generated with .def file or with .dll file.
+# make 'dmake' happy
+	@-$(RM) $@
+	@$(TOUCH) $@
 
 .ELSE
 	@echo no ImportLibs on Mac and *ix
@@ -5700,10 +5730,10 @@ $(SHL6IMPLIBN):	\
 
 .ELIF "$(GUI)" == "OS2"
 
-# touch creates an empty file, but this is not good for emxomfar, so
-# create a dummy lib here
-	$(COMMAND_ECHO)-$(LIBMGR) $(LIBFLAGS) $@ $(SHL6VERSIONOBJ)
-	+@echo build of $(SHL6TARGETN) creates $@
+	@echo Import libs generated with .def file or with .dll file.
+# make 'dmake' happy
+	@-$(RM) $@
+	@$(TOUCH) $@
 
 .ELSE
 	@echo no ImportLibs on Mac and *ix
@@ -5754,10 +5784,10 @@ $(SHL7IMPLIBN):	\
 
 .ELIF "$(GUI)" == "OS2"
 
-# touch creates an empty file, but this is not good for emxomfar, so
-# create a dummy lib here
-	$(COMMAND_ECHO)-$(LIBMGR) $(LIBFLAGS) $@ $(SHL7VERSIONOBJ)
-	+@echo build of $(SHL7TARGETN) creates $@
+	@echo Import libs generated with .def file or with .dll file.
+# make 'dmake' happy
+	@-$(RM) $@
+	@$(TOUCH) $@
 
 .ELSE
 	@echo no ImportLibs on Mac and *ix
@@ -5808,10 +5838,10 @@ $(SHL8IMPLIBN):	\
 
 .ELIF "$(GUI)" == "OS2"
 
-# touch creates an empty file, but this is not good for emxomfar, so
-# create a dummy lib here
-	$(COMMAND_ECHO)-$(LIBMGR) $(LIBFLAGS) $@ $(SHL8VERSIONOBJ)
-	+@echo build of $(SHL8TARGETN) creates $@
+	@echo Import libs generated with .def file or with .dll file.
+# make 'dmake' happy
+	@-$(RM) $@
+	@$(TOUCH) $@
 
 .ELSE
 	@echo no ImportLibs on Mac and *ix
@@ -5862,10 +5892,10 @@ $(SHL9IMPLIBN):	\
 
 .ELIF "$(GUI)" == "OS2"
 
-# touch creates an empty file, but this is not good for emxomfar, so
-# create a dummy lib here
-	$(COMMAND_ECHO)-$(LIBMGR) $(LIBFLAGS) $@ $(SHL9VERSIONOBJ)
-	+@echo build of $(SHL9TARGETN) creates $@
+	@echo Import libs generated with .def file or with .dll file.
+# make 'dmake' happy
+	@-$(RM) $@
+	@$(TOUCH) $@
 
 .ELSE
 	@echo no ImportLibs on Mac and *ix
@@ -5916,10 +5946,10 @@ $(SHL10IMPLIBN):	\
 
 .ELIF "$(GUI)" == "OS2"
 
-# touch creates an empty file, but this is not good for emxomfar, so
-# create a dummy lib here
-	$(COMMAND_ECHO)-$(LIBMGR) $(LIBFLAGS) $@ $(SHL10VERSIONOBJ)
-	+@echo build of $(SHL10TARGETN) creates $@
+	@echo Import libs generated with .def file or with .dll file.
+# make 'dmake' happy
+	@-$(RM) $@
+	@$(TOUCH) $@
 
 .ELSE
 	@echo no ImportLibs on Mac and *ix

Modified: openoffice/branches/l10n/main/solenv/inc/found_no.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/solenv/inc/found_no.mk?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/solenv/inc/found_no.mk (original)
+++ openoffice/branches/l10n/main/solenv/inc/found_no.mk Sun Feb  3 13:23:59 2013
@@ -18,7 +18,7 @@
 #  under the License.
 #  
 # *************************************************************
-no_traget:
+no_target:
 	@echo -----------------------------------------------
 	@echo         Error: No makefile.mk found!
 	@echo -----------------------------------------------

Modified: openoffice/branches/l10n/main/solenv/inc/libs.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/solenv/inc/libs.mk?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/solenv/inc/libs.mk (original)
+++ openoffice/branches/l10n/main/solenv/inc/libs.mk Sun Feb  3 13:23:59 2013
@@ -49,7 +49,11 @@ ICULELIB=-licule
 ICUUCLIB=-licuuc
 ICUDATALIB=-licudata
 .ENDIF			# "$(GUI)$(COM)"=="WNTGCC"
+.IF "$(GUI)"=="OS2"
+I18NUTILLIB=-li18nutil
+.ELSE
 I18NUTILLIB=-li18nutil$(COMID)
+.ENDIF
 .INCLUDE .IGNORE : i18npool/version.mk
 I18NISOLANGLIB=-li18nisolang$(ISOLANG_MAJOR)$(COMID)
 I18NPAPERLIB=-li18npaper$(DLLPOSTFIX)
@@ -190,11 +194,7 @@ TKTLIB=-ltkt$(DLLPOSTFIX)
 SAXLIB=-lsax$(DLLPOSTFIX)
 MAILLIB=-lmail
 DOCMGRLIB=-ldmg$(DLLPOSTFIX)
-.IF "$(GUI)"=="OS2"
-BASICLIB=-lbasic
-.ELSE
 BASICLIB=-lsb$(DLLPOSTFIX)
-.ENDIF
 VBAHELPERLIB=-lvbahelper$(DLLPOSTFIX)
 DBTOOLSLIB=-ldbtools$(DLLPOSTFIX)
 HM2LIBSH=-lhmwrpdll

Modified: openoffice/branches/l10n/main/solenv/inc/os2gcci.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/solenv/inc/os2gcci.mk?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/solenv/inc/os2gcci.mk (original)
+++ openoffice/branches/l10n/main/solenv/inc/os2gcci.mk Sun Feb  3 13:23:59 2013
@@ -272,7 +272,7 @@ LIBMGR=emxomfar -p2048
 .ENDIF
 
 # tool for generating import libraries
-IMPLIB=emximp
+IMPLIB=emximp -p2048
 IMPLIBFLAGS=-o
 
 MAPSYM=mapsym

Modified: openoffice/branches/l10n/main/solenv/inc/rules.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/solenv/inc/rules.mk?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/solenv/inc/rules.mk (original)
+++ openoffice/branches/l10n/main/solenv/inc/rules.mk Sun Feb  3 13:23:59 2013
@@ -88,31 +88,12 @@ $(OBJ)/%.obj : %.cc
 .ENDIF
 
 .IF "$(ENABLE_PCH)"!=""
-# workaround for file locking problems on network volumes
-.IF "$(NETWORK_BUILD)"==""
 PCHOUTDIR=$(SLO)/pch
 PCHEXOUTDIR=$(SLO)/pch_ex
-.ELSE			# "$(NETWORK_BUILD)"==""
-PCHOUTDIR=$(TMP)/$(BUILD)$(CWS_WORK_STAMP)$(PRJNAME)$(PROEXT)
-PCHEXOUTDIR=$(TMP)/$(BUILD)$(CWS_WORK_STAMP)$(PRJNAME)_ex$(PROEXT)
-.ENDIF			# "$(NETWORK_BUILD)"==""
 $(SLO)/precompiled.% .PHONY:
 	-$(MKDIRHIER) $(SLO)/pch
 .IF "$(COM)"=="MSC"
-.IF "$(NETWORK_BUILD)"!=""
-	-$(MKDIRHIER) $(PCHOUTDIR)
-.IF "$(HAVE_BIG_TMP)"==""
-	$(COMMAND_ECHO)-$(COPY) $(SLO)/pch/precompiled_$(PRJNAME).hxx$(PCHPOST) $(PCHOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST) 
-.ENDIF			# "$(HAVE_BIG_TMP)"==""
-.ENDIF			# "$(NETWORK_BUILD)"!=""
 	$(COMMAND_ECHO)$(CXX) @$(mktmp -Fp$(PCHOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST) $(CFLAGS_CREATE_PCH) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGS_NO_EXCEPTIONS) -DEXCEPTIONS_OFF $(CFLAGSAPPEND) $(INCPCH)/precompiled_$(PRJNAME).cxx)
-.IF "$(NETWORK_BUILD)"!=""
-	$(COMMAND_ECHO)$(COPY) $(PCHOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST) $(SLO)/pch/precompiled_$(PRJNAME).hxx$(PCHPOST)
-.IF "$(HAVE_BIG_TMP)"==""
-	$(COMMAND_ECHO)$(RM) $(PCHOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST)
-	$(COMMAND_ECHO)$(RMDIR) $(PCHOUTDIR)
-.ENDIF			# "$(HAVE_BIG_TMP)"==""
-.ENDIF			# "$(NETWORK_BUILD)"!=""
 .ELIF "$(COM)"=="GCC" && "$(CCNUMVER)">="000300040000"
 	$(COMMAND_ECHO)$(CXX) -o$(SLO)/pch/precompiled_$(PRJNAME).hxx$(PCHPOST) $(CFLAGS_CREATE_PCH) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGS_NO_EXCEPTIONS) -DEXCEPTIONS_OFF $(CFLAGSAPPEND) $(INCPCH)/precompiled_$(PRJNAME).hxx
 	@echo "#error Tried to use wrong precompiled header" > $(SLO)/pch/precompiled_$(PRJNAME).hxx
@@ -124,20 +105,7 @@ $(SLO)/precompiled.% .PHONY:
 $(SLO)/precompiled_ex.% .PHONY:
 	-$(MKDIRHIER) $(SLO)/pch_ex
 .IF "$(COM)"=="MSC"
-.IF "$(NETWORK_BUILD)"!=""
-	-$(MKDIRHIER) $(PCHEXOUTDIR)
-.IF "$(HAVE_BIG_TMP)"==""
-	$(COMMAND_ECHO)-$(COPY) $(SLO)/pch_ex/precompiled_$(PRJNAME).hxx$(PCHPOST) $(PCHEXOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST) 
-.ENDIF			# "$(HAVE_BIG_TMP)"==""
-.ENDIF			# "$(NETWORK_BUILD)"!=""
 	$(COMMAND_ECHO)$(CXX) @$(mktmp -Fp$(PCHEXOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST) $(CFLAGS_CREATE_PCH:s/pchname/pchname_ex/) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSEXCEPTIONS) -DEXCEPTIONS_ON $(CFLAGSAPPEND) $(INCPCH)/precompiled_$(PRJNAME).cxx)
-.IF "$(NETWORK_BUILD)"!=""
-	$(COMMAND_ECHO)$(COPY) $(PCHEXOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST) $(SLO)/pch_ex/precompiled_$(PRJNAME).hxx$(PCHPOST)
-.IF "$(HAVE_BIG_TMP)"==""
-	$(COMMAND_ECHO)$(RM) $(PCHEXOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST)
-	$(COMMAND_ECHO)$(RMDIR) $(PCHEXOUTDIR)
-.ENDIF			# "$(HAVE_BIG_TMP)"==""
-.ENDIF			# "$(NETWORK_BUILD)"!=""
 .ELIF "$(COM)"=="GCC" && "$(CCNUMVER)">="000300040000"
 	$(COMMAND_ECHO)$(CXX) -o$(SLO)/pch_ex/precompiled_$(PRJNAME).hxx$(PCHPOST) $(CFLAGS_CREATE_PCH) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSEXCEPTIONS) -DEXCEPTIONS_ON $(CFLAGSAPPEND) $(INCPCH)/precompiled_$(PRJNAME).hxx
 	@echo "#error Tried to use wrong precompiled header" > $(SLO)/pch_ex/precompiled_$(PRJNAME).hxx

Modified: openoffice/branches/l10n/main/solenv/inc/settings.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/solenv/inc/settings.mk?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/solenv/inc/settings.mk (original)
+++ openoffice/branches/l10n/main/solenv/inc/settings.mk Sun Feb  3 13:23:59 2013
@@ -38,12 +38,6 @@ force_dmake_to_error
 ENABLE_PCH=TRUE
 .ENDIF			# "$(USE_PCH)"!=""
 
-.IF "$(ENABLE_PCH)"!="" && "$(BUILD_SPECIAL)"!=""
-.IF "$(SOLARSRC)"=="$(SRC_ROOT)"
-NETWORK_BUILD:=TRUE
-.ENDIF			# "$(SOLARSRC)"=="$(SRC_ROOT)"
-.ENDIF			# "$(ENABLE_PCH)"!="" && "$(BUILD_SPECIAL)"!=""
-
 .INCLUDE : unitools.mk
 
 .INCLUDE : minor.mk

Modified: openoffice/branches/l10n/main/solenv/inc/tg_def.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/solenv/inc/tg_def.mk?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/solenv/inc/tg_def.mk (original)
+++ openoffice/branches/l10n/main/solenv/inc/tg_def.mk Sun Feb  3 13:23:59 2013
@@ -288,8 +288,12 @@ $(DEF$(TNR)TARGETN) .PHONY :
 	$(COMMAND_ECHO)+$(RENAME) $@.tmpfile $@
 	@+-$(RM) $@.tmp_ord
 	@+-$(RM) $@.exptmpfile
-	$(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(SHL$(TNR)IMPLIBN:s/.lib/.a/) $@
-	$(COMMAND_ECHO)+emxomf -o $(SHL$(TNR)IMPLIBN) $(SHL$(TNR)IMPLIBN:s/.lib/.a/) 
+.IF "$(SHL$(TNR)USE_EXPORTS)"=="" || "$(SHL$(TNR)USE_EXPORTS)"=="ordinal"
+#03/11/2012  if 'name' is not used, export from def file (with ordinals)
+	@echo Build import library from DEF file.
+	@+-$(RM) $(LB)/$(SHL$(TNR)TARGETN:b).lib
+	$(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(LB)/$(SHL$(TNR)TARGETN:b).lib $@
+.ENDIF			# "$(SHL$(TNR)USE_EXPORTS)"==""
 
 .ENDIF			# "$(GUI)"=="OS2"
 

Modified: openoffice/branches/l10n/main/solenv/inc/tg_shl.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/solenv/inc/tg_shl.mk?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/solenv/inc/tg_shl.mk (original)
+++ openoffice/branches/l10n/main/solenv/inc/tg_shl.mk Sun Feb  3 13:23:59 2013
@@ -53,7 +53,7 @@ SHL$(TNR)RPATH*=OOO
 LINKFLAGSRUNPATH_$(SHL$(TNR)RPATH)*=/ERROR:/Bad_SHL$(TNR)RPATH_value
 SHL$(TNR)LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL$(TNR)RPATH))
 
-.IF "$(SHL$(TNR)USE_EXPORTS)"==""
+.IF "$(SHL$(TNR)USE_EXPORTS)"=="" || "$(GUI)"=="OS2"
 SHL$(TNR)DEF*=$(MISC)/$(SHL$(TNR)TARGET).def
 .ENDIF			# "$(SHL$(TNR)USE_EXPORTS)"==""
 
@@ -549,8 +549,11 @@ $(SHL$(TNR)TARGETN) : \
 
 .ENDIF			# "$(USE_DEFFILE)"!=""
 
-	$(COMMAND_ECHO)+$(IMPLIB) -p256 $(IMPLIBFLAGS) $(SHL$(TNR)IMPLIBN) $@
-	$(COMMAND_ECHO)+$(IMPLIB) -p256 $(IMPLIBFLAGS) $(LB)/$(SHL$(TNR)TARGET).lib $@
+.IF "$(SHL$(TNR)USE_EXPORTS)"=="name"
+#03/11/2012  if 'name' is used, export from DLL file (only names, no ordinals)
+	@echo Build import library from DLL file.
+	$(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(LB)/$(SHL$(TNR)TARGETN:b).lib $@
+.ENDIF			# "$(SHL$(TNR)USE_EXPORTS)"==""
 
 .IF "$(SHL$(TNR)TARGET8)" != "$(SHL$(TNR)TARGET)"
 	$(COMMAND_ECHO)+$(COPY) $@ $(@:d)$(SHL$(TNR)TARGET8).dll
@@ -609,10 +612,10 @@ $(SHL$(TNR)IMPLIBN):	\
 
 .ELIF "$(GUI)" == "OS2"
 
-# touch creates an empty file, but this is not good for emxomfar, so
-# create a dummy lib here
-	$(COMMAND_ECHO)-$(LIBMGR) $(LIBFLAGS) $@ $(SHL$(TNR)VERSIONOBJ)
-	+@echo build of $(SHL$(TNR)TARGETN) creates $@
+	@echo Import libs generated with .def file or with .dll file.
+# make 'dmake' happy
+	@-$(RM) $@
+	@$(TOUCH) $@
 
 .ELSE
 	@echo no ImportLibs on Mac and *ix

Modified: openoffice/branches/l10n/main/sot/inc/sot/formats.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sot/inc/sot/formats.hxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sot/inc/sot/formats.hxx (original)
+++ openoffice/branches/l10n/main/sot/inc/sot/formats.hxx Sun Feb  3 13:23:59 2013
@@ -181,7 +181,8 @@
 #define SOT_FORMATSTR_ID_STARMATH_8_TEMPLATE    ((sal_uLong)138)
 #define SOT_FORMATSTR_ID_STARBASE_8             ((sal_uLong)139)
 #define SOT_FORMATSTR_ID_HC_GDIMETAFILE         ((sal_uLong)140)
-#define SOT_FORMATSTR_ID_USER_END               SOT_FORMATSTR_ID_HC_GDIMETAFILE
+#define SOT_FORMATSTR_ID_PNG                    ((sal_uLong)141)
+#define SOT_FORMATSTR_ID_USER_END               SOT_FORMATSTR_ID_PNG
 
 #endif // _SOT_FORMATS_HXX
 

Modified: openoffice/branches/l10n/main/sot/source/base/exchange.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sot/source/base/exchange.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sot/source/base/exchange.cxx (original)
+++ openoffice/branches/l10n/main/sot/source/base/exchange.cxx Sun Feb  3 13:23:59 2013
@@ -207,6 +207,7 @@ namespace
             /*138 SOT_FORMATSTR_ID_STARMATH_8_TEMPLATE*/            { MIMETYPE_OASIS_OPENDOCUMENT_FORMULA_TEMPLATE_ASCII, "Math 8 Template", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
             /*139 SOT_FORMATSTR_ID_STARBASE_8*/            { MIMETYPE_OASIS_OPENDOCUMENT_DATABASE_ASCII, "StarBase 8", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
             /*140 SOT_FORMAT_GDIMETAFILE*/					{ "application/x-openoffice-highcontrast-gdimetafile;windows_formatname=\"GDIMetaFile\"", "High Contrast GDIMetaFile", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /*141 SOT_FORMATSTR_ID_PNG*/                    { "image/png", "Windows Bitmap", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
             };
 	    return &aInstance[0];
         }

Modified: openoffice/branches/l10n/main/sot/source/base/formats.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/sot/source/base/formats.cxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/sot/source/base/formats.cxx (original)
+++ openoffice/branches/l10n/main/sot/source/base/formats.cxx Sun Feb  3 13:23:59 2013
@@ -1590,7 +1590,7 @@ sal_uInt16 SotExchange::GetExchangeActio
 
 				aVector.push_back( aFlavorEx );
 
-				if( ( SOT_FORMATSTR_ID_BMP == aFlavorEx.mnSotId ) &&
+				if( (( SOT_FORMATSTR_ID_BMP == aFlavorEx.mnSotId ) || (SOT_FORMATSTR_ID_PNG == aFlavorEx.mnSotId)) &&
 					!IsFormatSupported( aVector, SOT_FORMAT_BITMAP ) )
 				{
 					if( SotExchange::GetFormatDataFlavor( SOT_FORMAT_BITMAP, aFlavorEx ) )

Modified: openoffice/branches/l10n/main/stlport/STLport-4.5.patch
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/stlport/STLport-4.5.patch?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/stlport/STLport-4.5.patch (original)
+++ openoffice/branches/l10n/main/stlport/STLport-4.5.patch Sun Feb  3 13:23:59 2013
@@ -684,143 +684,16 @@
    __Named_exception(const string& __str) 
 --- misc/STLport-4.5/stlport/stl/_bvector.h	2001-05-30 05:45:41.000000000 +0200
 +++ misc/build/STLport-4.5/stlport/stl/_bvector.h	2008-07-18 14:13:49.000000000 +0200
-@@ -34,7 +34,7 @@
+@@ -34,7 +34,9 @@
  # include <stl/_vector.h>
  # endif
  
--#define __WORD_BIT (int(CHAR_BIT*sizeof(unsigned int)))
-+#define ___WORD_BIT (int(CHAR_BIT*sizeof(unsigned int)))
++#ifndef __WORD_BIT
+ #define __WORD_BIT (int(CHAR_BIT*sizeof(unsigned int)))
++#endif
  
  _STLP_BEGIN_NAMESPACE 
  
-@@ -80,7 +80,7 @@
-   unsigned int  _M_offset;
- 
-   void _M_bump_up() {
--    if (_M_offset++ == __WORD_BIT - 1) {
-+    if (_M_offset++ == ___WORD_BIT - 1) {
-       _M_offset = 0;
-       ++_M_p;
-     }
-@@ -88,7 +88,7 @@
- 
-   void _M_bump_down() {
-     if (_M_offset-- == 0) {
--      _M_offset = __WORD_BIT - 1;
-+      _M_offset = ___WORD_BIT - 1;
-       --_M_p;
-     }
-   }
-@@ -100,17 +100,17 @@
- 
-   void _M_advance (difference_type __i) {
-     difference_type __n = __i + _M_offset;
--    _M_p += __n / __WORD_BIT;
--    __n = __n % __WORD_BIT;
-+    _M_p += __n / ___WORD_BIT;
-+    __n = __n % ___WORD_BIT;
-     if (__n < 0) {
--      _M_offset = (unsigned int) __n + __WORD_BIT;
-+      _M_offset = (unsigned int) __n + ___WORD_BIT;
-       --_M_p;
-     } else
-       _M_offset = (unsigned int) __n;
-   }
- 
-   difference_type _M_subtract(const _Bit_iterator_base& __x) const {
--    return __WORD_BIT * (_M_p - __x._M_p) + _M_offset - __x._M_offset;
-+    return ___WORD_BIT * (_M_p - __x._M_p) + _M_offset - __x._M_offset;
-   }
- };
- 
-@@ -242,7 +242,7 @@
- protected:
- 
-   unsigned int* _M_bit_alloc(size_t __n) 
--    { return _M_end_of_storage.allocate((__n + __WORD_BIT - 1)/__WORD_BIT); }
-+    { return _M_end_of_storage.allocate((__n + ___WORD_BIT - 1)/___WORD_BIT); }
-   void _M_deallocate() {
-     if (_M_start._M_p)
-       _M_end_of_storage.deallocate(_M_start._M_p,
-@@ -341,7 +341,7 @@
- 
-   void _M_initialize(size_type __n) {
-     unsigned int* __q = this->_M_bit_alloc(__n);
--    this->_M_end_of_storage._M_data = __q + (__n + __WORD_BIT - 1)/__WORD_BIT;
-+    this->_M_end_of_storage._M_data = __q + (__n + ___WORD_BIT - 1)/___WORD_BIT;
-     this->_M_start = iterator(__q, 0);
-     this->_M_finish = this->_M_start + difference_type(__n);
-   }
-@@ -352,13 +352,13 @@
-       ++this->_M_finish;
-     }
-     else {
--      size_type __len = size() ? 2 * size() : __WORD_BIT;
-+      size_type __len = size() ? 2 * size() : ___WORD_BIT;
-       unsigned int* __q = this->_M_bit_alloc(__len);
-       iterator __i = copy(begin(), __position, iterator(__q, 0));
-       *__i++ = __x;
-       this->_M_finish = copy(__position, end(), __i);
-       this->_M_deallocate();
--      this->_M_end_of_storage._M_data = __q + (__len + __WORD_BIT - 1)/__WORD_BIT;
-+      this->_M_end_of_storage._M_data = __q + (__len + ___WORD_BIT - 1)/___WORD_BIT;
-       this->_M_start = iterator(__q, 0);
-     }
-   }
-@@ -411,7 +411,7 @@
-         __i = copy(__first, __last, __i);
-         this->_M_finish = copy(__position, end(), __i);
-         this->_M_deallocate();
--        this->_M_end_of_storage._M_data = __q + (__len + __WORD_BIT - 1)/__WORD_BIT;
-+        this->_M_end_of_storage._M_data = __q + (__len + ___WORD_BIT - 1)/___WORD_BIT;
-         this->_M_start = iterator(__q, 0);
-       }
-     }
-@@ -609,7 +609,7 @@
-       this->_M_finish = copy(begin(), end(), __z);
-       this->_M_deallocate();
-       this->_M_start = iterator(__q, 0);
--      this->_M_end_of_storage._M_data = __q + (__n + __WORD_BIT - 1)/__WORD_BIT;
-+      this->_M_end_of_storage._M_data = __q + (__n + ___WORD_BIT - 1)/___WORD_BIT;
-     }
-   }
- 
-@@ -681,7 +681,7 @@
-       __i = copy(__first, __last, __i);
-       this->_M_finish = copy(__position, end(), __i);
-       this->_M_deallocate();
--      this->_M_end_of_storage._M_data = __q + (__len + __WORD_BIT - 1)/__WORD_BIT;
-+      this->_M_end_of_storage._M_data = __q + (__len + ___WORD_BIT - 1)/___WORD_BIT;
-       this->_M_start = iterator(__q, 0);
-     }
-   }
-@@ -702,7 +702,7 @@
-       __i = copy(__first, __last, __i);
-       this->_M_finish = copy(__position, end(), __i);
-       this->_M_deallocate();
--      this->_M_end_of_storage._M_data = __q + (__len + __WORD_BIT - 1)/__WORD_BIT;
-+      this->_M_end_of_storage._M_data = __q + (__len + ___WORD_BIT - 1)/___WORD_BIT;
-       this->_M_start = iterator(__q, 0);
-     }
-   }
-@@ -722,7 +722,7 @@
-       fill_n(__i, __n, __x);
-       this->_M_finish = copy(__position, end(), __i + difference_type(__n));
-       this->_M_deallocate();
--      this->_M_end_of_storage._M_data = __q + (__len + __WORD_BIT - 1)/__WORD_BIT;
-+      this->_M_end_of_storage._M_data = __q + (__len + ___WORD_BIT - 1)/___WORD_BIT;
-       this->_M_start = iterator(__q, 0);
-     }
-   }
-@@ -799,7 +799,7 @@
- #undef __BVECTOR_QUALIFIED
- #undef __BVEC_TMPL_HEADER
- 
--# undef __WORD_BIT
-+# undef ___WORD_BIT
- 
- #endif /* _STLP_INTERNAL_BVECTOR_H */
- 
 --- misc/STLport-4.5/stlport/stl/_complex.h	2001-07-06 06:16:17.000000000 +0200
 +++ misc/build/STLport-4.5/stlport/stl/_complex.h	2008-07-18 14:13:49.000000000 +0200
 @@ -18,6 +18,10 @@

Modified: openoffice/branches/l10n/main/svgio/inc/svgio/svgreader/svgnode.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/main/svgio/inc/svgio/svgreader/svgnode.hxx?rev=1441909&r1=1441908&r2=1441909&view=diff
==============================================================================
--- openoffice/branches/l10n/main/svgio/inc/svgio/svgreader/svgnode.hxx (original)
+++ openoffice/branches/l10n/main/svgio/inc/svgio/svgreader/svgnode.hxx Sun Feb  3 13:23:59 2013
@@ -59,6 +59,29 @@ namespace svgio
             XmlSpace_preserve
         };
 
+        // display property (see SVG 1.1. 11.5), not inheritable
+        enum Display // #121656#
+        {
+            Display_inline, // the default
+            Display_block,
+            Display_list_item,
+            Display_run_in,
+            Display_compact,
+            Display_marker,
+            Display_table,
+            Display_inline_table,
+            Display_table_row_group,
+            Display_table_header_group,
+            Display_table_footer_group,
+            Display_table_row,
+            Display_table_column_group,
+            Display_table_column,
+            Display_table_cell,
+            Display_table_caption,
+            Display_none,
+            Display_inherit
+        };
+
         class SvgNode : private boost::noncopyable, public InfoProvider
         {
         private:
@@ -80,6 +103,9 @@ namespace svgio
             /// XmlSpace value
             XmlSpace                    maXmlSpace;
 
+            /// Display value #121656#
+            Display                     maDisplay;
+
             /// CSS styles
             SvgStyleAttributeVector     maCssStyleVector;
 
@@ -122,6 +148,10 @@ namespace svgio
             XmlSpace getXmlSpace() const;
             void setXmlSpace(XmlSpace eXmlSpace = XmlSpace_notset) { maXmlSpace = eXmlSpace; }
 
+            /// Display access #121656#
+            Display getDisplay() const { return maDisplay; }
+            void setDisplay(Display eDisplay = Display_inherit) { maDisplay = eDisplay; }
+
             /// alternative parent
             void setAlternativeParent(const SvgNode* pAlternativeParent = 0) { mpAlternativeParent = pAlternativeParent; }
         };



Mime
View raw message