diff options
Diffstat (limited to 'svx')
69 files changed, 136 insertions, 131 deletions
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" |