Commits

Anonymous committed e6f27db Merge

sb118: merged in DEV300_m76

Comments (0)

Files changed (15)

 fc8bb8ed6262cc430fb8c628c58a96998d08b787 DEV300_m73
 b76dd88d09c1612dddc97347900a324c511eaf90 DEV300_m74
 8565218dc2356f0dbb8e9d9c262aab3ff9d40e54 DEV300_m75
+2a38235a70e552084a85666e27d4a7cfeb28260f DEV300_m76

desktop/source/app/langselect.cxx

 
 #include "app.hxx"
 #include "langselect.hxx"
+#include "cmdlineargs.hxx"
 #include <stdio.h>
 
-#ifndef _RTL_STRING_HXX
 #include <rtl/string.hxx>
-#endif
-#ifndef _SVTOOLS_PATHOPTIONS_HXX
+#include <rtl/bootstrap.hxx>
 #include <unotools/pathoptions.hxx>
-#endif
 #include <tools/resid.hxx>
+#include <tools/config.hxx>
 #include <i18npool/mslangid.hxx>
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/container/XNameAccess.hpp>
                 flush();
             theConfigProvider->setLocale(loc);
 
+            Reference< XPropertySet > xProp(getConfigAccess("org.openoffice.Setup/L10N/", sal_True), UNO_QUERY_THROW);
             if ( !bCmdLanguage )
             {
                 // Store language only 
-                Reference< XPropertySet > xProp(getConfigAccess("org.openoffice.Setup/L10N/", sal_True), UNO_QUERY_THROW);
                 xProp->setPropertyValue(OUString::createFromAscii("ooLocale"), makeAny(aLocaleString));
                 Reference< XChangesBatch >(xProp, UNO_QUERY_THROW)->commitChanges();
             }
             if ( bIniLanguage )
             {
                 // Store language only 
-                Reference< XPropertySet > xProp(getConfigAccess("org.openoffice.Office.Linguistic/General/", sal_True), UNO_QUERY_THROW);
-                xProp->setPropertyValue(OUString::createFromAscii("UILocale"), makeAny(aLocaleString));
-                Reference< XChangesBatch >(xProp, UNO_QUERY_THROW)->commitChanges();
+                Reference< XPropertySet > xProp2(getConfigAccess("org.openoffice.Office.Linguistic/General/", sal_True), UNO_QUERY_THROW);
+                xProp2->setPropertyValue(OUString::createFromAscii("UILocale"), makeAny(aLocaleString));
+                Reference< XChangesBatch >(xProp2, UNO_QUERY_THROW)->commitChanges();
             }
 			
             MsLangId::setConfiguredSystemUILanguage( MsLangId::convertLocaleToLanguage(loc) );

mysqlcppconn/mysql-connector-cpp.patch

  {
  	MethodNotImplementedException(const MethodNotImplementedException& e) : SQLException(e.what(), e.sql_state, e.errNo) { }
  	MethodNotImplementedException(const std::string& reason) : SQLException(reason, "", 0) {}
-@@ -87,7 +87,7 @@
- 	virtual SQLException* copy() { return new MethodNotImplementedException(*this); }
  };
  
 -struct CPPCONN_PUBLIC_FUNC InvalidArgumentException : public SQLException
  {
  	InvalidArgumentException(const InvalidArgumentException& e) : SQLException(e.what(), e.sql_state, e.errNo) { }
  	InvalidArgumentException(const std::string& reason) : SQLException(reason, "", 0) {}
-@@ -96,7 +96,7 @@
- 	virtual SQLException* copy() { return new InvalidArgumentException(*this); }
  };
  
 -struct CPPCONN_PUBLIC_FUNC InvalidInstanceException : public SQLException

postprocess/packregistry/makefile.mk

     $(MY_MOD)/org/openoffice/Inet-wnt.xcu \
     $(MY_MOD)/org/openoffice/Office/Accelerators-unxwnt.xcu \
     $(MY_MOD)/org/openoffice/Office/Common-wnt.xcu \
-    $(MY_MOD)/org/openoffice/Office/Linguistic-ForceDefaultLanguage.xcu \
     $(MY_MOD)/org/openoffice/Office/Paths-unxwnt.xcu
         # Inet-wnt.xcu must come after Inet.xcu
 .ELSE
     $(MY_MOD)/org/openoffice/Office/Impress-ogltrans.xcu
 .END
 
+.IF "$(GUIBASE)" == "WIN"
+MX_XCDS += $(MISC)/forcedefaultlanguage.xcd
+MY_DEPS_forcedefaultlanguage = main
+MY_FILES_forcedefaultlanguage = \
+    $(MY_MOD)/org/openoffice/Office/Linguistic-ForceDefaultLanguage.xcu
+.END
+
 .INCLUDE : settings.mk
 .INCLUDE : target.mk
 

