diff options
Diffstat (limited to 'sc/source/core/data')
37 files changed, 94 insertions, 100 deletions
diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx index 1a466d231459..590f278901d6 100644 --- a/sc/source/core/data/attarray.cxx +++ b/sc/source/core/data/attarray.cxx @@ -41,9 +41,9 @@ #include <svx/bolnitem.hxx> #include <svx/frmdiritem.hxx> #include <svx/shaditem.hxx> -#include <svtools/poolcach.hxx> +#include <svl/poolcach.hxx> #include <svx/fontitem.hxx> -#include <vcl/fontcvt.hxx> +#include <unotools/fontcvt.hxx> #include "attarray.hxx" #include "global.hxx" diff --git a/sc/source/core/data/bcaslot.cxx b/sc/source/core/data/bcaslot.cxx index d3d86be58440..2d8688ce5b3b 100644 --- a/sc/source/core/data/bcaslot.cxx +++ b/sc/source/core/data/bcaslot.cxx @@ -34,8 +34,8 @@ #include <sfx2/objsh.hxx> -#include <svtools/listener.hxx> -#include <svtools/listeneriter.hxx> +#include <svl/listener.hxx> +#include <svl/listeneriter.hxx> #include "document.hxx" #include "brdcst.hxx" diff --git a/sc/source/core/data/cell.cxx b/sc/source/core/data/cell.cxx index cfd7caafa3f3..e7c74d34a95e 100644 --- a/sc/source/core/data/cell.cxx +++ b/sc/source/core/data/cell.cxx @@ -33,7 +33,7 @@ // INCLUDE --------------------------------------------------------------- -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include "scitems.hxx" #include "attrib.hxx" @@ -55,9 +55,9 @@ #include "postit.hxx" #include "externalrefmgr.hxx" #include <svx/editobj.hxx> -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include <svx/flditem.hxx> -#include <svtools/broadcast.hxx> +#include <svl/broadcast.hxx> using namespace formula; // More or less arbitrary, of course all recursions must fit into available diff --git a/sc/source/core/data/cell2.cxx b/sc/source/core/data/cell2.cxx index acac874704c6..d7d3708c3295 100644 --- a/sc/source/core/data/cell2.cxx +++ b/sc/source/core/data/cell2.cxx @@ -570,7 +570,7 @@ USHORT ScFormulaCell::GetMatrixEdge( ScAddress& rOrgPos ) } else { -#ifndef PRODUCT +#ifdef DBG_UTIL String aTmp; ByteString aMsg( "broken Matrix, no MatFormula at origin, Pos: " ); aPos.Format( aTmp, SCA_VALID_COL | SCA_VALID_ROW, pDocument ); @@ -600,7 +600,7 @@ USHORT ScFormulaCell::GetMatrixEdge( ScAddress& rOrgPos ) if ( !nEdges ) nEdges = 1; // mittendrin } -#ifndef PRODUCT +#ifdef DBG_UTIL else { String aTmp; diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx index afcd809eed1d..b5dc01a8b059 100644 --- a/sc/source/core/data/column.cxx +++ b/sc/source/core/data/column.cxx @@ -37,8 +37,8 @@ #include <map> -#include <svtools/poolcach.hxx> -#include <svtools/zforlist.hxx> +#include <svl/poolcach.hxx> +#include <svl/zforlist.hxx> #include <svx/scripttypeitem.hxx> #include <string.h> diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx index 01c72ab4e0c4..4205c0f59dcc 100644 --- a/sc/source/core/data/column2.cxx +++ b/sc/source/core/data/column2.cxx @@ -47,9 +47,9 @@ #include <svx/rotmodit.hxx> #include <svx/scripttypeitem.hxx> #include <svx/unolingu.hxx> -#include <svtools/zforlist.hxx> -#include <svtools/broadcast.hxx> -#include <svtools/listeneriter.hxx> +#include <svl/zforlist.hxx> +#include <svl/broadcast.hxx> +#include <svl/listeneriter.hxx> #include <vcl/outdev.hxx> #include "column.hxx" diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx index 5726862366cf..e94cfca12ab7 100644 --- a/sc/source/core/data/column3.cxx +++ b/sc/source/core/data/column3.cxx @@ -35,8 +35,8 @@ #include <sfx2/objsh.hxx> -#include <svtools/zforlist.hxx> -#include <svtools/zformat.hxx> +#include <svl/zforlist.hxx> +#include <svl/zformat.hxx> #include "scitems.hxx" #include "column.hxx" diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx index 45ead48d0f35..857c149476b7 100644 --- a/sc/source/core/data/conditio.cxx +++ b/sc/source/core/data/conditio.cxx @@ -37,8 +37,8 @@ #include "scitems.hxx" #include <sfx2/objsh.hxx> -#include <svtools/itemset.hxx> -#include <svtools/zforlist.hxx> +#include <svl/itemset.hxx> +#include <svl/zforlist.hxx> #include <rtl/math.hxx> #include <unotools/collatorwrapper.hxx> diff --git a/sc/source/core/data/dbdocutl.cxx b/sc/source/core/data/dbdocutl.cxx index 6a849282a642..215f2d34aab1 100644 --- a/sc/source/core/data/dbdocutl.cxx +++ b/sc/source/core/data/dbdocutl.cxx @@ -38,7 +38,7 @@ #include <com/sun/star/sdbc/DataType.hpp> #include <com/sun/star/sdbc/XRow.hpp> -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include "dbdocutl.hxx" #include "document.hxx" diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx index b88cd49a6a8c..4548f1f7a1b5 100644 --- a/sc/source/core/data/dociter.cxx +++ b/sc/source/core/data/dociter.cxx @@ -33,7 +33,7 @@ // INCLUDE --------------------------------------------------------------- -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include "scitems.hxx" #include "global.hxx" diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx index fce83f25cd93..662e524b2bfc 100644 --- a/sc/source/core/data/docpool.cxx +++ b/sc/source/core/data/docpool.cxx @@ -36,8 +36,8 @@ #include "scitems.hxx" #include <tools/shl.hxx> #include <vcl/outdev.hxx> -#include <svtools/aeitem.hxx> -#include <svtools/itemiter.hxx> +#include <svl/aeitem.hxx> +#include <svl/itemiter.hxx> #include <svx/algitem.hxx> #include <svx/boxitem.hxx> #include <svx/bolnitem.hxx> diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx index 3404866446fe..09477e5a7eb4 100644 --- a/sc/source/core/data/documen2.cxx +++ b/sc/source/core/data/documen2.cxx @@ -45,11 +45,11 @@ #include <sfx2/bindings.hxx> #include <sfx2/objsh.hxx> #include <sfx2/printer.hxx> -#include <svtools/zforlist.hxx> -#include <svtools/zformat.hxx> +#include <svl/zforlist.hxx> +#include <svl/zformat.hxx> #include <vcl/virdev.hxx> #include <comphelper/processfactory.hxx> -#include <svtools/PasswordHelper.hxx> +#include <svl/PasswordHelper.hxx> #include <tools/tenccvt.hxx> #include <tools/list.hxx> #include <rtl/crc.h> diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx index 17650028db70..2529d0ad7f1d 100644 --- a/sc/source/core/data/documen3.cxx +++ b/sc/source/core/data/documen3.cxx @@ -39,8 +39,8 @@ #include <svx/linkmgr.hxx> #include <sfx2/bindings.hxx> #include <sfx2/objsh.hxx> -#include <svtools/zforlist.hxx> -#include <svtools/PasswordHelper.hxx> +#include <svl/zforlist.hxx> +#include <svl/PasswordHelper.hxx> #include <vcl/svapp.hxx> #include "document.hxx" #include "attrib.hxx" diff --git a/sc/source/core/data/documen4.cxx b/sc/source/core/data/documen4.cxx index 7313ebbf83f5..b47f55124041 100644 --- a/sc/source/core/data/documen4.cxx +++ b/sc/source/core/data/documen4.cxx @@ -35,8 +35,8 @@ // INCLUDE --------------------------------------------------------------- -#include <svtools/intitem.hxx> -#include <svtools/zforlist.hxx> +#include <svl/intitem.hxx> +#include <svl/zforlist.hxx> #include <vcl/sound.hxx> #include <formula/token.hxx> diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx index 64433a30297a..2b0b3821dcc2 100644 --- a/sc/source/core/data/documen8.cxx +++ b/sc/source/core/data/documen8.cxx @@ -49,16 +49,16 @@ #include <sfx2/printer.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/viewsh.hxx> -#include <svtools/flagitem.hxx> -#include <svtools/intitem.hxx> +#include <svl/flagitem.hxx> +#include <svl/intitem.hxx> #define _SVSTDARR_USHORTS -#include <svtools/svstdarr.hxx> -#include <svtools/zforlist.hxx> -#include <svtools/zformat.hxx> -#include <svtools/misccfg.hxx> +#include <svl/svstdarr.hxx> +#include <svl/zforlist.hxx> +#include <svl/zformat.hxx> +#include <unotools/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> @@ -137,17 +137,14 @@ SfxPrinter* ScDocument::GetPrinter(BOOL bCreateIfNotExist) SID_SCPRINTOPTIONS, SID_SCPRINTOPTIONS, NULL ); - SfxMiscCfg* pOffCfg = SFX_APP()->GetMiscConfig(); - if ( pOffCfg ) - { - USHORT nFlags = 0; - if ( pOffCfg->IsPaperOrientationWarning() ) - nFlags |= SFX_PRINTER_CHG_ORIENTATION; - if ( pOffCfg->IsPaperSizeWarning() ) - nFlags |= SFX_PRINTER_CHG_SIZE; - pSet->Put( SfxFlagItem( SID_PRINTER_CHANGESTODOC, nFlags ) ); - pSet->Put( SfxBoolItem( SID_PRINTER_NOTFOUND_WARN, pOffCfg->IsNotFoundWarning() ) ); - } + ::utl::MiscCfg aMisc; + USHORT nFlags = 0; + if ( aMisc.IsPaperOrientationWarning() ) + nFlags |= SFX_PRINTER_CHG_ORIENTATION; + if ( aMisc.IsPaperSizeWarning() ) + nFlags |= SFX_PRINTER_CHG_SIZE; + pSet->Put( SfxFlagItem( SID_PRINTER_CHANGESTODOC, nFlags ) ); + pSet->Put( SfxBoolItem( SID_PRINTER_NOTFOUND_WARN, aMisc.IsNotFoundWarning() ) ); pPrinter = new SfxPrinter( pSet ); pPrinter->SetMapMode( MAP_100TH_MM ); @@ -189,21 +186,18 @@ void ScDocument::SetPrintOptions() if ( pPrinter ) { - SfxMiscCfg* pOffCfg = SFX_APP()->GetMiscConfig(); - if ( pOffCfg ) - { - SfxItemSet aOptSet( pPrinter->GetOptions() ); - - USHORT nFlags = 0; - if ( pOffCfg->IsPaperOrientationWarning() ) - nFlags |= SFX_PRINTER_CHG_ORIENTATION; - if ( pOffCfg->IsPaperSizeWarning() ) - nFlags |= SFX_PRINTER_CHG_SIZE; - aOptSet.Put( SfxFlagItem( SID_PRINTER_CHANGESTODOC, nFlags ) ); - aOptSet.Put( SfxBoolItem( SID_PRINTER_NOTFOUND_WARN, pOffCfg->IsNotFoundWarning() ) ); - - pPrinter->SetOptions( aOptSet ); - } + ::utl::MiscCfg aMisc; + SfxItemSet aOptSet( pPrinter->GetOptions() ); + + USHORT nFlags = 0; + if ( aMisc.IsPaperOrientationWarning() ) + nFlags |= SFX_PRINTER_CHG_ORIENTATION; + if ( aMisc.IsPaperSizeWarning() ) + nFlags |= SFX_PRINTER_CHG_SIZE; + aOptSet.Put( SfxFlagItem( SID_PRINTER_CHANGESTODOC, nFlags ) ); + aOptSet.Put( SfxBoolItem( SID_PRINTER_NOTFOUND_WARN, aMisc.IsNotFoundWarning() ) ); + + pPrinter->SetOptions( aOptSet ); } } 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 077983b4382b..4dd3f34e3f0d 100644 --- a/sc/source/core/data/document.cxx +++ b/sc/source/core/data/document.cxx @@ -46,9 +46,9 @@ #include <svx/svdocapt.hxx> #include <sfx2/app.hxx> #include <sfx2/objsh.hxx> -#include <svtools/poolcach.hxx> -#include <svtools/saveopt.hxx> -#include <svtools/zforlist.hxx> +#include <svl/poolcach.hxx> +#include <unotools/saveopt.hxx> +#include <svl/zforlist.hxx> #include <unotools/charclass.hxx> #include <unotools/transliterationwrapper.hxx> #include <tools/tenccvt.hxx> diff --git a/sc/source/core/data/dpdimsave.cxx b/sc/source/core/data/dpdimsave.cxx index 7e1bc0389eaf..49e2c5b09c94 100644 --- a/sc/source/core/data/dpdimsave.cxx +++ b/sc/source/core/data/dpdimsave.cxx @@ -38,7 +38,7 @@ #include <com/sun/star/sheet/DataPilotFieldGroupBy.hpp> -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include <tools/debug.hxx> #include <rtl/math.hxx> #include <algorithm> diff --git a/sc/source/core/data/dpgroup.cxx b/sc/source/core/data/dpgroup.cxx index a2d21079826d..09f32b4ba1b1 100644 --- a/sc/source/core/data/dpgroup.cxx +++ b/sc/source/core/data/dpgroup.cxx @@ -40,7 +40,7 @@ #include <tools/debug.hxx> #include <rtl/math.hxx> #include <unotools/localedatawrapper.hxx> -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include "dpgroup.hxx" #include "collect.hxx" diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx index 787875fcb5ff..ad9795d11c4d 100644 --- a/sc/source/core/data/dpobject.cxx +++ b/sc/source/core/data/dpobject.cxx @@ -72,7 +72,7 @@ #include <comphelper/processfactory.hxx> #include <tools/debug.hxx> -#include <svtools/zforlist.hxx> // IsNumberFormat +#include <svl/zforlist.hxx> // IsNumberFormat #include <vector> diff --git a/sc/source/core/data/dpsdbtab.cxx b/sc/source/core/data/dpsdbtab.cxx index cfc98af5af99..01f63f0cbaa9 100644 --- a/sc/source/core/data/dpsdbtab.cxx +++ b/sc/source/core/data/dpsdbtab.cxx @@ -37,7 +37,7 @@ #include <tools/debug.hxx> #include <vcl/msgbox.hxx> -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/types.hxx> diff --git a/sc/source/core/data/dpshttab.cxx b/sc/source/core/data/dpshttab.cxx index 7956b68ad03f..29fe2dc7b6e5 100644 --- a/sc/source/core/data/dpshttab.cxx +++ b/sc/source/core/data/dpshttab.cxx @@ -36,7 +36,7 @@ // INCLUDE -------------------------------------------------------------- #include <tools/debug.hxx> -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include "dpshttab.hxx" #include "dptabres.hxx" diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx index 3e9a7586fd1a..e123e74a20e6 100644 --- a/sc/source/core/data/dptabsrc.cxx +++ b/sc/source/core/data/dptabsrc.cxx @@ -44,8 +44,8 @@ #include <tools/debug.hxx> #include <rtl/math.hxx> -#include <svtools/itemprop.hxx> -#include <svtools/intitem.hxx> +#include <svl/itemprop.hxx> +#include <svl/intitem.hxx> #include "scitems.hxx" #include "document.hxx" diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx index a5c571026e96..cb82ede30dca 100644 --- a/sc/source/core/data/drwlayer.cxx +++ b/sc/source/core/data/drwlayer.cxx @@ -64,8 +64,8 @@ #include <sfx2/viewsh.hxx> #include <sfx2/docfile.hxx> #include <sot/storage.hxx> -#include <svtools/pathoptions.hxx> -#include <svtools/itempool.hxx> +#include <unotools/pathoptions.hxx> +#include <svl/itempool.hxx> #include <vcl/virdev.hxx> #include <vcl/svapp.hxx> #include <unotools/ucbstreamhelper.hxx> diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx index 88ff065572b4..d49e8e1aa139 100644 --- a/sc/source/core/data/global.cxx +++ b/sc/source/core/data/global.cxx @@ -47,9 +47,9 @@ #include <sfx2/objsh.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/viewsh.hxx> -#include <svtools/stritem.hxx> -#include <svtools/zforlist.hxx> -#include <svtools/zformat.hxx> +#include <svl/stritem.hxx> +#include <svl/zforlist.hxx> +#include <svl/zformat.hxx> #include <vcl/image.hxx> #include <vcl/virdev.hxx> #include <tools/rcid.h> @@ -67,7 +67,7 @@ #include <unotools/collatorwrapper.hxx> #include <com/sun/star/i18n/CollatorOptions.hpp> #include <unotools/intlwrapper.hxx> -#include <svtools/syslocale.hxx> +#include <unotools/syslocale.hxx> #include <unotools/transliterationwrapper.hxx> #include "global.hxx" diff --git a/sc/source/core/data/global2.cxx b/sc/source/core/data/global2.cxx index 6af662119f12..e6f8523a3c42 100644 --- a/sc/source/core/data/global2.cxx +++ b/sc/source/core/data/global2.cxx @@ -38,13 +38,13 @@ #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> #include <ctype.h> -#include <svtools/syslocale.hxx> +#include <unotools/syslocale.hxx> #include "global.hxx" #include "rangeutl.hxx" 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/patattr.cxx b/sc/source/core/data/patattr.cxx index ee74a66bcc3b..dbc5bbf50c63 100644 --- a/sc/source/core/data/patattr.cxx +++ b/sc/source/core/data/patattr.cxx @@ -60,8 +60,8 @@ #include <svx/udlnitem.hxx> #include <svx/wghtitem.hxx> #include <svx/wrlmitem.hxx> -#include <svtools/intitem.hxx> -#include <svtools/zforlist.hxx> +#include <svl/intitem.hxx> +#include <svl/zforlist.hxx> #include <vcl/outdev.hxx> #include <vcl/svapp.hxx> diff --git a/sc/source/core/data/poolhelp.cxx b/sc/source/core/data/poolhelp.cxx index d85e16ad135f..2bd7cc9c1ea9 100644 --- a/sc/source/core/data/poolhelp.cxx +++ b/sc/source/core/data/poolhelp.cxx @@ -35,7 +35,7 @@ // INCLUDE --------------------------------------------------------------- -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include <svx/editeng.hxx> #include "poolhelp.hxx" 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/data/stlpool.cxx b/sc/source/core/data/stlpool.cxx index 260385d6feac..e47f3899bfeb 100644 --- a/sc/source/core/data/stlpool.cxx +++ b/sc/source/core/data/stlpool.cxx @@ -49,10 +49,10 @@ #include <svx/postitem.hxx> #include <svx/udlnitem.hxx> #include <svx/wghtitem.hxx> -#include <svtools/itemset.hxx> -#include <svtools/zforlist.hxx> +#include <svl/itemset.hxx> +#include <svl/zforlist.hxx> #include <unotools/charclass.hxx> -#include <vcl/fontcvt.hxx> +#include <unotools/fontcvt.hxx> #include <vcl/outdev.hxx> #include <vcl/svapp.hxx> diff --git a/sc/source/core/data/stlsheet.cxx b/sc/source/core/data/stlsheet.cxx index 4452cd357132..277a7ce9f326 100644 --- a/sc/source/core/data/stlsheet.cxx +++ b/sc/source/core/data/stlsheet.cxx @@ -48,9 +48,9 @@ #include <svx/sizeitem.hxx> #include <svx/ulspitem.hxx> #include <sfx2/printer.hxx> -#include <svtools/itempool.hxx> -#include <svtools/itemset.hxx> -#include <svtools/smplhint.hxx> +#include <svl/itempool.hxx> +#include <svl/itemset.hxx> +#include <svl/smplhint.hxx> #include "attrib.hxx" diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx index c8a25fbe0ec1..31f9c18e3d3a 100644 --- a/sc/source/core/data/table2.cxx +++ b/sc/source/core/data/table2.cxx @@ -36,10 +36,10 @@ #include "scitems.hxx" #include <svx/boxitem.hxx> #include <tools/urlobj.hxx> -#include <svtools/poolcach.hxx> +#include <svl/poolcach.hxx> #include <unotools/charclass.hxx> #include <math.h> -#include <svtools/PasswordHelper.hxx> +#include <svl/PasswordHelper.hxx> #include <unotools/transliterationwrapper.hxx> #include "patattr.hxx" diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx index 01dc74f8644e..b85b910795a5 100644 --- a/sc/source/core/data/table3.cxx +++ b/sc/source/core/data/table3.cxx @@ -33,7 +33,7 @@ #include <rtl/math.hxx> #include <unotools/textsearch.hxx> -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include <unotools/charclass.hxx> #include <unotools/collatorwrapper.hxx> #include <com/sun/star/i18n/CollatorOptions.hpp> diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx index fd725e96d124..b10741f46c3f 100644 --- a/sc/source/core/data/table4.cxx +++ b/sc/source/core/data/table4.cxx @@ -61,7 +61,7 @@ #include <svx/editeng.hxx> #include <svx/eeitem.hxx> #include <svx/escpitem.hxx> -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include <vcl/keycodes.hxx> #include <rtl/math.hxx> #include <unotools/charclass.hxx> diff --git a/sc/source/core/data/tabprotection.cxx b/sc/source/core/data/tabprotection.cxx index 1620c5194e92..c19cd8cf6b21 100644 --- a/sc/source/core/data/tabprotection.cxx +++ b/sc/source/core/data/tabprotection.cxx @@ -35,7 +35,7 @@ #include "tabprotection.hxx" #include "tools/debug.hxx" -#include "svtools/PasswordHelper.hxx" +#include "svl/PasswordHelper.hxx" #include "document.hxx" #define DEBUG_TAB_PROTECTION 0 diff --git a/sc/source/core/data/validat.cxx b/sc/source/core/data/validat.cxx index 443474060c3e..9b0970611254 100644 --- a/sc/source/core/data/validat.cxx +++ b/sc/source/core/data/validat.cxx @@ -45,7 +45,7 @@ #include <basic/basmgr.hxx> #include <basic/sbx.hxx> -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include <vcl/msgbox.hxx> #include <tools/urlobj.hxx> #include <rtl/math.hxx> |