diff options
41 files changed, 55 insertions, 58 deletions
diff --git a/chart2/inc/pch/precompiled_chart2.hxx b/chart2/inc/pch/precompiled_chart2.hxx index e8af809b1af2..ca7ab50f7ad7 100644 --- a/chart2/inc/pch/precompiled_chart2.hxx +++ b/chart2/inc/pch/precompiled_chart2.hxx @@ -218,7 +218,7 @@ #include "svtools/itemiter.hxx" #include "svtools/itempool.hxx" #include "svtools/itemset.hxx" -#include "svtools/pathoptions.hxx" +#include "unotools/pathoptions.hxx" #include "svtools/poolitem.hxx" #include "svtools/stritem.hxx" #include "svtools/syslocale.hxx" diff --git a/chart2/source/controller/dialogs/dlg_DataEditor.cxx b/chart2/source/controller/dialogs/dlg_DataEditor.cxx index 6abbf5a8e038..edc431c2c763 100644 --- a/chart2/source/controller/dialogs/dlg_DataEditor.cxx +++ b/chart2/source/controller/dialogs/dlg_DataEditor.cxx @@ -43,7 +43,7 @@ #include <vcl/msgbox.hxx> #include <vcl/taskpanelist.hxx> #include <svtools/miscopt.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> // for SfxBoolItem #include <svtools/eitem.hxx> diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx index e25cb92d4012..f3971b28d40f 100644 --- a/chart2/source/model/filter/XMLFilter.cxx +++ b/chart2/source/model/filter/XMLFilter.cxx @@ -41,7 +41,7 @@ // header contains only macros #include <svtools/sfxecode.hxx> // header for class SvtSaveOptions -#include <svtools/saveopt.hxx> +#include <unotools/saveopt.hxx> #include <comphelper/genericpropertyset.hxx> // header for struct PropertyMapEntry #include <comphelper/propertysetinfo.hxx> diff --git a/chart2/source/tools/AxisHelper.cxx b/chart2/source/tools/AxisHelper.cxx index 5e6c0bce8717..b7dfd60f8712 100644 --- a/chart2/source/tools/AxisHelper.cxx +++ b/chart2/source/tools/AxisHelper.cxx @@ -42,7 +42,7 @@ #include "DataSeriesHelper.hxx" #include "Scaling.hxx" -#include <svtools/saveopt.hxx> +#include <unotools/saveopt.hxx> #include <com/sun/star/chart/ChartAxisPosition.hpp> diff --git a/chart2/source/tools/CharacterProperties.cxx b/chart2/source/tools/CharacterProperties.cxx index 4f558b35df0a..6981d7fab9a2 100644 --- a/chart2/source/tools/CharacterProperties.cxx +++ b/chart2/source/tools/CharacterProperties.cxx @@ -58,7 +58,7 @@ // header for struct SvtLinguConfig #ifndef _SVTOOLS_LINGUCFG_HXX_ -#include <svtools/lingucfg.hxx> +#include <unotools/lingucfg.hxx> #endif #ifndef INCLUDED_I18NPOOL_MSLANGID_HXX #include <i18npool/mslangid.hxx> diff --git a/chart2/source/view/main/DrawModelWrapper.cxx b/chart2/source/view/main/DrawModelWrapper.cxx index 95b5144265ae..edcb8c3eecc9 100644 --- a/chart2/source/view/main/DrawModelWrapper.cxx +++ b/chart2/source/view/main/DrawModelWrapper.cxx @@ -45,7 +45,7 @@ // header for class Svx3DPercentDiagonalItem #include <svx/svx3ditems.hxx> // header for class SvtPathOptions -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> // header E3dObjFactory #include <svx/objfac3d.hxx> // header for class SdrObjList diff --git a/sc/inc/chgtrack.hxx b/sc/inc/chgtrack.hxx index 6707473f5610..52915e59358a 100644 --- a/sc/inc/chgtrack.hxx +++ b/sc/inc/chgtrack.hxx @@ -39,7 +39,7 @@ #include <tools/queue.hxx> #include <tools/mempool.hxx> #include <tools/link.hxx> -#include <svtools/lstner.hxx> +#include <unotools/options.hxx> #include "global.hxx" #include "bigrange.hxx" #include "collect.hxx" @@ -994,9 +994,7 @@ DECLARE_TABLE( ScChangeActionTable, ScChangeAction* ) // "normalen" Actions in die Quere zu kommen. #define SC_CHGTRACK_GENERATED_START ((UINT32) 0xfffffff0) -// SfxListener an der Applikation, um Aenderungen des Usernamens mitzubekommen - -class ScChangeTrack : public SfxListener +class ScChangeTrack : public utl::ConfigurationListener { friend void ScChangeAction::RejectRestoreContents( ScChangeTrack*, SCsCOL, SCsROW ); friend BOOL ScChangeActionDel::Reject( ScDocument* pDoc ); @@ -1059,7 +1057,6 @@ class ScChangeTrack : public SfxListener const ScBaseCell* pOldCell, const ScBaseCell* pNewCell ); - virtual void Notify( SfxBroadcaster&, const SfxHint& ); void Init(); void DtorClear(); void SetLoadSave( BOOL bVal ) { bLoadSave = bVal; } @@ -1130,6 +1127,7 @@ class ScChangeTrack : public SfxListener #endif // SC_CHGTRACK_CXX void ClearMsgQueue(); + virtual void ConfigurationChanged( utl::ConfigurationBroadcaster* ); public: diff --git a/sc/inc/pch/precompiled_sc.hxx b/sc/inc/pch/precompiled_sc.hxx index b905bb19db03..f1e916f5b568 100644 --- a/sc/inc/pch/precompiled_sc.hxx +++ b/sc/inc/pch/precompiled_sc.hxx @@ -155,13 +155,13 @@ #include <svtools/brdcst.hxx> #include <svtools/cenumitm.hxx> #include <svtools/cintitem.hxx> -#include <svtools/fltrcfg.hxx> +#include <unotools/fltrcfg.hxx> #include <svtools/intitem.hxx> #include <svtools/listener.hxx> #include <svtools/lstner.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <svtools/solar.hrc> -#include <svtools/useroptions.hxx> +#include <unotools/useroptions.hxx> #include <svx/editobj.hxx> #include <svx/eeitem.hxx> #include <svx/fmglob.hxx> diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx index 64433a30297a..b12a2783baa9 100644 --- a/sc/source/core/data/documen8.cxx +++ b/sc/source/core/data/documen8.cxx @@ -58,7 +58,7 @@ #include <svtools/misccfg.hxx> #include <sfx2/app.hxx> #include <unotools/transliterationwrapper.hxx> -#include <svtools/securityoptions.hxx> +#include <unotools/securityoptions.hxx> #include <vcl/virdev.hxx> #include <vcl/msgbox.hxx> diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx index de27a80b17ee..772ed496d2e1 100644 --- a/sc/source/core/data/documen9.cxx +++ b/sc/source/core/data/documen9.cxx @@ -56,8 +56,8 @@ #include <svx/xtable.hxx> #include <sfx2/objsh.hxx> #include <sfx2/printer.hxx> -#include <svtools/saveopt.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/saveopt.hxx> +#include <unotools/pathoptions.hxx> #include "document.hxx" #include "docoptio.hxx" diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx index 8b04d5a0500e..4249efa9d020 100644 --- a/sc/source/core/data/document.cxx +++ b/sc/source/core/data/document.cxx @@ -47,7 +47,7 @@ #include <sfx2/app.hxx> #include <sfx2/objsh.hxx> #include <svtools/poolcach.hxx> -#include <svtools/saveopt.hxx> +#include <unotools/saveopt.hxx> #include <svtools/zforlist.hxx> #include <unotools/charclass.hxx> #include <unotools/transliterationwrapper.hxx> diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx index a5c571026e96..6a3beb940c48 100644 --- a/sc/source/core/data/drwlayer.cxx +++ b/sc/source/core/data/drwlayer.cxx @@ -64,7 +64,7 @@ #include <sfx2/viewsh.hxx> #include <sfx2/docfile.hxx> #include <sot/storage.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <svtools/itempool.hxx> #include <vcl/virdev.hxx> #include <vcl/svapp.hxx> diff --git a/sc/source/core/data/global2.cxx b/sc/source/core/data/global2.cxx index 6af662119f12..67dccac980ae 100644 --- a/sc/source/core/data/global2.cxx +++ b/sc/source/core/data/global2.cxx @@ -38,8 +38,8 @@ #include <sfx2/docfile.hxx> #include <sfx2/objsh.hxx> #include <unotools/textsearch.hxx> -#include <svtools/pathoptions.hxx> -#include <svtools/useroptions.hxx> +#include <unotools/pathoptions.hxx> +#include <unotools/useroptions.hxx> #include <tools/urlobj.hxx> #include <unotools/charclass.hxx> #include <stdlib.h> diff --git a/sc/source/core/data/globalx.cxx b/sc/source/core/data/globalx.cxx index 03ca187df4d2..a5b14a3cc8c5 100644 --- a/sc/source/core/data/globalx.cxx +++ b/sc/source/core/data/globalx.cxx @@ -40,7 +40,7 @@ #include <unotools/localfilehelper.hxx> #include <tools/debug.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <com/sun/star/sdbc/XResultSet.hpp> #include <com/sun/star/sdbc/XRow.hpp> diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx index 7a08f352ed91..6489b4f21a6a 100644 --- a/sc/source/core/data/postit.cxx +++ b/sc/source/core/data/postit.cxx @@ -34,7 +34,7 @@ #include "postit.hxx" #include <rtl/ustrbuf.hxx> -#include <svtools/useroptions.hxx> +#include <unotools/useroptions.hxx> #include <svx/svdpage.hxx> #include <svx/svdocapt.hxx> #include <svx/outlobj.hxx> diff --git a/sc/source/core/tool/autoform.cxx b/sc/source/core/tool/autoform.cxx index 3b8a88c47e2f..f21a0860d962 100644 --- a/sc/source/core/tool/autoform.cxx +++ b/sc/source/core/tool/autoform.cxx @@ -39,7 +39,7 @@ #include <sfx2/app.hxx> #include <sfx2/docfile.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <svtools/itemset.hxx> #include <tools/shl.hxx> #include <vcl/svapp.hxx> diff --git a/sc/source/core/tool/chgtrack.cxx b/sc/source/core/tool/chgtrack.cxx index 22d996dd701f..2a9ca186bf85 100644 --- a/sc/source/core/tool/chgtrack.cxx +++ b/sc/source/core/tool/chgtrack.cxx @@ -41,7 +41,7 @@ #include <svtools/isethint.hxx> #include <svtools/itempool.hxx> #include <sfx2/app.hxx> -#include <svtools/useroptions.hxx> +#include <unotools/useroptions.hxx> #include <sfx2/sfxsids.hrc> #include "cell.hxx" @@ -2229,7 +2229,7 @@ ScChangeTrack::ScChangeTrack( ScDocument* pDocP ) : pDoc( pDocP ) { Init(); - StartListening(SC_MOD()->GetUserOptions()); + SC_MOD()->GetUserOptions().AddListener(this); ppContentSlots = new ScChangeActionContent* [ nContentSlots ]; memset( ppContentSlots, 0, nContentSlots * sizeof( ScChangeActionContent* ) ); @@ -2240,13 +2240,14 @@ ScChangeTrack::ScChangeTrack( ScDocument* pDocP, const ScStrCollection& aTempUse pDoc( pDocP ) { Init(); - StartListening(SC_MOD()->GetUserOptions()); + SC_MOD()->GetUserOptions().AddListener(this); ppContentSlots = new ScChangeActionContent* [ nContentSlots ]; memset( ppContentSlots, 0, nContentSlots * sizeof( ScChangeActionContent* ) ); } ScChangeTrack::~ScChangeTrack() { + SC_MOD()->GetUserOptions().RemoveListener(this); DtorClear(); delete [] ppContentSlots; } @@ -2339,11 +2340,9 @@ void ScChangeTrack::Clear() } -void __EXPORT ScChangeTrack::Notify( SfxBroadcaster&, const SfxHint& rHint ) +void __EXPORT ScChangeTrack::ConfigurationChanged( utl::ConfigurationBroadcaster* ) { - if ( !pDoc->IsInDtorClear() && - rHint.ISA(SfxSimpleHint) && - ((SfxSimpleHint&)rHint).GetId() == SFX_HINT_USER_OPTIONS_CHANGED ) + if ( !pDoc->IsInDtorClear() ) { const SvtUserOptions& rUserOptions = SC_MOD()->GetUserOptions(); USHORT nOldCount = aUserCollection.GetCount(); diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx index 1d209b91bc68..65ca7d593b3d 100644 --- a/sc/source/filter/excel/excimp8.cxx +++ b/sc/source/filter/excel/excimp8.cxx @@ -36,7 +36,7 @@ #include <scitems.hxx> #include <comphelper/processfactory.hxx> -#include <svtools/fltrcfg.hxx> +#include <unotools/fltrcfg.hxx> #include <svtools/wmf.hxx> diff --git a/sc/source/filter/excel/expop2.cxx b/sc/source/filter/excel/expop2.cxx index 677d872fe8e9..69f1d4eb56d2 100644 --- a/sc/source/filter/excel/expop2.cxx +++ b/sc/source/filter/excel/expop2.cxx @@ -35,7 +35,7 @@ //------------------------------------------------------------------------ -#include <svtools/fltrcfg.hxx> +#include <unotools/fltrcfg.hxx> #include <sfx2/objsh.hxx> #include <sfx2/docinf.hxx> diff --git a/sc/source/filter/excel/xeroot.cxx b/sc/source/filter/excel/xeroot.cxx index 7c4974db3029..c4acc89c1ff0 100644 --- a/sc/source/filter/excel/xeroot.cxx +++ b/sc/source/filter/excel/xeroot.cxx @@ -32,7 +32,7 @@ #include "precompiled_sc.hxx" #include <sfx2/docfile.hxx> #include <sfx2/sfxsids.hrc> -#include <svtools/saveopt.hxx> +#include <unotools/saveopt.hxx> #include <svtools/itemset.hxx> #include <svtools/stritem.hxx> #include <svtools/eitem.hxx> diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx index 599b33f9c8aa..419cbb3d6168 100644 --- a/sc/source/filter/excel/xiescher.cxx +++ b/sc/source/filter/excel/xiescher.cxx @@ -56,8 +56,8 @@ #include <rtl/logfile.hxx> #include <sfx2/objsh.hxx> -#include <svtools/moduleoptions.hxx> -#include <svtools/fltrcfg.hxx> +#include <unotools/moduleoptions.hxx> +#include <unotools/fltrcfg.hxx> #include <svtools/wmf.hxx> #include <comphelper/types.hxx> #include <comphelper/classids.hxx> diff --git a/sc/source/filter/starcalc/scfobj.cxx b/sc/source/filter/starcalc/scfobj.cxx index a36be98b3d11..d15cb3c5a227 100644 --- a/sc/source/filter/starcalc/scfobj.cxx +++ b/sc/source/filter/starcalc/scfobj.cxx @@ -41,7 +41,7 @@ using namespace com::sun::star; // INCLUDE --------------------------------------------------------------- -#include <svtools/moduleoptions.hxx> +#include <unotools/moduleoptions.hxx> #include <svx/svdoole2.hxx> #include <svx/svdpage.hxx> #include <sfx2/objsh.hxx> diff --git a/sc/source/filter/xcl97/xcl97rec.cxx b/sc/source/filter/xcl97/xcl97rec.cxx index ac71dbb01fbb..a11b814643d8 100644 --- a/sc/source/filter/xcl97/xcl97rec.cxx +++ b/sc/source/filter/xcl97/xcl97rec.cxx @@ -57,7 +57,7 @@ #include "scitems.hxx" -#include <svtools/fltrcfg.hxx> +#include <unotools/fltrcfg.hxx> #include <svx/brshitem.hxx> #include <svx/boxitem.hxx> #include <svx/frmdiritem.hxx> @@ -65,7 +65,7 @@ #include <svx/eeitem.hxx> #include <svx/msoleexp.hxx> -#include <svtools/useroptions.hxx> +#include <unotools/useroptions.hxx> #include <unotools/localedatawrapper.hxx> #include <stdio.h> diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx index 7bc5396fcb5b..d13956fd1ca3 100644 --- a/sc/source/filter/xml/xmlwrap.cxx +++ b/sc/source/filter/xml/xmlwrap.cxx @@ -71,7 +71,7 @@ #include <svx/xmleohlp.hxx> #include <rtl/logfile.hxx> -#include <svtools/saveopt.hxx> +#include <unotools/saveopt.hxx> #include "document.hxx" #include "xmlwrap.hxx" diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index 5afe9e11c7d5..43041d1be852 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -57,7 +57,7 @@ #include <svtools/ehdl.hxx> #include <svtools/accessibilityoptions.hxx> #include <svtools/ctloptions.hxx> -#include <svtools/useroptions.hxx> +#include <unotools/useroptions.hxx> #include <vcl/status.hxx> #include <sfx2/bindings.hxx> #include <sfx2/request.hxx> diff --git a/sc/source/ui/app/scmod2.cxx b/sc/source/ui/app/scmod2.cxx index 4001ebe62036..7e0b43bdd156 100644 --- a/sc/source/ui/app/scmod2.cxx +++ b/sc/source/ui/app/scmod2.cxx @@ -36,7 +36,7 @@ //------------------------------------------------------------------ #include <svx/unolingu.hxx> -#include <svtools/lingucfg.hxx> +#include <unotools/lingucfg.hxx> #include <i18npool/mslangid.hxx> #include <com/sun/star/i18n/ScriptType.hpp> #include <com/sun/star/linguistic2/XThesaurus.hpp> diff --git a/sc/source/ui/dbgui/scendlg.cxx b/sc/source/ui/dbgui/scendlg.cxx index 60c37ee19381..0065af288783 100644 --- a/sc/source/ui/dbgui/scendlg.cxx +++ b/sc/source/ui/dbgui/scendlg.cxx @@ -39,7 +39,7 @@ #include <svx/drawitem.hxx> #include <svx/xtable.hxx> #include <sfx2/objsh.hxx> -#include <svtools/useroptions.hxx> +#include <unotools/useroptions.hxx> #include <vcl/msgbox.hxx> #include <unotools/localedatawrapper.hxx> diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index f7d1e2ccae2f..44d77f5517fa 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -42,7 +42,7 @@ #include <sot/clsids.hxx> -#include <svtools/securityoptions.hxx> +#include <unotools/securityoptions.hxx> #include <tools/stream.hxx> #include <tools/string.hxx> #include <tools/urlobj.hxx> @@ -64,7 +64,7 @@ #include <sfx2/objface.hxx> #include <svx/srchitem.hxx> #include <svx/svxmsbas.hxx> -#include <svtools/fltrcfg.hxx> +#include <unotools/fltrcfg.hxx> #include <svtools/documentlockfile.hxx> #include <svtools/sharecontrolfile.hxx> #include <unotools/charclass.hxx> diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx index 93abbd48c9e7..a40bcf32dd30 100644 --- a/sc/source/ui/drawfunc/fuins2.cxx +++ b/sc/source/ui/drawfunc/fuins2.cxx @@ -49,7 +49,7 @@ #include <tools/urlobj.hxx> #include <vcl/msgbox.hxx> #include <svtools/urihelper.hxx> -#include <svtools/moduleoptions.hxx> +#include <unotools/moduleoptions.hxx> #include <svtools/insdlg.hxx> #include <svtools/soerr.hxx> #include <svx/svxdlg.hxx> diff --git a/sc/source/ui/miscdlgs/sharedocdlg.cxx b/sc/source/ui/miscdlgs/sharedocdlg.cxx index ec93346e1fed..e349f18a2c27 100644 --- a/sc/source/ui/miscdlgs/sharedocdlg.cxx +++ b/sc/source/ui/miscdlgs/sharedocdlg.cxx @@ -35,7 +35,7 @@ #include <osl/security.hxx> #include <svtools/sharecontrolfile.hxx> -#include <svtools/useroptions.hxx> +#include <unotools/useroptions.hxx> #include <docsh.hxx> diff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx b/sc/source/ui/pagedlg/scuitphfedit.cxx index 70232e2827f1..9e037fbe7d0e 100644 --- a/sc/source/ui/pagedlg/scuitphfedit.cxx +++ b/sc/source/ui/pagedlg/scuitphfedit.cxx @@ -50,7 +50,7 @@ #include <sfx2/objsh.hxx> #include <vcl/msgbox.hxx> #include <vcl/svapp.hxx> -#include <svtools/useroptions.hxx> +#include <unotools/useroptions.hxx> #define _SVSTDARR_USHORTS #include <svtools/svstdarr.hxx> diff --git a/sc/source/ui/unoobj/chartuno.cxx b/sc/source/ui/unoobj/chartuno.cxx index 3c584a94a775..d66600df4243 100644 --- a/sc/source/ui/unoobj/chartuno.cxx +++ b/sc/source/ui/unoobj/chartuno.cxx @@ -44,7 +44,7 @@ #include <svx/svdpage.hxx> #include <svx/svdundo.hxx> #include <sfx2/app.hxx> -#include <svtools/moduleoptions.hxx> +#include <unotools/moduleoptions.hxx> #include <sot/clsids.hxx> #include <toolkit/helper/vclunohelper.hxx> diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index cd63adc33989..befb6a6f76e2 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -42,7 +42,7 @@ #include <svtools/numuno.hxx> #include <svtools/smplhint.hxx> -#include <svtools/undoopt.hxx> +#include <unotools/undoopt.hxx> #include <sfx2/printer.hxx> #include <sfx2/bindings.hxx> #include <vcl/pdfextoutdevdata.hxx> diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx index c2d0f68fc6ef..3dfd6e2479c2 100644 --- a/sc/source/ui/view/cellsh.cxx +++ b/sc/source/ui/view/cellsh.cxx @@ -38,7 +38,7 @@ #include <svtools/slstitm.hxx> #include <svtools/stritem.hxx> #include <svtools/whiter.hxx> -#include <svtools/moduleoptions.hxx> +#include <unotools/moduleoptions.hxx> #include <svtools/cliplistener.hxx> #include <svtools/insdlg.hxx> #include <sot/formats.hxx> diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx index f610e28b3fc5..cf9cbeb468ad 100644 --- a/sc/source/ui/view/cellsh1.cxx +++ b/sc/source/ui/view/cellsh1.cxx @@ -70,7 +70,7 @@ #include <sfx2/passwd.hxx> #include <svx/hlnkitem.hxx> #include <basic/sbxcore.hxx> -#include <svtools/useroptions.hxx> +#include <unotools/useroptions.hxx> #include <vcl/waitobj.hxx> #include <unotools/localedatawrapper.hxx> diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx index 039e4dc256ba..d17fa7160834 100644 --- a/sc/source/ui/view/cellsh2.cxx +++ b/sc/source/ui/view/cellsh2.cxx @@ -48,7 +48,7 @@ #include <vcl/msgbox.hxx> #include <svtools/stritem.hxx> #include <svtools/visitem.hxx> -#include <svtools/moduleoptions.hxx> +#include <unotools/moduleoptions.hxx> #include <com/sun/star/frame/FrameSearchFlag.hpp> #include <com/sun/star/sdbc/XResultSet.hpp> diff --git a/sc/source/ui/view/notemark.cxx b/sc/source/ui/view/notemark.cxx index 2c50a8eb0a81..359c789e43de 100644 --- a/sc/source/ui/view/notemark.cxx +++ b/sc/source/ui/view/notemark.cxx @@ -36,7 +36,7 @@ #include <svx/svdpage.hxx> #include <svx/svdocapt.hxx> #include <sfx2/printer.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <svtools/itempool.hxx> #include <vcl/svapp.hxx> diff --git a/sc/source/ui/view/tabvwsh2.cxx b/sc/source/ui/view/tabvwsh2.cxx index db6ee302a792..20f5250bca00 100644 --- a/sc/source/ui/view/tabvwsh2.cxx +++ b/sc/source/ui/view/tabvwsh2.cxx @@ -43,7 +43,7 @@ #include <sfx2/viewfrm.hxx> #include <svtools/aeitem.hxx> #include <svtools/whiter.hxx> -#include <svtools/moduleoptions.hxx> +#include <unotools/moduleoptions.hxx> #include <svtools/languageoptions.hxx> #include <sfx2/dispatch.hxx> diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx index e34741ba4c6b..8e32b1c9a2af 100644 --- a/sc/source/ui/view/tabvwsh4.cxx +++ b/sc/source/ui/view/tabvwsh4.cxx @@ -52,7 +52,7 @@ #include <sfx2/dispatch.hxx> #include <svtools/printdlg.hxx> #include <svtools/whiter.hxx> -#include <svtools/moduleoptions.hxx> +#include <unotools/moduleoptions.hxx> #include <rtl/logfile.hxx> #include <tools/urlobj.hxx> #include <sfx2/docfile.hxx> diff --git a/sc/source/ui/view/tabvwshb.cxx b/sc/source/ui/view/tabvwshb.cxx index 37dc2c11da7f..6312ff9e3b50 100644 --- a/sc/source/ui/view/tabvwshb.cxx +++ b/sc/source/ui/view/tabvwshb.cxx @@ -65,7 +65,7 @@ #include <svtools/soerr.hxx> #include <svtools/rectitem.hxx> #include <svtools/whiter.hxx> -#include <svtools/moduleoptions.hxx> +#include <unotools/moduleoptions.hxx> #include <sot/exchange.hxx> #include "tabvwsh.hxx" diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx index 35af3ee2a2e3..71e8b4f9ae0b 100644 --- a/sc/source/ui/view/viewfun5.cxx +++ b/sc/source/ui/view/viewfun5.cxx @@ -53,7 +53,7 @@ #include <sot/clsids.hxx> #include <sot/formats.hxx> #include <sot/filelist.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <svtools/ptitem.hxx> #include <svtools/stritem.hxx> #include <svtools/transfer.hxx> |