diff options
| author | Mathias Bauer <mba@openoffice.org> | 2009-10-06 07:38:24 +0200 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2009-10-06 07:38:24 +0200 |
| commit | bff284e216792b8d2a4e498beaba806eeddf844a (patch) | |
| tree | efb38696ec3a75e2e52be6ec37af575e241f4154 | |
| parent | 243aa82066d78f18ddcc7fbbc1ddcb03d7a0ecde (diff) | |
#103496#: move VCL free ConfigItems to unotools
188 files changed, 364 insertions, 360 deletions
diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx index 5a3376c0ce65..4cf91bd3d199 100644 --- a/avmedia/source/viewer/mediawindow.cxx +++ b/avmedia/source/viewer/mediawindow.cxx @@ -36,7 +36,7 @@ #include "mediawindow.hrc" #include <tools/urlobj.hxx> #include <vcl/msgbox.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <sfx2/filedlghelper.hxx> #include <comphelper/processfactory.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> diff --git a/basic/inc/pch/precompiled_basic.hxx b/basic/inc/pch/precompiled_basic.hxx index 32b4fd480afb..0a0ee33fd989 100644 --- a/basic/inc/pch/precompiled_basic.hxx +++ b/basic/inc/pch/precompiled_basic.hxx @@ -180,7 +180,7 @@ #include "svtools/filedlg.hxx" #include "svtools/hint.hxx" #include "svtools/lstner.hxx" -#include "svtools/pathoptions.hxx" +#include "unotools/pathoptions.hxx" #include "svtools/sfxecode.hxx" #include "svtools/smplhint.hxx" #include "svtools/solar.hrc" diff --git a/basic/source/basmgr/basicmanagerrepository.cxx b/basic/source/basmgr/basicmanagerrepository.cxx index 17bd8a712763..2340c7326910 100644 --- a/basic/source/basmgr/basicmanagerrepository.cxx +++ b/basic/source/basmgr/basicmanagerrepository.cxx @@ -44,7 +44,7 @@ /** === end UNO includes === **/ #include <svtools/ehdl.hxx> #include <svtools/sfxecode.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <svtools/smplhint.hxx> #include <vcl/svapp.hxx> #include <tools/debug.hxx> diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx index 8cf8a674ec2f..fbd204180dcc 100644 --- a/basic/source/basmgr/basmgr.cxx +++ b/basic/source/basmgr/basmgr.cxx @@ -40,7 +40,7 @@ #include <vcl/msgbox.hxx> #include <basic/sbx.hxx> #include <sot/storinfo.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <tools/debug.hxx> #include <tools/diagnose_ex.h> #include <basic/sbmod.hxx> diff --git a/basic/source/uno/dlgcont.cxx b/basic/source/uno/dlgcont.cxx index f7e5f9a842e4..f199353c2d7a 100644 --- a/basic/source/uno/dlgcont.cxx +++ b/basic/source/uno/dlgcont.cxx @@ -51,7 +51,7 @@ #include <vcl/svapp.hxx> #include <vcl/settings.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <xmlscript/xmldlg_imexp.hxx> #include <cppuhelper/factory.hxx> #include <svtools/sfxecode.hxx> diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx index c397e402fac4..47b6fbdcb73a 100644 --- a/basic/source/uno/namecont.cxx +++ b/basic/source/uno/namecont.cxx @@ -54,7 +54,7 @@ #include <tools/diagnose_ex.h> #include <tools/urlobj.hxx> #include <unotools/streamwrap.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <svtools/sfxecode.hxx> #include <svtools/ehdl.hxx> #include <basic/basmgr.hxx> diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx index aad4815872c0..e72205744ce0 100644 --- a/basic/source/uno/scriptcont.cxx +++ b/basic/source/uno/scriptcont.cxx @@ -58,7 +58,7 @@ #include <tools/urlobj.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <svtools/sfxecode.hxx> #include <svtools/ehdl.hxx> #include <basic/basmgr.hxx> diff --git a/connectivity/source/drivers/calc/CConnection.cxx b/connectivity/source/drivers/calc/CConnection.cxx index 77467dda0bc3..cfcd8b83761b 100644 --- a/connectivity/source/drivers/calc/CConnection.cxx +++ b/connectivity/source/drivers/calc/CConnection.cxx @@ -46,7 +46,7 @@ #include <tools/urlobj.hxx> #include "calc/CPreparedStatement.hxx" #include "calc/CStatement.hxx" -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <connectivity/dbexception.hxx> #include <cppuhelper/exc_hlp.hxx> #include <rtl/logfile.hxx> diff --git a/connectivity/source/drivers/calc/makefile.mk b/connectivity/source/drivers/calc/makefile.mk index 620bcd6a8eee..f4019564ed30 100644 --- a/connectivity/source/drivers/calc/makefile.mk +++ b/connectivity/source/drivers/calc/makefile.mk @@ -73,6 +73,7 @@ SHL1STDLIBS=\ $(VOSLIB) \ $(SVLLIB) \ $(TOOLSLIB) \ + $(UNOTOOLSLIB) \ $(SALLIB) \ $(DBTOOLSLIB) \ $(DBFILELIB) \ diff --git a/connectivity/source/drivers/file/FConnection.cxx b/connectivity/source/drivers/file/FConnection.cxx index 52d14e6498cb..caa117037bcf 100644 --- a/connectivity/source/drivers/file/FConnection.cxx +++ b/connectivity/source/drivers/file/FConnection.cxx @@ -44,7 +44,7 @@ #include <com/sun/star/ucb/XContentIdentifier.hpp> #include <tools/urlobj.hxx> #include "file/FCatalog.hxx" -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <ucbhelper/content.hxx> #include <connectivity/dbcharset.hxx> #include <connectivity/dbexception.hxx> diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 01691bdfdd6b..ec4ffbe957c1 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -114,14 +114,14 @@ #include <unotools/ucbhelper.hxx> #include <tools/tempfile.hxx> #include <tools/urlobj.hxx> -#include <svtools/moduleoptions.hxx> +#include <unotools/moduleoptions.hxx> #include <osl/module.h> #include <osl/file.hxx> #include <osl/signal.h> #include <rtl/uuid.h> -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <svtools/languageoptions.hxx> -#include <svtools/internaloptions.hxx> +#include <unotools/internaloptions.hxx> #include <svtools/miscopt.hxx> #include <svtools/menuoptions.hxx> #include <svtools/syslocaleoptions.hxx> @@ -149,7 +149,7 @@ #include <svtools/apearcfg.hxx> #include <svtools/misccfg.hxx> #include <svtools/filter.hxx> -#include <svtools/regoptions.hxx> +#include <unotools/regoptions.hxx> #include "langselect.hxx" @@ -1400,7 +1400,7 @@ void Desktop::Main() if (IsFirstStartWizardNeeded()) { - ::svt::RegOptions().removeReminder(); // remove patch registration reminder + ::utl::RegOptions().removeReminder(); // remove patch registration reminder Reference< XJob > xFirstStartJob( xSMgr->createInstance( DEFINE_CONST_UNICODE( "com.sun.star.comp.desktop.FirstStart" ) ), UNO_QUERY ); if (xFirstStartJob.is()) diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx index e87701b4addf..b81923a48d9c 100644 --- a/desktop/source/app/appinit.cxx +++ b/desktop/source/app/appinit.cxx @@ -75,9 +75,9 @@ #include <unotools/tempfile.hxx> #include <ucbhelper/contentbroker.hxx> #include <vcl/svapp.hxx> -#include <svtools/startoptions.hxx> -#include <svtools/pathoptions.hxx> -#include <svtools/internaloptions.hxx> +#include <unotools/startoptions.hxx> +#include <unotools/pathoptions.hxx> +#include <unotools/internaloptions.hxx> #define DEFINE_CONST_OUSTRING(CONSTASCII) OUString(RTL_CONSTASCII_USTRINGPARAM(CONSTASCII)) diff --git a/desktop/source/app/langselect.cxx b/desktop/source/app/langselect.cxx index e9a39207cb50..114997b5d1f7 100644 --- a/desktop/source/app/langselect.cxx +++ b/desktop/source/app/langselect.cxx @@ -39,7 +39,7 @@ #include <rtl/string.hxx> #endif #ifndef _SVTOOLS_PATHOPTIONS_HXX -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #endif #include <tools/resid.hxx> #include <i18npool/mslangid.hxx> diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx index cb2856fb897d..6777bbd52fe6 100644 --- a/desktop/source/app/officeipcthread.cxx +++ b/desktop/source/app/officeipcthread.cxx @@ -47,7 +47,7 @@ #include <rtl/ustrbuf.hxx> #include <rtl/instance.hxx> #include <osl/conditn.hxx> -#include <svtools/moduleoptions.hxx> +#include <unotools/moduleoptions.hxx> #include <rtl/bootstrap.hxx> #include <rtl/strbuf.hxx> #include <comphelper/processfactory.hxx> diff --git a/desktop/source/migration/pages.cxx b/desktop/source/migration/pages.cxx index 80c5849ee4d9..6f9308f7885d 100644 --- a/desktop/source/migration/pages.cxx +++ b/desktop/source/migration/pages.cxx @@ -43,8 +43,8 @@ #include <osl/file.hxx> #include <unotools/bootstrap.hxx> #include <unotools/configmgr.hxx> -#include <svtools/regoptions.hxx> -#include <svtools/useroptions.hxx> +#include <unotools/regoptions.hxx> +#include <unotools/useroptions.hxx> #include <sfx2/basedlgs.hxx> #include <comphelper/processfactory.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> @@ -546,7 +546,7 @@ sal_Bool RegistrationPage::commitPage( CommitPageReason _eReason ) { if ( _eReason == eFinish ) { - ::svt::RegOptions aOptions; + ::utl::RegOptions aOptions; rtl::OUString aEvent; if ( m_rbNow.IsChecked()) @@ -603,7 +603,7 @@ void RegistrationPage::prepareSingleMode() bool RegistrationPage::hasReminderDateCome() { - return ::svt::RegOptions().hasReminderDateCome(); + return ::utl::RegOptions().hasReminderDateCome(); } void RegistrationPage::executeSingleMode() @@ -620,7 +620,7 @@ void RegistrationPage::executeSingleMode() if ( eMode == RegistrationPage::rmNow || eMode == RegistrationPage::rmLater ) pPage->commitPage( IWizardPage::eFinish ); if ( eMode != RegistrationPage::rmLater ) - ::svt::RegOptions().removeReminder(); + ::utl::RegOptions().removeReminder(); } // ----------------------------------------------------------------------- diff --git a/fpicker/source/office/OfficeFilePicker.cxx b/fpicker/source/office/OfficeFilePicker.cxx index 0a8b5ca76974..3f5584a361ed 100644 --- a/fpicker/source/office/OfficeFilePicker.cxx +++ b/fpicker/source/office/OfficeFilePicker.cxx @@ -58,7 +58,7 @@ #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/beans/NamedValue.hpp> #include <unotools/ucbhelper.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <comphelper/sequence.hxx> #include <cppuhelper/typeprovider.hxx> #include "vos/mutex.hxx" diff --git a/fpicker/source/office/OfficeFolderPicker.cxx b/fpicker/source/office/OfficeFolderPicker.cxx index 757ebc0cca7f..b6d04b0190ab 100644 --- a/fpicker/source/office/OfficeFolderPicker.cxx +++ b/fpicker/source/office/OfficeFolderPicker.cxx @@ -45,7 +45,7 @@ #include <com/sun/star/uno/Any.hxx> #include <cppuhelper/factory.hxx> #include <com/sun/star/beans/XPropertySet.hpp> -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> // using ---------------------------------------------------------------- diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index 1b9494bdae22..83b14f3de182 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -45,10 +45,10 @@ #include <ucbhelper/contentbroker.hxx> #include "svtools/ehdl.hxx" #include "svtools/urihelper.hxx" -#include "svtools/pathoptions.hxx" -#include "svtools/viewoptions.hxx" +#include "unotools/pathoptions.hxx" +#include "unotools/viewoptions.hxx" #include "svtools/fileview.hxx" -#include "svtools/inetoptions.hxx" +#include "unotools/inetoptions.hxx" #include "svtools/sfxecode.hxx" #include "svtools/svarray.hxx" #include "svtools/svtabbx.hxx" diff --git a/fpicker/source/office/iodlgimp.cxx b/fpicker/source/office/iodlgimp.cxx index 3a34c1da7be6..5e98d025b0d7 100644 --- a/fpicker/source/office/iodlgimp.cxx +++ b/fpicker/source/office/iodlgimp.cxx @@ -45,7 +45,7 @@ // #97148# --------------- #include "svtools/ctypeitm.hxx" #include "svtools/eitem.hxx" -#include "svtools/viewoptions.hxx" +#include "unotools/viewoptions.hxx" #include "svtools/fileview.hxx" #include "svtools/inettbc.hxx" #include "iodlg.hxx" @@ -54,7 +54,7 @@ #endif #include "svtools/imagemgr.hxx" #include <unotools/localfilehelper.hxx> -#include "svtools/useroptions.hxx" +#include "unotools/useroptions.hxx" #ifndef _RTL_INSTANCE_HXX_ #include "rtl/instance.hxx" #endif diff --git a/framework/inc/dispatch/basedispatcher.hxx b/framework/inc/dispatch/basedispatcher.hxx index 595f45bfc79a..a62ec3e47890 100644 --- a/framework/inc/dispatch/basedispatcher.hxx +++ b/framework/inc/dispatch/basedispatcher.hxx @@ -70,7 +70,7 @@ #include <cppuhelper/weakref.hxx> #include <cppuhelper/interfacecontainer.h> /*DRAFT -#include <svtools/historyoptions.hxx> +#include <unotools/historyoptions.hxx> */ //_________________________________________________________________________________________________________________ diff --git a/framework/inc/helper/persistentwindowstate.hxx b/framework/inc/helper/persistentwindowstate.hxx index 22ef1a481ab7..55d356c80806 100644 --- a/framework/inc/helper/persistentwindowstate.hxx +++ b/framework/inc/helper/persistentwindowstate.hxx @@ -53,7 +53,7 @@ //_________________________________________________________________________________________________________________ // other includes //_________________________________________________________________________________________________________________ -#include <svtools/moduleoptions.hxx> +#include <unotools/moduleoptions.hxx> #include <cppuhelper/weak.hxx> //_________________________________________________________________________________________________________________ diff --git a/framework/inc/helper/titlebarupdate.hxx b/framework/inc/helper/titlebarupdate.hxx index aa893cd40a57..255229d8e2eb 100644 --- a/framework/inc/helper/titlebarupdate.hxx +++ b/framework/inc/helper/titlebarupdate.hxx @@ -93,7 +93,7 @@ //_________________________________________________________________________________________________________________ #ifndef INCLUDED_SVTOOLS_MODULEOPTIONS_HXX -#include <svtools/moduleoptions.hxx> +#include <unotools/moduleoptions.hxx> #endif #ifndef _CPPUHELPER_WEAK_HXX_ diff --git a/framework/inc/pch/precompiled_framework.hxx b/framework/inc/pch/precompiled_framework.hxx index eaffedbc0e5c..5d1d1141244b 100644 --- a/framework/inc/pch/precompiled_framework.hxx +++ b/framework/inc/pch/precompiled_framework.hxx @@ -380,23 +380,23 @@ #include "sot/storage.hxx" #include "svtools/acceleratorexecute.hxx" -#include "svtools/cmdoptions.hxx" +#include "unotools/cmdoptions.hxx" #include "svtools/colorcfg.hxx" #include "svtools/ctrltool.hxx" -#include "svtools/dynamicmenuoptions.hxx" +#include "unotools/dynamicmenuoptions.hxx" #include "svtools/filter.hxx" #include "svtools/framestatuslistener.hxx" #include "svtools/helpopt.hxx" -#include "svtools/historyoptions.hxx" +#include "unotools/historyoptions.hxx" #include "svtools/imageitm.hxx" #include "svtools/imgdef.hxx" #include "svtools/inettype.hxx" -#include "svtools/internaloptions.hxx" +#include "unotools/internaloptions.hxx" #include "svtools/lstner.hxx" #include "svtools/menuoptions.hxx" #include "svtools/miscopt.hxx" -#include "svtools/moduleoptions.hxx" -#include "svtools/pathoptions.hxx" +#include "unotools/moduleoptions.hxx" +#include "unotools/pathoptions.hxx" #include "svtools/sfxecode.hxx" #include "svtools/smplhint.hxx" #include "svtools/solar.hrc" diff --git a/framework/inc/services/desktop.hxx b/framework/inc/services/desktop.hxx index 92c575c7b5b5..c1e1e59dc02f 100644 --- a/framework/inc/services/desktop.hxx +++ b/framework/inc/services/desktop.hxx @@ -80,7 +80,7 @@ //_________________________________________________________________________________________________________________ // other includes //_________________________________________________________________________________________________________________ -#include <svtools/cmdoptions.hxx> +#include <unotools/cmdoptions.hxx> #include <cppuhelper/propshlp.hxx> #include <cppuhelper/interfacecontainer.hxx> #include <cppuhelper/weak.hxx> diff --git a/framework/inc/services/frame.hxx b/framework/inc/services/frame.hxx index 32e83aed1974..022bda1786bc 100644 --- a/framework/inc/services/frame.hxx +++ b/framework/inc/services/frame.hxx @@ -87,7 +87,7 @@ //_________________________________________________________________________________________________________________ // other includes //_________________________________________________________________________________________________________________ -#include <svtools/cmdoptions.hxx> +#include <unotools/cmdoptions.hxx> #include <cppuhelper/interfacecontainer.hxx> #include <cppuhelper/weak.hxx> #include <rtl/string.hxx> diff --git a/framework/inc/services/pluginframe.hxx b/framework/inc/services/pluginframe.hxx index 46a90015a56e..af81b51d04ac 100644 --- a/framework/inc/services/pluginframe.hxx +++ b/framework/inc/services/pluginframe.hxx @@ -57,7 +57,7 @@ #ifndef _VCL_ATOM_HXX #include <vcl/threadex.hxx> #endif -#include <svtools/cmdoptions.hxx> +#include <unotools/cmdoptions.hxx> //_________________________________________________________________________________________________________________ diff --git a/framework/source/classes/bmkmenu.cxx b/framework/source/classes/bmkmenu.cxx index efa66b3a6140..44a023d3b70d 100644 --- a/framework/source/classes/bmkmenu.cxx +++ b/framework/source/classes/bmkmenu.cxx @@ -61,7 +61,7 @@ //_________________________________________________________________________________________________________________ #include <tools/config.hxx> #include <vcl/svapp.hxx> -#include <svtools/dynamicmenuoptions.hxx> +#include <unotools/dynamicmenuoptions.hxx> #include <svtools/menuoptions.hxx> #include <rtl/logfile.hxx> diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx index bb850b876e5c..588c59d8f323 100644 --- a/framework/source/classes/menumanager.cxx +++ b/framework/source/classes/menumanager.cxx @@ -66,8 +66,8 @@ #include <comphelper/extract.hxx> #include <svtools/menuoptions.hxx> -#include <svtools/historyoptions.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/historyoptions.hxx> +#include <unotools/pathoptions.hxx> #include <unotools/localfilehelper.hxx> #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ diff --git a/framework/source/dispatch/closedispatcher.cxx b/framework/source/dispatch/closedispatcher.cxx index 25b80650e81a..d1ac0c0e044e 100644 --- a/framework/source/dispatch/closedispatcher.cxx +++ b/framework/source/dispatch/closedispatcher.cxx @@ -58,7 +58,7 @@ #include <vcl/window.hxx> #include <vcl/svapp.hxx> #include <vos/mutex.hxx> -#include <svtools/moduleoptions.hxx> +#include <unotools/moduleoptions.hxx> //_______________________________________________ // namespace diff --git a/framework/source/dispatch/startmoduledispatcher.cxx b/framework/source/dispatch/startmoduledispatcher.cxx index 80f02236065f..9326181c6476 100644 --- a/framework/source/dispatch/startmoduledispatcher.cxx +++ b/framework/source/dispatch/startmoduledispatcher.cxx @@ -60,7 +60,7 @@ #include <vcl/window.hxx> #include <vcl/svapp.hxx> #include <vos/mutex.hxx> -#include <svtools/moduleoptions.hxx> +#include <unotools/moduleoptions.hxx> //_______________________________________________ // namespace diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index fb10e4fae24c..0887433692b9 100644 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -105,7 +105,7 @@ #include <toolkit/awt/vclxmenu.hxx> #include <comphelper/mediadescriptor.hxx> #include <rtl/logfile.hxx> -#include <svtools/cmdoptions.hxx> +#include <unotools/cmdoptions.hxx> #include <algorithm> #include <boost/bind.hpp> diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx index 0af8ea0e6587..3bf20e9f6590 100644 --- a/framework/source/loadenv/loadenv.cxx +++ b/framework/source/loadenv/loadenv.cxx @@ -106,7 +106,7 @@ #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/unohlp.hxx> #endif -#include <svtools/moduleoptions.hxx> +#include <unotools/moduleoptions.hxx> #include <svtools/sfxecode.hxx> #include <unotools/processfactory.hxx> #include <comphelper/configurationhelper.hxx> diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx index 9328ed9d9a5c..2137e1a22ddd 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -80,7 +80,7 @@ #include <comphelper/configurationhelper.hxx> #include <comphelper/mediadescriptor.hxx> #include <vcl/svapp.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <tools/link.hxx> #include <tools/string.hxx> #include <unotools/tempfile.hxx> diff --git a/framework/source/services/backingwindow.cxx b/framework/source/services/backingwindow.cxx index 40e4a9f7a6b9..509b37d09529 100644 --- a/framework/source/services/backingwindow.cxx +++ b/framework/source/services/backingwindow.cxx @@ -43,7 +43,7 @@ #include "tools/urlobj.hxx" -#include "svtools/dynamicmenuoptions.hxx" +#include "unotools/dynamicmenuoptions.hxx" #include "svtools/imagemgr.hxx" #include "svtools/svtools.hrc" diff --git a/framework/source/services/backingwindow.hxx b/framework/source/services/backingwindow.hxx index 63cfa0742e35..794fbdcc8a1a 100644 --- a/framework/source/services/backingwindow.hxx +++ b/framework/source/services/backingwindow.hxx @@ -38,7 +38,7 @@ #include "vcl/bitmapex.hxx" #include "vcl/toolbox.hxx" -#include "svtools/moduleoptions.hxx" +#include "unotools/moduleoptions.hxx" #include "svtools/acceleratorexecute.hxx" #include "com/sun/star/frame/XDispatchProvider.hpp" diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx index 0e14404de381..2b615240b594 100644 --- a/framework/source/services/frame.cxx +++ b/framework/source/services/frame.cxx @@ -106,7 +106,7 @@ #endif #include <toolkit/awt/vclxwindow.hxx> #include <comphelper/processfactory.hxx> -#include <svtools/moduleoptions.hxx> +#include <unotools/moduleoptions.hxx> #ifdef ENABLE_ASSERTIONS #ifndef _RTL_STRBUF_HXX_ diff --git a/framework/source/services/sessionlistener.cxx b/framework/source/services/sessionlistener.cxx index ad0016fc0af6..81338c1cdbbf 100644 --- a/framework/source/services/sessionlistener.cxx +++ b/framework/source/services/sessionlistener.cxx @@ -66,8 +66,8 @@ #include <com/sun/star/util/URL.hpp> #include <osl/time.h> #include <comphelper/processfactory.hxx> -#include <svtools/pathoptions.hxx> -#include <svtools/internaloptions.hxx> +#include <unotools/pathoptions.hxx> +#include <unotools/internaloptions.hxx> #include <stdio.h> //_______________________________________________ // interface includes diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index 4c20b96f00dc..0b26f96829d2 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -82,9 +82,9 @@ #include <comphelper/processfactory.hxx> #include <comphelper/extract.hxx> #include <svtools/menuoptions.hxx> -#include <svtools/historyoptions.hxx> -#include <svtools/pathoptions.hxx> -#include <svtools/cmdoptions.hxx> +#include <unotools/historyoptions.hxx> +#include <unotools/pathoptions.hxx> +#include <unotools/cmdoptions.hxx> #include <unotools/localfilehelper.hxx> #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/unohlp.hxx> diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx index 37580f86f546..d4e5228c6b9c 100644 --- a/framework/source/uielement/newmenucontroller.cxx +++ b/framework/source/uielement/newmenucontroller.cxx @@ -68,7 +68,7 @@ #include <osl/file.hxx> #include <svtools/menuoptions.hxx> #include <svtools/acceleratorexecute.hxx> -#include <svtools/moduleoptions.hxx> +#include <unotools/moduleoptions.hxx> #include <dispatch/uieventloghelper.hxx> //_________________________________________________________________________________________________________________ diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx b/framework/source/uielement/recentfilesmenucontroller.cxx index 1ca5bf409e6d..9c5ed617b9e0 100644 --- a/framework/source/uielement/recentfilesmenucontroller.cxx +++ b/framework/source/uielement/recentfilesmenucontroller.cxx @@ -62,7 +62,7 @@ #include <vcl/i18nhelp.hxx> #include <tools/urlobj.hxx> #include <rtl/ustrbuf.hxx> -#include <svtools/historyoptions.hxx> +#include <unotools/historyoptions.hxx> #include <cppuhelper/implbase1.hxx> #include <osl/file.hxx> //#include <tools/solar.hrc> diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index 55c8d16af2ec..6be7dc73b4c2 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -85,7 +85,7 @@ //_________________________________________________________________________________________________________________ #include <svtools/imgdef.hxx> #include <svtools/toolboxcontroller.hxx> -#include <svtools/cmdoptions.hxx> +#include <unotools/cmdoptions.hxx> #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/unohlp.hxx> #endif @@ -99,7 +99,7 @@ #include <vcl/taskpanelist.hxx> #include <rtl/logfile.hxx> #include <svtools/menuoptions.hxx> -#include <svtools/cmdoptions.hxx> +#include <unotools/cmdoptions.hxx> #include <boost/bind.hpp> //_________________________________________________________________________________________________________________ diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx index 3b359eea97c2..a697eaeff3b7 100644 --- a/framework/source/uielement/toolbarsmenucontroller.cxx +++ b/framework/source/uielement/toolbarsmenucontroller.cxx @@ -80,7 +80,7 @@ #endif #include <vcl/window.hxx> #include <svtools/menuoptions.hxx> -#include <svtools/cmdoptions.hxx> +#include <unotools/cmdoptions.hxx> #include <dispatch/uieventloghelper.hxx> #include <rtl/logfile.hxx> diff --git a/linguistic/inc/lngprops.hxx b/linguistic/inc/lngprops.hxx index 2714c439d18e..6903d3f1d897 100644 --- a/linguistic/inc/lngprops.hxx +++ b/linguistic/inc/lngprops.hxx @@ -31,7 +31,7 @@ #ifndef _LINGUISTIC_LNGPROPS_HHX_ #define _LINGUISTIC_LNGPROPS_HHX_ -#include <svtools/linguprops.hxx> +#include <unotools/linguprops.hxx> // maximal number of suggestions to be returned in spelling context-menu // (may not include results added by looking up user dictionaries) diff --git a/linguistic/inc/misc.hxx b/linguistic/inc/misc.hxx index 6f06948db4af..a588491ef4d6 100644 --- a/linguistic/inc/misc.hxx +++ b/linguistic/inc/misc.hxx @@ -44,7 +44,7 @@ #include <uno/lbnames.h> // CPPU_CURRENT_LANGUAGE_BINDING_NAME macro, which specify the environment type #include <cppuhelper/implbase1.hxx> // helper for implementations -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <i18npool/lang.h> #include <tools/string.hxx> #include <unotools/charclass.hxx> diff --git a/linguistic/source/convdiclist.cxx b/linguistic/source/convdiclist.cxx index ff68146834bf..89604517a41f 100644 --- a/linguistic/source/convdiclist.cxx +++ b/linguistic/source/convdiclist.cxx @@ -33,9 +33,9 @@ #include <tools/fsys.hxx> #include <tools/stream.hxx> #include <tools/urlobj.hxx> -#include <svtools/pathoptions.hxx> -#include <svtools/useroptions.hxx> -#include <svtools/lingucfg.hxx> +#include <unotools/pathoptions.hxx> +#include <unotools/useroptions.hxx> +#include <unotools/lingucfg.hxx> #include <sfx2/docfile.hxx> #include <vcl/svapp.hxx> #include <rtl/instance.hxx> diff --git a/linguistic/source/dlistimp.cxx b/linguistic/source/dlistimp.cxx index 4da58e270991..fea10319a99c 100644 --- a/linguistic/source/dlistimp.cxx +++ b/linguistic/source/dlistimp.cxx @@ -39,8 +39,8 @@ #include <tools/stream.hxx> #include <tools/urlobj.hxx> #include <i18npool/mslangid.hxx> -#include <svtools/pathoptions.hxx> -#include <svtools/useroptions.hxx> +#include <unotools/pathoptions.hxx> +#include <unotools/useroptions.hxx> #include <sfx2/docfile.hxx> #include <vcl/svapp.hxx> #include <cppuhelper/factory.hxx> // helper for factories diff --git a/linguistic/source/lngopt.cxx b/linguistic/source/lngopt.cxx index 995b0686e2f8..6b7b74a68d86 100644 --- a/linguistic/source/lngopt.cxx +++ b/linguistic/source/lngopt.cxx @@ -35,7 +35,7 @@ #include "lngprops.hxx" #include "misc.hxx" #include <tools/debug.hxx> -#include <svtools/lingucfg.hxx> +#include <unotools/lingucfg.hxx> #include <vcl/svapp.hxx> #include <uno/lbnames.h> // CPPU_CURRENT_LANGUAGE_BINDING_NAME macro, which specify the environment type diff --git a/linguistic/source/lngopt.hxx b/linguistic/source/lngopt.hxx index b424970a929b..34a9259545d3 100644 --- a/linguistic/source/lngopt.hxx +++ b/linguistic/source/lngopt.hxx @@ -41,7 +41,7 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/beans/XPropertyAccess.hpp> #include <com/sun/star/lang/XComponent.hpp> -#include <svtools/lingucfg.hxx> +#include <unotools/lingucfg.hxx> #include <svtools/itemprop.hxx> #include <unotools/configitem.hxx> #include <com/sun/star/uno/Any.h> diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx index 41d805fe9212..a002799efedc 100644 --- a/linguistic/source/lngsvcmgr.cxx +++ b/linguistic/source/lngsvcmgr.cxx @@ -40,7 +40,7 @@ #include <com/sun/star/linguistic2/LinguServiceEventFlags.hpp> #include <tools/solar.h> -#include <svtools/lingucfg.hxx> +#include <unotools/lingucfg.hxx> #include <unotools/processfactory.hxx> #include <i18npool/lang.h> #include <i18npool/mslangid.hxx> diff --git a/linguistic/source/misc.cxx b/linguistic/source/misc.cxx index 91beaa2e2c9f..8d754054422a 100644 --- a/linguistic/source/misc.cxx +++ b/linguistic/source/misc.cxx @@ -33,7 +33,7 @@ #include <tools/string.hxx> #include <tools/fsys.hxx> #include <tools/debug.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <svtools/lngmisc.hxx> #include <ucbhelper/content.hxx> #include <i18npool/mslangid.hxx> diff --git a/linguistic/source/misc2.cxx b/linguistic/source/misc2.cxx index f89ebc1bc661..ffd54b78f860 100644 --- a/linguistic/source/misc2.cxx +++ b/linguistic/source/misc2.cxx @@ -35,7 +35,7 @@ #include <tools/urlobj.hxx> #include <ucbhelper/content.hxx> #include <tools/debug.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <unotools/processfactory.hxx> #include <unotools/localfilehelper.hxx> #include <unotools/localedatawrapper.hxx> diff --git a/sfx2/inc/pch/precompiled_sfx2.hxx b/sfx2/inc/pch/precompiled_sfx2.hxx index 03f38a27fe4f..07483990a655 100644 --- a/sfx2/inc/pch/precompiled_sfx2.hxx +++ b/sfx2/inc/pch/precompiled_sfx2.hxx @@ -503,20 +503,20 @@ #include "svtools/cstitem.hxx" #include "svtools/ctypeitm.hxx" #include "svtools/dateitem.hxx" -#include "svtools/dynamicmenuoptions.hxx" +#include "unotools/dynamicmenuoptions.hxx" #include "svtools/ehdl.hxx" #include "svtools/eitem.hxx" #include "svtools/embedhlp.hxx" #include "svtools/embedtransfer.hxx" -#include "svtools/eventcfg.hxx" -#include "svtools/extendedsecurityoptions.hxx" +#include "unotools/eventcfg.hxx" +#include "unotools/extendedsecurityoptions.hxx" #include "svtools/flagitem.hxx" #include "svtools/folderrestriction.hxx" -#include "svtools/fontoptions.hxx" +#include "unotools/fontoptions.hxx" #include "svtools/framestatuslistener.hxx" #include "svtools/helpopt.hxx" #include "svtools/hint.hxx" -#include "svtools/historyoptions.hxx" +#include "unotools/historyoptions.hxx" #include "svtools/htmlkywd.hxx" #include "svtools/htmltokn.h" #include "svtools/imageitm.hxx" @@ -526,10 +526,10 @@ #include "svtools/inetdef.hxx" #include "svtools/inethist.hxx" #include "svtools/inetmsg.hxx" -#include "svtools/inetoptions.hxx" +#include "unotools/inetoptions.hxx" #include "svtools/inetstrm.hxx" #include "svtools/inettype.hxx" -#include "svtools/internaloptions.hxx" +#include "unotools/internaloptions.hxx" #include "svtools/intitem.hxx" #include "svtools/isethint.hxx" #include "svtools/itemdel.hxx" @@ -539,32 +539,32 @@ #include "svtools/itemset.hxx" #include "svtools/javacontext.hxx" #include "svtools/lckbitem.hxx" -#include "svtools/localisationoptions.hxx" +#include "unotools/localisationoptions.hxx" #include "svtools/localresaccess.hxx" #include "svtools/lstner.hxx" #include "svtools/memberid.hrc" #include "svtools/menuoptions.hxx" #include "svtools/misccfg.hxx" #include "svtools/miscopt.hxx" -#include "svtools/moduleoptions.hxx" +#include "unotools/moduleoptions.hxx" #include "svtools/ownlist.hxx" #include "svtools/parhtml.hxx" -#include "svtools/pathoptions.hxx" +#include "unotools/pathoptions.hxx" #include "svtools/pickerhelper.hxx" #include "svtools/poolitem.hxx" #include "svtools/printoptions.hxx" -#include "svtools/printwarningoptions.hxx" +#include "unotools/printwarningoptions.hxx" #include "svtools/rectitem.hxx" -#include "svtools/regoptions.hxx" -#include "svtools/saveopt.hxx" -#include "svtools/searchopt.hxx" -#include "svtools/securityoptions.hxx" +#include "unotools/regoptions.hxx" +#include "unotools/saveopt.hxx" +#include "unotools/searchopt.hxx" +#include "unotools/securityoptions.hxx" #include "svtools/sfxecode.hxx" #include "svtools/slstitm.hxx" #include "svtools/smplhint.hxx" #include "svtools/soerr.hxx" #include "svtools/solar.hrc" -#include "svtools/startoptions.hxx" +#include "unotools/startoptions.hxx" #include "svtools/statusbarcontroller.hxx" #include "svtools/stritem.hxx" #include "svtools/style.hrc" @@ -582,14 +582,14 @@ #include "svtools/transfer.hxx" #include "svtools/ttprops.hxx" #include "svtools/undo.hxx" -#include "svtools/undoopt.hxx" +#include "unotools/undoopt.hxx" #include "svtools/urihelper.hxx" #include "svtools/urlbmk.hxx" -#include "svtools/useroptions.hxx" -#include "svtools/viewoptions.hxx" +#include "unotools/useroptions.hxx" +#include "unotools/viewoptions.hxx" #include "svtools/visitem.hxx" #include "svtools/whiter.hxx" -#include "svtools/workingsetoptions.hxx" +#include "unotools/workingsetoptions.hxx" #include "svtools/zforlist.hxx" #include "toolkit/awt/vclxwindow.hxx" #include "toolkit/helper/convert.hxx" diff --git a/sfx2/inc/sfx2/event.hxx b/sfx2/inc/sfx2/event.hxx index 653fa2eeb7d8..bec05af5dfaa 100644 --- a/sfx2/inc/sfx2/event.hxx +++ b/sfx2/inc/sfx2/event.hxx @@ -34,7 +34,7 @@ #include "sfx2/dllapi.h" #include <tools/string.hxx> #include <svtools/hint.hxx> -#include <svtools/eventcfg.hxx> +#include <unotools/eventcfg.hxx> #include <rtl/ustring.hxx> #include <com/sun/star/uno/Sequence.hxx> diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx index d00a1e7c9b22..a432bd437b77 100644 --- a/sfx2/source/appl/app.cxx +++ b/sfx2/source/appl/app.cxx @@ -136,29 +136,28 @@ #define DDE_AVAILABLE #endif -#include <svtools/saveopt.hxx> -#include <svtools/undoopt.hxx> +#include <unotools/saveopt.hxx> +#include <unotools/undoopt.hxx> #include <svtools/helpopt.hxx> -#include <svtools/pathoptions.hxx> -#include <svtools/viewoptions.hxx> -#include <svtools/moduleoptions.hxx> -#include <svtools/historyoptions.hxx> +#include <unotools/pathoptions.hxx> +#include <unotools/viewoptions.hxx> +#include <unotools/moduleoptions.hxx> +#include <unotools/historyoptions.hxx> #include <svtools/menuoptions.hxx> -#include <svtools/addxmltostorageoptions.hxx> #include <svtools/miscopt.hxx> -#include <svtools/useroptions.hxx> -#include <svtools/startoptions.hxx> -#include <svtools/securityoptions.hxx> -#include <svtools/localisationoptions.hxx> -#include <svtools/inetoptions.hxx> -#include <svtools/fontoptions.hxx> -#include <svtools/internaloptions.hxx> -#include <svtools/workingsetoptions.hxx> +#include <unotools/useroptions.hxx> +#include <unotools/startoptions.hxx> +#include <unotools/securityoptions.hxx> +#include <unotools/localisationoptions.hxx> +#include <unotools/inetoptions.hxx> +#include <unotools/fontoptions.hxx> +#include <unotools/internaloptions.hxx> +#include <unotools/workingsetoptions.hxx> #include <svtools/syslocaleoptions.hxx> #include <svtools/syslocale.hxx> #include <framework/addonsoptions.hxx> #include <svtools/ttprops.hxx> -#include <svtools/extendedsecurityoptions.hxx> +#include <unotools/extendedsecurityoptions.hxx> using namespace ::com::sun::star; diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx index 37ba123b2aca..e7b8316ea861 100644 --- a/sfx2/source/appl/appbas.cxx +++ b/sfx2/source/appl/appbas.cxx @@ -53,9 +53,9 @@ #include <svtools/sfxecode.hxx> #include <svtools/ehdl.hxx> -#include <svtools/undoopt.hxx> -#include <svtools/pathoptions.hxx> -#include <svtools/useroptions.hxx> +#include <unotools/undoopt.hxx> +#include <unotools/pathoptions.hxx> +#include <unotools/useroptions.hxx> #include <unotools/bootstrap.hxx> #include <sfx2/appuno.hxx> diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx index af31659ec24c..4a264c4566f0 100644 --- a/sfx2/source/appl/appcfg.cxx +++ b/sfx2/source/appl/appcfg.cxx @@ -68,12 +68,12 @@ #include <unotools/configmgr.hxx> #include <tools/urlobj.hxx> #include <tools/wldcrd.hxx> -#include <svtools/saveopt.hxx> +#include <unotools/saveopt.hxx> #include <svtools/helpopt.hxx> -#include <svtools/undoopt.hxx> -#include <svtools/securityoptions.hxx> -#include <svtools/pathoptions.hxx> -#include <svtools/inetoptions.hxx> +#include <unotools/undoopt.hxx> +#include <unotools/securityoptions.hxx> +#include <unotools/pathoptions.hxx> +#include <unotools/inetoptions.hxx> #include <svtools/miscopt.hxx> #include <vcl/toolbox.hxx> #include <unotools/localfilehelper.hxx> diff --git a/sfx2/source/appl/appdde.cxx b/sfx2/source/appl/appdde.cxx index ec26ead8a792..b28f7bcad460 100644 --- a/sfx2/source/appl/appdde.cxx +++ b/sfx2/source/appl/appdde.cxx @@ -41,7 +41,7 @@ #include <sfx2/linkmgr.hxx> #include <tools/urlobj.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #ifndef GCC #endif diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx index 98439eb5a6dc..1603a6775ce5 100644 --- a/sfx2/source/appl/appinit.cxx +++ b/sfx2/source/appl/appinit.cxx @@ -39,8 +39,8 @@ #include <svtools/soerr.hxx> #include <svtools/svtools.hrc> -#include <svtools/saveopt.hxx> -#include <svtools/localisationoptions.hxx> +#include <unotools/saveopt.hxx> +#include <unotools/localisationoptions.hxx> #include <tools/config.hxx> #ifndef _SV_RESARY_HXX #include <tools/resary.hxx> @@ -60,9 +60,9 @@ #include <rtl/ustrbuf.hxx> #include <vos/security.hxx> #include <ucbhelper/configurationkeys.hxx> -#include <svtools/pathoptions.hxx> -#include <svtools/historyoptions.hxx> -#include <svtools/moduleoptions.hxx> +#include <unotools/pathoptions.hxx> +#include <unotools/historyoptions.hxx> +#include <unotools/moduleoptions.hxx> #include <cppuhelper/implbase2.hxx> #include <rtl/logfile.hxx> diff --git a/sfx2/source/appl/appmain.cxx b/sfx2/source/appl/appmain.cxx index 8d9114abda40..92817d0dbee1 100644 --- a/sfx2/source/appl/appmain.cxx +++ b/sfx2/source/appl/appmain.cxx @@ -40,7 +40,7 @@ #include <svtools/cstitem.hxx> #include <tools/config.hxx> #include <svtools/ehdl.hxx> -#include <svtools/startoptions.hxx> +#include <unotools/startoptions.hxx> #include <svtools/itempool.hxx> #include <svtools/urihelper.hxx> #include <svtools/helpopt.hxx> diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx index 684a78aeb39c..7af52a15cddf 100644 --- a/sfx2/source/appl/appmisc.cxx +++ b/sfx2/source/appl/appmisc.cxx @@ -41,8 +41,8 @@ #include <svtools/intitem.hxx> #include <svtools/eitem.hxx> #include <svtools/filter.hxx> -#include <svtools/internaloptions.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/internaloptions.hxx> +#include <unotools/pathoptions.hxx> #include <com/sun/star/registry/InvalidRegistryException.hpp> #ifndef _COM_SUN_STAR_BEANS_PropertyValue_HPP_ #include <com/sun/star/beans/PropertyValue.hpp> @@ -64,7 +64,7 @@ #include <comphelper/processfactory.hxx> #include <unotools/localfilehelper.hxx> #include <unotools/bootstrap.hxx> -#include <svtools/moduleoptions.hxx> +#include <unotools/moduleoptions.hxx> #include <osl/file.hxx> #include "sfxresid.hxx" diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx index c6cb16f8f3f6..24b1437abc26 100644 --- a/sfx2/source/appl/appopen.cxx +++ b/sfx2/source/appl/appopen.cxx @@ -75,11 +75,11 @@ #include <basic/sbxobj.hxx> #include <svtools/urihelper.hxx> #include <unotools/localfilehelper.hxx> -#include <svtools/pathoptions.hxx> -#include <svtools/moduleoptions.hxx> +#include <unotools/pathoptions.hxx> +#include <unotools/moduleoptions.hxx> #include <svtools/templdlg.hxx> #include <osl/file.hxx> -#include <svtools/extendedsecurityoptions.hxx> +#include <unotools/extendedsecurityoptions.hxx> #include <comphelper/docpasswordhelper.hxx> #include <vcl/svapp.hxx> diff --git a/sfx2/source/appl/appquit.cxx b/sfx2/source/appl/appquit.cxx index 9a89b4de2f81..4dfdbb90b20c 100644 --- a/sfx2/source/appl/appquit.cxx +++ b/sfx2/source/appl/appquit.cxx @@ -42,7 +42,7 @@ #endif #include <svtools/eitem.hxx> -#include <svtools/saveopt.hxx> +#include <unotools/saveopt.hxx> #include <svtools/misccfg.hxx> #ifndef GCC diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index 184ecb9f1a5c..bc3bf30fc0cc 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -84,9 +84,9 @@ #include <vcl/stdtext.hxx> #include <rtl/ustrbuf.hxx> -#include <svtools/pathoptions.hxx> -#include <svtools/moduleoptions.hxx> -#include <svtools/regoptions.hxx> +#include <unotools/pathoptions.hxx> +#include <unotools/moduleoptions.hxx> +#include <unotools/regoptions.hxx> #include <svtools/helpopt.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <tools/shl.hxx> @@ -1209,7 +1209,7 @@ void SfxApplication::OfaState_Impl(SfxItemSet &rSet) { case SID_ONLINE_REGISTRATION: { - ::svt::RegOptions aOptions; + ::utl::RegOptions aOptions; if ( !aOptions.allowMenu() ) rSet.DisableItem( SID_ONLINE_REGISTRATION ); } diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx index 60beac537e53..23a08e71356f 100644 --- a/sfx2/source/appl/childwin.cxx +++ b/sfx2/source/appl/childwin.cxx @@ -37,7 +37,7 @@ #ifndef _RCID_H #include <tools/rcid.h> #endif -#include <svtools/viewoptions.hxx> +#include <unotools/viewoptions.hxx> #include <com/sun/star/frame/XController.hpp> #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/util/XCloseable.hpp> diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index 5051f71ab78e..0795d876040e 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -95,10 +95,10 @@ #include <com/sun/star/view/XViewSettingsSupplier.hpp> #include <com/sun/star/ui/XDockingAreaAcceptor.hpp> #include <svtools/helpopt.hxx> -#include <svtools/historyoptions.hxx> +#include <unotools/historyoptions.hxx> #include <svtools/menuoptions.hxx> -#include <svtools/pathoptions.hxx> -#include <svtools/viewoptions.hxx> +#include <unotools/pathoptions.hxx> +#include <unotools/viewoptions.hxx> #include <svtools/svtdata.hxx> #include <tools/urlobj.hxx> #include <tools/cachestr.hxx> diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx index 69b16058db8f..acda2cf312e7 100644 --- a/sfx2/source/appl/newhelp.hxx +++ b/sfx2/source/appl/newhelp.hxx @@ -52,7 +52,7 @@ namespace com { namespace sun { namespace star { namespace text { class XTextRan #include <vcl/lstbox.hxx> #include <vcl/dialog.hxx> #include <svtools/svtreebx.hxx> -#include <svtools/moduleoptions.hxx> +#include <unotools/moduleoptions.hxx> #include "srchdlg.hxx" diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx index 8a6622636c14..bf213d1a5d3e 100644 --- a/sfx2/source/appl/sfxhelp.cxx +++ b/sfx2/source/appl/sfxhelp.cxx @@ -56,12 +56,12 @@ #include <unotools/configmgr.hxx> #include <unotools/configitem.hxx> #include <svtools/helpopt.hxx> -#include <svtools/moduleoptions.hxx> +#include <unotools/moduleoptions.hxx> #include <tools/urlobj.hxx> #include <unotools/configmgr.hxx> #include <ucbhelper/content.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <rtl/ustring.hxx> #include <osl/process.h> #include <osl/file.hxx> diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx index 0de25b0c7503..4e57eea38d57 100644 --- a/sfx2/source/appl/sfxpicklist.cxx +++ b/sfx2/source/appl/sfxpicklist.cxx @@ -32,8 +32,8 @@ #include "precompiled_sfx2.hxx" #include <com/sun/star/document/XDocumentProperties.hpp> -#include <svtools/historyoptions.hxx> -#include <svtools/useroptions.hxx> +#include <unotools/historyoptions.hxx> +#include <unotools/useroptions.hxx> #include <tools/urlobj.hxx> #include <framework/menuconfiguration.hxx> #include <svtools/inethist.hxx> diff --git a/sfx2/source/appl/shutdowniconOs2.cxx b/sfx2/source/appl/shutdowniconOs2.cxx index 6b69b5d0fae8..f4108950db22 100644 --- a/sfx2/source/appl/shutdowniconOs2.cxx +++ b/sfx2/source/appl/shutdowniconOs2.cxx @@ -29,9 +29,9 @@ ************************************************************************/ -#include <svtools/moduleoptions.hxx> +#include <unotools/moduleoptions.hxx> -#include <svtools/dynamicmenuoptions.hxx> +#include <unotools/dynamicmenuoptions.hxx> #include "shutdownicon.hxx" #include <comphelper/processfactory.hxx> diff --git a/sfx2/source/appl/shutdowniconunx.cxx b/sfx2/source/appl/shutdowniconunx.cxx index f68d367df658..b9799f5818b7 100644 --- a/sfx2/source/appl/shutdowniconunx.cxx +++ b/sfx2/source/appl/shutdowniconunx.cxx @@ -1,9 +1,9 @@ #ifdef ENABLE_QUICKSTART_APPLET -#include <svtools/moduleoptions.hxx> +#include <unotools/moduleoptions.hxx> -#include <svtools/dynamicmenuoptions.hxx> +#include <unotools/dynamicmenuoptions.hxx> #include <gtk/gtk.h> #include <glib.h> diff --git a/sfx2/source/appl/shutdowniconw32.cxx b/sfx2/source/appl/shutdowniconw32.cxx index 414b400d7377..676a46ab584f 100644 --- a/sfx2/source/appl/shutdowniconw32.cxx +++ b/sfx2/source/appl/shutdowniconw32.cxx @@ -45,9 +45,9 @@ // // the systray icon is only available on windows // -#include <svtools/moduleoptions.hxx> -#include <svtools/dynamicmenuoptions.hxx> +#include <unotools/moduleoptions.hxx> +#include <unotools/dynamicmenuoptions.hxx> #include "shutdownicon.hxx" #include "app.hrc" diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx index 358c226d6c4a..608573af1602 100644 --- a/sfx2/source/bastyp/fltfnc.cxx +++ b/sfx2/source/bastyp/fltfnc.cxx @@ -97,8 +97,8 @@ #include <com/sun/star/ucb/XContent.hpp> #include <rtl/ustring.hxx> #include <vos/process.hxx> -#include <svtools/pathoptions.hxx> -#include <svtools/moduleoptions.hxx> +#include <unotools/pathoptions.hxx> +#include <unotools/moduleoptions.hxx> #include <comphelper/mediadescriptor.hxx> #include <tools/urlobj.hxx> diff --git a/sfx2/source/config/evntconf.cxx b/sfx2/source/config/evntconf.cxx index daf9174d20cb..58b48db6347a 100644 --- a/sfx2/source/config/evntconf.cxx +++ b/sfx2/source/config/evntconf.cxx @@ -41,7 +41,7 @@ #include <basic/sbx.hxx> #include <sot/storage.hxx> -#include <svtools/securityoptions.hxx> +#include <unotools/securityoptions.hxx> #ifndef _RTL_USTRING_ #include <rtl/ustring.h> diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx index f9b601a4cf23..861cbb7485a1 100644 --- a/sfx2/source/control/shell.cxx +++ b/sfx2/source/control/shell.cxx @@ -39,7 +39,7 @@ #include <svtools/asynclink.hxx> #include <basic/sbx.hxx> -#include <svtools/undoopt.hxx> +#include <unotools/undoopt.hxx> #ifndef GCC #endif diff --git a/sfx2/source/control/srchitem.cxx b/sfx2/source/control/srchitem.cxx index 8f1507a45610..2f667147b64b 100644 --- a/sfx2/source/control/srchitem.cxx +++ b/sfx2/source/control/srchitem.cxx @@ -36,7 +36,7 @@ #ifndef __SBX_SBXVARIABLE_HXX #include <basic/sbxvar.hxx> #endif -#include <svtools/searchopt.hxx> +#include <unotools/searchopt.hxx> #include <com/sun/star/util/XReplaceable.hpp> #include <com/sun/star/util/XSearchable.hpp> #include <com/sun/star/util/XSearchDescriptor.hpp> diff --git a/sfx2/source/dialog/alienwarn.cxx b/sfx2/source/dialog/alienwarn.cxx index 5ed5569ea336..f7f3f7b14ec9 100644 --- a/sfx2/source/dialog/alienwarn.cxx +++ b/sfx2/source/dialog/alienwarn.cxx @@ -38,7 +38,7 @@ #include "alienwarn.hrc" #include "dialog.hrc" #include <vcl/msgbox.hxx> -#include <svtools/saveopt.hxx> +#include <unotools/saveopt.hxx> // class SfxAlienWarningDialog ------------------------------------------- diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx index 6b92cb0137de..8eec8a8f8e2a 100644 --- a/sfx2/source/dialog/basedlgs.cxx +++ b/sfx2/source/dialog/basedlgs.cxx @@ -38,7 +38,7 @@ #include <vcl/help.hxx> #include <vcl/msgbox.hxx> #include <svtools/eitem.hxx> -#include <svtools/viewoptions.hxx> +#include <unotools/viewoptions.hxx> #include <svtools/fixedhyper.hxx> #include <svtools/controldims.hrc> diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index 484e953f1cf4..9efd5f5dcf9f 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -38,7 +38,7 @@ #include <unotools/localedatawrapper.hxx> #include <comphelper/processfactory.hxx> #include <svtools/urihelper.hxx> -#include <svtools/useroptions.hxx> +#include <unotools/useroptions.hxx> #include <svtools/imagemgr.hxx> #include <tools/datetime.hxx> diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index 5a0d2f4a69a0..f6db88d4b77a 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -71,15 +71,15 @@ #include <vcl/cvtgrf.hxx> #include <vcl/msgbox.hxx> #include <vcl/mnemonic.hxx> -#include <svtools/pathoptions.hxx> -#include <svtools/securityoptions.hxx> +#include <unotools/pathoptions.hxx> +#include <unotools/securityoptions.hxx> #include <svtools/itemset.hxx> #include <svtools/eitem.hxx> #include <svtools/intitem.hxx> #include <svtools/stritem.hxx> #include <svtools/filter.hxx> -#include <svtools/viewoptions.hxx> -#include <svtools/moduleoptions.hxx> +#include <unotools/viewoptions.hxx> +#include <unotools/moduleoptions.hxx> #include <svtools/helpid.hrc> #include <svtools/pickerhelper.hxx> #include <comphelper/docpasswordrequest.hxx> diff --git a/sfx2/source/dialog/intro.cxx b/sfx2/source/dialog/intro.cxx index aac052ff4ae2..07f20b0801b8 100644 --- a/sfx2/source/dialog/intro.cxx +++ b/sfx2/source/dialog/intro.cxx @@ -38,7 +38,7 @@ #include <tools/stream.hxx> #include <tools/urlobj.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <unotools/configmgr.hxx> #include <com/sun/star/uno/Any.h> diff --git a/sfx2/source/dialog/mailmodel.cxx b/sfx2/source/dialog/mailmodel.cxx index 11d586ea2026..b36a6923184e 100644 --- a/sfx2/source/dialog/mailmodel.cxx +++ b/sfx2/source/dialog/mailmodel.cxx @@ -78,7 +78,7 @@ #include <unotools/configitem.hxx> #include <ucbhelper/content.hxx> #include <tools/urlobj.hxx> -#include <svtools/useroptions.hxx> +#include <unotools/useroptions.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/extract.hxx> #include <comphelper/storagehelper.hxx> diff --git a/sfx2/source/dialog/mailmodelapi.cxx b/sfx2/source/dialog/mailmodelapi.cxx index d5fececf3b38..0ec723649664 100644 --- a/sfx2/source/dialog/mailmodelapi.cxx +++ b/sfx2/source/dialog/mailmodelapi.cxx @@ -75,7 +75,7 @@ #include <vcl/svapp.hxx> #include <svtools/stritem.hxx> #include <svtools/eitem.hxx> -#include <svtools/useroptions.hxx> +#include <unotools/useroptions.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/extract.hxx> #include <ucbhelper/content.hxx> diff --git a/sfx2/source/dialog/printopt.cxx b/sfx2/source/dialog/printopt.cxx index c0802b573cc6..74330fbc3646 100644 --- a/sfx2/source/dialog/printopt.cxx +++ b/sfx2/source/dialog/printopt.cxx @@ -34,7 +34,7 @@ #ifndef GCC #endif #include <vcl/msgbox.hxx> -#include <svtools/printwarningoptions.hxx> +#include <unotools/printwarningoptions.hxx> #include <svtools/printoptions.hxx> #include <svtools/flagitem.hxx> diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx index f30fef23dbd0..750bf90d175c 100644 --- a/sfx2/source/dialog/splitwin.cxx +++ b/sfx2/source/dialog/splitwin.cxx @@ -41,7 +41,7 @@ #ifndef _WRKWIN_HXX //autogen #include <vcl/wrkwin.hxx> #endif -#include <svtools/viewoptions.hxx> +#include <unotools/viewoptions.hxx> #ifndef GCC #endif diff --git a/sfx2/source/dialog/srchdlg.cxx b/sfx2/source/dialog/srchdlg.cxx index 0cbecdc719b0..500d530bab3f 100644 --- a/sfx2/source/dialog/srchdlg.cxx +++ b/sfx2/source/dialog/srchdlg.cxx @@ -38,7 +38,7 @@ #include "srchdlg.hrc" #include "dialog.hrc" #include <tools/debug.hxx> -#include <svtools/viewoptions.hxx> +#include <unotools/viewoptions.hxx> using namespace ::com::sun::star::uno; diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index 80f0daba71b9..81dc51563d4e 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -34,7 +34,7 @@ #include <limits.h> #include <stdlib.h> #include <vcl/msgbox.hxx> -#include <svtools/viewoptions.hxx> +#include <unotools/viewoptions.hxx> #define _SVSTDARR_USHORTS #include <svtools/svstdarr.hxx> diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx index accb6b5c3a37..5504c7c9b28c 100644 --- a/sfx2/source/dialog/versdlg.cxx +++ b/sfx2/source/dialog/versdlg.cxx @@ -38,7 +38,7 @@ #include <svtools/intitem.hxx> #include <svtools/stritem.hxx> #include <svtools/itemset.hxx> -#include <svtools/useroptions.hxx> +#include <unotools/useroptions.hxx> #include <vcl/msgbox.hxx> #include <vcl/svapp.hxx> #include <tools/datetime.hxx> diff --git a/sfx2/source/doc/applet.cxx b/sfx2/source/doc/applet.cxx index c6e5bfabbe94..8a98a1f8bd70 100644 --- a/sfx2/source/doc/applet.cxx +++ b/sfx2/source/doc/applet.cxx @@ -43,7 +43,7 @@ #include <vcl/syschild.hxx> #include <rtl/ustring.hxx> #include <toolkit/helper/vclunohelper.hxx> -#include <svtools/javaoptions.hxx> +#include <unotools/javaoptions.hxx> #include <svtools/miscopt.hxx> #include <comphelper/TypeGeneration.hxx> diff --git a/sfx2/source/doc/docfac.cxx b/sfx2/source/doc/docfac.cxx index 3a00bbe3097a..012109cac21a 100644 --- a/sfx2/source/doc/docfac.cxx +++ b/sfx2/source/doc/docfac.cxx @@ -35,8 +35,8 @@ #include <com/sun/star/container/XNameAccess.hpp> #include <comphelper/processfactory.hxx> #include <tools/config.hxx> -#include <svtools/pathoptions.hxx> -#include <svtools/moduleoptions.hxx> +#include <unotools/pathoptions.hxx> +#include <unotools/moduleoptions.hxx> #include <tools/urlobj.hxx> #include <unotools/ucbstreamhelper.hxx> #include <comphelper/sequenceashashmap.hxx> diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index 32ae33ec3c8b..85dc3ce9e671 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -121,7 +121,7 @@ using namespace ::com::sun::star::io; #include <tools/urlobj.hxx> #include <tools/inetmime.hxx> #include <unotools/ucblockbytes.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <svtools/asynclink.hxx> #include <svtools/inettype.hxx> #include <ucbhelper/contentbroker.hxx> @@ -133,7 +133,7 @@ using namespace ::com::sun::star::io; #include <ucbhelper/content.hxx> #include <ucbhelper/interactionrequest.hxx> #include <sot/stg.hxx> -#include <svtools/saveopt.hxx> +#include <unotools/saveopt.hxx> #include <svtools/documentlockfile.hxx> #include "opostponedtruncationstream.hxx" diff --git a/sfx2/source/doc/docmacromode.cxx b/sfx2/source/doc/docmacromode.cxx index f1b889821de7..8d96c08a51d4 100644 --- a/sfx2/source/doc/docmacromode.cxx +++ b/sfx2/source/doc/docmacromode.cxx @@ -48,7 +48,7 @@ #include <framework/interaction.hxx> #include <osl/file.hxx> #include <rtl/ref.hxx> -#include <svtools/securityoptions.hxx> +#include <unotools/securityoptions.hxx> #include <svtools/sfxecode.hxx> #include <tools/diagnose_ex.h> #include <tools/urlobj.hxx> diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx index f1b117f6a1c9..80492708d652 100644 --- a/sfx2/source/doc/doctempl.cxx +++ b/sfx2/source/doc/doctempl.cxx @@ -42,7 +42,7 @@ #include <vcl/svapp.hxx> #include <vcl/settings.hxx> #include <unotools/localedatawrapper.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <tools/string.hxx> #include <tools/urlobj.hxx> #include <svtools/ehdl.hxx> diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx index 099e649506c0..4439dc05f9ff 100644 --- a/sfx2/source/doc/doctemplates.cxx +++ b/sfx2/source/doc/doctemplates.cxx @@ -43,7 +43,7 @@ #include <vcl/svapp.hxx> #include <vcl/wrkwin.hxx> #include <comphelper/sequenceashashmap.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <comphelper/processfactory.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/beans/XPropertySet.hpp> diff --git a/sfx2/source/doc/docvor.cxx b/sfx2/source/doc/docvor.cxx index e70824869070..017b12b2a430 100644 --- a/sfx2/source/doc/docvor.cxx +++ b/sfx2/source/doc/docvor.cxx @@ -53,8 +53,8 @@ #include <vcl/waitobj.hxx> #include <tools/urlobj.hxx> #include <tools/color.hxx> -#include <svtools/pathoptions.hxx> -#include <svtools/moduleoptions.hxx> +#include <unotools/pathoptions.hxx> +#include <unotools/moduleoptions.hxx> #include <sot/exchange.hxx> #include <comphelper/storagehelper.hxx> diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx index 5916fb625787..c656a4f0cbe9 100644 --- a/sfx2/source/doc/guisaveas.cxx +++ b/sfx2/source/doc/guisaveas.cxx @@ -62,12 +62,12 @@ #include "guisaveas.hxx" -#include <svtools/pathoptions.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <svtools/itemset.hxx> #include <svtools/adrparse.hxx> -#include <svtools/useroptions.hxx> -#include <svtools/saveopt.hxx> +#include <unotools/useroptions.hxx> +#include <unotools/saveopt.hxx> #include <tools/debug.hxx> #include <tools/urlobj.hxx> #include <comphelper/processfactory.hxx> diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx index f9c675372307..193dfae7afaa 100644 --- a/sfx2/source/doc/objcont.cxx +++ b/sfx2/source/doc/objcont.cxx @@ -52,14 +52,14 @@ #include <svtools/ctloptions.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/storagehelper.hxx> -#include <svtools/securityoptions.hxx> +#include <unotools/securityoptions.hxx> #include <svtools/sfxecode.hxx> #include <svtools/ehdl.hxx> #include <tools/datetime.hxx> #include <math.h> -#include <svtools/saveopt.hxx> -#include <svtools/useroptions.hxx> +#include <unotools/saveopt.hxx> +#include <unotools/useroptions.hxx> #include <unotools/localfilehelper.hxx> #include <vcl/virdev.hxx> diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index 5e3ace93372a..f5be69d753e9 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -80,7 +80,7 @@ #include <com/sun/star/uno/Any.h> #include <com/sun/star/ucb/XContent.hpp> #include <com/sun/star/task/ErrorCodeRequest.hpp> -#include <svtools/securityoptions.hxx> +#include <unotools/securityoptions.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/componentcontext.hxx> @@ -111,7 +111,7 @@ using namespace ::com::sun::star::container; #include <svtools/sfxecode.hxx> #include <svtools/ehdl.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <unotools/ucbhelper.hxx> #include <tools/inetmime.hxx> #include <tools/urlobj.hxx> diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx index 8a8512a37af0..56afae3975df 100644 --- a/sfx2/source/doc/objserv.cxx +++ b/sfx2/source/doc/objserv.cxx @@ -64,10 +64,10 @@ #include <comphelper/string.hxx> #include <basic/sbx.hxx> -#include <svtools/pathoptions.hxx> -#include <svtools/useroptions.hxx> +#include <unotools/pathoptions.hxx> +#include <unotools/useroptions.hxx> #include <svtools/asynclink.hxx> -#include <svtools/saveopt.hxx> +#include <unotools/saveopt.hxx> #include <comphelper/documentconstants.hxx> #include <sfx2/app.hxx> diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index cd73a92196d7..42f9788ec9d2 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -80,16 +80,15 @@ #include <comphelper/configurationhelper.hxx> #include <comphelper/interaction.hxx> #include <svtools/sfxecode.hxx> -#include <svtools/securityoptions.hxx> +#include <unotools/securityoptions.hxx> #include <cppuhelper/weak.hxx> #include <comphelper/processfactory.hxx> #include <tools/cachestr.hxx> -#include <svtools/addxmltostorageoptions.hxx> #include <unotools/streamwrap.hxx> -#include <svtools/saveopt.hxx> -#include <svtools/useroptions.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/saveopt.hxx> +#include <unotools/useroptions.hxx> +#include <unotools/pathoptions.hxx> #include <tools/urlobj.hxx> #include <tools/diagnose_ex.h> #include <unotools/localfilehelper.hxx> diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx index 950ecf9ea239..fbbb46853a30 100644 --- a/sfx2/source/doc/objxtor.cxx +++ b/sfx2/source/doc/objxtor.cxx @@ -61,7 +61,7 @@ #include <basic/sbstar.hxx> #include <svtools/stritem.hxx> #include <basic/sbx.hxx> -#include <svtools/eventcfg.hxx> +#include <unotools/eventcfg.hxx> #include <sfx2/objsh.hxx> #include <sfx2/signaturestate.hxx> @@ -71,7 +71,7 @@ #endif #include <svtools/sfxecode.hxx> #include <svtools/ehdl.hxx> -#include <svtools/printwarningoptions.hxx> +#include <unotools/printwarningoptions.hxx> #ifndef _UNOTOOLS_PROCESSFACTORY_HXX #include <comphelper/processfactory.hxx> #endif @@ -83,7 +83,7 @@ #include <com/sun/star/document/XScriptInvocationContext.hpp> #include <svtools/urihelper.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <svtools/sharecontrolfile.hxx> #include <unotools/localfilehelper.hxx> #include <unotools/ucbhelper.hxx> diff --git a/sfx2/source/inc/eventsupplier.hxx b/sfx2/source/inc/eventsupplier.hxx index 0940d4bb66e3..bf88b5efd7e3 100644 --- a/sfx2/source/inc/eventsupplier.hxx +++ b/sfx2/source/inc/eventsupplier.hxx @@ -58,7 +58,7 @@ #include <vos/mutex.hxx> #include <cppuhelper/interfacecontainer.hxx> #include <svtools/lstner.hxx> -#include <svtools/eventcfg.hxx> +#include <unotools/eventcfg.hxx> //-------------------------------------------------------------------------------------------------------- diff --git a/sfx2/source/inc/objshimp.hxx b/sfx2/source/inc/objshimp.hxx index 77162423cabe..fed465c69986 100644 --- a/sfx2/source/inc/objshimp.hxx +++ b/sfx2/source/inc/objshimp.hxx @@ -38,7 +38,7 @@ #include <com/sun/star/logging/XSimpleLogRing.hpp> #include <tools/datetime.hxx> -#include <svtools/securityoptions.hxx> +#include <unotools/securityoptions.hxx> #include <sfx2/objsh.hxx> #include "sfx2/docmacromode.hxx" #include "bitset.hxx" diff --git a/sfx2/source/inet/inettbc.cxx b/sfx2/source/inet/inettbc.cxx index d6ce65c96b6d..9f91c752cf4b 100644 --- a/sfx2/source/inet/inettbc.cxx +++ b/sfx2/source/inet/inettbc.cxx @@ -43,7 +43,7 @@ #include <svtools/eitem.hxx> #include <svtools/stritem.hxx> #include <svtools/cancel.hxx> -#include <svtools/historyoptions.hxx> +#include <unotools/historyoptions.hxx> #include <svtools/folderrestriction.hxx> #include <vcl/toolbox.hxx> #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ @@ -59,7 +59,7 @@ #include <svtools/itemset.hxx> #include <svtools/urihelper.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <svtools/asynclink.hxx> #include <svtools/inettbc.hxx> diff --git a/sfx2/source/layout/sfxtabdialog.cxx b/sfx2/source/layout/sfxtabdialog.cxx index a6d592bf48d5..0478fb0ea94b 100644 --- a/sfx2/source/layout/sfxtabdialog.cxx +++ b/sfx2/source/layout/sfxtabdialog.cxx @@ -34,7 +34,7 @@ #include <limits.h> #include <stdlib.h> #include <vcl/msgbox.hxx> -#include <svtools/viewoptions.hxx> +#include <unotools/viewoptions.hxx> #define _SVSTDARR_USHORTS #include <svtools/svstdarr.hxx> diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx index f0bb48b54261..483910b91be0 100644 --- a/sfx2/source/menu/mnumgr.cxx +++ b/sfx2/source/menu/mnumgr.cxx @@ -54,7 +54,7 @@ #include <comphelper/processfactory.hxx> #include <unotools/ucbstreamhelper.hxx> #include <tools/urlobj.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <sfx2/mnumgr.hxx> diff --git a/sfx2/source/notify/eventsupplier.cxx b/sfx2/source/notify/eventsupplier.cxx index a01b1df73c82..52a0ac36d3e4 100644 --- a/sfx2/source/notify/eventsupplier.cxx +++ b/sfx2/source/notify/eventsupplier.cxx @@ -47,9 +47,9 @@ #include <sfx2/objsh.hxx> #include <sfx2/sfxbasemodel.hxx> #include <sfx2/evntconf.hxx> -#include <svtools/eventcfg.hxx> +#include <unotools/eventcfg.hxx> -#include <svtools/securityoptions.hxx> +#include <unotools/securityoptions.hxx> #include <comphelper/processfactory.hxx> #include "eventsupplier.hxx" diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx index 6a776f6a211e..9b68499edd68 100644 --- a/sfx2/source/toolbox/tbxitem.cxx +++ b/sfx2/source/toolbox/tbxitem.cxx @@ -65,7 +65,7 @@ #include <svtools/visitem.hxx> #include <svtools/urlbmk.hxx> #include <vcl/toolbox.hxx> -#include <svtools/moduleoptions.hxx> +#include <unotools/moduleoptions.hxx> #include <svtools/imagemgr.hxx> #include <comphelper/processfactory.hxx> diff --git a/sfx2/source/view/frmload.cxx b/sfx2/source/view/frmload.cxx index b91e1e6b4998..fa0a6fe75d48 100644 --- a/sfx2/source/view/frmload.cxx +++ b/sfx2/source/view/frmload.cxx @@ -73,7 +73,7 @@ #include <sot/storinfo.hxx> #include <comphelper/sequenceashashmap.hxx> #include <comphelper/mediadescriptor.hxx> -#include <svtools/moduleoptions.hxx> +#include <unotools/moduleoptions.hxx> #ifndef css namespace css = ::com::sun::star; diff --git a/sfx2/source/view/printer.cxx b/sfx2/source/view/printer.cxx index c99d45db6397..1ea49ecd879b 100644 --- a/sfx2/source/view/printer.cxx +++ b/sfx2/source/view/printer.cxx @@ -34,7 +34,7 @@ #include <vcl/metric.hxx> #include <vcl/msgbox.hxx> #include <svtools/printdlg.hxx> -#include <svtools/printwarningoptions.hxx> +#include <unotools/printwarningoptions.hxx> #include <svtools/printoptions.hxx> #include <vector> diff --git a/sfx2/source/view/prnmon.cxx b/sfx2/source/view/prnmon.cxx index 21d484e550ab..ebed00148420 100644 --- a/sfx2/source/view/prnmon.cxx +++ b/sfx2/source/view/prnmon.cxx @@ -39,7 +39,7 @@ #include <vcl/msgbox.hxx> #include <svtools/asynclink.hxx> -#include <svtools/printwarningoptions.hxx> +#include <unotools/printwarningoptions.hxx> #include <svtools/eitem.hxx> #ifndef GCC diff --git a/sfx2/source/view/topfrm.cxx b/sfx2/source/view/topfrm.cxx index 40c14bd48c82..1a8da1b4179c 100644 --- a/sfx2/source/view/topfrm.cxx +++ b/sfx2/source/view/topfrm.cxx @@ -68,7 +68,7 @@ #include <svtools/sfxecode.hxx> #include <vcl/dialog.hxx> #include <svtools/urihelper.hxx> -#include <svtools/moduleoptions.hxx> +#include <unotools/moduleoptions.hxx> #include <unotools/configmgr.hxx> #include <unotools/bootstrap.hxx> diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index 592926bca1ce..32151a123539 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -44,7 +44,7 @@ #ifndef _SPLITWIN_HXX //autogen #include <vcl/splitwin.hxx> #endif -#include <svtools/moduleoptions.hxx> +#include <unotools/moduleoptions.hxx> #include <svtools/intitem.hxx> #include <svtools/stritem.hxx> #include <svtools/eitem.hxx> diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx index c944264dd20c..4b085737eee7 100644 --- a/sfx2/source/view/viewprn.cxx +++ b/sfx2/source/view/viewprn.cxx @@ -48,8 +48,8 @@ #include <svtools/intitem.hxx> #include <svtools/eitem.hxx> #include <sfx2/app.hxx> -#include <svtools/useroptions.hxx> -#include <svtools/printwarningoptions.hxx> +#include <unotools/useroptions.hxx> +#include <unotools/printwarningoptions.hxx> #include <tools/datetime.hxx> #include <sfx2/viewsh.hxx> diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index 299c928c748b..7f55a016217e 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -55,12 +55,12 @@ #include <vos/mutex.hxx> #include <tools/urlobj.hxx> #include <unotools/tempfile.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <svtools/miscopt.hxx> #include <svtools/soerr.hxx> -#include <svtools/internaloptions.hxx> +#include <unotools/internaloptions.hxx> -#include <svtools/javaoptions.hxx> +#include <unotools/javaoptions.hxx> #include <basic/basmgr.hxx> #include <basic/sbuno.hxx> #include <framework/actiontriggerhelper.hxx> diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx index 8e9bc4d17930..d118cfbb409d 100644 --- a/svx/inc/pch/precompiled_svx.hxx +++ b/svx/inc/pch/precompiled_svx.hxx @@ -756,23 +756,23 @@ #include "svtools/adrparse.hxx" #include "svtools/apearcfg.hxx" #include "svtools/brdcst.hxx" -#include "svtools/cacheoptions.hxx" +#include "unotools/cacheoptions.hxx" #include "svtools/cancel.hxx" #include "svtools/cjkoptions.hxx" -#include "svtools/cmdoptions.hxx" +#include "unotools/cmdoptions.hxx" #include "svtools/cntwall.hxx" #include "svtools/colorcfg.hxx" #include "svtools/ctloptions.hxx" -#include "svtools/defaultoptions.hxx" -#include "svtools/dynamicmenuoptions.hxx" +#include "unotools/defaultoptions.hxx" +#include "unotools/dynamicmenuoptions.hxx" #include "svtools/ehdl.hxx" #include "svtools/eitem.hxx" -#include "svtools/eventcfg.hxx" -#include "svtools/extendedsecurityoptions.hxx" +#include "unotools/eventcfg.hxx" +#include "unotools/extendedsecurityoptions.hxx" #include "svtools/filenotation.hxx" #include "svtools/flagitem.hxx" -#include "svtools/fltrcfg.hxx" -#include "svtools/fontoptions.hxx" +#include "unotools/fltrcfg.hxx" +#include "unotools/fontoptions.hxx" #include "svtools/fontsubstconfig.hxx" #include "svtools/helpopt.hxx" #include "svtools/hint.hxx" @@ -784,17 +784,17 @@ #include "svtools/imappoly.hxx" #include "svtools/imaprect.hxx" #include "svtools/inetimg.hxx" -#include "svtools/inetoptions.hxx" +#include "unotools/inetoptions.hxx" #include "svtools/intitem.hxx" #include "svtools/isethint.hxx" #include "svtools/itemiter.hxx" #include "svtools/itempool.hxx" #include "svtools/itemprop.hxx" #include "svtools/itemset.hxx" -#include "svtools/javaoptions.hxx" +#include "unotools/javaoptions.hxx" #include "svtools/languageoptions.hxx" -#include "svtools/lingucfg.hxx" -#include "svtools/linguprops.hxx" +#include "unotools/lingucfg.hxx" +#include "unotools/linguprops.hxx" #include "svtools/lngmisc.hxx" #include "svtools/localresaccess.hxx" #include "svtools/lstner.hxx" @@ -803,30 +803,30 @@ #include "svtools/metitem.hxx" #include "svtools/misccfg.hxx" #include "svtools/miscopt.hxx" -#include "svtools/moduleoptions.hxx" +#include "unotools/moduleoptions.hxx" #include "svtools/numuno.hxx" -#include "svtools/optionsdlg.hxx" +#include "unotools/optionsdlg.hxx" #include "svtools/parhtml.hxx" #include "svtools/parrtf.hxx" -#include "svtools/pathoptions.hxx" +#include "unotools/pathoptions.hxx" #include "svtools/pickerhelper.hxx" #include "svtools/poolitem.hxx" -#include "svtools/printwarningoptions.hxx" +#include "unotools/printwarningoptions.hxx" #include "svtools/ptitem.hxx" #include "svtools/rectitem.hxx" #include "svtools/rngitem.hxx" #include "svtools/rtfkeywd.hxx" #include "svtools/rtfout.hxx" #include "svtools/rtftoken.h" -#include "svtools/saveopt.hxx" -#include "svtools/searchopt.hxx" -#include "svtools/securityoptions.hxx" +#include "unotools/saveopt.hxx" +#include "unotools/searchopt.hxx" +#include "unotools/securityoptions.hxx" #include "svtools/sfontitm.hxx" #include "svtools/slstitm.hxx" #include "svtools/smplhint.hxx" #include "svtools/soerr.hxx" -#include "svtools/sourceviewconfig.hxx" -#include "svtools/startoptions.hxx" +#include "unotools/sourceviewconfig.hxx" +#include "unotools/startoptions.hxx" #include "svtools/stdmenu.hxx" #include "svtools/stringtransfer.hxx" #include "svtools/stritem.hxx" @@ -839,13 +839,13 @@ #include "svtools/transfer.hxx" #include "svtools/txtcmp.hxx" #include "svtools/undo.hxx" -#include "svtools/undoopt.hxx" +#include "unotools/undoopt.hxx" #include "svtools/unoevent.hxx" #include "svtools/unoimap.hxx" #include "svtools/urihelper.hxx" #include "svtools/urlbmk.hxx" -#include "svtools/useroptions.hxx" -#include "svtools/viewoptions.hxx" +#include "unotools/useroptions.hxx" +#include "unotools/viewoptions.hxx" #include "svtools/visitem.hxx" #include "svtools/whiter.hxx" #include "sys/stat.h" diff --git a/svx/source/cui/SpellDialog.cxx b/svx/source/cui/SpellDialog.cxx index 3febb657ded2..aea58ffc6bd9 100644 --- a/svx/source/cui/SpellDialog.cxx +++ b/svx/source/cui/SpellDialog.cxx @@ -49,7 +49,7 @@ #include <sfx2/dispatch.hxx> #include <sfx2/bindings.hxx> #include <svtools/undo.hxx> -#include <svtools/lingucfg.hxx> +#include <unotools/lingucfg.hxx> #include <svtools/textdata.hxx> #include <svtools/filter.hxx> #include <unolingu.hxx> diff --git a/svx/source/cui/backgrnd.cxx b/svx/source/cui/backgrnd.cxx index 9ba19816b1bf..1c9c364e0b43 100644 --- a/svx/source/cui/backgrnd.cxx +++ b/svx/source/cui/backgrnd.cxx @@ -36,7 +36,7 @@ #endif // include --------------------------------------------------------------- -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <svtools/intitem.hxx> #include <vcl/msgbox.hxx> #include <tools/urlobj.hxx> diff --git a/svx/source/cui/chardlg.cxx b/svx/source/cui/chardlg.cxx index 0d0b6de205de..9777c70dbc6a 100644 --- a/svx/source/cui/chardlg.cxx +++ b/svx/source/cui/chardlg.cxx @@ -38,7 +38,7 @@ // include --------------------------------------------------------------- #include <unolingu.hxx> #include <vcl/svapp.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <svtools/ctrltool.hxx> #include <svtools/sfontitm.hxx> #include <sfx2/printer.hxx> diff --git a/svx/source/cui/cuigaldlg.cxx b/svx/source/cui/cuigaldlg.cxx index 3bac445b66e3..2b9b4440e866 100644 --- a/svx/source/cui/cuigaldlg.cxx +++ b/svx/source/cui/cuigaldlg.cxx @@ -41,7 +41,7 @@ #include <vcl/svapp.hxx> #include <vcl/msgbox.hxx> #include <avmedia/mediawindow.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <avmedia/mediawindow.hxx> #include "opengrf.hxx" #include "impgrf.hxx" diff --git a/svx/source/cui/cuihyperdlg.cxx b/svx/source/cui/cuihyperdlg.cxx index b29e202030b4..07dace362bbf 100644 --- a/svx/source/cui/cuihyperdlg.cxx +++ b/svx/source/cui/cuihyperdlg.cxx @@ -37,7 +37,7 @@ // include --------------------------------------------------------------- #include <vcl/settings.hxx> -#include <svtools/viewoptions.hxx> +#include <unotools/viewoptions.hxx> #include "cuihyperdlg.hxx" diff --git a/svx/source/cui/cuisrchdlg.cxx b/svx/source/cui/cuisrchdlg.cxx index efeeffebaf4f..9e372b1b1110 100644 --- a/svx/source/cui/cuisrchdlg.cxx +++ b/svx/source/cui/cuisrchdlg.cxx @@ -42,7 +42,7 @@ #include <svtools/slstitm.hxx> #include <svtools/itemiter.hxx> #include <svtools/style.hxx> -#include <svtools/searchopt.hxx> +#include <unotools/searchopt.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/objsh.hxx> #include <sfx2/module.hxx> diff --git a/svx/source/cui/dbregisterednamesconfig.cxx b/svx/source/cui/dbregisterednamesconfig.cxx index 4f9cf1150422..b78876f5a88e 100644 --- a/svx/source/cui/dbregisterednamesconfig.cxx +++ b/svx/source/cui/dbregisterednamesconfig.cxx @@ -48,7 +48,7 @@ #include <com/sun/star/uno/XNamingService.hpp> #include <svtools/eitem.hxx> #include <comphelper/processfactory.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include "dbregistersettings.hxx" #include "connpooloptions.hxx" diff --git a/svx/source/cui/eventdlg.cxx b/svx/source/cui/eventdlg.cxx index dd9e2511b1ea..838aa37e72bd 100644 --- a/svx/source/cui/eventdlg.cxx +++ b/svx/source/cui/eventdlg.cxx @@ -52,7 +52,7 @@ #include <sfx2/objsh.hxx> #include <sfx2/docfac.hxx> #include <sfx2/fcontnr.hxx> -#include <svtools/eventcfg.hxx> +#include <unotools/eventcfg.hxx> #include "headertablistbox.hxx" #include "macropg_impl.hxx" diff --git a/svx/source/cui/fontsubs.cxx b/svx/source/cui/fontsubs.cxx index 9e957ffbb43b..9e28b992876b 100644 --- a/svx/source/cui/fontsubs.cxx +++ b/svx/source/cui/fontsubs.cxx @@ -45,7 +45,7 @@ #ifndef _OFA_FONTSUBSTCONFIG_HXX #include <svtools/fontsubstconfig.hxx> #endif -#include <svtools/sourceviewconfig.hxx> +#include <unotools/sourceviewconfig.hxx> #include "fontsubs.hrc" #include "fontsubs.hxx" @@ -85,7 +85,7 @@ SvxFontSubstTabPage::SvxFontSubstTabPage( Window* pParent, sAutomatic (SVX_RES( STR_AUTOMATIC )), pConfig(new SvtFontSubstConfig), - pSourceViewConfig(new svt::SourceViewConfig), + pSourceViewConfig(new utl::SourceViewConfig), sHeader1 (SVX_RES( STR_HEADER1 )), sHeader2 (SVX_RES( STR_HEADER2 )), diff --git a/svx/source/cui/fontsubs.hxx b/svx/source/cui/fontsubs.hxx index 8032136bdc3d..be174768bea4 100644 --- a/svx/source/cui/fontsubs.hxx +++ b/svx/source/cui/fontsubs.hxx @@ -36,6 +36,11 @@ #include <vcl/toolbox.hxx> #include <svtools/ctrlbox.hxx> +namespace utl +{ + class SourceViewConfig; +}; + // class SvxFontSubstCheckListBox ------------------------------------------ class SvxFontSubstCheckListBox : public SvxSimpleTable @@ -88,7 +93,7 @@ class SvxFontSubstTabPage : public SfxTabPage String sAutomatic; SvtFontSubstConfig* pConfig; - svt::SourceViewConfig* pSourceViewConfig; + utl::SourceViewConfig* pSourceViewConfig; String sHeader1; String sHeader2; diff --git a/svx/source/cui/hangulhanjadlg.cxx b/svx/source/cui/hangulhanjadlg.cxx index 0d0c9348634f..85e9084abc66 100644 --- a/svx/source/cui/hangulhanjadlg.cxx +++ b/svx/source/cui/hangulhanjadlg.cxx @@ -48,8 +48,8 @@ #include <tools/urlobj.hxx> #include <vcl/controllayout.hxx> #include <vcl/msgbox.hxx> -#include <svtools/lingucfg.hxx> -#include <svtools/linguprops.hxx> +#include <unotools/lingucfg.hxx> +#include <unotools/linguprops.hxx> //#ifndef _COM_SUN_STAR_FRAME_XSTORABLE_HPP_ //#include <com/sun/star/frame/XStorable.hpp> //#endif diff --git a/svx/source/cui/hldocntp.cxx b/svx/source/cui/hldocntp.cxx index 8ecaf7429edd..4f58450d2527 100644 --- a/svx/source/cui/hldocntp.cxx +++ b/svx/source/cui/hldocntp.cxx @@ -46,8 +46,8 @@ #include <tools/config.hxx> #include <vcl/image.hxx> #include <tools/urlobj.hxx> -#include <svtools/pathoptions.hxx> -#include <svtools/dynamicmenuoptions.hxx> +#include <unotools/pathoptions.hxx> +#include <unotools/dynamicmenuoptions.hxx> #include <sfx2/filedlghelper.hxx> #include <unotools/ucbstreamhelper.hxx> #include <unotools/ucbhelper.hxx> diff --git a/svx/source/cui/hlinettp.cxx b/svx/source/cui/hlinettp.cxx index 218cc73d8a82..275af57408e5 100644 --- a/svx/source/cui/hlinettp.cxx +++ b/svx/source/cui/hlinettp.cxx @@ -35,8 +35,8 @@ #undef SVX_DLLIMPLEMENTATION #endif #include <svtools/adrparse.hxx> -#include <svtools/pathoptions.hxx> -#include <svtools/useroptions.hxx> +#include <unotools/pathoptions.hxx> +#include <unotools/useroptions.hxx> #include "hlinettp.hxx" #include "hyperdlg.hrc" diff --git a/svx/source/cui/hlmailtp.cxx b/svx/source/cui/hlmailtp.cxx index 982e79c9d921..a5744c48dc80 100644 --- a/svx/source/cui/hlmailtp.cxx +++ b/svx/source/cui/hlmailtp.cxx @@ -41,8 +41,8 @@ #include <comphelper/processfactory.hxx> #include <sfx2/viewfrm.hxx> -#include <svtools/pathoptions.hxx> -#include <svtools/moduleoptions.hxx> +#include <unotools/pathoptions.hxx> +#include <unotools/moduleoptions.hxx> #include "hlmailtp.hxx" #include "hyperdlg.hrc" diff --git a/svx/source/cui/iconcdlg.cxx b/svx/source/cui/iconcdlg.cxx index 5099fdce6af2..5435bf16da4e 100644 --- a/svx/source/cui/iconcdlg.cxx +++ b/svx/source/cui/iconcdlg.cxx @@ -50,7 +50,7 @@ #ifndef _SVX_DIALOGS_HRC #include <svx/dialogs.hrc> #endif -#include <svtools/viewoptions.hxx> +#include <unotools/viewoptions.hxx> #include <svtools/apearcfg.hxx> #include <vcl/mnemonic.hxx> #include <vcl/i18nhelp.hxx> diff --git a/svx/source/cui/multipat.cxx b/svx/source/cui/multipat.cxx index 49357245b819..cdafe4ce322f 100644 --- a/svx/source/cui/multipat.cxx +++ b/svx/source/cui/multipat.cxx @@ -52,7 +52,7 @@ #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp> #include <unotools/localfilehelper.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> using namespace ::com::sun::star::lang; using namespace ::com::sun::star::ui::dialogs; diff --git a/svx/source/cui/numpages.cxx b/svx/source/cui/numpages.cxx index 0e2840894e9a..e28422ec7933 100644 --- a/svx/source/cui/numpages.cxx +++ b/svx/source/cui/numpages.cxx @@ -68,7 +68,7 @@ #include <drawitem.hxx> #include <numvset.hxx> #include <htmlmode.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <svtools/ctrltool.hxx> #include <unolingu.hxx> #include <com/sun/star/style/NumberingType.hpp> diff --git a/svx/source/cui/optchart.cxx b/svx/source/cui/optchart.cxx index 652c0500a8d9..18bd4df7252e 100644 --- a/svx/source/cui/optchart.cxx +++ b/svx/source/cui/optchart.cxx @@ -34,7 +34,7 @@ #ifdef SVX_DLLIMPLEMENTATION #undef SVX_DLLIMPLEMENTATION #endif -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <svx/dialogs.hrc> diff --git a/svx/source/cui/optcolor.cxx b/svx/source/cui/optcolor.cxx index 11112dd936cd..25785014e192 100644 --- a/svx/source/cui/optcolor.cxx +++ b/svx/source/cui/optcolor.cxx @@ -42,8 +42,8 @@ #include <svtools/ctrlbox.hxx> #include <vcl/scrbar.hxx> #include <svx/xtable.hxx> -#include <svtools/moduleoptions.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/moduleoptions.hxx> +#include <unotools/pathoptions.hxx> #include <vcl/msgbox.hxx> #include <boost/shared_ptr.hpp> //CHINA001 #ifndef _SVX_DLG_NAME_HXX diff --git a/svx/source/cui/optfltr.cxx b/svx/source/cui/optfltr.cxx index d6c838a13314..c35b5b55fff2 100644 --- a/svx/source/cui/optfltr.cxx +++ b/svx/source/cui/optfltr.cxx @@ -36,9 +36,9 @@ #endif // include --------------------------------------------------------------- -#include <svtools/moduleoptions.hxx> +#include <unotools/moduleoptions.hxx> -#include <svtools/fltrcfg.hxx> +#include <unotools/fltrcfg.hxx> #include "optfltr.hxx" #include "optfltr.hrc" #include <svx/dialogs.hrc> diff --git a/svx/source/cui/optgdlg.cxx b/svx/source/cui/optgdlg.cxx index 9a53de6bea72..bbfd127c5c3b 100644 --- a/svx/source/cui/optgdlg.cxx +++ b/svx/source/cui/optgdlg.cxx @@ -37,7 +37,7 @@ #include <goodies/grfmgr.hxx> #include <svtools/flagitem.hxx> #include <sfx2/dispatch.hxx> -#include <svtools/lingucfg.hxx> +#include <unotools/lingucfg.hxx> #include <svtools/szitem.hxx> #include <sfx2/viewsh.hxx> #include <sfx2/viewfrm.hxx> @@ -46,14 +46,14 @@ #include <vcl/msgbox.hxx> #include <vcl/mnemonic.hxx> #include <i18npool/mslangid.hxx> -#include <svtools/useroptions.hxx> -#include <svtools/cacheoptions.hxx> -#include <svtools/fontoptions.hxx> +#include <unotools/useroptions.hxx> +#include <unotools/cacheoptions.hxx> +#include <unotools/fontoptions.hxx> #include <svtools/menuoptions.hxx> -#include <svtools/startoptions.hxx> +#include <unotools/startoptions.hxx> #include <svtools/languageoptions.hxx> #include <svtools/miscopt.hxx> -#include <svtools/printwarningoptions.hxx> +#include <unotools/printwarningoptions.hxx> #include <svtools/syslocaleoptions.hxx> #include <svtools/helpopt.hxx> #include <svtools/accessibilityoptions.hxx> @@ -89,7 +89,7 @@ #include <svx/dialmgr.hxx> #include <svtools/helpopt.hxx> -#include <svtools/saveopt.hxx> +#include <unotools/saveopt.hxx> #include <com/sun/star/container/XContentEnumerationAccess.hpp> #include <com/sun/star/container/XNameAccess.hpp> diff --git a/svx/source/cui/optgenrl.cxx b/svx/source/cui/optgenrl.cxx index 7159cfdd7e61..e143558f3a3e 100644 --- a/svx/source/cui/optgenrl.cxx +++ b/svx/source/cui/optgenrl.cxx @@ -39,13 +39,13 @@ #include <tools/shl.hxx> #include <vcl/svapp.hxx> #include <vcl/msgbox.hxx> -#include <svtools/saveopt.hxx> +#include <unotools/saveopt.hxx> #define _SVX_OPTGENRL_CXX #include <svx/dialogs.hrc> #include "optgenrl.hrc" -#include <svtools/useroptions.hxx> +#include <unotools/useroptions.hxx> #include "cuioptgenrl.hxx" #include <svx/dialmgr.hxx> #include "dlgutil.hxx" diff --git a/svx/source/cui/optinet2.cxx b/svx/source/cui/optinet2.cxx index 01d97a9e7e0b..f91812b18a50 100644 --- a/svx/source/cui/optinet2.cxx +++ b/svx/source/cui/optinet2.cxx @@ -55,7 +55,7 @@ #ifndef _CNTWIDS_HRC #include <svtools/cntwids.hrc> #endif -#include <svtools/inetoptions.hxx> +#include <unotools/inetoptions.hxx> #ifndef _SV_SVAPP_HXX #include <sfx2/app.hxx> #endif @@ -64,15 +64,15 @@ #include <vcl/help.hxx> #include <sfx2/viewfrm.hxx> #include <tools/urlobj.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #ifndef INCLUDED_SVTOOLS_SECURITIYOPTIONS_HXX -#include <svtools/securityoptions.hxx> +#include <unotools/securityoptions.hxx> #endif #ifndef _SVTOOLS_JAVAPTIONS_HXX -#include <svtools/javaoptions.hxx> +#include <unotools/javaoptions.hxx> #endif #include <unotools/localfilehelper.hxx> -#include <svtools/extendedsecurityoptions.hxx> +#include <unotools/extendedsecurityoptions.hxx> #include <com/sun/star/uno/Sequence.hxx> #define _SVX_OPTINET2_CXX #include <svx/dialmgr.hxx> diff --git a/svx/source/cui/optjava.cxx b/svx/source/cui/optjava.cxx index 549a4c09c96d..20d423f9ffad 100644 --- a/svx/source/cui/optjava.cxx +++ b/svx/source/cui/optjava.cxx @@ -48,7 +48,7 @@ #include <tools/urlobj.hxx> #include <vcl/msgbox.hxx> #include <vcl/waitobj.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <svtools/imagemgr.hxx> #include <sfx2/filedlghelper.hxx> #include <comphelper/processfactory.hxx> diff --git a/svx/source/cui/optjsearch.cxx b/svx/source/cui/optjsearch.cxx index cbc6d605ba03..23ebd106cfde 100644 --- a/svx/source/cui/optjsearch.cxx +++ b/svx/source/cui/optjsearch.cxx @@ -37,7 +37,7 @@ #include <tools/shl.hxx> -#include <svtools/searchopt.hxx> +#include <unotools/searchopt.hxx> #include <com/sun/star/i18n/TransliterationModules.hpp> #ifndef _SVX_DIALOGS_HRC diff --git a/svx/source/cui/optmemory.cxx b/svx/source/cui/optmemory.cxx index ac5a1809fc7b..3f930c4fe750 100644 --- a/svx/source/cui/optmemory.cxx +++ b/svx/source/cui/optmemory.cxx @@ -40,19 +40,19 @@ #include <goodies/grfmgr.hxx> #include <svtools/flagitem.hxx> #include <sfx2/dispatch.hxx> -#include <svtools/lingucfg.hxx> +#include <unotools/lingucfg.hxx> #include <svtools/szitem.hxx> #include <sfx2/viewsh.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/filedlghelper.hxx> #include <vcl/msgbox.hxx> #include <rtl/math.hxx> -#include <svtools/undoopt.hxx> -#include <svtools/useroptions.hxx> -#include <svtools/cacheoptions.hxx> -#include <svtools/fontoptions.hxx> +#include <unotools/undoopt.hxx> +#include <unotools/useroptions.hxx> +#include <unotools/cacheoptions.hxx> +#include <unotools/fontoptions.hxx> #include <svtools/menuoptions.hxx> -#include <svtools/startoptions.hxx> +#include <unotools/startoptions.hxx> #include <svtools/cjkoptions.hxx> #ifndef INCLUDED_SVTOOLS_MISCPOPT_HXX #include <svtools/miscopt.hxx> diff --git a/svx/source/cui/optpath.cxx b/svx/source/cui/optpath.cxx index eeef9ec75fea..0dd7eca0990c 100644 --- a/svx/source/cui/optpath.cxx +++ b/svx/source/cui/optpath.cxx @@ -49,11 +49,11 @@ #include <tools/config.hxx> #include <tools/urlobj.hxx> #include <vcl/svapp.hxx> -#include <svtools/defaultoptions.hxx> +#include <unotools/defaultoptions.hxx> #include <unotools/localfilehelper.hxx> -#include <svtools/pathoptions.hxx> -#include <svtools/moduleoptions.hxx> -#include <svtools/viewoptions.hxx> +#include <unotools/pathoptions.hxx> +#include <unotools/moduleoptions.hxx> +#include <unotools/viewoptions.hxx> #define _SVX_OPTPATH_CXX diff --git a/svx/source/cui/optsave.cxx b/svx/source/cui/optsave.cxx index 29708444fe93..7e37c46b6733 100644 --- a/svx/source/cui/optsave.cxx +++ b/svx/source/cui/optsave.cxx @@ -49,8 +49,8 @@ #include <comphelper/processfactory.hxx> #include <comphelper/sequenceasvector.hxx> #include <comphelper/sequenceashashmap.hxx> -#include <svtools/moduleoptions.hxx> -#include <svtools/saveopt.hxx> +#include <unotools/moduleoptions.hxx> +#include <unotools/saveopt.hxx> #include <comphelper/sequenceasvector.hxx> #include <comphelper/sequenceashashmap.hxx> #include <com/sun/star/container/XContainerQuery.hpp> @@ -66,7 +66,7 @@ #include <vcl/fixed.hxx> #include <vcl/msgbox.hxx> #include <unotools/configitem.hxx> -#include <svtools/optionsdlg.hxx> +#include <unotools/optionsdlg.hxx> #include <vcl/msgbox.hxx> diff --git a/svx/source/cui/postdlg.cxx b/svx/source/cui/postdlg.cxx index 1f4d481f4b8e..8badd25b336b 100644 --- a/svx/source/cui/postdlg.cxx +++ b/svx/source/cui/postdlg.cxx @@ -45,7 +45,7 @@ #endif #include <svtools/itempool.hxx> #include <svtools/itemset.hxx> -#include <svtools/useroptions.hxx> +#include <unotools/useroptions.hxx> #include <unotools/localedatawrapper.hxx> #ifndef _UNOTOOLS_PROCESSFACTORY_HXX #include <comphelper/processfactory.hxx> diff --git a/svx/source/cui/securityoptions.cxx b/svx/source/cui/securityoptions.cxx index e033b9010868..a55e904a484b 100644 --- a/svx/source/cui/securityoptions.cxx +++ b/svx/source/cui/securityoptions.cxx @@ -38,7 +38,7 @@ // include --------------------------------------------------------------- #ifndef INCLUDED_SVTOOLS_SECURITIYOPTIONS_HXX -#include <svtools/securityoptions.hxx> +#include <unotools/securityoptions.hxx> #endif #include <svtools/stdctrl.hxx> #include <svx/dialmgr.hxx> diff --git a/svx/source/cui/tabarea.cxx b/svx/source/cui/tabarea.cxx index 219009eb15a1..2c68adae7b29 100644 --- a/svx/source/cui/tabarea.cxx +++ b/svx/source/cui/tabarea.cxx @@ -43,7 +43,7 @@ #ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> #endif -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <svx/svdmark.hxx> #include <svx/svdobj.hxx> #include <svx/svdview.hxx> diff --git a/svx/source/cui/tabline.cxx b/svx/source/cui/tabline.cxx index 456842f93171..abe9b903d506 100644 --- a/svx/source/cui/tabline.cxx +++ b/svx/source/cui/tabline.cxx @@ -40,7 +40,7 @@ #ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> #endif -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <sfx2/app.hxx> #include <sfx2/objsh.hxx> diff --git a/svx/source/cui/tpbitmap.cxx b/svx/source/cui/tpbitmap.cxx index 47a516e65f3b..380e97b14b0e 100644 --- a/svx/source/cui/tpbitmap.cxx +++ b/svx/source/cui/tpbitmap.cxx @@ -55,7 +55,7 @@ #ifndef _UNOTOOLS_UCBSTREAMHELPER_HXX #include <unotools/ucbstreamhelper.hxx> #endif -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <sfx2/app.hxx> #include <sfx2/filedlghelper.hxx> #include <unotools/localfilehelper.hxx> diff --git a/svx/source/cui/tpcolor.cxx b/svx/source/cui/tpcolor.cxx index 3a7399ae073d..9408b31c9b70 100644 --- a/svx/source/cui/tpcolor.cxx +++ b/svx/source/cui/tpcolor.cxx @@ -38,7 +38,7 @@ // include --------------------------------------------------------------- #include <tools/shl.hxx> #include <tools/urlobj.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <sfx2/app.hxx> #include <sfx2/module.hxx> #include <svtools/colrdlg.hxx> diff --git a/svx/source/cui/tpgradnt.cxx b/svx/source/cui/tpgradnt.cxx index 2624738baaa4..27d0b650fa5e 100644 --- a/svx/source/cui/tpgradnt.cxx +++ b/svx/source/cui/tpgradnt.cxx @@ -40,7 +40,7 @@ #include <tools/shl.hxx> #include <tools/urlobj.hxx> #include <vcl/msgbox.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <sfx2/app.hxx> #include <sfx2/filedlghelper.hxx> #include "com/sun/star/ui/dialogs/TemplateDescription.hpp" diff --git a/svx/source/cui/tphatch.cxx b/svx/source/cui/tphatch.cxx index d060031abea2..a6f1730636a2 100644 --- a/svx/source/cui/tphatch.cxx +++ b/svx/source/cui/tphatch.cxx @@ -41,7 +41,7 @@ #ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> #endif -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <sfx2/app.hxx> #include <sfx2/module.hxx> #include <sfx2/filedlghelper.hxx> diff --git a/svx/source/cui/tplnedef.cxx b/svx/source/cui/tplnedef.cxx index 7b22fe175d16..5662b1719ebd 100644 --- a/svx/source/cui/tplnedef.cxx +++ b/svx/source/cui/tplnedef.cxx @@ -39,7 +39,7 @@ #include <tools/shl.hxx> #include <tools/urlobj.hxx> #include <vcl/msgbox.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <sfx2/app.hxx> #include <sfx2/module.hxx> #include <sfx2/filedlghelper.hxx> diff --git a/svx/source/cui/tplneend.cxx b/svx/source/cui/tplneend.cxx index c83a88956273..fda2945ee060 100644 --- a/svx/source/cui/tplneend.cxx +++ b/svx/source/cui/tplneend.cxx @@ -39,7 +39,7 @@ #include <tools/shl.hxx> #include <tools/urlobj.hxx> #include <vcl/msgbox.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <sfx2/app.hxx> #include <sfx2/filedlghelper.hxx> #include "com/sun/star/ui/dialogs/TemplateDescription.hpp" diff --git a/svx/source/cui/treeopt.cxx b/svx/source/cui/treeopt.cxx index ca2be79075e8..c7a28814dd51 100644 --- a/svx/source/cui/treeopt.cxx +++ b/svx/source/cui/treeopt.cxx @@ -71,16 +71,16 @@ #include <linguistic/misc.hxx> #endif #include <svtools/helpopt.hxx> -#include <svtools/moduleoptions.hxx> +#include <unotools/moduleoptions.hxx> #include <svtools/languageoptions.hxx> -#include <svtools/optionsdlg.hxx> +#include <unotools/optionsdlg.hxx> #include <sfx2/module.hxx> #include <vcl/msgbox.hxx> #include <sfx2/dispatch.hxx> #include <vcl/waitobj.hxx> #include <svtools/slstitm.hxx> #include <sfx2/viewfrm.hxx> -#include <svtools/viewoptions.hxx> +#include <unotools/viewoptions.hxx> #include <sfx2/printopt.hxx> #include <osl/module.h> #include <osl/process.h> @@ -91,7 +91,7 @@ #include <sfx2/viewsh.hxx> #include <sfx2/tplpitem.hxx> #include <svtools/apearcfg.hxx> -#include <svtools/linguprops.hxx> +#include <unotools/linguprops.hxx> #include <sfx2/app.hxx> #include <svx/xdef.hxx> #include <svx/xflclit.hxx> diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx index 90cbdc27cb1a..12f5d44ddb1e 100644 --- a/svx/source/dialog/docrecovery.cxx +++ b/svx/source/dialog/docrecovery.cxx @@ -65,7 +65,7 @@ #include <osl/file.hxx> #include <osl/security.hxx> #include <rtl/bootstrap.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <unotools/localfilehelper.hxx> #define RET_BACK 100 diff --git a/svx/source/dialog/hangulhanja.cxx b/svx/source/dialog/hangulhanja.cxx index 3a3f35d36e0a..f4fbe2acab23 100644 --- a/svx/source/dialog/hangulhanja.cxx +++ b/svx/source/dialog/hangulhanja.cxx @@ -34,8 +34,8 @@ #include <vcl/msgbox.hxx> //add CHINA001 #include <vcl/button.hxx> // header for class SvtLinguConfig -#include <svtools/lingucfg.hxx> -#include <svtools/linguprops.hxx> +#include <unotools/lingucfg.hxx> +#include <unotools/linguprops.hxx> #include <set> #include <map> diff --git a/svx/source/dialog/hyperdlg.cxx b/svx/source/dialog/hyperdlg.cxx index d17a24a37e22..cf2eba07351c 100644 --- a/svx/source/dialog/hyperdlg.cxx +++ b/svx/source/dialog/hyperdlg.cxx @@ -33,7 +33,7 @@ // include --------------------------------------------------------------- #include <vcl/settings.hxx> -#include <svtools/viewoptions.hxx> +#include <unotools/viewoptions.hxx> #include "hyperdlg.hxx" #include <svx/svxdlg.hxx> //CHINA001 #include <sfx2/app.hxx> diff --git a/svx/source/dialog/hyprlink.cxx b/svx/source/dialog/hyprlink.cxx index 86d01aa9fdb8..495880278363 100644 --- a/svx/source/dialog/hyprlink.cxx +++ b/svx/source/dialog/hyprlink.cxx @@ -33,7 +33,7 @@ #include <tools/urlobj.hxx> #include <vcl/msgbox.hxx> #include <unotools/configitem.hxx> -#include <svtools/cmdoptions.hxx> +#include <unotools/cmdoptions.hxx> #include <svtools/inetimg.hxx> #include <svtools/urlbmk.hxx> #include <svtools/eitem.hxx> diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx index 5777dc8e7446..980ec36be7cf 100644 --- a/svx/source/dialog/imapdlg.cxx +++ b/svx/source/dialog/imapdlg.cxx @@ -53,7 +53,7 @@ #include <vcl/group.hxx> #include <vcl/lstbox.hxx> #include <svtools/eitem.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/module.hxx> #include <sfx2/filedlghelper.hxx> diff --git a/svx/source/dialog/impgrf.cxx b/svx/source/dialog/impgrf.cxx index 6fad7cb03f58..de5295e8d1d2 100644 --- a/svx/source/dialog/impgrf.cxx +++ b/svx/source/dialog/impgrf.cxx @@ -41,8 +41,8 @@ #include <sfx2/dispatch.hxx> #include <vcl/msgbox.hxx> #include <vcl/waitobj.hxx> -#include <svtools/pathoptions.hxx> -#include <svtools/viewoptions.hxx> +#include <unotools/pathoptions.hxx> +#include <unotools/viewoptions.hxx> #include <unotools/localfilehelper.hxx> #include <ucbhelper/content.hxx> #include <osl/file.hxx> diff --git a/svx/source/dialog/opengrf.cxx b/svx/source/dialog/opengrf.cxx index 6457cefad316..6621a04d39c1 100644 --- a/svx/source/dialog/opengrf.cxx +++ b/svx/source/dialog/opengrf.cxx @@ -58,7 +58,7 @@ #endif #include <sfx2/filedlghelper.hxx> #include <sfx2/docfile.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <svx/dialmgr.hxx> #include "opengrf.hxx" diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index 918234222135..a4cc3b44bcc7 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -38,7 +38,7 @@ #include <svtools/slstitm.hxx> #include <svtools/itemiter.hxx> #include <svtools/style.hxx> -#include <svtools/searchopt.hxx> +#include <unotools/searchopt.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/objsh.hxx> #include <sfx2/module.hxx> diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx index 9ab1eb43de5c..6abadb0ac4ab 100644 --- a/svx/source/dialog/svxbmpnumvalueset.cxx +++ b/svx/source/dialog/svxbmpnumvalueset.cxx @@ -60,7 +60,7 @@ #include <drawitem.hxx> #include <numvset.hxx> #include <htmlmode.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <svtools/ctrltool.hxx> #include <unolingu.hxx> #include <com/sun/star/style/NumberingType.hpp> diff --git a/svx/source/editeng/acorrcfg.cxx b/svx/source/editeng/acorrcfg.cxx index 601e8497baa3..b7e5be53344a 100644 --- a/svx/source/editeng/acorrcfg.cxx +++ b/svx/source/editeng/acorrcfg.cxx @@ -35,7 +35,7 @@ #include <sfx2/app.hxx> #include <tools/urlobj.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <svtools/urihelper.hxx> #include <svx/svxacorr.hxx> diff --git a/svx/source/editeng/editview.cxx b/svx/source/editeng/editview.cxx index 6776f57ea2b6..0e9f82cc31a1 100644 --- a/svx/source/editeng/editview.cxx +++ b/svx/source/editeng/editview.cxx @@ -72,7 +72,7 @@ #include <linguistic/lngprops.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> -#include <svtools/lingucfg.hxx> +#include <unotools/lingucfg.hxx> using ::rtl::OUString; diff --git a/svx/source/editeng/unolingu.cxx b/svx/source/editeng/unolingu.cxx index 39ece655d631..fce15ed61bac 100644 --- a/svx/source/editeng/unolingu.cxx +++ b/svx/source/editeng/unolingu.cxx @@ -40,7 +40,7 @@ #include <tools/debug.hxx> #include <tools/urlobj.hxx> #include <rtl/logfile.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/frame/XStorable.hpp> #include <com/sun/star/lang/XEventListener.hpp> @@ -57,7 +57,7 @@ #include <comphelper/processfactory.hxx> #include <cppuhelper/implbase1.hxx> // helper for implementations #include <i18npool/mslangid.hxx> -#include <svtools/lingucfg.hxx> +#include <unotools/lingucfg.hxx> #include <unotools/ucbhelper.hxx> #include <unotools/localfilehelper.hxx> #include <ucbhelper/commandenvironment.hxx> diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index 791bebc772c8..af32dc4fb9a9 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -44,8 +44,8 @@ #include <svx/dialmgr.hxx> #include <svx/fmshell.hxx> #include <svtools/miscopt.hxx> -#include <svtools/pathoptions.hxx> -#include <svtools/viewoptions.hxx> +#include <unotools/pathoptions.hxx> +#include <unotools/viewoptions.hxx> #include <svtools/svtools.hrc> #include <sfx2/app.hxx> #include <sfx2/filedlghelper.hxx> diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx index ccdfb2b1af39..78586ed2bd87 100644 --- a/svx/source/form/fmshell.cxx +++ b/svx/source/form/fmshell.cxx @@ -60,7 +60,7 @@ #include <sfx2/app.hxx> #include <svtools/intitem.hxx> #include <svtools/visitem.hxx> -#include <svtools/moduleoptions.hxx> +#include <unotools/moduleoptions.hxx> #include <sfx2/objface.hxx> #include <sfx2/request.hxx> #include <sfx2/dispatch.hxx> diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx index 222407a36021..d5e7992bc8e9 100644 --- a/svx/source/form/fmview.cxx +++ b/svx/source/form/fmview.cxx @@ -35,7 +35,7 @@ #undef REFERENCE #endif #include <svtools/ehdl.hxx> -#include <svtools/moduleoptions.hxx> +#include <unotools/moduleoptions.hxx> #include <com/sun/star/sdb/SQLContext.hpp> #include <com/sun/star/uno/XNamingService.hpp> #include <com/sun/star/sdbc/XConnection.hpp> diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx index 46750d524a4d..f3cc71721401 100644 --- a/svx/source/form/fmvwimp.cxx +++ b/svx/source/form/fmvwimp.cxx @@ -90,7 +90,7 @@ #include <comphelper/extract.hxx> #include <comphelper/numbers.hxx> #include <comphelper/property.hxx> -#include <svtools/moduleoptions.hxx> +#include <unotools/moduleoptions.hxx> #include <tools/diagnose_ex.h> #include <vcl/msgbox.hxx> #include <vcl/stdtext.hxx> diff --git a/svx/source/gallery2/galbrws.cxx b/svx/source/gallery2/galbrws.cxx index a58b654fe277..91aab0b4e6bf 100644 --- a/svx/source/gallery2/galbrws.cxx +++ b/svx/source/gallery2/galbrws.cxx @@ -33,7 +33,7 @@ #include <vcl/split.hxx> #include <vcl/ctrl.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <sfx2/app.hxx> #include <sfx2/sfxsids.hrc> #include "gallery.hrc" diff --git a/svx/source/gallery2/galexpl.cxx b/svx/source/gallery2/galexpl.cxx index d8bc33f5b1e8..5068dafe3d31 100644 --- a/svx/source/gallery2/galexpl.cxx +++ b/svx/source/gallery2/galexpl.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <sfx2/viewfrm.hxx> #include "gallery1.hxx" #include "galtheme.hxx" diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx index 7e0faeeb4994..0305fa74e21d 100644 --- a/svx/source/gallery2/gallery1.cxx +++ b/svx/source/gallery2/gallery1.cxx @@ -36,7 +36,7 @@ #include <tools/vcompat.hxx> #include <ucbhelper/content.hxx> #include <unotools/ucbstreamhelper.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <sfx2/docfile.hxx> #include "gallery.hxx" #include "galmisc.hxx" diff --git a/svx/source/gallery2/galobj.cxx b/svx/source/gallery2/galobj.cxx index b5cdd332362d..f2f800e8a2c9 100644 --- a/svx/source/gallery2/galobj.cxx +++ b/svx/source/gallery2/galobj.cxx @@ -38,7 +38,7 @@ #include <sfx2/docfac.hxx> #include <comphelper/classids.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <tools/rcid.h> #include <tools/vcompat.hxx> diff --git a/svx/source/options/optlingu.cxx b/svx/source/options/optlingu.cxx index f4ed552d7d27..c58a0c01fb80 100644 --- a/svx/source/options/optlingu.cxx +++ b/svx/source/options/optlingu.cxx @@ -45,7 +45,7 @@ #include <tools/dynary.hxx> #include <i18npool/mslangid.hxx> //#include <svtools/svarray.hxx> -#include <svtools/lingucfg.hxx> +#include <unotools/lingucfg.hxx> #include <unolingu.hxx> #include <dlgutil.hxx> #include <linguistic/lngprops.hxx> @@ -70,7 +70,7 @@ #include <com/sun/star/ucb/CommandAbortedException.hpp> #include <com/sun/star/system/XSystemShellExecute.hpp> #include <com/sun/star/system/SystemShellExecuteFlags.hpp> -#include <svtools/extendedsecurityoptions.hxx> +#include <unotools/extendedsecurityoptions.hxx> #include <svtools/svlbox.hxx> #include <svtools/eitem.hxx> #include <svtools/intitem.hxx> diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx index 6f4ee781dc37..5134b97f6ab4 100644 --- a/svx/source/svdraw/svdetc.cxx +++ b/svx/source/svdraw/svdetc.cxx @@ -46,7 +46,7 @@ #include <svx/eeitem.hxx> #include <svtools/itemset.hxx> #include <tools/config.hxx> -#include <svtools/cacheoptions.hxx> +#include <unotools/cacheoptions.hxx> #include <svtools/whiter.hxx> #include <tools/bigint.hxx> #include "fontitem.hxx" diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index efa49025bbc4..cff14ad46237 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -45,7 +45,7 @@ #include <svtools/style.hxx> #include <svtools/ctrltool.hxx> #include <svtools/stritem.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <sfx2/tplpitem.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/viewsh.hxx> @@ -58,7 +58,7 @@ #include <tools/urlobj.hxx> #include <sfx2/childwin.hxx> #include <sfx2/viewfrm.hxx> -#include <svtools/fontoptions.hxx> +#include <unotools/fontoptions.hxx> #ifndef _VCL_MNEMONIC_HXX_ #include <vcl/mnemonic.hxx> #endif diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx index b6189fd35f61..45a38fd86361 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx @@ -47,8 +47,8 @@ // header for define RET_OK #include <vcl/msgbox.hxx> // header for class SvtLinguConfigItem -#include <svtools/lingucfg.hxx> -#include <svtools/linguprops.hxx> +#include <unotools/lingucfg.hxx> +#include <unotools/linguprops.hxx> // header for class IntlWrapper #include <unotools/intlwrapper.hxx> #ifndef _UNOTOOLS_PROCESSFACTORY_HXX diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx index b05db957af7a..868ccfd06f76 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx @@ -39,8 +39,8 @@ // header for define RET_OK #include <vcl/msgbox.hxx> // header for class SvtLinguConfigItem -#include <svtools/lingucfg.hxx> -#include <svtools/linguprops.hxx> +#include <unotools/lingucfg.hxx> +#include <unotools/linguprops.hxx> #ifndef _SVX_HELPID_HRC #include "helpid.hrc" #endif diff --git a/svx/source/unodraw/unoctabl.cxx b/svx/source/unodraw/unoctabl.cxx index 91ffcd28b45d..5ca18dcfa558 100644 --- a/svx/source/unodraw/unoctabl.cxx +++ b/svx/source/unodraw/unoctabl.cxx @@ -30,7 +30,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/container/XNameContainer.hpp> #include <cppuhelper/implbase2.hxx> diff --git a/svx/source/unogallery/unogaltheme.cxx b/svx/source/unogallery/unogaltheme.cxx index 683a67e2b253..99c1f13eebc4 100644 --- a/svx/source/unogallery/unogaltheme.cxx +++ b/svx/source/unogallery/unogaltheme.cxx @@ -44,7 +44,7 @@ #ifndef _SV_SVAPP_HXX_ #include <vcl/svapp.hxx> #endif -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> using namespace ::com::sun::star; diff --git a/svx/source/unogallery/unogalthemeprovider.cxx b/svx/source/unogallery/unogalthemeprovider.cxx index 126f49fe0b50..9ccf7f978011 100644 --- a/svx/source/unogallery/unogalthemeprovider.cxx +++ b/svx/source/unogallery/unogalthemeprovider.cxx @@ -39,7 +39,7 @@ #ifndef _SV_SVAPP_HXX_ #include <vcl/svapp.hxx> #endif -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <com/sun/star/gallery/XGalleryTheme.hpp> #include <com/sun/star/beans/PropertyValue.hpp> diff --git a/svx/source/xoutdev/xtabcolr.cxx b/svx/source/xoutdev/xtabcolr.cxx index 45f0f056bc0d..1e945e9f20bb 100644 --- a/svx/source/xoutdev/xtabcolr.cxx +++ b/svx/source/xoutdev/xtabcolr.cxx @@ -37,7 +37,7 @@ #include "XPropertyTable.hxx" #include <unotools/ucbstreamhelper.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include "xmlxtexp.hxx" #include "xmlxtimp.hxx" diff --git a/uui/source/secmacrowarnings.hxx b/uui/source/secmacrowarnings.hxx index 17280ecbbac1..1415d18b1b0e 100644 --- a/uui/source/secmacrowarnings.hxx +++ b/uui/source/secmacrowarnings.hxx @@ -33,7 +33,7 @@ #include <vcl/dialog.hxx> #include <svtools/stdctrl.hxx> -#include <svtools/securityoptions.hxx> +#include <unotools/securityoptions.hxx> #include <vcl/button.hxx> namespace com { diff --git a/xmloff/inc/pch/precompiled_xmloff.hxx b/xmloff/inc/pch/precompiled_xmloff.hxx index f8f890e9050f..907f3682fe58 100644 --- a/xmloff/inc/pch/precompiled_xmloff.hxx +++ b/xmloff/inc/pch/precompiled_xmloff.hxx @@ -438,7 +438,7 @@ #include "svtools/cntnrsrt.hxx" #include "svtools/itemset.hxx" -#include "svtools/moduleoptions.hxx" +#include "unotools/moduleoptions.hxx" #include "svtools/nfsymbol.hxx" #include "svtools/numuno.hxx" #include "svtools/poolitem.hxx" diff --git a/xmloff/inc/xmloff/maptype.hxx b/xmloff/inc/xmloff/maptype.hxx index ba85669d8be2..69d94145d6fc 100644 --- a/xmloff/inc/xmloff/maptype.hxx +++ b/xmloff/inc/xmloff/maptype.hxx @@ -34,7 +34,7 @@ #include <tools/solar.h> #include <com/sun/star/uno/Any.hxx> #include <xmloff/xmltoken.hxx> -#include <svtools/saveopt.hxx> +#include <unotools/saveopt.hxx> /////////////////////////////////////////////////////////////////////////// // diff --git a/xmloff/inc/xmloff/xmlexp.hxx b/xmloff/inc/xmloff/xmlexp.hxx index 276627e80354..f8aeac6b3b6a 100644 --- a/xmloff/inc/xmloff/xmlexp.hxx +++ b/xmloff/inc/xmloff/xmlexp.hxx @@ -68,7 +68,7 @@ #include <com/sun/star/lang/XEventListener.hpp> #include <com/sun/star/container/XNamed.hpp> -#include <svtools/saveopt.hxx> +#include <unotools/saveopt.hxx> #include <xmloff/XMLPageExport.hxx> #include <xmloff/ProgressBarHelper.hxx> @@ -87,7 +87,7 @@ class XMLImageMapExport; class XMLErrors; // --> OD 2006-03-14 #i51726# -#include <svtools/moduleoptions.hxx> +#include <unotools/moduleoptions.hxx> // <-- namespace rtl { class OUString; } diff --git a/xmloff/source/chart/XMLErrorBarStylePropertyHdl.cxx b/xmloff/source/chart/XMLErrorBarStylePropertyHdl.cxx index 273e9db4e364..cc67c4ac75fa 100644 --- a/xmloff/source/chart/XMLErrorBarStylePropertyHdl.cxx +++ b/xmloff/source/chart/XMLErrorBarStylePropertyHdl.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_xmloff.hxx" #include "XMLErrorBarStylePropertyHdl.hxx" -#include <svtools/saveopt.hxx> +#include <unotools/saveopt.hxx> #include <com/sun/star/chart/ErrorBarStyle.hpp> #include <com/sun/star/uno/Any.hxx> |