sc/inc/dptablecache.hxx

 
 class ScDPTableDataCache;
 class TypedStrData;
+struct ScQueryParam;
+
 // --------------------------------------------------------------------
 //
 //	base class ScDPTableData to allow implementation with tabular data

sc/source/core/data/dpcachetable.cxx

     // during this call, for this method may be called from the interpretation
     // of GETPIVOTDATA, which disables nested formula interpretation without
     // increasing the macro level.
-    MacroInterpretIncrementer aMacroInc(pDoc);
+    MacroInterpretIncrementer aMacroInc(GetCache()->GetDoc());
 
 	if ( mpCache == NULL )
 		InitNoneCache( NULL );

sc/source/core/data/dptablecache.cxx

 #include "globstr.hrc"
 
 #include <rtl/math.hxx>
+#include "queryparam.hxx"
 #include "dpglobal.hxx"
 
 #include "docoptio.hxx" //for ValidQuery

sc/source/core/data/scdpoutputimpl.cxx

 // INCLUDE ---------------------------------------------------------------
 #include "scdpoutputimpl.hxx"
 #include "scitems.hxx"
-#include <svx/boxitem.hxx>
+#include <editeng/boxitem.hxx>
 // -----------------------------------------------------------------------
 
 namespace

scp2/source/ooo/file_ooo.scp

     Name = "main.xcd";
 End
 
+#ifdef WNT
+
+File gid_File_Share_Registry_Forcedefault_Xcd
+    TXT_FILE_BODY;
+    Styles = (PACKED, SCPZIP_REPLACE, SET_OFFICE_LANGUAGE);
+    Dir = gid_Dir_Share_Registry;
+    Name = "forcedefault.xcd";
+End
+
+#endif
+
 File gid_File_Oo_Ldap_Xcd_Sample
     TXT_FILE_BODY;
     Styles = (PACKED);

scp2/source/ooo/module_hidden_ooo.scp

     gid_File_Oo_Ldap_Xcd_Sample,
     gid_File_Oo_Ad_Ldap_Xcd_Sample,
     gid_File_Share_Registry_Main_Xcd,
+    gid_File_Share_Registry_Forcedefault_Xcd,
 	gid_File_Pymailmerge,
     gid_File_Xsl_Common_Measure_Conversion,
 	gid_File_Xsl_Common_Math_Functions,

sdext/source/minimizer/makefile.mk

 
 COMPONENT_MERGED_XCU= \
     $(EXTENSIONDIR)$/registry$/data$/org$/openoffice$/Office$/Addons.xcu \
+    $(EXTENSIONDIR)$/registry$/data$/org$/openoffice$/Office$/ProtocolHandler.xcu \
     $(EXTENSIONDIR)$/registry$/data$/org$/openoffice$/Office$/extension$/SunPresentationMinimizer.xcu
 
 COMPONENT_FILES= \

sdext/source/minimizer/registry/data/org/openoffice/Office/extension/SunPresentationMinimizer.xcu

     </prop>
 
     <prop oor:name="HelpFile" oor:type="xs:string">
-		<info>
-			<desc>Specifies the filename of the help document after installation,
-			the help can be found in sdext/source/minimizer/help</desc>
-		</info>
 		<value xml:lang="en-US">%origin%/../../../../../../help/help_en-US.odt</value>
     </prop>
 

solenv/config/sdev300.ini

 			COPY_PACKED TRUE
 			DEVROOT %SOL_TMP%$/r
 			FSDK %SOL_TMP%$/r$/msvc7net$/FrameworkSDK
-			NSIS_PATH %SOL_TMP%$/NSIS_242_unicode
+			NSIS_PATH %SOL_TMP%$/r$/NSIS_242_unicode
 			PCLEAN_PATH %SOLARROOT%$/etw
 			PERL %SOL_TMP%$/r$/btw$/perl$/bin$/perl
 			PSDK %SOL_TMP%$/r$/MinGW$/w32api
 			COMPATH %SOL_TMP%$/r$/MinGW
 			COPYALL FALSE
 			FSDK %SOL_TMP%$/r$/msvc7net$/FrameworkSDK
-			NSIS_PATH %SOL_TMP%$/NSIS_242_unicode
+			NSIS_PATH %SOL_TMP%$/r$/NSIS_242_unicode
 			PCLEAN_PATH %SOL_TMP%$/r$/etw
 			PERL %SOL_TMP%$/r$/btw$/perl$/bin$/perl
 			PSDK %SOL_TMP%$/r$/MinGW$/w32api
 			COPY_PACKED TRUE
 			DEVROOT %SOL_TMP%$/r
 			DSDK %SOL_TMP%$/r$/msvc9p$/DirectXSDK
