diff options
| author | sb <sb@openoffice.org> | 2010-04-11 17:40:44 +0200 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2010-04-11 17:40:44 +0200 |
| commit | b0818f8883618cbfcb18f839ce9bf8709b23fcb6 (patch) | |
| tree | 5f193343814e560a9d1e338023b2c1dfac5e3216 | |
| parent | 75ba0870517ea585027812c48dcfbc0827280a84 (diff) | |
| parent | a001605a190749900d3e09aa864ce56925ff848e (diff) | |
sb118: merged in DEV300_m76
| -rw-r--r-- | desktop/source/app/langselect.cxx | 15 | ||||
| -rw-r--r-- | svx/source/sdr/primitive2d/sdrattributecreator.cxx | 2 |
2 files changed, 8 insertions, 9 deletions
diff --git a/desktop/source/app/langselect.cxx b/desktop/source/app/langselect.cxx index 7969371f56d9..5e2145b03729 100644 --- a/desktop/source/app/langselect.cxx +++ b/desktop/source/app/langselect.cxx @@ -30,15 +30,14 @@ #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> @@ -224,10 +223,10 @@ bool LanguageSelection::prepareLanguage() 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(); } @@ -235,9 +234,9 @@ bool LanguageSelection::prepareLanguage() 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) ); diff --git a/svx/source/sdr/primitive2d/sdrattributecreator.cxx b/svx/source/sdr/primitive2d/sdrattributecreator.cxx index 361fc6e1f24d..4ff335a04125 100644 --- a/svx/source/sdr/primitive2d/sdrattributecreator.cxx +++ b/svx/source/sdr/primitive2d/sdrattributecreator.cxx @@ -71,7 +71,7 @@ #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> |