diff options
Diffstat (limited to 'desktop/source')
19 files changed, 25 insertions, 28 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 0e09b8b87d..660db6a0c5 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -120,12 +120,13 @@ #include <osl/signal.h> #include <rtl/uuid.h> #include <unotools/pathoptions.hxx> -#include <svtools/languageoptions.hxx> +#include <svl/languageoptions.hxx> #include <unotools/internaloptions.hxx> #include <svtools/miscopt.hxx> #include <svtools/menuoptions.hxx> -#include <svtools/syslocaleoptions.hxx> -#include <svtools/folderrestriction.hxx> +#include <unotools/syslocaleoptions.hxx> +#include <unotools/syslocale.hxx> +#include <svl/folderrestriction.hxx> #include <unotools/tempfile.hxx> #include <rtl/logfile.hxx> #include <rtl/ustrbuf.hxx> @@ -147,7 +148,7 @@ #include <svtools/fontsubstconfig.hxx> #include <svtools/accessibilityoptions.hxx> #include <svtools/apearcfg.hxx> -#include <svtools/misccfg.hxx> +#include <unotools/misccfg.hxx> #include <svtools/filter.hxx> #include <unotools/regoptions.hxx> @@ -1329,7 +1330,7 @@ void Desktop::Main() //LanguageSelection langselect; OUString aUILocaleString = LanguageSelection::getLanguageString(); Locale aUILocale = LanguageSelection::IsoStringToLocale(aUILocaleString); - LanguageType eLanguage = SvtSysLocaleOptions().GetLocaleLanguageType(); + LanguageType eLanguage = SvtSysLocale().GetLanguage(); // #i39040#, do not call anything between GetSettings and SetSettings that might have // a side effect on the settings (like, eg, SvtSysLocaleOptions().GetLocaleLanguageType(), @@ -1820,10 +1821,6 @@ void Desktop::SystemSettingsChanging( AllSettings& rSettings, Window* ) hStyleSettings.SetDragFullOptions( nDragFullOptions ); rSettings.SetStyleSettings ( hStyleSettings ); - - MiscSettings aMiscSettings( rSettings.GetMiscSettings() ); - aMiscSettings.SetTwoDigitYearStart( (USHORT) SfxMiscCfg().GetYear2000() ); - rSettings.SetMiscSettings( aMiscSettings ); } // ======================================================================== diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx index 84bb6cd7b2..e2a8558372 100644 --- a/desktop/source/app/cmdlineargs.cxx +++ b/desktop/source/app/cmdlineargs.cxx @@ -41,7 +41,7 @@ #include <com/sun/star/uno/Reference.hxx> #include "tools/getprocessworkingdir.hxx" -#include <svtools/documentlockfile.hxx> +#include <svl/documentlockfile.hxx> using namespace rtl; using namespace com::sun::star::lang; diff --git a/desktop/source/app/desktop.hrc b/desktop/source/app/desktop.hrc index 76d6710ba0..0a67c2017f 100644 --- a/desktop/source/app/desktop.hrc +++ b/desktop/source/app/desktop.hrc @@ -32,7 +32,7 @@ #define _DESKTOP_HRC_ #ifndef _SOLAR_HRC -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #endif #define RID_DESKTOP_DIALOG_START 2000 diff --git a/desktop/source/app/langselect.hxx b/desktop/source/app/langselect.hxx index 748b50fc65..7d233c2d58 100644 --- a/desktop/source/app/langselect.hxx +++ b/desktop/source/app/langselect.hxx @@ -36,7 +36,7 @@ #include <com/sun/star/lang/Locale.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#include <svtools/languageoptions.hxx> +#include <svl/languageoptions.hxx> namespace desktop { diff --git a/desktop/source/app/userinstall.cxx b/desktop/source/app/userinstall.cxx index 920da56133..ccdeadbd7c 100644 --- a/desktop/source/app/userinstall.cxx +++ b/desktop/source/app/userinstall.cxx @@ -50,9 +50,9 @@ #include <tools/resmgr.hxx> #endif #include <unotools/bootstrap.hxx> -#include <svtools/languageoptions.hxx> +#include <svl/languageoptions.hxx> #ifndef _SVTOOLS_SYSLOCALEOPTIONSOPTIONS_HXX -#include <svtools/syslocaleoptions.hxx> +#include <unotools/syslocaleoptions.hxx> #endif #include <comphelper/processfactory.hxx> #include <com/sun/star/container/XNameAccess.hpp> diff --git a/desktop/source/deployment/gui/dp_gui_autoscrolledit.cxx b/desktop/source/deployment/gui/dp_gui_autoscrolledit.cxx index af99601334..dc9ea6fea8 100644 --- a/desktop/source/deployment/gui/dp_gui_autoscrolledit.cxx +++ b/desktop/source/deployment/gui/dp_gui_autoscrolledit.cxx @@ -33,7 +33,7 @@ #include "svtools/svmedit2.hxx" -#include "svtools/lstner.hxx" +#include "svl/lstner.hxx" #include "svtools/xtextedt.hxx" #include "vcl/scrbar.hxx" diff --git a/desktop/source/deployment/gui/dp_gui_autoscrolledit.hxx b/desktop/source/deployment/gui/dp_gui_autoscrolledit.hxx index c73a4df82c..6ed3d3c723 100644 --- a/desktop/source/deployment/gui/dp_gui_autoscrolledit.hxx +++ b/desktop/source/deployment/gui/dp_gui_autoscrolledit.hxx @@ -31,7 +31,7 @@ #define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_AUTOSCROLLEDIT_HXX #include "svtools/svmedit2.hxx" -#include "svtools/lstner.hxx" +#include "svl/lstner.hxx" namespace dp_gui { diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx index 4430b5b444..e8acd11e45 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx @@ -34,7 +34,7 @@ #include "dp_gui.hrc" #include "svtools/controldims.hrc" -#include "svtools/svtools.hrc" +#include "svl/svtools.hrc" #include "dp_gui.h" #include "dp_gui_dialog2.hxx" diff --git a/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx index d0e2c44be2..f8b3f2be40 100644 --- a/desktop/source/deployment/gui/license_dialog.cxx +++ b/desktop/source/deployment/gui/license_dialog.cxx @@ -43,7 +43,7 @@ #include "com/sun/star/lang/XServiceInfo.hpp" #include "com/sun/star/task/XJobExecutor.hpp" #include "svtools/svmedit.hxx" -#include "svtools/lstner.hxx" +#include "svl/lstner.hxx" #include "svtools/xtextedt.hxx" #include <vcl/scrbar.hxx> #include "vcl/threadex.hxx" diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx index aff8ada634..f940366e06 100644 --- a/desktop/source/deployment/manager/dp_manager.cxx +++ b/desktop/source/deployment/manager/dp_manager.cxx @@ -49,7 +49,7 @@ #include "comphelper/servicedecl.hxx" #include "comphelper/sequence.hxx" #include "xmlscript/xml_helper.hxx" -#include "svtools/inettype.hxx" +#include "svl/inettype.hxx" #include "com/sun/star/lang/DisposedException.hpp" #include "com/sun/star/lang/WrappedTargetRuntimeException.hpp" #include "com/sun/star/beans/UnknownPropertyException.hpp" diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx index 3f2def05d7..1da716513a 100644 --- a/desktop/source/deployment/registry/component/dp_component.cxx +++ b/desktop/source/deployment/registry/component/dp_component.cxx @@ -45,7 +45,7 @@ #include "comphelper/servicedecl.hxx" #include "comphelper/sequence.hxx" #include "xmlscript/xml_helper.hxx" -#include "svtools/inettype.hxx" +#include "svl/inettype.hxx" #include "com/sun/star/lang/WrappedTargetRuntimeException.hpp" #include "com/sun/star/container/XNameContainer.hpp" #include "com/sun/star/container/XHierarchicalNameAccess.hpp" diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.cxx b/desktop/source/deployment/registry/configuration/dp_configuration.cxx index bf63a338ee..e13d580e2b 100644 --- a/desktop/source/deployment/registry/configuration/dp_configuration.cxx +++ b/desktop/source/deployment/registry/configuration/dp_configuration.cxx @@ -45,7 +45,7 @@ #include "comphelper/anytostring.hxx" #include "comphelper/servicedecl.hxx" #include "xmlscript/xml_helper.hxx" -#include "svtools/inettype.hxx" +#include "svl/inettype.hxx" #include "com/sun/star/ucb/NameClash.hpp" #include "com/sun/star/io/XActiveDataSink.hpp" #include "com/sun/star/lang/WrappedTargetRuntimeException.hpp" diff --git a/desktop/source/deployment/registry/executable/dp_executable.cxx b/desktop/source/deployment/registry/executable/dp_executable.cxx index 902d9f6645..5ecfab8b34 100644 --- a/desktop/source/deployment/registry/executable/dp_executable.cxx +++ b/desktop/source/deployment/registry/executable/dp_executable.cxx @@ -38,7 +38,7 @@ #include "osl/file.hxx" #include "ucbhelper/content.hxx" #include "comphelper/servicedecl.hxx" -#include "svtools/inettype.hxx" +#include "svl/inettype.hxx" #include "cppuhelper/implbase1.hxx" using namespace ::com::sun::star; diff --git a/desktop/source/deployment/registry/help/dp_help.cxx b/desktop/source/deployment/registry/help/dp_help.cxx index 8ef0a7141a..61636da1e2 100644 --- a/desktop/source/deployment/registry/help/dp_help.cxx +++ b/desktop/source/deployment/registry/help/dp_help.cxx @@ -38,7 +38,7 @@ #include "osl/file.hxx" #include "ucbhelper/content.hxx" #include "comphelper/servicedecl.hxx" -#include "svtools/inettype.hxx" +#include "svl/inettype.hxx" #include <transex3/compilehelp.hxx> #include <com/sun/star/ucb/XSimpleFileAccess.hpp> diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx index 98f80df964..b4042d1969 100644 --- a/desktop/source/deployment/registry/package/dp_package.cxx +++ b/desktop/source/deployment/registry/package/dp_package.cxx @@ -44,7 +44,7 @@ #include "cppuhelper/exc_hlp.hxx" #include "cppuhelper/implbase1.hxx" #include "ucbhelper/content.hxx" -#include "svtools/inettype.hxx" +#include "svl/inettype.hxx" #include "comphelper/anytostring.hxx" #include "comphelper/makesequence.hxx" #include "comphelper/sequence.hxx" diff --git a/desktop/source/deployment/registry/script/dp_script.cxx b/desktop/source/deployment/registry/script/dp_script.cxx index 1a8a0e4d1b..f5c2ee3e3e 100644 --- a/desktop/source/deployment/registry/script/dp_script.cxx +++ b/desktop/source/deployment/registry/script/dp_script.cxx @@ -40,7 +40,7 @@ #include "cppuhelper/exc_hlp.hxx" #include "cppuhelper/implbase1.hxx" #include "comphelper/servicedecl.hxx" -#include "svtools/inettype.hxx" +#include "svl/inettype.hxx" #include "com/sun/star/util/XUpdatable.hpp" #include "com/sun/star/script/XLibraryContainer.hpp" #include <com/sun/star/ucb/XSimpleFileAccess.hpp> diff --git a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx index c460409890..953cdb8901 100644 --- a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx +++ b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx @@ -38,7 +38,7 @@ #include "ucbhelper/content.hxx" #include "cppuhelper/exc_hlp.hxx" #include "comphelper/servicedecl.hxx" -#include "svtools/inettype.hxx" +#include "svl/inettype.hxx" #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/script/provider/XScriptProviderFactory.hpp> #include <memory> diff --git a/desktop/source/inc/helpid.hrc b/desktop/source/inc/helpid.hrc index 6532e1687e..7bbc194670 100644 --- a/desktop/source/inc/helpid.hrc +++ b/desktop/source/inc/helpid.hrc @@ -31,7 +31,7 @@ #if ! defined INCLUDED_DESKTOP_HELPID_HRC #define INCLUDED_DESKTOP_HELPID_HRC -#include "svtools/solar.hrc" +#include "svl/solar.hrc" #define HID_GLOBAL_FALLBACK 0xFFFFFFFF diff --git a/desktop/source/migration/pages.hxx b/desktop/source/migration/pages.hxx index c5ab388687..f243fff61f 100644 --- a/desktop/source/migration/pages.hxx +++ b/desktop/source/migration/pages.hxx @@ -38,7 +38,7 @@ #include <vcl/scrbar.hxx> #include <svtools/wizardmachine.hxx> #include <svtools/svmedit.hxx> -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include <svtools/xtextedt.hxx> namespace desktop |