-			ENV_TOOLS %SOL_TMP%$/etw$/%WORK_STAMP%
+			ENV_TOOLS %SOL_TMP%$/r$/etw$/%WORK_STAMP%
 			FSDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v3.5
 			F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0
-			NSIS_PATH %SOL_TMP%$/NSIS_242_unicode
+			NSIS_PATH %SOL_TMP%$/r$/NSIS_242_unicode
 			PCLEAN_PATH %SOLARROOT%$/etw
 			PERL %SOL_TMP%$/r$/%PERLDIR%
 			PSDK %SOL_TMP%$/r$/msvc9p$/PlatformSDK$/V6.1
 		}
 		cax
 		{
-			BUILD_TOOLS %SOL_TMP%$/btw$/%BTOOLDIR%
+			BUILD_TOOLS %SOL_TMP%$/r$/btw$/%BTOOLDIR%
 			COMPATH %SOL_TMP%$/r$/msvc9p
 			COMPROOT %SOL_TMP%$/r$/msvc9p
 			COPYALL FALSE
 			DSDK %COMPATH%$/DirectXSDK
-			ENV_TOOLS %SOL_TMP%$/etw$/%WORK_STAMP%
+			ENV_TOOLS %SOL_TMP%$/r$/etw$/%WORK_STAMP%
 			FSDK %COMPATH%$/Sdk$/v3.5
 			F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0
-			NSIS_PATH %SOL_TMP%$/NSIS_242_unicode
+			NSIS_PATH %SOL_TMP%$/r$/NSIS_242_unicode
 			PCLEAN_PATH %SOL_TMP%$/r$/etw
 			PERL %SOL_TMP%$/r$/%PERLDIR%
 			PSDK %COMPATH%$/PlatformSDK$/V6.1
 		}
 		cap
 		{
-			BUILD_TOOLS %SOL_TMP%$/btw$/%BTOOLDIR%
+			BUILD_TOOLS %SOL_TMP%$/r$/btw$/%BTOOLDIR%
 			COMPATH %SOL_TMP%$/r$/msvc9p
 			COMPROOT %SOL_TMP%$/r$/msvc9p
 			COPYALL TRUE
 			COPY_PACKED TRUE
 			DEVROOT %SOL_TMP%$/r
 			DSDK %SOL_TMP%$/r$/msvc9p$/DirectXSDK
-			ENV_TOOLS %SOL_TMP%$/etw$/%WORK_STAMP%
+			ENV_TOOLS %SOL_TMP%$/r$/etw$/%WORK_STAMP%
 			FSDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v3.5
 			F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0
-			NSIS_PATH %SOL_TMP%$/NSIS_242_unicode
+			NSIS_PATH %SOL_TMP%$/r$/NSIS_242_unicode
 			PCLEAN_PATH %SOLARROOT%$/etw
 			PERL %SOL_TMP%$/r$/%PERLDIR%
 			PSDK %SOL_TMP%$/r$/msvc9p$/PlatformSDK$/V6.1
 		}
 		cax
 		{
-			BUILD_TOOLS %SOL_TMP%$/btw$/%BTOOLDIR%
+			BUILD_TOOLS %SOL_TMP%$/r$/btw$/%BTOOLDIR%
 			COMPATH %SOL_TMP%$/r$/msvc9p
 			COMPROOT %SOL_TMP%$/r$/msvc9p
 			COPYALL FALSE
 			DSDK %COMPATH%$/DirectXSDK
-			ENV_TOOLS %SOL_TMP%$/etw$/%WORK_STAMP%
+			ENV_TOOLS %SOL_TMP%$/r$/etw$/%WORK_STAMP%
 			FSDK %COMPATH%$/Sdk$/v3.5
 			F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0
-			NSIS_PATH %SOL_TMP%$/NSIS_242_unicode
+			NSIS_PATH %SOL_TMP%$/r$/NSIS_242_unicode
 			PCLEAN_PATH %SOL_TMP%$/r$/etw
 			PERL %SOL_TMP%$/r$/%PERLDIR%
 			PSDK %COMPATH%$/PlatformSDK$/V6.1

solenv/inc/minor.mk

 RSCVERSION=300
-RSCREVISION=300m75(Build:9488)
-BUILD=9488
-LAST_MINOR=m75
+RSCREVISION=300m76(Build:9491)
+BUILD=9491
+LAST_MINOR=m76
 SOURCEVERSION=DEV300

svx/source/sdr/primitive2d/sdrattributecreator.cxx

 #include <svx/sdtfchim.hxx>
 #include <svx/svdoutl.hxx>
 #include <svx/svdmodel.hxx>
-#include <editstat.hxx>
+#include <editeng/editstat.hxx>
 #include <drawinglayer/attribute/fillhatchattribute.hxx>
 #include <drawinglayer/attribute/fillgradientattribute.hxx>
 #include <svx/sdr/attribute/sdrshadowtextattribute.hxx>