diff options
| author | Mathias Bauer <mba@openoffice.org> | 2009-10-16 00:05:16 +0200 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2009-10-16 00:05:16 +0200 |
| commit | a293d0a7b13c0294a202e0e332961f85359d611d (patch) | |
| tree | 2ce4b39a34620f3941583b59f73eac8f1049c292 | |
| parent | 20ade6a1d2fc888edec120f09079ed26d3bd80ff (diff) | |
#i103496#: split svtools; improve ConfitItems
353 files changed, 806 insertions, 801 deletions
diff --git a/chart2/inc/pch/precompiled_chart2.hxx b/chart2/inc/pch/precompiled_chart2.hxx index ca7ab50f7ad7..53b88ebc28ad 100644 --- a/chart2/inc/pch/precompiled_chart2.hxx +++ b/chart2/inc/pch/precompiled_chart2.hxx @@ -213,17 +213,17 @@ #include "sot/clsids.hxx" -#include "svtools/eitem.hxx" -#include "svtools/intitem.hxx" -#include "svtools/itemiter.hxx" -#include "svtools/itempool.hxx" -#include "svtools/itemset.hxx" +#include "svl/eitem.hxx" +#include "svl/intitem.hxx" +#include "svl/itemiter.hxx" +#include "svl/itempool.hxx" +#include "svl/itemset.hxx" #include "unotools/pathoptions.hxx" -#include "svtools/poolitem.hxx" -#include "svtools/stritem.hxx" -#include "svtools/syslocale.hxx" -#include "svtools/urihelper.hxx" -#include "svtools/whiter.hxx" +#include "svl/poolitem.hxx" +#include "svl/stritem.hxx" +#include "unotools/syslocale.hxx" +#include "svl/urihelper.hxx" +#include "svl/whiter.hxx" #include "svx/brshitem.hxx" #include "svx/crsditem.hxx" diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx b/chart2/source/controller/accessibility/AccessibleBase.cxx index df3cab9e39b4..81b85cfacf34 100644 --- a/chart2/source/controller/accessibility/AccessibleBase.cxx +++ b/chart2/source/controller/accessibility/AccessibleBase.cxx @@ -50,7 +50,7 @@ #include <vcl/svapp.hxx> #include <rtl/uuid.h> #include <cppuhelper/queryinterface.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <svx/unofdesc.hxx> #include <svx/outliner.hxx> #include <svx/svdoutl.hxx> diff --git a/chart2/source/controller/dialogs/Bitmaps.hrc b/chart2/source/controller/dialogs/Bitmaps.hrc index 8823b582a28e..d3aa3ebbff2f 100644 --- a/chart2/source/controller/dialogs/Bitmaps.hrc +++ b/chart2/source/controller/dialogs/Bitmaps.hrc @@ -31,7 +31,7 @@ #define CHART_BITMAPS_HRC #ifndef _SOLAR_HRC -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #endif #ifndef STD_MASKCOLOR diff --git a/chart2/source/controller/dialogs/Bitmaps_HC.hrc b/chart2/source/controller/dialogs/Bitmaps_HC.hrc index 8dd4acaffd15..71a181b92559 100644 --- a/chart2/source/controller/dialogs/Bitmaps_HC.hrc +++ b/chart2/source/controller/dialogs/Bitmaps_HC.hrc @@ -28,10 +28,10 @@ * ************************************************************************/ #ifndef _SOLAR_HRC -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #endif -// RID_SCH_START is 30512 (see svtools/solar.hrc) +// RID_SCH_START is 30512 (see svl/solar.hrc) // next free: 100 diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx index 56ef98b159ba..d83159862705 100644 --- a/chart2/source/controller/dialogs/DataBrowser.cxx +++ b/chart2/source/controller/dialogs/DataBrowser.cxx @@ -36,10 +36,10 @@ #ifndef _ZFORLIST_DECLARE_TABLE #define _ZFORLIST_DECLARE_TABLE #endif -#include <svtools/zformat.hxx> +#include <svl/zformat.hxx> #endif // header for SvNumberFormatter -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include "DataBrowser.hxx" #include "DataBrowserModel.hxx" diff --git a/chart2/source/controller/dialogs/ObjectNameProvider.cxx b/chart2/source/controller/dialogs/ObjectNameProvider.cxx index 24b717adba7f..fbbbca7fd826 100644 --- a/chart2/source/controller/dialogs/ObjectNameProvider.cxx +++ b/chart2/source/controller/dialogs/ObjectNameProvider.cxx @@ -49,7 +49,7 @@ #include <tools/debug.hxx> #include <tools/string.hxx> -// #include <svtools/syslocale.hxx> +// #include <unotools/syslocale.hxx> #include <com/sun/star/chart2/XTitle.hpp> #include <com/sun/star/chart2/XRegressionCurveContainer.hpp> diff --git a/chart2/source/controller/dialogs/TextDirectionListBox.cxx b/chart2/source/controller/dialogs/TextDirectionListBox.cxx index d1365b908eac..f049f77ee312 100644 --- a/chart2/source/controller/dialogs/TextDirectionListBox.cxx +++ b/chart2/source/controller/dialogs/TextDirectionListBox.cxx @@ -34,7 +34,7 @@ #include "TextDirectionListBox.hxx" #include "ResId.hxx" #include "Strings.hrc" -#include <svtools/languageoptions.hxx> +#include <svl/languageoptions.hxx> #include <vcl/window.hxx> namespace chart diff --git a/chart2/source/controller/dialogs/dlg_DataEditor.cxx b/chart2/source/controller/dialogs/dlg_DataEditor.cxx index edc431c2c763..05a38b87e382 100644 --- a/chart2/source/controller/dialogs/dlg_DataEditor.cxx +++ b/chart2/source/controller/dialogs/dlg_DataEditor.cxx @@ -46,7 +46,7 @@ #include <unotools/pathoptions.hxx> // for SfxBoolItem -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <vcl/edit.hxx> diff --git a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx index 99b88b956c88..859465e3fd0d 100644 --- a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx +++ b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx @@ -41,7 +41,7 @@ #include "ObjectNameProvider.hxx" // header for class SfxBoolItem -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> //............................................................................. namespace chart diff --git a/chart2/source/controller/dialogs/dlg_InsertLegend.cxx b/chart2/source/controller/dialogs/dlg_InsertLegend.cxx index 9ffaa2b28490..036ad921679d 100644 --- a/chart2/source/controller/dialogs/dlg_InsertLegend.cxx +++ b/chart2/source/controller/dialogs/dlg_InsertLegend.cxx @@ -41,7 +41,7 @@ // header for enum SvxChartLegendPos #include <svx/chrtitem.hxx> // header for class SfxItemPool -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> //............................................................................. namespace chart diff --git a/chart2/source/controller/dialogs/dlg_NumberFormat.cxx b/chart2/source/controller/dialogs/dlg_NumberFormat.cxx index c8684bdaecbc..184214d3c5b0 100644 --- a/chart2/source/controller/dialogs/dlg_NumberFormat.cxx +++ b/chart2/source/controller/dialogs/dlg_NumberFormat.cxx @@ -34,7 +34,7 @@ #include "dlg_NumberFormat.hxx" // header for class SfxItemSet -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> // header for class SvxNumberInfoItem #define ITEMID_NUMBERINFO SID_ATTR_NUMBERFORMAT_INFO @@ -45,7 +45,7 @@ #include <sfx2/tabdlg.hxx> // header for SvNumberFormatter -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> //............................................................................. namespace chart diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx index 097c6c1d0107..ec8a0eaaa784 100644 --- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx +++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx @@ -34,7 +34,7 @@ #ifndef _ZFORLIST_DECLARE_TABLE #define _ZFORLIST_DECLARE_TABLE #endif -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #endif #include "dlg_ObjectProperties.hxx" @@ -66,8 +66,8 @@ #include <com/sun/star/chart2/XAxis.hpp> #include <com/sun/star/chart2/XChartType.hpp> #include <com/sun/star/chart2/XDataSeries.hpp> -#include <svtools/intitem.hxx> -#include <svtools/languageoptions.hxx> +#include <svl/intitem.hxx> +#include <svl/languageoptions.hxx> #include <svx/svxids.hrc> @@ -82,7 +82,7 @@ #include <svx/flagsdef.hxx> #include <svx/numinf.hxx> -#include <svtools/cjkoptions.hxx> +#include <svl/cjkoptions.hxx> //............................................................................. namespace chart diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx b/chart2/source/controller/dialogs/res_DataLabel.cxx index c6129629a51a..44fd27f7d09a 100644 --- a/chart2/source/controller/dialogs/res_DataLabel.cxx +++ b/chart2/source/controller/dialogs/res_DataLabel.cxx @@ -42,13 +42,13 @@ // header for class SvxNumberInfoItem #include <svx/numinf.hxx> -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> // for SfxUInt32Item -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> // header for class SfxStringItem -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> //SfxIntegerListItem -#include <svtools/ilstitem.hxx> +#include <svl/ilstitem.hxx> #include <svx/eeitem.hxx> #include <svx/frmdiritem.hxx> @@ -56,7 +56,7 @@ #include <vcl/msgbox.hxx> #include <svx/svxids.hrc> // header for SvNumberFormatter -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include <svtools/controldims.hrc> diff --git a/chart2/source/controller/dialogs/res_DataLabel.hxx b/chart2/source/controller/dialogs/res_DataLabel.hxx index e560eed9f573..9d887f7fbc33 100644 --- a/chart2/source/controller/dialogs/res_DataLabel.hxx +++ b/chart2/source/controller/dialogs/res_DataLabel.hxx @@ -34,7 +34,7 @@ // header for class CheckBox #include <vcl/button.hxx> // header for class SfxItemSet -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include "TextDirectionListBox.hxx" #include <svx/dialcontrol.hxx> diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx b/chart2/source/controller/dialogs/res_ErrorBar.cxx index 48bf877ae2b2..4b22b5352afe 100644 --- a/chart2/source/controller/dialogs/res_ErrorBar.cxx +++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx @@ -43,7 +43,7 @@ #include <rtl/math.hxx> #include <vcl/dialog.hxx> -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> using namespace ::com::sun::star; diff --git a/chart2/source/controller/dialogs/res_LegendPosition.cxx b/chart2/source/controller/dialogs/res_LegendPosition.cxx index 45623ebad3c5..4bbe7344c78d 100644 --- a/chart2/source/controller/dialogs/res_LegendPosition.cxx +++ b/chart2/source/controller/dialogs/res_LegendPosition.cxx @@ -50,7 +50,7 @@ #include "chartview/ChartSfxItemIds.hxx" #include <svx/chrtitem.hxx> // header for class SfxItemPool -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> //............................................................................. namespace chart diff --git a/chart2/source/controller/dialogs/res_LegendPosition.hxx b/chart2/source/controller/dialogs/res_LegendPosition.hxx index 571a0dfc33ff..81d30eb7b294 100644 --- a/chart2/source/controller/dialogs/res_LegendPosition.hxx +++ b/chart2/source/controller/dialogs/res_LegendPosition.hxx @@ -36,7 +36,7 @@ #endif #include <vcl/fixed.hxx> // header for class SfxItemSet -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/uno/XComponentContext.hpp> diff --git a/chart2/source/controller/dialogs/res_Trendline.hxx b/chart2/source/controller/dialogs/res_Trendline.hxx index e1becbf8631f..181341f5c55e 100644 --- a/chart2/source/controller/dialogs/res_Trendline.hxx +++ b/chart2/source/controller/dialogs/res_Trendline.hxx @@ -34,7 +34,7 @@ #include <vcl/button.hxx> #include <vcl/fixed.hxx> #include <svtools/valueset.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <svx/chrtitem.hxx> namespace chart diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.cxx b/chart2/source/controller/dialogs/tp_AxisLabel.cxx index ae20b1db1d2b..a7407b4781ee 100644 --- a/chart2/source/controller/dialogs/tp_AxisLabel.cxx +++ b/chart2/source/controller/dialogs/tp_AxisLabel.cxx @@ -41,7 +41,7 @@ #include <svx/chrtitem.hxx> // header for SfxInt32Item -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include <svx/eeitem.hxx> #include <svx/frmdiritem.hxx> diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.cxx b/chart2/source/controller/dialogs/tp_AxisPositions.cxx index d1e17f677646..0b10204c54bc 100644 --- a/chart2/source/controller/dialogs/tp_AxisPositions.cxx +++ b/chart2/source/controller/dialogs/tp_AxisPositions.cxx @@ -46,9 +46,9 @@ // header for class SvxDoubleItem #include <svx/chrtitem.hxx> // header for class SfxBoolItem -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> // header for SfxInt32Item -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> // header for class WarningBox #include <vcl/msgbox.hxx> @@ -58,7 +58,7 @@ #ifndef _ZFORLIST_DECLARE_TABLE #define _ZFORLIST_DECLARE_TABLE #endif -#include <svtools/zformat.hxx> +#include <svl/zformat.hxx> #endif #include <svtools/controldims.hrc> diff --git a/chart2/source/controller/dialogs/tp_PointGeometry.cxx b/chart2/source/controller/dialogs/tp_PointGeometry.cxx index 7e2fa80dd556..d5dcad1eb02d 100644 --- a/chart2/source/controller/dialogs/tp_PointGeometry.cxx +++ b/chart2/source/controller/dialogs/tp_PointGeometry.cxx @@ -38,7 +38,7 @@ #include "chartview/ChartSfxItemIds.hxx" // header for SfxInt32Item -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> // header for class Svx3DHorizontalSegmentsItem #include <svx/svx3ditems.hxx> diff --git a/chart2/source/controller/dialogs/tp_PolarOptions.cxx b/chart2/source/controller/dialogs/tp_PolarOptions.cxx index 38d36d032921..1681962eb5fe 100644 --- a/chart2/source/controller/dialogs/tp_PolarOptions.cxx +++ b/chart2/source/controller/dialogs/tp_PolarOptions.cxx @@ -35,8 +35,8 @@ #include "chartview/ChartSfxItemIds.hxx" #include "NoWarningThisInCTOR.hxx" -#include <svtools/eitem.hxx> -#include <svtools/intitem.hxx> +#include <svl/eitem.hxx> +#include <svl/intitem.hxx> #include <svtools/controldims.hrc> //............................................................................. diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx index a2c3694a8469..dc2c1f156bcb 100644 --- a/chart2/source/controller/dialogs/tp_Scale.cxx +++ b/chart2/source/controller/dialogs/tp_Scale.cxx @@ -46,9 +46,9 @@ // header for class SvxDoubleItem #include <svx/chrtitem.hxx> // header for class SfxBoolItem -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> // header for SfxInt32Item -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> // header for class WarningBox #include <vcl/msgbox.hxx> @@ -58,7 +58,7 @@ #ifndef _ZFORLIST_DECLARE_TABLE #define _ZFORLIST_DECLARE_TABLE #endif -#include <svtools/zformat.hxx> +#include <svl/zformat.hxx> #endif #include <svtools/controldims.hrc> diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx index cc8ac2139639..a5247e47ad1e 100644 --- a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx +++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx @@ -38,11 +38,11 @@ #include "NoWarningThisInCTOR.hxx" // header for class SfxBoolItem -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> // header for SfxInt32Item -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> //SfxIntegerListItem -#include <svtools/ilstitem.hxx> +#include <svl/ilstitem.hxx> #include <svtools/controldims.hrc> #include <com/sun/star/chart/MissingValueTreatment.hpp> diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.cxx b/chart2/source/controller/dialogs/tp_TitleRotation.cxx index 6733d9e08c3a..d04f43c7031b 100644 --- a/chart2/source/controller/dialogs/tp_TitleRotation.cxx +++ b/chart2/source/controller/dialogs/tp_TitleRotation.cxx @@ -40,7 +40,7 @@ #include <svx/frmdiritem.hxx> // header for class SfxInt32Item -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> //............................................................................. namespace chart diff --git a/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx b/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx index 92b37e8b4195..c1ba3ed3ed6c 100644 --- a/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx +++ b/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx @@ -57,7 +57,7 @@ //oldChartModelWrapper // header for class SfxItemPool -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> // header for class FontList #include <svtools/ctrltool.hxx> // header for class Application diff --git a/chart2/source/controller/inc/HelpIds.hrc b/chart2/source/controller/inc/HelpIds.hrc index ccff9e913f97..89010d2bc8b5 100644 --- a/chart2/source/controller/inc/HelpIds.hrc +++ b/chart2/source/controller/inc/HelpIds.hrc @@ -30,7 +30,7 @@ #ifndef CHART_HELPIDS_HRC #define CHART_HELPIDS_HRC -#include <svtools/solar.hrc> +#include <svl/solar.hrc> //next is 120 //see old chart: schhids.h diff --git a/chart2/source/controller/inc/ItemConverter.hxx b/chart2/source/controller/inc/ItemConverter.hxx index e55456519cd1..52d98132ea82 100644 --- a/chart2/source/controller/inc/ItemConverter.hxx +++ b/chart2/source/controller/inc/ItemConverter.hxx @@ -31,8 +31,8 @@ #define CHART_ITEMCONVERTER_HXX #include <unotools/eventlisteneradapter.hxx> -#include <svtools/itempool.hxx> -#include <svtools/itemset.hxx> +#include <svl/itempool.hxx> +#include <svl/itemset.hxx> #include <com/sun/star/beans/XPropertySet.hpp> // for pair diff --git a/chart2/source/controller/inc/dlg_DataEditor.hxx b/chart2/source/controller/inc/dlg_DataEditor.hxx index fd565aba081b..cd82c4a7f46d 100644 --- a/chart2/source/controller/inc/dlg_DataEditor.hxx +++ b/chart2/source/controller/inc/dlg_DataEditor.hxx @@ -31,7 +31,7 @@ #ifndef _SCH_DGRDATA_HXX #define _SCH_DGRDATA_HXX -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include <svtools/stdctrl.hxx> #include <vcl/toolbox.hxx> #include <comphelper/stl_types.hxx> diff --git a/chart2/source/controller/inc/dlg_InsertDataLabel.hxx b/chart2/source/controller/inc/dlg_InsertDataLabel.hxx index d5748a3e990f..d5e19b6de40c 100644 --- a/chart2/source/controller/inc/dlg_InsertDataLabel.hxx +++ b/chart2/source/controller/inc/dlg_InsertDataLabel.hxx @@ -37,7 +37,7 @@ #include <vcl/button.hxx> #endif // header for class SfxItemSet -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> //for auto_ptr #include <memory> diff --git a/chart2/source/controller/inc/dlg_InsertErrorBars.hxx b/chart2/source/controller/inc/dlg_InsertErrorBars.hxx index 13382ff9bffa..f463fc1e854f 100644 --- a/chart2/source/controller/inc/dlg_InsertErrorBars.hxx +++ b/chart2/source/controller/inc/dlg_InsertErrorBars.hxx @@ -32,7 +32,7 @@ #include <vcl/dialog.hxx> #include <vcl/button.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <memory> #include <com/sun/star/frame/XModel.hpp> diff --git a/chart2/source/controller/inc/dlg_InsertTrendline.hxx b/chart2/source/controller/inc/dlg_InsertTrendline.hxx index 517da8fb6930..44f660373b41 100644 --- a/chart2/source/controller/inc/dlg_InsertTrendline.hxx +++ b/chart2/source/controller/inc/dlg_InsertTrendline.hxx @@ -32,7 +32,7 @@ #include <vcl/dialog.hxx> #include <vcl/button.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <memory> //............................................................................. diff --git a/chart2/source/controller/inc/res_ErrorBar.hxx b/chart2/source/controller/inc/res_ErrorBar.hxx index e1490f5b7e50..a37ed80cbd30 100644 --- a/chart2/source/controller/inc/res_ErrorBar.hxx +++ b/chart2/source/controller/inc/res_ErrorBar.hxx @@ -35,7 +35,7 @@ #include <vcl/field.hxx> #include <vcl/lstbox.hxx> #include <svtools/valueset.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <svx/chrtitem.hxx> #include "chartview/ChartSfxItemIds.hxx" #include "RangeSelectionButton.hxx" diff --git a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx index 0c7ff467a91b..07cc3191b906 100644 --- a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx @@ -49,11 +49,11 @@ #include <com/sun/star/chart2/AxisOrientation.hpp> // for SfxBoolItem -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> // for SvxDoubleItem #include <svx/chrtitem.hxx> // for SfxInt32Item -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include <rtl/math.hxx> #include <algorithm> diff --git a/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx index ad2aab714757..ee83459d4429 100644 --- a/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx @@ -42,7 +42,7 @@ #include <svx/postitem.hxx> #include <svx/wghtitem.hxx> #include <svx/fhgtitem.hxx> -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #include <com/sun/star/beans/XPropertyState.hpp> #include <com/sun/star/chart2/XFormattedString.hpp> diff --git a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx index af062cf3b93c..c27fa016d00d 100644 --- a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx @@ -49,15 +49,15 @@ // header for class XFillColorItem #include <svx/xflclit.hxx> -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include <svx/sizeitem.hxx> // header for class SfxStringItem -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #include <svx/brshitem.hxx> //SfxIntegerListItem -#include <svtools/ilstitem.hxx> +#include <svl/ilstitem.hxx> #define _SVSTDARR_ULONGS -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #include <vcl/graph.hxx> #include <com/sun/star/graphic/XGraphic.hpp> diff --git a/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx b/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx index fff6d87be9ab..7b05b72bb53f 100755 --- a/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx @@ -42,9 +42,9 @@ #include "GraphicPropertyItemConverter.hxx" -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #include <svx/chrtitem.hxx> -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include <rtl/math.hxx> #include <com/sun/star/chart2/DataPointLabel.hpp> diff --git a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx index 593b523316e3..1c7273f44c89 100644 --- a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx @@ -38,7 +38,7 @@ #include "CommonConverters.hxx" // #ifndef _SFXINTITEM_HXX -// #include <svtools/intitem.hxx> +// #include <svl/intitem.hxx> // #endif #include <svx/xflclit.hxx> #include <svx/xlnclit.hxx> @@ -53,7 +53,7 @@ #include <svx/xlntrit.hxx> #include <svx/eeitem.hxx> // for SfxBoolItem -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> // for XFillGradientStepCountItem #include <svx/xgrscit.hxx> #include <com/sun/star/beans/XPropertyState.hpp> diff --git a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx index e0a7b20bfa6f..04b35f275618 100644 --- a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx @@ -33,10 +33,10 @@ #include "ItemConverter.hxx" #include "macros.hxx" #include <com/sun/star/lang/XComponent.hpp> -#include <svtools/itemprop.hxx> -#include <svtools/itemiter.hxx> +#include <svl/itemprop.hxx> +#include <svl/itemiter.hxx> // header for class SfxWhichIter -#include <svtools/whiter.hxx> +#include <svl/whiter.hxx> #include <svx/svxids.hrc> using namespace ::com::sun::star; diff --git a/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx b/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx index c62fa6735512..69209884fbdb 100644 --- a/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx @@ -40,7 +40,7 @@ #include <com/sun/star/chart2/XRegressionCurve.hpp> // for SfxBoolItem -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <svx/chrtitem.hxx> #include <functional> diff --git a/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx b/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx index 6ac0d87b3e5f..439aa84c0073 100644 --- a/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx @@ -39,7 +39,7 @@ #include "CharacterPropertyItemConverter.hxx" #include "MultipleItemConverter.hxx" -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include <rtl/math.hxx> #include <functional> diff --git a/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx b/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx index f30bb4aeda57..d74eff927bc4 100644 --- a/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx @@ -48,13 +48,13 @@ #include <com/sun/star/chart2/XDataSeries.hpp> // for SfxBoolItem -#include <svtools/eitem.hxx> -#include <svtools/intitem.hxx> +#include <svl/eitem.hxx> +#include <svl/intitem.hxx> //SfxIntegerListItem -#include <svtools/ilstitem.hxx> +#include <svl/ilstitem.hxx> #define _SVSTDARR_ULONGS -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #include <rtl/math.hxx> #include <functional> diff --git a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx index eed9235aff9b..acaf493836bc 100644 --- a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx @@ -43,9 +43,9 @@ #include "GraphicPropertyItemConverter.hxx" -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #include <svx/chrtitem.hxx> -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include <rtl/math.hxx> #include <com/sun/star/chart2/DataPointLabel.hpp> diff --git a/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx b/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx index 96f6e01cadb5..a94c1f07909f 100644 --- a/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx @@ -37,7 +37,7 @@ #include "GraphicPropertyItemConverter.hxx" #include "CharacterPropertyItemConverter.hxx" #include "MultipleItemConverter.hxx" -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include <rtl/math.hxx> #include <com/sun/star/chart2/XTitled.hpp> diff --git a/chart2/source/controller/main/ChartController_Position.cxx b/chart2/source/controller/main/ChartController_Position.cxx index 4cf4de81480b..4cbb6db76bd4 100644 --- a/chart2/source/controller/main/ChartController_Position.cxx +++ b/chart2/source/controller/main/ChartController_Position.cxx @@ -48,7 +48,7 @@ #include <vcl/msgbox.hxx> #include <svx/svxids.hrc> #include <svx/rectenum.hxx> -#include <svtools/aeitem.hxx> +#include <svl/aeitem.hxx> #include <svx/svxdlg.hxx> #include <svx/dialogs.hrc> #include <vcl/svapp.hxx> diff --git a/chart2/source/controller/main/ChartController_TextEdit.cxx b/chart2/source/controller/main/ChartController_TextEdit.cxx index e1f83550bd5d..855357ce701b 100644 --- a/chart2/source/controller/main/ChartController_TextEdit.cxx +++ b/chart2/source/controller/main/ChartController_TextEdit.cxx @@ -54,7 +54,7 @@ #include <vcl/svapp.hxx> #include <vos/mutex.hxx> #include <com/sun/star/beans/XPropertySet.hpp> -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #include <svx/fontitem.hxx> //............................................................................. diff --git a/chart2/source/controller/main/ConfigurationAccess.cxx b/chart2/source/controller/main/ConfigurationAccess.cxx index f71d26b7b3c2..2cb5a7c6800c 100644 --- a/chart2/source/controller/main/ConfigurationAccess.cxx +++ b/chart2/source/controller/main/ConfigurationAccess.cxx @@ -35,7 +35,7 @@ #include "macros.hxx" // header for class SvtSysLocale -#include <svtools/syslocale.hxx> +#include <unotools/syslocale.hxx> // header for class ConfigItem #include <unotools/configitem.hxx> // header for rtl::Static @@ -69,6 +69,8 @@ public: virtual ~CalcConfigItem(); FieldUnit getFieldUnit(); + virtual void Commit(); + virtual void Notify( const uno::Sequence<rtl::OUString>& aPropertyNames); }; CalcConfigItem::CalcConfigItem() @@ -80,6 +82,9 @@ CalcConfigItem::~CalcConfigItem() { } +void CalcConfigItem::Commit() {} +void CalcConfigItem::Notify( const uno::Sequence<rtl::OUString>& aPropertyNames) {} + FieldUnit CalcConfigItem::getFieldUnit() { FieldUnit eResult( FUNIT_CM ); diff --git a/chart2/source/inc/Strings.hrc b/chart2/source/inc/Strings.hrc index fea8bb867057..3353e48e9238 100644 --- a/chart2/source/inc/Strings.hrc +++ b/chart2/source/inc/Strings.hrc @@ -31,7 +31,7 @@ #define CHART_STRINGS_HRC // this includes no link dependency -#include <svtools/solar.hrc> +#include <svl/solar.hrc> //next free is 290 //single free is: 134 diff --git a/chart2/source/inc/chartview/NumberFormatterWrapper.hxx b/chart2/source/inc/chartview/NumberFormatterWrapper.hxx index 5077541abe2c..03c182229d45 100644 --- a/chart2/source/inc/chartview/NumberFormatterWrapper.hxx +++ b/chart2/source/inc/chartview/NumberFormatterWrapper.hxx @@ -30,7 +30,7 @@ #ifndef _CHART2_VIEW_NUMBERFORMATTERWRAPPER_HXX #define _CHART2_VIEW_NUMBERFORMATTERWRAPPER_HXX -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include <com/sun/star/util/XNumberFormatsSupplier.hpp> #include "chartviewdllapi.hxx" diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx index 4882ecef72de..1286a6e553cc 100644 --- a/chart2/source/model/main/ChartModel.cxx +++ b/chart2/source/model/main/ChartModel.cxx @@ -49,7 +49,7 @@ #include <comphelper/processfactory.hxx> // header for class SvNumberFormatsSupplierObj -#include <svtools/numuno.hxx> +#include <svl/numuno.hxx> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/view/XSelectionSupplier.hpp> diff --git a/chart2/source/model/main/ImplChartModel.cxx b/chart2/source/model/main/ImplChartModel.cxx index 87383dcf5817..4c8e3bdfc8c9 100644 --- a/chart2/source/model/main/ImplChartModel.cxx +++ b/chart2/source/model/main/ImplChartModel.cxx @@ -45,9 +45,9 @@ #include "AxisHelper.hxx" // header for class SvNumberFormatter -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> // header for class SvNumberFormatsSupplierObj -#include <svtools/numuno.hxx> +#include <svl/numuno.hxx> #include <vcl/svapp.hxx> #include <cppuhelper/component_context.hxx> diff --git a/chart2/source/tools/ConfigColorScheme.cxx b/chart2/source/tools/ConfigColorScheme.cxx index 835872aad8e4..648aca20bc77 100644 --- a/chart2/source/tools/ConfigColorScheme.cxx +++ b/chart2/source/tools/ConfigColorScheme.cxx @@ -76,6 +76,7 @@ public: protected: // ____ ::utl::ConfigItem ____ + virtual void Commit(); virtual void Notify( const Sequence< OUString > & aPropertyNames ); private: @@ -100,6 +101,9 @@ void ChartConfigItem::Notify( const Sequence< OUString > & aPropertyNames ) } } +void ChartConfigItem::Commit() +{} + void ChartConfigItem::addPropertyNotification( const OUString & rPropertyName ) { m_aPropertiesToNotify.insert( rPropertyName ); diff --git a/chart2/source/tools/ImplUndoManager.cxx b/chart2/source/tools/ImplUndoManager.cxx index 91d5f869bc53..e6c87ae16f9e 100644 --- a/chart2/source/tools/ImplUndoManager.cxx +++ b/chart2/source/tools/ImplUndoManager.cxx @@ -463,6 +463,10 @@ void UndoStepsConfigItem::Notify( const Sequence< OUString > & aPropertyNames ) } } +void UndoStepsConfigItem::Commit() +{ +} + // mtehod is not const, because GetProperties is not const sal_Int32 UndoStepsConfigItem::getUndoSteps() { diff --git a/chart2/source/tools/ImplUndoManager.hxx b/chart2/source/tools/ImplUndoManager.hxx index 94d04b69a5a4..35a90becbcf2 100644 --- a/chart2/source/tools/ImplUndoManager.hxx +++ b/chart2/source/tools/ImplUndoManager.hxx @@ -200,6 +200,7 @@ public: protected: // ____ ::utl::ConfigItem ____ virtual void Notify( const ::com::sun::star::uno::Sequence< ::rtl::OUString > & aPropertyNames ); + virtual void Commit(); private: ConfigItemListener & m_rListener; diff --git a/chart2/source/view/main/ChartItemPool.cxx b/chart2/source/view/main/ChartItemPool.cxx index f3024a10e958..3da8fe225f8c 100644 --- a/chart2/source/view/main/ChartItemPool.cxx +++ b/chart2/source/view/main/ChartItemPool.cxx @@ -36,15 +36,15 @@ #include "chartview/ChartSfxItemIds.hxx" #include <svx/chrtitem.hxx> -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include <svx/brshitem.hxx> #include <svx/sizeitem.hxx> // header for class SfxStringItem -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> //SfxIntegerListItem -#include <svtools/ilstitem.hxx> +#include <svl/ilstitem.hxx> #define _SVSTDARR_ULONGS -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> namespace chart { diff --git a/chart2/source/view/main/ChartItemPool.hxx b/chart2/source/view/main/ChartItemPool.hxx index 00c813ed4922..22bc5b900d06 100644 --- a/chart2/source/view/main/ChartItemPool.hxx +++ b/chart2/source/view/main/ChartItemPool.hxx @@ -30,8 +30,8 @@ #ifndef _CHART2_ITEMPOOL_HXX #define _CHART2_ITEMPOOL_HXX -#include <svtools/poolitem.hxx> -#include <svtools/itempool.hxx> +#include <svl/poolitem.hxx> +#include <svl/itempool.hxx> namespace chart { diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index dfd57f9bce92..fed4b52f3b5f 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -103,7 +103,7 @@ #include <com/sun/star/text/XTextDocument.hpp> #include <com/sun/star/text/WritingMode2.hpp> #include <com/sun/star/text/XTextEmbeddedObjectsSupplier.hpp> -#include <svtools/languageoptions.hxx> +#include <svl/languageoptions.hxx> #include <sot/clsids.hxx> //............................................................................. diff --git a/chart2/source/view/main/ChartView.hxx b/chart2/source/view/main/ChartView.hxx index b536998fd5bd..b1d7c5eede78 100644 --- a/chart2/source/view/main/ChartView.hxx +++ b/chart2/source/view/main/ChartView.hxx @@ -36,7 +36,7 @@ #include <cppuhelper/interfacecontainer.hxx> // header for class SfxListener -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include <com/sun/star/datatransfer/XTransferable.hpp> #include <com/sun/star/drawing/XDrawPage.hpp> #include <com/sun/star/frame/XModel.hpp> diff --git a/chart2/source/view/main/DrawModelWrapper.cxx b/chart2/source/view/main/DrawModelWrapper.cxx index edcb8c3eecc9..4212640033ac 100644 --- a/chart2/source/view/main/DrawModelWrapper.cxx +++ b/chart2/source/view/main/DrawModelWrapper.cxx @@ -37,9 +37,9 @@ #include "ChartItemPool.hxx" #include "ObjectIdentifier.hxx" #include <svx/unomodel.hxx> -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> // header for class SfxBoolItem -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> // header for define EE_PARA_HYPHENATE #include <svx/eeitem.hxx> // header for class Svx3DPercentDiagonalItem diff --git a/chart2/source/view/main/NumberFormatterWrapper.cxx b/chart2/source/view/main/NumberFormatterWrapper.cxx index 2a01d2f1cde3..b947894c77bb 100644 --- a/chart2/source/view/main/NumberFormatterWrapper.cxx +++ b/chart2/source/view/main/NumberFormatterWrapper.cxx @@ -34,9 +34,9 @@ #include "macros.hxx" #include <comphelper/processfactory.hxx> // header for class SvNumberFormatsSupplierObj -#include <svtools/numuno.hxx> +#include <svl/numuno.hxx> // header for class SvNumberformat -#include <svtools/zformat.hxx> +#include <svl/zformat.hxx> #include <tools/color.hxx> #include <i18npool/mslangid.hxx> #include <tools/debug.hxx> diff --git a/chart2/source/view/main/VLegend.cxx b/chart2/source/view/main/VLegend.cxx index b9fa4b3aba84..8e65dd6c2458 100644 --- a/chart2/source/view/main/VLegend.cxx +++ b/chart2/source/view/main/VLegend.cxx @@ -49,7 +49,7 @@ #include <com/sun/star/chart2/LegendPosition.hpp> #include <com/sun/star/chart2/RelativePosition.hpp> #include <rtl/ustrbuf.hxx> -#include <svtools/languageoptions.hxx> +#include <svl/languageoptions.hxx> #include <vector> #include <algorithm> diff --git a/sc/inc/addruno.hxx b/sc/inc/addruno.hxx index 1427d9b14a75..c9089ba48d2e 100644 --- a/sc/inc/addruno.hxx +++ b/sc/inc/addruno.hxx @@ -34,7 +34,7 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <cppuhelper/implbase2.hxx> -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include "global.hxx" #include "address.hxx" diff --git a/sc/inc/afmtuno.hxx b/sc/inc/afmtuno.hxx index ac7d444ca561..843fa673543f 100644 --- a/sc/inc/afmtuno.hxx +++ b/sc/inc/afmtuno.hxx @@ -31,8 +31,8 @@ #ifndef SC_AFMTUNO_HXX #define SC_AFMTUNO_HXX -#include <svtools/lstner.hxx> -#include <svtools/itemprop.hxx> +#include <svl/lstner.hxx> +#include <svl/itemprop.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/container/XContainer.hpp> #include <com/sun/star/container/XIndexContainer.hpp> diff --git a/sc/inc/appluno.hxx b/sc/inc/appluno.hxx index 09a1e9ced9ba..05de5a22cc90 100644 --- a/sc/inc/appluno.hxx +++ b/sc/inc/appluno.hxx @@ -31,7 +31,7 @@ #ifndef SC_APPLUNO_HXX #define SC_APPLUNO_HXX -#include <svtools/itemprop.hxx> +#include <svl/itemprop.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/sheet/XRecentFunctions.hpp> diff --git a/sc/inc/attrib.hxx b/sc/inc/attrib.hxx index 8dd77cf68c3f..55bb707f4edb 100644 --- a/sc/inc/attrib.hxx +++ b/sc/inc/attrib.hxx @@ -31,9 +31,9 @@ #ifndef SC_SCATTR_HXX #define SC_SCATTR_HXX -#include <svtools/poolitem.hxx> -#include <svtools/intitem.hxx> -#include <svtools/eitem.hxx> +#include <svl/poolitem.hxx> +#include <svl/intitem.hxx> +#include <svl/eitem.hxx> #include "scdllapi.h" #include "global.hxx" #include "address.hxx" diff --git a/sc/inc/autoform.hxx b/sc/inc/autoform.hxx index f8df5e9fa236..8ec139ffa2d5 100644 --- a/sc/inc/autoform.hxx +++ b/sc/inc/autoform.hxx @@ -64,7 +64,7 @@ JP 20.07.95: #include <svx/udlnitem.hxx> #include <svx/wghtitem.hxx> #include <svx/rotmodit.hxx> -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include <svx/bolnitem.hxx> #include "scdllapi.h" #include "collect.hxx" diff --git a/sc/inc/brdcst.hxx b/sc/inc/brdcst.hxx index 0d4b9aac9fa7..e7418c8dedfe 100644 --- a/sc/inc/brdcst.hxx +++ b/sc/inc/brdcst.hxx @@ -33,8 +33,8 @@ #include "global.hxx" #include "address.hxx" #include <tools/rtti.hxx> -#include <svtools/hint.hxx> -#include <svtools/smplhint.hxx> +#include <svl/hint.hxx> +#include <svl/smplhint.hxx> class ScBaseCell; #define SC_HINT_DYING SFX_HINT_DYING diff --git a/sc/inc/cell.hxx b/sc/inc/cell.hxx index 1f2bff35ce98..6bc1716529a3 100644 --- a/sc/inc/cell.hxx +++ b/sc/inc/cell.hxx @@ -35,7 +35,7 @@ #include <set> #include <tools/mempool.hxx> -#include <svtools/listener.hxx> +#include <svl/listener.hxx> #include "global.hxx" #include "rangenam.hxx" #include "formula/grammar.hxx" diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx index 2dd0bd6cc16e..8def9591d5b9 100644 --- a/sc/inc/cellsuno.hxx +++ b/sc/inc/cellsuno.hxx @@ -35,9 +35,9 @@ #include "rangelst.hxx" // ScRangeList #include "formula/grammar.hxx" -#include <svtools/lstner.hxx> -#include <svtools/listener.hxx> -#include <svtools/itemprop.hxx> +#include <svl/lstner.hxx> +#include <svl/listener.hxx> +#include <svl/itemprop.hxx> #include <com/sun/star/table/XTableChartsSupplier.hpp> #include <com/sun/star/chart/XChartDataArray.hpp> #include <com/sun/star/text/XTextFieldsSupplier.hpp> diff --git a/sc/inc/chart2uno.hxx b/sc/inc/chart2uno.hxx index dc0244dfcdb8..32dc3a777086 100644 --- a/sc/inc/chart2uno.hxx +++ b/sc/inc/chart2uno.hxx @@ -37,7 +37,7 @@ #include "token.hxx" #include "chartlis.hxx" -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include <com/sun/star/chart/ChartDataRowSource.hpp> #include <com/sun/star/chart2/data/XDataProvider.hpp> #include <com/sun/star/chart2/data/XRangeXMLConversion.hpp> @@ -59,7 +59,7 @@ #include <cppuhelper/implbase6.hxx> #include <cppuhelper/implbase7.hxx> #include <rtl/ustring.hxx> -#include <svtools/itemprop.hxx> +#include <svl/itemprop.hxx> #include <hash_set> #include <list> diff --git a/sc/inc/chartlis.hxx b/sc/inc/chartlis.hxx index 490c62743fb4..0ebc84268f74 100644 --- a/sc/inc/chartlis.hxx +++ b/sc/inc/chartlis.hxx @@ -33,7 +33,7 @@ #include <vcl/timer.hxx> -#include <svtools/listener.hxx> +#include <svl/listener.hxx> #include "collect.hxx" #include "rangelst.hxx" #include "token.hxx" diff --git a/sc/inc/chartuno.hxx b/sc/inc/chartuno.hxx index 914c48393573..7c82b4874fca 100644 --- a/sc/inc/chartuno.hxx +++ b/sc/inc/chartuno.hxx @@ -32,7 +32,7 @@ #define SC_CHARTUNO_HXX #include "address.hxx" -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include <tools/string.hxx> #include <com/sun/star/table/XTableChart.hpp> diff --git a/sc/inc/chgtrack.hxx b/sc/inc/chgtrack.hxx index 52915e59358a..0018f8b2ac3c 100644 --- a/sc/inc/chgtrack.hxx +++ b/sc/inc/chgtrack.hxx @@ -1127,7 +1127,7 @@ class ScChangeTrack : public utl::ConfigurationListener #endif // SC_CHGTRACK_CXX void ClearMsgQueue(); - virtual void ConfigurationChanged( utl::ConfigurationBroadcaster* ); + virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 ); public: diff --git a/sc/inc/conditio.hxx b/sc/inc/conditio.hxx index 141cb5706515..f659c52d0892 100644 --- a/sc/inc/conditio.hxx +++ b/sc/inc/conditio.hxx @@ -34,7 +34,7 @@ #include "global.hxx" #include "address.hxx" #include "formula/grammar.hxx" -#include <svtools/svarray.hxx> +#include <svl/svarray.hxx> #include "scdllapi.h" class ScBaseCell; diff --git a/sc/inc/confuno.hxx b/sc/inc/confuno.hxx index a7327402e5e0..a82e4fad1a09 100644 --- a/sc/inc/confuno.hxx +++ b/sc/inc/confuno.hxx @@ -31,8 +31,8 @@ #ifndef SC_CONFUNO_HXX #define SC_CONFUNO_HXX -#include <svtools/itemprop.hxx> -#include <svtools/lstner.hxx> +#include <svl/itemprop.hxx> +#include <svl/lstner.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <cppuhelper/implbase2.hxx> diff --git a/sc/inc/dapiuno.hxx b/sc/inc/dapiuno.hxx index c3d5db0bc72b..86f395f525ca 100644 --- a/sc/inc/dapiuno.hxx +++ b/sc/inc/dapiuno.hxx @@ -34,8 +34,8 @@ #include "global.hxx" #include "dpobject.hxx" #include "rangeutl.hxx" // ScArea -#include <svtools/lstner.hxx> -#include <svtools/itemprop.hxx> +#include <svl/lstner.hxx> +#include <svl/itemprop.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> diff --git a/sc/inc/datauno.hxx b/sc/inc/datauno.hxx index a93bfc341573..6cd2d1555bdf 100644 --- a/sc/inc/datauno.hxx +++ b/sc/inc/datauno.hxx @@ -32,8 +32,8 @@ #define SC_DATAUNO_HXX #include "global.hxx" -#include <svtools/itemprop.hxx> -#include <svtools/lstner.hxx> +#include <svl/itemprop.hxx> +#include <svl/lstner.hxx> #include <com/sun/star/sheet/TableFilterField.hpp> #include <com/sun/star/sheet/GeneralFunction.hpp> #include <com/sun/star/sheet/XCellRangeReferrer.hpp> diff --git a/sc/inc/defltuno.hxx b/sc/inc/defltuno.hxx index 2f33dcdb3f48..b93c386a77f0 100644 --- a/sc/inc/defltuno.hxx +++ b/sc/inc/defltuno.hxx @@ -31,12 +31,12 @@ #ifndef SC_DEFLTUNO_HXX #define SC_DEFLTUNO_HXX -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XPropertyState.hpp> #include <cppuhelper/implbase3.hxx> -#include <svtools/itemprop.hxx> +#include <svl/itemprop.hxx> class ScDocShell; diff --git a/sc/inc/detdata.hxx b/sc/inc/detdata.hxx index 06beb91790f1..b16b5a05778c 100644 --- a/sc/inc/detdata.hxx +++ b/sc/inc/detdata.hxx @@ -31,7 +31,7 @@ #ifndef SC_DETDATA_HXX #define SC_DETDATA_HXX -#include <svtools/svarray.hxx> +#include <svl/svarray.hxx> #include "global.hxx" #include "address.hxx" diff --git a/sc/inc/dispuno.hxx b/sc/inc/dispuno.hxx index 34578c64bacf..b09a064ee797 100644 --- a/sc/inc/dispuno.hxx +++ b/sc/inc/dispuno.hxx @@ -34,8 +34,8 @@ #include <com/sun/star/frame/XDispatchProviderInterceptor.hpp> #include <com/sun/star/view/XSelectionChangeListener.hpp> #include <cppuhelper/implbase2.hxx> -#include <svtools/lstner.hxx> -#include <svtools/svarray.hxx> +#include <svl/lstner.hxx> +#include <svl/svarray.hxx> #include "global.hxx" // ScImportParam diff --git a/sc/inc/docoptio.hxx b/sc/inc/docoptio.hxx index 325060f0c05a..f102b5ea966d 100644 --- a/sc/inc/docoptio.hxx +++ b/sc/inc/docoptio.hxx @@ -32,8 +32,8 @@ #define SC_DOCOPTIO_HXX #include <unotools/configitem.hxx> -#include <svtools/poolitem.hxx> -#include <svtools/itemprop.hxx> +#include <svl/poolitem.hxx> +#include <svl/itemprop.hxx> #include "scdllapi.h" #include "optutil.hxx" diff --git a/sc/inc/docpool.hxx b/sc/inc/docpool.hxx index c81a68afe63d..52cf1a968163 100644 --- a/sc/inc/docpool.hxx +++ b/sc/inc/docpool.hxx @@ -31,7 +31,7 @@ #ifndef SC_SCDOCPOL_HXX #define SC_SCDOCPOL_HXX -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> #include "scdllapi.h" class ScStyleSheet; diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index 5f75108c2ebf..116d25ee901e 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -155,7 +155,7 @@ namespace com { namespace sun { namespace star { } } } } -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> /* #ifdef _ZFORLIST_DECLARE_TABLE class SvNumberFormatterIndexTable; diff --git a/sc/inc/docuno.hxx b/sc/inc/docuno.hxx index 0d69c9f68670..3ed1d5f147ac 100644 --- a/sc/inc/docuno.hxx +++ b/sc/inc/docuno.hxx @@ -33,7 +33,7 @@ #include "address.hxx" #include <sfx2/sfxbasemodel.hxx> -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include <svx/fmdmod.hxx> #include <com/sun/star/view/XRenderable.hpp> #include <com/sun/star/style/XStyleFamiliesSupplier.hpp> @@ -61,7 +61,7 @@ #include <cppuhelper/implbase4.hxx> #include <cppuhelper/implbase5.hxx> #include <cppuhelper/interfacecontainer.h> -#include <svtools/itemprop.hxx> +#include <svl/itemprop.hxx> #include "drwlayer.hxx" class ScDocShell; diff --git a/sc/inc/dptabres.hxx b/sc/inc/dptabres.hxx index 6dfb782b2313..b18ea8e56b76 100644 --- a/sc/inc/dptabres.hxx +++ b/sc/inc/dptabres.hxx @@ -31,7 +31,7 @@ #ifndef SC_DPTABRES_HXX #define SC_DPTABRES_HXX -#include <svtools/svarray.hxx> +#include <svl/svarray.hxx> #include <tools/string.hxx> #include <com/sun/star/sheet/MemberResult.hpp> #include <com/sun/star/sheet/DataResult.hpp> diff --git a/sc/inc/drawattr.hxx b/sc/inc/drawattr.hxx index 174b675ebcae..ad0ce37e35c3 100644 --- a/sc/inc/drawattr.hxx +++ b/sc/inc/drawattr.hxx @@ -30,7 +30,7 @@ #ifndef _IDLITEMS_HXX #define _IDLITEMS_HXX -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <svx/svxenum.hxx> diff --git a/sc/inc/drdefuno.hxx b/sc/inc/drdefuno.hxx index 7eb45d3ea355..4b0a534dc655 100644 --- a/sc/inc/drdefuno.hxx +++ b/sc/inc/drdefuno.hxx @@ -32,7 +32,7 @@ #define SC_DRDEFUNO_HXX #include <svx/unopool.hxx> -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> class ScDocShell; diff --git a/sc/inc/editsrc.hxx b/sc/inc/editsrc.hxx index 950c3533e44a..3dd928384fe8 100644 --- a/sc/inc/editsrc.hxx +++ b/sc/inc/editsrc.hxx @@ -33,7 +33,7 @@ #include "address.hxx" #include <svx/unoedsrc.hxx> -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include <memory> diff --git a/sc/inc/externalrefmgr.hxx b/sc/inc/externalrefmgr.hxx index bf795f04fe1c..90adedd6d346 100644 --- a/sc/inc/externalrefmgr.hxx +++ b/sc/inc/externalrefmgr.hxx @@ -37,7 +37,7 @@ #include "sfx2/lnkbase.hxx" #include "tools/time.hxx" #include "vcl/timer.hxx" -#include "svtools/zforlist.hxx" +#include "svl/zforlist.hxx" #include "scmatrix.hxx" #include <hash_map> diff --git a/sc/inc/fielduno.hxx b/sc/inc/fielduno.hxx index d4319bcba50e..6d777b38424a 100644 --- a/sc/inc/fielduno.hxx +++ b/sc/inc/fielduno.hxx @@ -34,8 +34,8 @@ #include "address.hxx" #include "mutexhlp.hxx" -#include <svtools/lstner.hxx> -#include <svtools/itemprop.hxx> +#include <svl/lstner.hxx> +#include <svl/itemprop.hxx> #include <svx/editdata.hxx> #include <com/sun/star/text/XTextField.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> diff --git a/sc/inc/fmtuno.hxx b/sc/inc/fmtuno.hxx index 6005a849fb0f..ccd93d982bdf 100644 --- a/sc/inc/fmtuno.hxx +++ b/sc/inc/fmtuno.hxx @@ -35,7 +35,7 @@ #include "conditio.hxx" #include <formula/grammar.hxx> #include <tools/list.hxx> -#include <svtools/itemprop.hxx> +#include <svl/itemprop.hxx> #include <com/sun/star/sheet/XSheetConditionalEntries.hpp> #include <com/sun/star/sheet/XSheetCondition.hpp> #include <com/sun/star/sheet/XSheetConditionalEntry.hpp> diff --git a/sc/inc/forbiuno.hxx b/sc/inc/forbiuno.hxx index eb142b2166a1..305d818a299d 100644 --- a/sc/inc/forbiuno.hxx +++ b/sc/inc/forbiuno.hxx @@ -32,7 +32,7 @@ #define SC_FORBIUNO_HXX #include <svx/UnoForbiddenCharsTable.hxx> -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> class ScDocShell; diff --git a/sc/inc/funcuno.hxx b/sc/inc/funcuno.hxx index 2e5e167bc988..4c45cdb627bc 100644 --- a/sc/inc/funcuno.hxx +++ b/sc/inc/funcuno.hxx @@ -35,7 +35,7 @@ #include <com/sun/star/sheet/XFunctionAccess.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <cppuhelper/implbase3.hxx> -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> class ScDocument; class ScDocOptions; diff --git a/sc/inc/hints.hxx b/sc/inc/hints.hxx index 92c17caf9641..889dc302fcf6 100644 --- a/sc/inc/hints.hxx +++ b/sc/inc/hints.hxx @@ -33,7 +33,7 @@ #include "global.hxx" #include "address.hxx" -#include <svtools/hint.hxx> +#include <svl/hint.hxx> // --------------------------------------------------------------------------- diff --git a/sc/inc/linkuno.hxx b/sc/inc/linkuno.hxx index c45da4f35e27..1a9479dff278 100644 --- a/sc/inc/linkuno.hxx +++ b/sc/inc/linkuno.hxx @@ -31,8 +31,8 @@ #ifndef SC_LINKUNO_HXX #define SC_LINKUNO_HXX -#include <svtools/lstner.hxx> -#include <svtools/itemprop.hxx> +#include <svl/lstner.hxx> +#include <svl/itemprop.hxx> #include <com/sun/star/sheet/XDDELink.hpp> #include <com/sun/star/sheet/XDDELinkResults.hpp> #include <com/sun/star/sheet/XDDELinks.hpp> diff --git a/sc/inc/lookupcache.hxx b/sc/inc/lookupcache.hxx index 12b85d54cc49..9261a6db0395 100644 --- a/sc/inc/lookupcache.hxx +++ b/sc/inc/lookupcache.hxx @@ -34,7 +34,7 @@ #include "address.hxx" #include "global.hxx" #include "formula/token.hxx" -#include <svtools/listener.hxx> +#include <svl/listener.hxx> #include <tools/string.hxx> #include <hash_map> diff --git a/sc/inc/nameuno.hxx b/sc/inc/nameuno.hxx index bac1dd9711d5..240cead3be83 100644 --- a/sc/inc/nameuno.hxx +++ b/sc/inc/nameuno.hxx @@ -31,7 +31,7 @@ #ifndef SC_NAMEUNO_HXX #define SC_NAMEUNO_HXX -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include "address.hxx" #include "formula/grammar.hxx" #include <com/sun/star/sheet/XLabelRange.hpp> diff --git a/sc/inc/notesuno.hxx b/sc/inc/notesuno.hxx index 3907f3d20967..4cf8148eff17 100644 --- a/sc/inc/notesuno.hxx +++ b/sc/inc/notesuno.hxx @@ -32,7 +32,7 @@ #define SC_NOTESUNO_HXX #include "address.hxx" -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include <com/sun/star/sheet/XSheetAnnotation.hpp> #include <com/sun/star/sheet/XSheetAnnotationShapeSupplier.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> diff --git a/sc/inc/patattr.hxx b/sc/inc/patattr.hxx index 86506d7ccdb8..c1fb936c90fe 100644 --- a/sc/inc/patattr.hxx +++ b/sc/inc/patattr.hxx @@ -31,8 +31,8 @@ #ifndef SC_SCPATATR_HXX #define SC_SCPATATR_HXX -#include <svtools/poolitem.hxx> -#include <svtools/itemset.hxx> +#include <svl/poolitem.hxx> +#include <svl/itemset.hxx> #include <vcl/fontcvt.hxx> #include <svx/svxenum.hxx> #include "scdllapi.h" diff --git a/sc/inc/pch/precompiled_sc.hxx b/sc/inc/pch/precompiled_sc.hxx index f1e916f5b568..dbb86fdf7484 100644 --- a/sc/inc/pch/precompiled_sc.hxx +++ b/sc/inc/pch/precompiled_sc.hxx @@ -152,15 +152,15 @@ #include <sot/exchange.hxx> #include <sot/factory.hxx> #include <sot/storage.hxx> -#include <svtools/brdcst.hxx> -#include <svtools/cenumitm.hxx> -#include <svtools/cintitem.hxx> +#include <svl/brdcst.hxx> +#include <svl/cenumitm.hxx> +#include <svl/cintitem.hxx> #include <unotools/fltrcfg.hxx> -#include <svtools/intitem.hxx> -#include <svtools/listener.hxx> -#include <svtools/lstner.hxx> +#include <svl/intitem.hxx> +#include <svl/listener.hxx> +#include <svl/lstner.hxx> #include <unotools/pathoptions.hxx> -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #include <unotools/useroptions.hxx> #include <svx/editobj.hxx> #include <svx/eeitem.hxx> diff --git a/sc/inc/printopt.hxx b/sc/inc/printopt.hxx index 6c4a88d9df60..0c90ba4497fc 100644 --- a/sc/inc/printopt.hxx +++ b/sc/inc/printopt.hxx @@ -31,7 +31,7 @@ #ifndef SC_PRINTOPT_HXX #define SC_PRINTOPT_HXX -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #include <unotools/configitem.hxx> #include "scdllapi.h" @@ -96,6 +96,7 @@ public: void SetOptions( const ScPrintOptions& rNew ); virtual void Commit(); + virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); }; #endif diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx index 69f3def3efc5..86d1d5b789aa 100644 --- a/sc/inc/scmod.hxx +++ b/sc/inc/scmod.hxx @@ -34,11 +34,11 @@ #include "scdllapi.h" #include "scdll.hxx" #include <vcl/timer.hxx> -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include "global.hxx" // ScInputMode #include "markdata.hxx" //ScMarkData #include "shellids.hxx" - +#include <unotools/options.hxx> #include <tools/shl.hxx> @@ -113,7 +113,7 @@ struct ScClipData //================================================================== -class ScModule: public SfxModule, public SfxListener +class ScModule: public SfxModule, public SfxListener, utl::ConfigurationListener { Timer aIdleTimer; Timer aSpellTimer; @@ -153,6 +153,7 @@ public: virtual void FillStatusBar(StatusBar &rBar); virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 ); void DeleteCfg(); // von der Applikation verschoben: diff --git a/sc/inc/srchuno.hxx b/sc/inc/srchuno.hxx index d486d8b7e298..ffa54cf29d70 100644 --- a/sc/inc/srchuno.hxx +++ b/sc/inc/srchuno.hxx @@ -34,7 +34,7 @@ #include <com/sun/star/util/XReplaceDescriptor.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> -#include <svtools/itemprop.hxx> +#include <svl/itemprop.hxx> #include <cppuhelper/implbase3.hxx> diff --git a/sc/inc/stlpool.hxx b/sc/inc/stlpool.hxx index 1028bb5f7673..ce1d643cd27f 100644 --- a/sc/inc/stlpool.hxx +++ b/sc/inc/stlpool.hxx @@ -31,7 +31,7 @@ #ifndef SC_STLPOOL_HXX #define SC_STLPOOL_HXX -#include <svtools/style.hxx> +#include <svl/style.hxx> class ScStyleSheet; diff --git a/sc/inc/stlsheet.hxx b/sc/inc/stlsheet.hxx index 06786dfff69d..ddbbc41b4f80 100644 --- a/sc/inc/stlsheet.hxx +++ b/sc/inc/stlsheet.hxx @@ -31,7 +31,7 @@ #ifndef SC_STLSHEET_HXX #define SC_STLSHEET_HXX -#include <svtools/style.hxx> +#include <svl/style.hxx> //------------------------------------------------------------------------ diff --git a/sc/inc/styleuno.hxx b/sc/inc/styleuno.hxx index 5fb28db3239a..34d1b8d3302c 100644 --- a/sc/inc/styleuno.hxx +++ b/sc/inc/styleuno.hxx @@ -31,8 +31,8 @@ #ifndef SC_STYLEUNO_HXX #define SC_STYLEUNO_HXX -#include <svtools/itemprop.hxx> -#include <svtools/lstner.hxx> +#include <svl/itemprop.hxx> +#include <svl/lstner.hxx> #include <rsc/rscsfx.hxx> #include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/style/XStyle.hpp> diff --git a/sc/inc/targuno.hxx b/sc/inc/targuno.hxx index 3dc549656fa1..db8670521c25 100644 --- a/sc/inc/targuno.hxx +++ b/sc/inc/targuno.hxx @@ -31,7 +31,7 @@ #ifndef SC_TARGUNO_HXX #define SC_TARGUNO_HXX -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include <tools/string.hxx> #include <com/sun/star/document/XLinkTargetSupplier.hpp> #include <com/sun/star/lang/XServiceName.hpp> diff --git a/sc/inc/textuno.hxx b/sc/inc/textuno.hxx index 8ec7707874be..64eb2aaba696 100644 --- a/sc/inc/textuno.hxx +++ b/sc/inc/textuno.hxx @@ -34,8 +34,8 @@ #include "global.hxx" // ScRange, ScAddress #include "address.hxx" #include <svx/unotext.hxx> -#include <svtools/brdcst.hxx> -#include <svtools/lstner.hxx> +#include <svl/brdcst.hxx> +#include <svl/lstner.hxx> #include <com/sun/star/text/XTextFieldsSupplier.hpp> #include <com/sun/star/sheet/XHeaderFooterContent.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> diff --git a/sc/inc/tokenuno.hxx b/sc/inc/tokenuno.hxx index bcd3435668be..0c573c6961c1 100644 --- a/sc/inc/tokenuno.hxx +++ b/sc/inc/tokenuno.hxx @@ -38,7 +38,7 @@ #include <com/sun/star/sheet/FormulaToken.hpp> #include <com/sun/star/sheet/XFormulaParser.hpp> #include <cppuhelper/implbase3.hxx> -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include <formula/FormulaOpCodeMapperObj.hxx> #include "address.hxx" #include "compiler.hxx" diff --git a/sc/inc/unoreflist.hxx b/sc/inc/unoreflist.hxx index 42486071adef..08223d546c57 100644 --- a/sc/inc/unoreflist.hxx +++ b/sc/inc/unoreflist.hxx @@ -32,7 +32,7 @@ #define SC_UNOREFLIST_HXX #include <list> -#include <svtools/hint.hxx> +#include <svl/hint.hxx> #include "rangelst.hxx" diff --git a/sc/inc/viewuno.hxx b/sc/inc/viewuno.hxx index e489cb718163..bb322424a9a6 100644 --- a/sc/inc/viewuno.hxx +++ b/sc/inc/viewuno.hxx @@ -32,8 +32,8 @@ #define SC_VIEWUNO_HXX #include <sfx2/sfxbasecontroller.hxx> -#include <svtools/svarray.hxx> -#include <svtools/itemprop.hxx> +#include <svl/svarray.hxx> +#include <svl/itemprop.hxx> #include <com/sun/star/view/XFormLayerAccess.hpp> #include <com/sun/star/view/XSelectionChangeListener.hpp> #include <com/sun/star/view/XSelectionSupplier.hpp> diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx index 1a466d231459..dcc4ce2580d2 100644 --- a/sc/source/core/data/attarray.cxx +++ b/sc/source/core/data/attarray.cxx @@ -41,7 +41,7 @@ #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> diff --git a/sc/source/core/data/bcaslot.cxx b/sc/source/core/data/bcaslot.cxx index 85f8a4921242..e3bf0b527578 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 aea2bf4ff276..8b441628686e 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/column.cxx b/sc/source/core/data/column.cxx index 0afc4fb1347c..ef8bd9bde2c0 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 9fc4b09f21af..14f3a566eb9f 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 b12a2783baa9..2b0b3821dcc2 100644 --- a/sc/source/core/data/documen8.cxx +++ b/sc/source/core/data/documen8.cxx @@ -49,13 +49,13 @@ #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 <unotools/securityoptions.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/document.cxx b/sc/source/core/data/document.cxx index 4249efa9d020..2c54b603e911 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 <svl/poolcach.hxx> #include <unotools/saveopt.hxx> -#include <svtools/zforlist.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 6a3beb940c48..cb82ede30dca 100644 --- a/sc/source/core/data/drwlayer.cxx +++ b/sc/source/core/data/drwlayer.cxx @@ -65,7 +65,7 @@ #include <sfx2/docfile.hxx> #include <sot/storage.hxx> #include <unotools/pathoptions.hxx> -#include <svtools/itempool.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 67dccac980ae..e6f8523a3c42 100644 --- a/sc/source/core/data/global2.cxx +++ b/sc/source/core/data/global2.cxx @@ -44,7 +44,7 @@ #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/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 ff8f7bb76c5c..ada3e5515590 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/stlpool.cxx b/sc/source/core/data/stlpool.cxx index 260385d6feac..8b6f9a89edd3 100644 --- a/sc/source/core/data/stlpool.cxx +++ b/sc/source/core/data/stlpool.cxx @@ -49,8 +49,8 @@ #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 <vcl/outdev.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> diff --git a/sc/source/core/inc/adiasync.hxx b/sc/source/core/inc/adiasync.hxx index 9d1b4e89e1c3..cc696499d025 100644 --- a/sc/source/core/inc/adiasync.hxx +++ b/sc/source/core/inc/adiasync.hxx @@ -31,8 +31,8 @@ #ifndef SC_ADIASYNC_HXX #define SC_ADIASYNC_HXX -#include <svtools/broadcast.hxx> -#include <svtools/svarray.hxx> +#include <svl/broadcast.hxx> +#include <svl/svarray.hxx> #include "callform.hxx" diff --git a/sc/source/core/inc/bcaslot.hxx b/sc/source/core/inc/bcaslot.hxx index ef2f77b55684..1c94b648c7fb 100644 --- a/sc/source/core/inc/bcaslot.hxx +++ b/sc/source/core/inc/bcaslot.hxx @@ -34,8 +34,8 @@ #include <set> #include <hash_set> #include <functional> -#include <svtools/broadcast.hxx> -#include <svtools/svarray.hxx> +#include <svl/broadcast.hxx> +#include <svl/svarray.hxx> #include "global.hxx" #include "brdcst.hxx" diff --git a/sc/source/core/inc/core_pch.hxx b/sc/source/core/inc/core_pch.hxx index d756d1a91246..19d0463e7871 100644 --- a/sc/source/core/inc/core_pch.hxx +++ b/sc/source/core/inc/core_pch.hxx @@ -59,7 +59,7 @@ #include <i18npool/lang.h> #include <tools/debug.hxx> #include <tools/gen.hxx> -#include <svtools/svarray.hxx> +#include <svl/svarray.hxx> #include <markarr.hxx> #include <vcl/timer.hxx> #include <rangelst.hxx> @@ -67,18 +67,18 @@ #include <vcl/prntypes.hxx> #include <table.hxx> #include <column.hxx> -#include <svtools/hint.hxx> -#include <svtools/lstner.hxx> -#include <svtools/poolitem.hxx> +#include <svl/hint.hxx> +#include <svl/lstner.hxx> +#include <svl/poolitem.hxx> #include <tools/time.hxx> -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #include <tools/date.hxx> -#include <svtools/brdcst.hxx> +#include <svl/brdcst.hxx> #include <svx/svxids.hrc> -#include <svtools/memberid.hrc> +#include <svl/memberid.hrc> #include <sfx2/sfx.hrc> #include <sfx2/sfxsids.hrc> -#include <svtools/cntwids.hrc> +#include <svl/cntwids.hrc> #include <tools/resid.hxx> #include <tools/table.hxx> #include <stdarg.h> @@ -87,7 +87,7 @@ #include <tools/unqidx.hxx> #include <rsc/rscsfx.hxx> #include <basic/sbxdef.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <stddef.h> #include <collect.hxx> #include <scitems.hxx> @@ -100,8 +100,8 @@ #include <vcl/region.hxx> #include <vcl/mapmod.hxx> #include <vcl/bitmap.hxx> -#include <svtools/eitem.hxx> -#include <svtools/intitem.hxx> +#include <svl/eitem.hxx> +#include <svl/intitem.hxx> #include <sot/object.hxx> #include <sot/factory.hxx> #include <sot/sotdata.hxx> @@ -117,12 +117,12 @@ #include <tools/shl.hxx> #include <compiler.hxx> #include <vcl/font.hxx> -#include <svtools/smplhint.hxx> +#include <svl/smplhint.hxx> #include <vcl/wall.hxx> #include <vcl/settings.hxx> #include <vcl/accel.hxx> #include <patattr.hxx> -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include <tools/pstm.hxx> #include <vcl/svapp.hxx> #include <vcl/outdev.hxx> @@ -131,7 +131,7 @@ #include <vcl/wintypes.hxx> #include <vcl/event.hxx> #include <tools/ownlist.hxx> -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> #include <tools/datetime.hxx> #include <attrib.hxx> #include <docpool.hxx> @@ -143,8 +143,8 @@ #include <sc.hrc> #include <svx/dialogs.hrc> #include <math.h> -#include <svtools/style.hxx> -#include <svtools/style.hrc> +#include <svl/style.hxx> +#include <svl/style.hrc> #include <stdlib.h> #include <vcl/prntypes.hxx> #include <vcl/jobset.hxx> @@ -157,11 +157,11 @@ #include <vcl/wrkwin.hxx> #include <stlpool.hxx> #include <sfx2/app.hxx> -#include <svtools/inetmsg.hxx> +#include <svl/inetmsg.hxx> #include <svtools/compat.hxx> -#include <svtools/inetdef.hxx> -#include <svtools/inethist.hxx> -#include <svtools/cancel.hxx> +#include <svl/inetdef.hxx> +#include <svl/inethist.hxx> +#include <svl/cancel.hxx> #include <vcl/accel.hxx> #include <sfx2/sfxdefs.hxx> #include <sfx2/module.hxx> @@ -200,7 +200,7 @@ #include <scresid.hxx> #include <vcl/print.hxx> #include <attarray.hxx> -#include <svtools/ownlist.hxx> +#include <svl/ownlist.hxx> #include <interpre.hxx> #include <subtotal.hxx> #include <rangenam.hxx> @@ -225,7 +225,7 @@ #include <svx/editobj.hxx> #include <svx/wghtitem.hxx> #include <svx/fhgtitem.hxx> -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #include <pivot.hxx> #include <vcl/gdimtf.hxx> #include <svx/svdpage.hxx> diff --git a/sc/source/core/inc/ddelink.hxx b/sc/source/core/inc/ddelink.hxx index b8b44a568110..465c58afb823 100644 --- a/sc/source/core/inc/ddelink.hxx +++ b/sc/source/core/inc/ddelink.hxx @@ -33,7 +33,7 @@ #include "address.hxx" #include <sfx2/lnkbase.hxx> -#include <svtools/broadcast.hxx> +#include <svl/broadcast.hxx> #include "scmatrix.hxx" class ScDocument; diff --git a/sc/source/core/tool/autoform.cxx b/sc/source/core/tool/autoform.cxx index f21a0860d962..f9a9f0bd51a0 100644 --- a/sc/source/core/tool/autoform.cxx +++ b/sc/source/core/tool/autoform.cxx @@ -40,7 +40,7 @@ #include <sfx2/app.hxx> #include <sfx2/docfile.hxx> #include <unotools/pathoptions.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <tools/shl.hxx> #include <vcl/svapp.hxx> #include <vcl/outdev.hxx> diff --git a/sc/source/core/tool/cellform.cxx b/sc/source/core/tool/cellform.cxx index 238d0f943367..5305db490f8d 100644 --- a/sc/source/core/tool/cellform.cxx +++ b/sc/source/core/tool/cellform.cxx @@ -33,8 +33,8 @@ // INCLUDE --------------------------------------------------------------- #include <sfx2/objsh.hxx> -#include <svtools/smplhint.hxx> -#include <svtools/zforlist.hxx> +#include <svl/smplhint.hxx> +#include <svl/zforlist.hxx> #include "cellform.hxx" #include "cell.hxx" diff --git a/sc/source/core/tool/chartarr.cxx b/sc/source/core/tool/chartarr.cxx index bd2b06001726..e4def00c10b0 100644 --- a/sc/source/core/tool/chartarr.cxx +++ b/sc/source/core/tool/chartarr.cxx @@ -36,8 +36,8 @@ // INCLUDE --------------------------------------------------------------- #include "scitems.hxx" -#include <svtools/intitem.hxx> -#include <svtools/zforlist.hxx> +#include <svl/intitem.hxx> +#include <svl/zforlist.hxx> #include <float.h> // DBL_MIN #include "chartarr.hxx" diff --git a/sc/source/core/tool/chgtrack.cxx b/sc/source/core/tool/chgtrack.cxx index 2a9ca186bf85..7dfd75206a9f 100644 --- a/sc/source/core/tool/chgtrack.cxx +++ b/sc/source/core/tool/chgtrack.cxx @@ -36,10 +36,10 @@ #include <tools/shl.hxx> // SHL_CALC #include <tools/stack.hxx> #include <tools/rtti.hxx> -#include <svtools/zforlist.hxx> -#include <svtools/itemset.hxx> -#include <svtools/isethint.hxx> -#include <svtools/itempool.hxx> +#include <svl/zforlist.hxx> +#include <svl/itemset.hxx> +#include <svl/isethint.hxx> +#include <svl/itempool.hxx> #include <sfx2/app.hxx> #include <unotools/useroptions.hxx> #include <sfx2/sfxsids.hrc> @@ -2340,7 +2340,7 @@ void ScChangeTrack::Clear() } -void __EXPORT ScChangeTrack::ConfigurationChanged( utl::ConfigurationBroadcaster* ) +void __EXPORT ScChangeTrack::ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 ) { if ( !pDoc->IsInDtorClear() ) { diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx index a8ca4be2b5b6..949326d35091 100644 --- a/sc/source/core/tool/compiler.cxx +++ b/sc/source/core/tool/compiler.cxx @@ -37,7 +37,7 @@ #include <sfx2/objsh.hxx> #include <basic/sbmeth.hxx> #include <basic/sbstar.hxx> -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include <tools/rcid.h> #include <tools/rc.hxx> #include <tools/solar.h> diff --git a/sc/source/core/tool/ddelink.cxx b/sc/source/core/tool/ddelink.cxx index cab3322401a8..446f892452fc 100644 --- a/sc/source/core/tool/ddelink.cxx +++ b/sc/source/core/tool/ddelink.cxx @@ -37,7 +37,7 @@ #include <tools/list.hxx> #include <svx/linkmgr.hxx> #include <sfx2/bindings.hxx> -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include "ddelink.hxx" #include "brdcst.hxx" diff --git a/sc/source/core/tool/detfunc.cxx b/sc/source/core/tool/detfunc.cxx index a08b81a1917c..fed4a3b0ae40 100644 --- a/sc/source/core/tool/detfunc.cxx +++ b/sc/source/core/tool/detfunc.cxx @@ -61,7 +61,7 @@ #include <svx/outliner.hxx> #include <svx/editobj.hxx> #include <svx/sxcecitm.hxx> -#include <svtools/whiter.hxx> +#include <svl/whiter.hxx> #include <svx/writingmodeitem.hxx> #include <basegfx/point/b2dpoint.hxx> diff --git a/sc/source/core/tool/docoptio.cxx b/sc/source/core/tool/docoptio.cxx index 13934914a3f3..37e6c68fbf03 100644 --- a/sc/source/core/tool/docoptio.cxx +++ b/sc/source/core/tool/docoptio.cxx @@ -34,7 +34,7 @@ #include <vcl/svapp.hxx> -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Sequence.hxx> diff --git a/sc/source/core/tool/editutil.cxx b/sc/source/core/tool/editutil.cxx index 5519c679f84e..e4f2c07a3c57 100644 --- a/sc/source/core/tool/editutil.cxx +++ b/sc/source/core/tool/editutil.cxx @@ -49,11 +49,11 @@ #include <svx/numitem.hxx> #include <vcl/svapp.hxx> #include <vcl/outdev.hxx> -#include <svtools/inethist.hxx> -#include <svtools/syslocale.hxx> +#include <svl/inethist.hxx> +#include <unotools/syslocale.hxx> #ifndef _SVSTDARR_USHORTS #define _SVSTDARR_USHORTS -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #endif #include "editutil.hxx" diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx index 904c2625730c..488bb818d615 100644 --- a/sc/source/core/tool/interpr1.cxx +++ b/sc/source/core/tool/interpr1.cxx @@ -37,8 +37,8 @@ #include <svx/langitem.hxx> #include <svx/algitem.hxx> #include <unotools/textsearch.hxx> -#include <svtools/zforlist.hxx> -#include <svtools/zformat.hxx> +#include <svl/zforlist.hxx> +#include <svl/zformat.hxx> #include <tools/urlobj.hxx> #include <unotools/charclass.hxx> #include <sfx2/docfile.hxx> diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx index fc0f085706c5..cb418476e9d9 100644 --- a/sc/source/core/tool/interpr2.cxx +++ b/sc/source/core/tool/interpr2.cxx @@ -36,8 +36,8 @@ #include <svx/linkmgr.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/objsh.hxx> -#include <svtools/stritem.hxx> -#include <svtools/zforlist.hxx> +#include <svl/stritem.hxx> +#include <svl/zforlist.hxx> #include <rtl/logfile.hxx> #include "interpre.hxx" diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx index 11fd414c81f2..2880d7708b10 100644 --- a/sc/source/core/tool/interpr4.cxx +++ b/sc/source/core/tool/interpr4.cxx @@ -40,7 +40,7 @@ #include <basic/sbmod.hxx> #include <basic/sbstar.hxx> #include <basic/sbx.hxx> -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include <tools/urlobj.hxx> #include <rtl/logfile.hxx> #include <stdlib.h> diff --git a/sc/source/core/tool/interpr5.cxx b/sc/source/core/tool/interpr5.cxx index 7da4778bfe1a..482748cbb547 100644 --- a/sc/source/core/tool/interpr5.cxx +++ b/sc/source/core/tool/interpr5.cxx @@ -45,7 +45,7 @@ #include <stdio.h> #endif #include <unotools/bootstrap.hxx> -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include "interpre.hxx" #include "global.hxx" diff --git a/sc/source/core/tool/optutil.cxx b/sc/source/core/tool/optutil.cxx index 3f3d2886dfa7..36fea8a5e899 100644 --- a/sc/source/core/tool/optutil.cxx +++ b/sc/source/core/tool/optutil.cxx @@ -37,7 +37,7 @@ #include "optutil.hxx" #include "global.hxx" // for pSysLocale -#include <svtools/syslocale.hxx> +#include <unotools/syslocale.hxx> //------------------------------------------------------------------ diff --git a/sc/source/core/tool/printopt.cxx b/sc/source/core/tool/printopt.cxx index dae055b5f47e..157375f32c91 100644 --- a/sc/source/core/tool/printopt.cxx +++ b/sc/source/core/tool/printopt.cxx @@ -210,4 +210,5 @@ void ScPrintCfg::SetOptions( const ScPrintOptions& rNew ) SetModified(); } +void ScPrintCfg::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {} diff --git a/sc/source/core/tool/progress.cxx b/sc/source/core/tool/progress.cxx index 450736997c2d..a24c33cf6255 100644 --- a/sc/source/core/tool/progress.cxx +++ b/sc/source/core/tool/progress.cxx @@ -40,8 +40,8 @@ #include <sfx2/progress.hxx> #include <sfx2/docfile.hxx> #include <sfx2/sfxsids.hrc> -#include <svtools/eitem.hxx> -#include <svtools/itemset.hxx> +#include <svl/eitem.hxx> +#include <svl/itemset.hxx> #define SC_PROGRESS_CXX #include "progress.hxx" diff --git a/sc/source/core/tool/rangeseq.cxx b/sc/source/core/tool/rangeseq.cxx index 499dbf0a6ba1..078f9a774c09 100644 --- a/sc/source/core/tool/rangeseq.cxx +++ b/sc/source/core/tool/rangeseq.cxx @@ -33,7 +33,7 @@ -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include <rtl/math.hxx> #include <tools/debug.hxx> diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx index ad7147ccb14d..6195164e34fa 100644 --- a/sc/source/core/tool/scmatrix.cxx +++ b/sc/source/core/tool/scmatrix.cxx @@ -38,7 +38,7 @@ #include "address.hxx" #include "formula/errorcodes.hxx" #include "interpre.hxx" -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include <tools/stream.hxx> #include <rtl/math.hxx> diff --git a/sc/source/core/tool/zforauto.cxx b/sc/source/core/tool/zforauto.cxx index f8d2bd3f1906..62a6b48c4da0 100644 --- a/sc/source/core/tool/zforauto.cxx +++ b/sc/source/core/tool/zforauto.cxx @@ -31,8 +31,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sc.hxx" -#include <svtools/zforlist.hxx> -#include <svtools/zformat.hxx> +#include <svl/zforlist.hxx> +#include <svl/zformat.hxx> #include <vcl/svapp.hxx> #include <tools/debug.hxx> diff --git a/sc/source/filter/dif/difimp.cxx b/sc/source/filter/dif/difimp.cxx index cf0ccf5447a3..77803d338788 100644 --- a/sc/source/filter/dif/difimp.cxx +++ b/sc/source/filter/dif/difimp.cxx @@ -34,7 +34,7 @@ //------------------------------------------------------------------------ #include "scitems.hxx" -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include "dif.hxx" #include "filter.hxx" diff --git a/sc/source/filter/excel/excdoc.cxx b/sc/source/filter/excel/excdoc.cxx index d1b08b9cfc68..06ffaea3c6f4 100644 --- a/sc/source/filter/excel/excdoc.cxx +++ b/sc/source/filter/excel/excdoc.cxx @@ -42,8 +42,8 @@ #include <svx/svdpage.hxx> #include <svx/lrspitem.hxx> #include <svx/ulspitem.hxx> -#include <svtools/intitem.hxx> -#include <svtools/zformat.hxx> +#include <svl/intitem.hxx> +#include <svl/zformat.hxx> #include <sot/storage.hxx> #include <sfx2/objsh.hxx> #include <tools/urlobj.hxx> diff --git a/sc/source/filter/excel/excel.cxx b/sc/source/filter/excel/excel.cxx index 8365ef0db3f9..41529b66346f 100644 --- a/sc/source/filter/excel/excel.cxx +++ b/sc/source/filter/excel/excel.cxx @@ -43,7 +43,7 @@ #include <com/sun/star/document/XFilter.hpp> #include <com/sun/star/document/XImporter.hpp> #include "scitems.hxx" -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #include "filter.hxx" #include "document.hxx" #include "xistream.hxx" diff --git a/sc/source/filter/excel/excrecds.cxx b/sc/source/filter/excel/excrecds.cxx index bff8d4cba246..34d51f0f9df5 100644 --- a/sc/source/filter/excel/excrecds.cxx +++ b/sc/source/filter/excel/excrecds.cxx @@ -62,13 +62,13 @@ #include <svx/ulspitem.hxx> #include <svx/fhgtitem.hxx> #include <svx/escpitem.hxx> -#include <svtools/intitem.hxx> -#include <svtools/zforlist.hxx> -#include <svtools/zformat.hxx> +#include <svl/intitem.hxx> +#include <svl/zforlist.hxx> +#include <svl/zformat.hxx> #include <svtools/ctrltool.hxx> #define _SVSTDARR_USHORTS -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #include <string.h> diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx index 5a0ae1f9a972..8258cbbc12db 100644 --- a/sc/source/filter/excel/impop.cxx +++ b/sc/source/filter/excel/impop.cxx @@ -47,7 +47,7 @@ #include <svx/colritem.hxx> #include <sfx2/printer.hxx> #include <sfx2/docfile.hxx> -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include <sfx2/objsh.hxx> #include "docuno.hxx" diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx index 1d09082ede82..ad51304b3e3e 100644 --- a/sc/source/filter/excel/xecontent.cxx +++ b/sc/source/filter/excel/xecontent.cxx @@ -40,7 +40,7 @@ #include <com/sun/star/sheet/XAreaLink.hpp> #include <sfx2/objsh.hxx> #include <tools/urlobj.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <formula/grammar.hxx> #include "scitems.hxx" #include <svx/eeitem.hxx> diff --git a/sc/source/filter/excel/xehelper.cxx b/sc/source/filter/excel/xehelper.cxx index 45a44b2c88d1..23a559d9bc83 100644 --- a/sc/source/filter/excel/xehelper.cxx +++ b/sc/source/filter/excel/xehelper.cxx @@ -35,7 +35,7 @@ #include <sfx2/objsh.hxx> #include <vcl/font.hxx> #include <tools/urlobj.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <svtools/ctrltool.hxx> #include <svx/svdotext.hxx> #include <svx/outlobj.hxx> @@ -49,7 +49,7 @@ #include <svx/svxfont.hxx> #define _SVSTDARR_USHORTS -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #include "document.hxx" #include "docpool.hxx" #include "cell.hxx" diff --git a/sc/source/filter/excel/xelink.cxx b/sc/source/filter/excel/xelink.cxx index 47f101f4c351..46fcd166ecf1 100644 --- a/sc/source/filter/excel/xelink.cxx +++ b/sc/source/filter/excel/xelink.cxx @@ -34,7 +34,7 @@ #include <algorithm> #include <unotools/collatorwrapper.hxx> -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include "document.hxx" #include "cell.hxx" #include "scextopt.hxx" diff --git a/sc/source/filter/excel/xepage.cxx b/sc/source/filter/excel/xepage.cxx index 36d7a9dc31b7..47414c07bec8 100644 --- a/sc/source/filter/excel/xepage.cxx +++ b/sc/source/filter/excel/xepage.cxx @@ -32,10 +32,10 @@ #include "precompiled_sc.hxx" #include "xepage.hxx" -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include "scitems.hxx" -#include <svtools/eitem.hxx> -#include <svtools/intitem.hxx> +#include <svl/eitem.hxx> +#include <svl/intitem.hxx> #include <svx/pageitem.hxx> #include <svx/sizeitem.hxx> #include <svx/lrspitem.hxx> diff --git a/sc/source/filter/excel/xepivot.cxx b/sc/source/filter/excel/xepivot.cxx index 69b323e1e718..bc694d01725e 100644 --- a/sc/source/filter/excel/xepivot.cxx +++ b/sc/source/filter/excel/xepivot.cxx @@ -42,7 +42,7 @@ #include <rtl/math.hxx> #include <tools/date.hxx> -#include <svtools/zformat.hxx> +#include <svl/zformat.hxx> #include <sot/storage.hxx> #include "document.hxx" #include "dpobject.hxx" diff --git a/sc/source/filter/excel/xeroot.cxx b/sc/source/filter/excel/xeroot.cxx index c4acc89c1ff0..45f90732b070 100644 --- a/sc/source/filter/excel/xeroot.cxx +++ b/sc/source/filter/excel/xeroot.cxx @@ -33,9 +33,9 @@ #include <sfx2/docfile.hxx> #include <sfx2/sfxsids.hrc> #include <unotools/saveopt.hxx> -#include <svtools/itemset.hxx> -#include <svtools/stritem.hxx> -#include <svtools/eitem.hxx> +#include <svl/itemset.hxx> +#include <svl/stritem.hxx> +#include <svl/eitem.hxx> #include "xecontent.hxx" #include "xltracer.hxx" #include "xehelper.hxx" diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx index 2172a7678763..6356aba5e932 100644 --- a/sc/source/filter/excel/xestyle.cxx +++ b/sc/source/filter/excel/xestyle.cxx @@ -37,8 +37,8 @@ #include <set> #include <com/sun/star/i18n/ScriptType.hpp> #include <vcl/font.hxx> -#include <svtools/zformat.hxx> -#include <svtools/languageoptions.hxx> +#include <svl/zformat.hxx> +#include <svl/languageoptions.hxx> #include <sfx2/printer.hxx> #include "scitems.hxx" #include <svx/algitem.hxx> diff --git a/sc/source/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxx index ef30e9a78f6d..1583828706cc 100644 --- a/sc/source/filter/excel/xetable.cxx +++ b/sc/source/filter/excel/xetable.cxx @@ -35,7 +35,7 @@ #include <map> #include <com/sun/star/i18n/ScriptType.hpp> #include "scitems.hxx" -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include "document.hxx" #include "dociter.hxx" #include "olinetab.hxx" diff --git a/sc/source/filter/excel/xicontent.cxx b/sc/source/filter/excel/xicontent.cxx index 7b5fb222a12b..444cf4c848d1 100644 --- a/sc/source/filter/excel/xicontent.cxx +++ b/sc/source/filter/excel/xicontent.cxx @@ -37,11 +37,11 @@ #include <svx/editeng.hxx> #include <svx/editobj.hxx> #include <svx/linkmgr.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include "scitems.hxx" #include <svx/eeitem.hxx> -#include <svtools/intitem.hxx> -#include <svtools/stritem.hxx> +#include <svl/intitem.hxx> +#include <svl/stritem.hxx> #include <svx/flditem.hxx> #include <svx/fhgtitem.hxx> #include <svx/wghtitem.hxx> diff --git a/sc/source/filter/excel/xihelper.cxx b/sc/source/filter/excel/xihelper.cxx index 47b42ad51e93..99dd5632443b 100644 --- a/sc/source/filter/excel/xihelper.cxx +++ b/sc/source/filter/excel/xihelper.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sc.hxx" #include "xihelper.hxx" -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <svx/editobj.hxx> #include <tools/urlobj.hxx> #include "scitems.hxx" diff --git a/sc/source/filter/excel/xipage.cxx b/sc/source/filter/excel/xipage.cxx index 2a5252193728..4d5b5c1ce56b 100644 --- a/sc/source/filter/excel/xipage.cxx +++ b/sc/source/filter/excel/xipage.cxx @@ -31,11 +31,11 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sc.hxx" #include "xipage.hxx" -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <vcl/graph.hxx> #include "scitems.hxx" -#include <svtools/eitem.hxx> -#include <svtools/intitem.hxx> +#include <svl/eitem.hxx> +#include <svl/intitem.hxx> #include <svx/pageitem.hxx> #include <svx/sizeitem.hxx> #include <svx/lrspitem.hxx> diff --git a/sc/source/filter/excel/xipivot.cxx b/sc/source/filter/excel/xipivot.cxx index acd371f43f7d..56532f1281cc 100644 --- a/sc/source/filter/excel/xipivot.cxx +++ b/sc/source/filter/excel/xipivot.cxx @@ -39,8 +39,8 @@ #include <com/sun/star/sheet/DataPilotFieldReference.hpp> #include <tools/datetime.hxx> -#include <svtools/zformat.hxx> -#include <svtools/intitem.hxx> +#include <svl/zformat.hxx> +#include <svl/intitem.hxx> #include "document.hxx" #include "cell.hxx" diff --git a/sc/source/filter/excel/xlchart.cxx b/sc/source/filter/excel/xlchart.cxx index d5664c088e29..e15adca249c5 100644 --- a/sc/source/filter/excel/xlchart.cxx +++ b/sc/source/filter/excel/xlchart.cxx @@ -48,7 +48,7 @@ #include <com/sun/star/chart/DataLabelPlacement.hpp> #include <rtl/math.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <svx/xfillit0.hxx> #include <svx/xflclit.hxx> #include <svx/xfltrit.hxx> diff --git a/sc/source/filter/excel/xlroot.cxx b/sc/source/filter/excel/xlroot.cxx index 29522f4f50ff..e02a2f149327 100644 --- a/sc/source/filter/excel/xlroot.cxx +++ b/sc/source/filter/excel/xlroot.cxx @@ -33,8 +33,8 @@ #include "xlroot.hxx" #include <com/sun/star/i18n/ScriptType.hpp> #include <vcl/svapp.hxx> -#include <svtools/stritem.hxx> -#include <svtools/languageoptions.hxx> +#include <svl/stritem.hxx> +#include <svl/languageoptions.hxx> #include <sfx2/objsh.hxx> #include <sfx2/printer.hxx> #include <sfx2/docfile.hxx> diff --git a/sc/source/filter/ftools/fapihelper.cxx b/sc/source/filter/ftools/fapihelper.cxx index 31190b6407b1..299708d2e11c 100644 --- a/sc/source/filter/ftools/fapihelper.cxx +++ b/sc/source/filter/ftools/fapihelper.cxx @@ -42,8 +42,8 @@ #include <sfx2/objsh.hxx> #include <sfx2/docfile.hxx> #include <sfx2/sfxsids.hrc> -#include <svtools/stritem.hxx> -#include <svtools/itemset.hxx> +#include <svl/stritem.hxx> +#include <svl/itemset.hxx> #include "miscuno.hxx" using ::rtl::OUString; diff --git a/sc/source/filter/ftools/ftools.cxx b/sc/source/filter/ftools/ftools.cxx index 2271a8f35d4d..917cba6c34ce 100644 --- a/sc/source/filter/ftools/ftools.cxx +++ b/sc/source/filter/ftools/ftools.cxx @@ -33,9 +33,9 @@ #include "ftools.hxx" #include <tools/color.hxx> #include <unotools/charclass.hxx> -#include <svtools/itempool.hxx> -#include <svtools/itemset.hxx> -#include <svtools/poolitem.hxx> +#include <svl/itempool.hxx> +#include <svl/itemset.hxx> +#include <svl/poolitem.hxx> #include <sot/storage.hxx> #include <math.h> diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx index ac6a5ac5705f..8d6486fca38d 100644 --- a/sc/source/filter/html/htmlexp.cxx +++ b/sc/source/filter/html/htmlexp.cxx @@ -57,13 +57,13 @@ #include <sfx2/docfile.hxx> #include <sfx2/frmhtmlw.hxx> #include <sfx2/objsh.hxx> -#include <svtools/stritem.hxx> -#include <svtools/urihelper.hxx> +#include <svl/stritem.hxx> +#include <svl/urihelper.hxx> #ifndef _SVSTDARR_USHORTS #define _SVSTDARR_USHORTS #endif -#include <svtools/svstdarr.hxx> -#include <svtools/zforlist.hxx> +#include <svl/svstdarr.hxx> +#include <svl/zforlist.hxx> #include <svtools/htmlkywd.hxx> #include <svtools/htmlout.hxx> #include <svtools/parhtml.hxx> @@ -88,7 +88,7 @@ #include <svx/flditem.hxx> #include <svx/borderline.hxx> -#include <svtools/syslocale.hxx> +#include <unotools/syslocale.hxx> // ohne sc.hrc: error C2679: binary '=' : no operator defined which takes a diff --git a/sc/source/filter/html/htmlexp2.cxx b/sc/source/filter/html/htmlexp2.cxx index b9705e66936d..6793cb879751 100644 --- a/sc/source/filter/html/htmlexp2.cxx +++ b/sc/source/filter/html/htmlexp2.cxx @@ -46,7 +46,7 @@ #include <svtools/htmlout.hxx> #include <svtools/transfer.hxx> #include <svtools/embedtransfer.hxx> -#include <svtools/urihelper.hxx> +#include <svl/urihelper.hxx> #include <tools/urlobj.hxx> #include "htmlexp.hxx" diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx index 36bbfe1d2787..99b5150621ef 100644 --- a/sc/source/filter/html/htmlpars.cxx +++ b/sc/source/filter/html/htmlpars.cxx @@ -50,7 +50,7 @@ #include <svx/wghtitem.hxx> #include <svx/boxitem.hxx> #include <sfx2/objsh.hxx> -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <svtools/filter.hxx> #include <svtools/parhtml.hxx> #include <svtools/htmlkywd.hxx> diff --git a/sc/source/filter/inc/eeparser.hxx b/sc/source/filter/inc/eeparser.hxx index ce1848d25cd9..a5398fb8fa84 100644 --- a/sc/source/filter/inc/eeparser.hxx +++ b/sc/source/filter/inc/eeparser.hxx @@ -35,7 +35,7 @@ #include <tools/gen.hxx> #include <vcl/graph.hxx> #include <tools/table.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <svx/editdata.hxx> #include <address.hxx> diff --git a/sc/source/filter/inc/excrecds.hxx b/sc/source/filter/inc/excrecds.hxx index 568032aa317f..071b5b4b9380 100644 --- a/sc/source/filter/inc/excrecds.hxx +++ b/sc/source/filter/inc/excrecds.hxx @@ -32,7 +32,7 @@ #define SC_EXCRECDS_HXX #include <tools/solar.h> -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include <tools/string.hxx> #include <vcl/vclenum.hxx> #include <tools/color.hxx> diff --git a/sc/source/filter/inc/filt_pch.hxx b/sc/source/filter/inc/filt_pch.hxx index b0ef236519a3..606cc2c98482 100644 --- a/sc/source/filter/inc/filt_pch.hxx +++ b/sc/source/filter/inc/filt_pch.hxx @@ -67,7 +67,7 @@ #include <tools/debug.hxx> #include <tools/time.hxx> #include <tools/date.hxx> -#include <svtools/svarray.hxx> +#include <svl/svarray.hxx> #include <vcl/sv.h> #include <vcl/timer.hxx> #include <tools/gen.hxx> @@ -99,8 +99,8 @@ #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/RuntimeException.hpp> #include <com/sun/star/uno/Exception.hpp> -#include <svtools/hint.hxx> -#include <svtools/poolitem.hxx> +#include <svl/hint.hxx> +#include <svl/poolitem.hxx> #include <document.hxx> #include <vcl/prntypes.hxx> #include <table.hxx> @@ -108,9 +108,9 @@ #include <markarr.hxx> #include <root.hxx> #include <flttypes.hxx> -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #include <sfx2/sfxsids.hrc> -#include <svtools/cntwids.hrc> +#include <svl/cntwids.hrc> #include <sfx2/cntids.hrc> #include <tools/mempool.hxx> #include <compiler.hxx> @@ -118,8 +118,8 @@ #include <sfx2/sfx.hrc> #include <scitems.hxx> #include <svx/svxids.hrc> -#include <svtools/itemset.hxx> -#include <svtools/memberid.hrc> +#include <svl/itemset.hxx> +#include <svl/memberid.hrc> #include <tools/table.hxx> #include <flttools.hxx> #include <vcl/vclenum.hxx> @@ -131,14 +131,14 @@ #include <vcl/mapmod.hxx> #include <vcl/mapunit.hxx> #include <vcl/region.hxx> -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include <patattr.hxx> #include <vcl/font.hxx> -#include <svtools/cenumitm.hxx> -#include <svtools/eitem.hxx> -#include <svtools/intitem.hxx> -#include <svtools/cintitem.hxx> -#include <svtools/brdcst.hxx> +#include <svl/cenumitm.hxx> +#include <svl/eitem.hxx> +#include <svl/intitem.hxx> +#include <svl/cintitem.hxx> +#include <svl/brdcst.hxx> #include <sot/sotref.hxx> #include <tools/globname.hxx> #include <sot/factory.hxx> @@ -170,7 +170,7 @@ #include <uno/sequence2.h> #include <com/sun/star/uno/Sequence.hxx> #include <attrib.hxx> -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include <svx/fontitem.hxx> #include <com/sun/star/lang/XEventListener.hpp> #include <com/sun/star/lang/XEventListener.hdl> @@ -243,11 +243,11 @@ #include <formel.hxx> #include <com/sun/star/container/XElementAccess.hdl> #include <com/sun/star/container/XElementAccess.hpp> -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> #include <svx/eeitem.hxx> #include <rangenam.hxx> #include <vcl/syswin.hxx> -#include <svtools/smplhint.hxx> +#include <svl/smplhint.hxx> #include <fontbuff.hxx> #include <vcl/ctrl.hxx> #include <vcl/field.hxx> diff --git a/sc/source/filter/inc/xestyle.hxx b/sc/source/filter/inc/xestyle.hxx index fb2ea876c279..50073950511b 100644 --- a/sc/source/filter/inc/xestyle.hxx +++ b/sc/source/filter/inc/xestyle.hxx @@ -34,8 +34,8 @@ #include <map> #include <tools/mempool.hxx> #include <tools/string.hxx> -#include <svtools/zforlist.hxx> -#include <svtools/nfkeytab.hxx> +#include <svl/zforlist.hxx> +#include <svl/nfkeytab.hxx> #include <svx/svxfont.hxx> #include "xerecord.hxx" #include "xlstyle.hxx" diff --git a/sc/source/filter/inc/xichart.hxx b/sc/source/filter/inc/xichart.hxx index 1798242df3c6..e09530083965 100644 --- a/sc/source/filter/inc/xichart.hxx +++ b/sc/source/filter/inc/xichart.hxx @@ -36,7 +36,7 @@ #include <set> #include <list> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include "rangelst.hxx" #include "xlchart.hxx" diff --git a/sc/source/filter/inc/xlstyle.hxx b/sc/source/filter/inc/xlstyle.hxx index ebb22c2cb05f..126087ad1e89 100644 --- a/sc/source/filter/inc/xlstyle.hxx +++ b/sc/source/filter/inc/xlstyle.hxx @@ -39,7 +39,7 @@ #include <vcl/vclenum.hxx> #include <svx/svxenum.hxx> #include <svx/frmdir.hxx> -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include "fapihelper.hxx" class XclRoot; diff --git a/sc/source/filter/lotus/tool.cxx b/sc/source/filter/lotus/tool.cxx index b413384064c4..a0c9a25d58d9 100644 --- a/sc/source/filter/lotus/tool.cxx +++ b/sc/source/filter/lotus/tool.cxx @@ -37,7 +37,7 @@ #include "scitems.hxx" #include <svx/algitem.hxx> -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include <tools/solar.h> #include "cell.hxx" diff --git a/sc/source/filter/rtf/eeimpars.cxx b/sc/source/filter/rtf/eeimpars.cxx index 9c28cf49d729..c3650e882973 100644 --- a/sc/source/filter/rtf/eeimpars.cxx +++ b/sc/source/filter/rtf/eeimpars.cxx @@ -50,10 +50,10 @@ #include <svx/htmlcfg.hxx> #include <sfx2/sfxhtml.hxx> #include <svtools/parhtml.hxx> -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include <vcl/virdev.hxx> #include <vcl/svapp.hxx> -#include <svtools/syslocale.hxx> +#include <unotools/syslocale.hxx> #include <unotools/charclass.hxx> #include "eeimport.hxx" diff --git a/sc/source/filter/rtf/rtfexp.cxx b/sc/source/filter/rtf/rtfexp.cxx index aee41be1a441..88611ca72283 100644 --- a/sc/source/filter/rtf/rtfexp.cxx +++ b/sc/source/filter/rtf/rtfexp.cxx @@ -43,7 +43,7 @@ #include <svx/udlnitem.hxx> #include <svx/fontitem.hxx> #include <svx/fhgtitem.hxx> -#include <svtools/style.hxx> +#include <svl/style.hxx> #include <svtools/rtfout.hxx> #include <svtools/rtfkeywd.hxx> diff --git a/sc/source/filter/starcalc/scflt.cxx b/sc/source/filter/starcalc/scflt.cxx index e2a7d9e4d538..b54e3bb97fab 100644 --- a/sc/source/filter/starcalc/scflt.cxx +++ b/sc/source/filter/starcalc/scflt.cxx @@ -55,8 +55,8 @@ #include <svx/udlnitem.hxx> #include <svx/ulspitem.hxx> #include <svx/wghtitem.hxx> -#include <svtools/zforlist.hxx> -#include <svtools/PasswordHelper.hxx> +#include <svl/zforlist.hxx> +#include <svl/PasswordHelper.hxx> #include <stdio.h> #include <math.h> #include <string.h> diff --git a/sc/source/filter/xcl97/XclImpChangeTrack.cxx b/sc/source/filter/xcl97/XclImpChangeTrack.cxx index 2f546e323179..1a8480a5e758 100644 --- a/sc/source/filter/xcl97/XclImpChangeTrack.cxx +++ b/sc/source/filter/xcl97/XclImpChangeTrack.cxx @@ -34,7 +34,7 @@ #include "XclImpChangeTrack.hxx" #include <tools/debug.hxx> #include <sot/storage.hxx> -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include "chgviset.hxx" #include "cell.hxx" #include "chgtrack.hxx" diff --git a/sc/source/filter/xcl97/xcl97rec.cxx b/sc/source/filter/xcl97/xcl97rec.cxx index a11b814643d8..04458f5b55be 100644 --- a/sc/source/filter/xcl97/xcl97rec.cxx +++ b/sc/source/filter/xcl97/xcl97rec.cxx @@ -37,14 +37,14 @@ #include <svx/editobj.hxx> #include <svx/svdoole2.hxx> #include <sot/storage.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <svx/svdpage.hxx> #include <svx/svdocapt.hxx> #include <svx/unoapi.hxx> #include <svx/writingmodeitem.hxx> #include <vcl/svapp.hxx> #include <rtl/math.hxx> -#include <svtools/zformat.hxx> +#include <svl/zformat.hxx> #include "cell.hxx" #include "drwlayer.hxx" diff --git a/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx b/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx index ac09f19a6dbe..da3c6c29bc30 100644 --- a/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx +++ b/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx @@ -45,7 +45,7 @@ #include <com/sun/star/util/DateTime.hpp> #include <tools/debug.hxx> #include <tools/datetime.hxx> -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #define SC_CHANGE_ID_PREFIX "ct" diff --git a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx b/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx index 2b16d33f1376..33a77df4f4dd 100644 --- a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx +++ b/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx @@ -38,7 +38,7 @@ #include "rangeutl.hxx" #include <tools/debug.hxx> #include <tools/datetime.hxx> -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include <xmloff/xmluconv.hxx> #define SC_CHANGE_ID_PREFIX "ct" diff --git a/sc/source/filter/xml/XMLTrackedChangesContext.cxx b/sc/source/filter/xml/XMLTrackedChangesContext.cxx index 2d8eac1dfc76..74b0518a6c62 100644 --- a/sc/source/filter/xml/XMLTrackedChangesContext.cxx +++ b/sc/source/filter/xml/XMLTrackedChangesContext.cxx @@ -42,7 +42,7 @@ #include <xmloff/xmlnmspe.hxx> #include <xmloff/nmspmap.hxx> #include <xmloff/xmluconv.hxx> -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include <com/sun/star/text/XTextCursor.hpp> #include <com/sun/star/text/ControlCharacter.hpp> diff --git a/sc/source/filter/xml/xmlcelli.cxx b/sc/source/filter/xml/xmlcelli.cxx index 6a42d505cdc8..2f3f847c6c58 100644 --- a/sc/source/filter/xml/xmlcelli.cxx +++ b/sc/source/filter/xml/xmlcelli.cxx @@ -65,12 +65,12 @@ #include <xmloff/families.hxx> #include <xmloff/numehelp.hxx> #include <xmloff/xmlnmspe.hxx> -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include <svx/svdocapt.hxx> #include <svx/outlobj.hxx> #include <svx/editobj.hxx> #include <svx/unoapi.hxx> -#include <svtools/languageoptions.hxx> +#include <svl/languageoptions.hxx> #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/text/XText.hpp> diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index 2dc19e428ad9..94613379a32d 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -88,7 +88,7 @@ #include <tools/debug.hxx> #include <rtl/math.hxx> -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include <svx/unoshape.hxx> #include <comphelper/extract.hxx> #include <svx/eeitem.hxx> diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx index 8e3f4b421a6c..5d07670f53a2 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.cxx @@ -33,7 +33,7 @@ // INCLUDE --------------------------------------------------------------- -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include <xmloff/nmspmap.hxx> #include <xmloff/xmlnmspe.hxx> @@ -51,9 +51,9 @@ #include <xmloff/xmltoken.hxx> #include <xmloff/xmlerror.hxx> -#include <svtools/zforlist.hxx> -#include <svtools/zformat.hxx> -#include <svtools/languageoptions.hxx> +#include <svl/zforlist.hxx> +#include <svl/zformat.hxx> +#include <svl/languageoptions.hxx> #include "xmlimprt.hxx" #include "document.hxx" diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx index d13956fd1ca3..98e8b2e1e83f 100644 --- a/sc/source/filter/xml/xmlwrap.cxx +++ b/sc/source/filter/xml/xmlwrap.cxx @@ -45,8 +45,8 @@ #include <svx/xmlgrhlp.hxx> #include <svtools/sfxecode.hxx> #include <sfx2/frame.hxx> -#include <svtools/itemset.hxx> -#include <svtools/stritem.hxx> +#include <svl/itemset.hxx> +#include <svl/stritem.hxx> #include <sfx2/sfxsids.hrc> #include <tools/urlobj.hxx> #include <com/sun/star/container/XChild.hpp> diff --git a/sc/source/ui/Accessibility/AccessibleContextBase.cxx b/sc/source/ui/Accessibility/AccessibleContextBase.cxx index 8774ef74f86d..b611198974de 100644 --- a/sc/source/ui/Accessibility/AccessibleContextBase.cxx +++ b/sc/source/ui/Accessibility/AccessibleContextBase.cxx @@ -47,7 +47,7 @@ #include <unotools/accessiblestatesethelper.hxx> #endif #include <toolkit/helper/convert.hxx> -#include <svtools/smplhint.hxx> +#include <svl/smplhint.hxx> #include <comphelper/sequence.hxx> #include <unotools/accessiblerelationsethelper.hxx> #include <vcl/unohelp.hxx> diff --git a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx index fdb7696f7f6c..960e58760512 100644 --- a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx +++ b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx @@ -52,10 +52,10 @@ #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <vcl/window.hxx> -#include <svtools/smplhint.hxx> +#include <svl/smplhint.hxx> #include <unotools/accessiblestatesethelper.hxx> -#include <svtools/style.hxx> -#include <svtools/itempool.hxx> +#include <svl/style.hxx> +#include <svl/itempool.hxx> #include <svx/editobj.hxx> #include <toolkit/helper/convert.hxx> diff --git a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx index ddb317ccc1b0..fabd1fc932cc 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx @@ -51,7 +51,7 @@ #include <com/sun/star/accessibility/AccessibleStateType.hpp> #include <vcl/window.hxx> -#include <svtools/smplhint.hxx> +#include <svl/smplhint.hxx> #include <unotools/accessiblestatesethelper.hxx> #include <comphelper/sequence.hxx> #include <toolkit/helper/convert.hxx> diff --git a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx index f4196896083b..0746495ca099 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx @@ -52,7 +52,7 @@ #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <vcl/window.hxx> -#include <svtools/smplhint.hxx> +#include <svl/smplhint.hxx> #include <unotools/accessiblestatesethelper.hxx> #include <comphelper/sequence.hxx> diff --git a/sc/source/ui/app/drwtrans.cxx b/sc/source/ui/app/drwtrans.cxx index 53f063db0e66..88b3d42996f6 100644 --- a/sc/source/ui/app/drwtrans.cxx +++ b/sc/source/ui/app/drwtrans.cxx @@ -60,8 +60,8 @@ #include <svx/svdpage.hxx> #include <svx/svdxcgv.hxx> #include <sfx2/docfile.hxx> -#include <svtools/itempool.hxx> -#include <svtools/urlbmk.hxx> +#include <svl/itempool.hxx> +#include <svl/urlbmk.hxx> #include <tools/urlobj.hxx> #include <vos/mutex.hxx> diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index 46987c88636f..c6901707d2c3 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -57,7 +57,7 @@ #include <sfx2/dispatch.hxx> #include <sfx2/docfile.hxx> #include <sfx2/printer.hxx> -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include <vcl/sound.hxx> #include <unotools/localedatawrapper.hxx> #include <vcl/help.hxx> diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index 5a3fd605b08f..f1d64074ea33 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -54,7 +54,7 @@ #include <svx/scripttypeitem.hxx> #include <vcl/cursor.hxx> #include <vcl/help.hxx> -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #include "inputwin.hxx" #include "scmod.hxx" diff --git a/sc/source/ui/app/lnktrans.cxx b/sc/source/ui/app/lnktrans.cxx index 314f051881f1..89a51cd2b2b0 100644 --- a/sc/source/ui/app/lnktrans.cxx +++ b/sc/source/ui/app/lnktrans.cxx @@ -35,7 +35,7 @@ -#include <svtools/urlbmk.hxx> +#include <svl/urlbmk.hxx> #include "lnktrans.hxx" #include "scmod.hxx" diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index 43041d1be852..d72c94022123 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -56,7 +56,7 @@ #include <svtools/ehdl.hxx> #include <svtools/accessibilityoptions.hxx> -#include <svtools/ctloptions.hxx> +#include <svl/ctloptions.hxx> #include <unotools/useroptions.hxx> #include <vcl/status.hxx> #include <sfx2/bindings.hxx> @@ -66,7 +66,7 @@ #include <svx/langitem.hxx> #include <svtools/colorcfg.hxx> -#include <svtools/whiter.hxx> +#include <svl/whiter.hxx> #include <svx/selctrl.hxx> #include <svx/insctrl.hxx> #include <svx/zoomctrl.hxx> @@ -74,7 +74,7 @@ #include <svx/pszctrl.hxx> #include <svx/zoomsliderctrl.hxx> #include <vcl/msgbox.hxx> -#include <svtools/inethist.hxx> +#include <svl/inethist.hxx> #include <vcl/waitobj.hxx> #include <svx/svxerr.hxx> @@ -217,125 +217,128 @@ ScModule::~ScModule() } //------------------------------------------------------------------ - -void ScModule::Notify( SfxBroadcaster&, const SfxHint& rHint ) +void ScModule::ConfigurationChanged( utl::ConfigurationBroadcaster* p, sal_uInt32 ) { - if ( rHint.ISA(SfxSimpleHint) ) + if ( p == pColorConfig || p == pAccessOptions ) { - ULONG nHintId = ((SfxSimpleHint&)rHint).GetId(); - if ( nHintId == SFX_HINT_DEINITIALIZING ) - { - // ConfigItems must be removed before ConfigManager - DeleteCfg(); - } - else if ( nHintId == SFX_HINT_COLORS_CHANGED || nHintId == SFX_HINT_ACCESSIBILITY_CHANGED ) + // Test if detective objects have to be updated with new colors + // (if the detective colors haven't been used yet, there's nothing to update) + if ( ScDetectiveFunc::IsColorsInitialized() ) { - // Test if detective objects have to be updated with new colors - // (if the detective colors haven't been used yet, there's nothing to update) - if ( ScDetectiveFunc::IsColorsInitialized() ) + const svtools::ColorConfig& rColors = GetColorConfig(); + BOOL bArrows = + ( ScDetectiveFunc::GetArrowColor() != (ColorData)rColors.GetColorValue(svtools::CALCDETECTIVE).nColor || + ScDetectiveFunc::GetErrorColor() != (ColorData)rColors.GetColorValue(svtools::CALCDETECTIVEERROR).nColor ); + BOOL bComments = + ( ScDetectiveFunc::GetCommentColor() != (ColorData)rColors.GetColorValue(svtools::CALCNOTESBACKGROUND).nColor ); + if ( bArrows || bComments ) { - const svtools::ColorConfig& rColors = GetColorConfig(); - BOOL bArrows = - ( ScDetectiveFunc::GetArrowColor() != (ColorData)rColors.GetColorValue(svtools::CALCDETECTIVE).nColor || - ScDetectiveFunc::GetErrorColor() != (ColorData)rColors.GetColorValue(svtools::CALCDETECTIVEERROR).nColor ); - BOOL bComments = - ( ScDetectiveFunc::GetCommentColor() != (ColorData)rColors.GetColorValue(svtools::CALCNOTESBACKGROUND).nColor ); - if ( bArrows || bComments ) - { - ScDetectiveFunc::InitializeColors(); // get the new colors + ScDetectiveFunc::InitializeColors(); // get the new colors - // update detective objects in all open documents - SfxObjectShell* pObjSh = SfxObjectShell::GetFirst(); - while ( pObjSh ) + // update detective objects in all open documents + SfxObjectShell* pObjSh = SfxObjectShell::GetFirst(); + while ( pObjSh ) + { + if ( pObjSh->Type() == TYPE(ScDocShell) ) { - if ( pObjSh->Type() == TYPE(ScDocShell) ) - { - ScDocShell* pDocSh = ((ScDocShell*)pObjSh); - if ( bArrows ) - ScDetectiveFunc( pDocSh->GetDocument(), 0 ).UpdateAllArrowColors(); - if ( bComments ) - ScDetectiveFunc::UpdateAllComments( *pDocSh->GetDocument() ); - } - pObjSh = SfxObjectShell::GetNext( *pObjSh ); + ScDocShell* pDocSh = ((ScDocShell*)pObjSh); + if ( bArrows ) + ScDetectiveFunc( pDocSh->GetDocument(), 0 ).UpdateAllArrowColors(); + if ( bComments ) + ScDetectiveFunc::UpdateAllComments( *pDocSh->GetDocument() ); } + pObjSh = SfxObjectShell::GetNext( *pObjSh ); } } + } - // force all views to repaint, using the new options + // force all views to repaint, using the new options - SfxViewShell* pViewShell = SfxViewShell::GetFirst(); - while(pViewShell) + SfxViewShell* pViewShell = SfxViewShell::GetFirst(); + while(pViewShell) + { + if ( pViewShell->ISA(ScTabViewShell) ) { - if ( pViewShell->ISA(ScTabViewShell) ) - { - ScTabViewShell* pViewSh = (ScTabViewShell*)pViewShell; - pViewSh->PaintGrid(); - pViewSh->PaintTop(); - pViewSh->PaintLeft(); - pViewSh->PaintExtras(); - - ScInputHandler* pHdl = pViewSh->GetInputHandler(); - if ( pHdl ) - pHdl->ForgetLastPattern(); // EditEngine BackgroundColor may change - } - else if ( pViewShell->ISA(ScPreviewShell) ) - { - Window* pWin = pViewShell->GetWindow(); - if (pWin) - pWin->Invalidate(); - } - pViewShell = SfxViewShell::GetNext( *pViewShell ); + ScTabViewShell* pViewSh = (ScTabViewShell*)pViewShell; + pViewSh->PaintGrid(); + pViewSh->PaintTop(); + pViewSh->PaintLeft(); + pViewSh->PaintExtras(); + + ScInputHandler* pHdl = pViewSh->GetInputHandler(); + if ( pHdl ) + pHdl->ForgetLastPattern(); // EditEngine BackgroundColor may change + } + else if ( pViewShell->ISA(ScPreviewShell) ) + { + Window* pWin = pViewShell->GetWindow(); + if (pWin) + pWin->Invalidate(); } + pViewShell = SfxViewShell::GetNext( *pViewShell ); } - else if ( nHintId == SFX_HINT_CTL_SETTINGS_CHANGED ) + } + else if ( p == pCTLOptions ) + { + // for all documents: set digit language for printer, recalc output factor, update row heights + SfxObjectShell* pObjSh = SfxObjectShell::GetFirst(); + while ( pObjSh ) { - // for all documents: set digit language for printer, recalc output factor, update row heights - SfxObjectShell* pObjSh = SfxObjectShell::GetFirst(); - while ( pObjSh ) + if ( pObjSh->Type() == TYPE(ScDocShell) ) { - if ( pObjSh->Type() == TYPE(ScDocShell) ) - { - ScDocShell* pDocSh = ((ScDocShell*)pObjSh); - OutputDevice* pPrinter = pDocSh->GetPrinter(); - if ( pPrinter ) - pPrinter->SetDigitLanguage( GetOptDigitLanguage() ); + ScDocShell* pDocSh = ((ScDocShell*)pObjSh); + OutputDevice* pPrinter = pDocSh->GetPrinter(); + if ( pPrinter ) + pPrinter->SetDigitLanguage( GetOptDigitLanguage() ); - pDocSh->CalcOutputFactor(); + pDocSh->CalcOutputFactor(); - SCTAB nTabCount = pDocSh->GetDocument()->GetTableCount(); - for (SCTAB nTab=0; nTab<nTabCount; nTab++) - pDocSh->AdjustRowHeight( 0, MAXROW, nTab ); - } - pObjSh = SfxObjectShell::GetNext( *pObjSh ); + SCTAB nTabCount = pDocSh->GetDocument()->GetTableCount(); + for (SCTAB nTab=0; nTab<nTabCount; nTab++) + pDocSh->AdjustRowHeight( 0, MAXROW, nTab ); } + pObjSh = SfxObjectShell::GetNext( *pObjSh ); + } - // for all views (table and preview): update digit language - SfxViewShell* pSh = SfxViewShell::GetFirst(); - while ( pSh ) + // for all views (table and preview): update digit language + SfxViewShell* pSh = SfxViewShell::GetFirst(); + while ( pSh ) + { + if ( pSh->ISA( ScTabViewShell ) ) { - if ( pSh->ISA( ScTabViewShell ) ) - { - ScTabViewShell* pViewSh = (ScTabViewShell*)pSh; + ScTabViewShell* pViewSh = (ScTabViewShell*)pSh; - // set ref-device for EditEngine (re-evaluates digit settings) - ScInputHandler* pHdl = GetInputHdl(pViewSh); - if (pHdl) - pHdl->UpdateRefDevice(); - - pViewSh->DigitLanguageChanged(); - pViewSh->PaintGrid(); - } - else if ( pSh->ISA( ScPreviewShell ) ) - { - ScPreviewShell* pPreviewSh = (ScPreviewShell*)pSh; - ScPreview* pPreview = pPreviewSh->GetPreview(); + // set ref-device for EditEngine (re-evaluates digit settings) + ScInputHandler* pHdl = GetInputHdl(pViewSh); + if (pHdl) + pHdl->UpdateRefDevice(); - pPreview->SetDigitLanguage( GetOptDigitLanguage() ); - pPreview->Invalidate(); - } + pViewSh->DigitLanguageChanged(); + pViewSh->PaintGrid(); + } + else if ( pSh->ISA( ScPreviewShell ) ) + { + ScPreviewShell* pPreviewSh = (ScPreviewShell*)pSh; + ScPreview* pPreview = pPreviewSh->GetPreview(); - pSh = SfxViewShell::GetNext( *pSh ); + pPreview->SetDigitLanguage( GetOptDigitLanguage() ); + pPreview->Invalidate(); } + + pSh = SfxViewShell::GetNext( *pSh ); + } + } +} + +void ScModule::Notify( SfxBroadcaster&, const SfxHint& rHint ) +{ + if ( rHint.ISA(SfxSimpleHint) ) + { + ULONG nHintId = ((SfxSimpleHint&)rHint).GetId(); + if ( nHintId == SFX_HINT_DEINITIALIZING ) + { + // ConfigItems must be removed before ConfigManager + DeleteCfg(); } } } @@ -354,17 +357,17 @@ void ScModule::DeleteCfg() if ( pColorConfig ) { - EndListening(*pColorConfig); + pColorConfig->RemoveListener(this); DELETEZ( pColorConfig ); } if ( pAccessOptions ) { - EndListening(*pAccessOptions); + pAccessOptions->RemoveListener(this); DELETEZ( pAccessOptions ); } if ( pCTLOptions ) { - EndListening(*pCTLOptions); + pCTLOptions->RemoveListener(this); DELETEZ( pCTLOptions ); } if( pUserOptions ) @@ -967,7 +970,7 @@ svtools::ColorConfig& ScModule::GetColorConfig() if ( !pColorConfig ) { pColorConfig = new svtools::ColorConfig; - StartListening(*pColorConfig); + pColorConfig->AddListener(this); } return *pColorConfig; @@ -978,7 +981,7 @@ SvtAccessibilityOptions& ScModule::GetAccessOptions() if ( !pAccessOptions ) { pAccessOptions = new SvtAccessibilityOptions; - StartListening(*pAccessOptions); + pAccessOptions->AddListener(this); } return *pAccessOptions; @@ -989,7 +992,7 @@ SvtCTLOptions& ScModule::GetCTLOptions() if ( !pCTLOptions ) { pCTLOptions = new SvtCTLOptions; - StartListening(*pCTLOptions); + pCTLOptions->AddListener(this); } return *pCTLOptions; diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx index 94a2cdfc3324..c37fced30109 100644 --- a/sc/source/ui/app/transobj.cxx +++ b/sc/source/ui/app/transobj.cxx @@ -66,8 +66,8 @@ #include <svx/paperinf.hxx> #include <svx/sizeitem.hxx> #include <svx/algitem.hxx> -#include <svtools/intitem.hxx> -#include <svtools/zforlist.hxx> +#include <svl/intitem.hxx> +#include <svl/zforlist.hxx> #include "docsh.hxx" #include "markdata.hxx" #include "stlpool.hxx" diff --git a/sc/source/ui/app/typemap.cxx b/sc/source/ui/app/typemap.cxx index eedfab338844..1a36b8ca5125 100644 --- a/sc/source/ui/app/typemap.cxx +++ b/sc/source/ui/app/typemap.cxx @@ -64,8 +64,8 @@ #include <sfx2/msg.hxx> -#include <svtools/stritem.hxx> -#include <svtools/slstitm.hxx> +#include <svl/stritem.hxx> +#include <svl/slstitm.hxx> #include <sfx2/objitem.hxx> #include <svx/fontitem.hxx> #include <svx/hlnkitem.hxx> @@ -80,7 +80,7 @@ #include <svx/colritem.hxx> #include <svx/boxitem.hxx> #include <svx/bolnitem.hxx> -#include <svtools/ptitem.hxx> +#include <svl/ptitem.hxx> #include <svx/sizeitem.hxx> #include <svx/algitem.hxx> #include <svx/clipfmtitem.hxx> @@ -117,15 +117,15 @@ #include <svx/charreliefitem.hxx> #include <svx/rotmodit.hxx> #include <svx/drawitem.hxx> -#include <svtools/ilstitem.hxx> -#include <svtools/globalnameitem.hxx> +#include <svl/ilstitem.hxx> +#include <svl/globalnameitem.hxx> #include <svx/chrtitem.hxx> #include <svx/zoomslideritem.hxx> // #i25616# #include <svx/sdshitm.hxx> -#include <svtools/aeitem.hxx> +#include <svl/aeitem.hxx> #include <avmedia/mediaitem.hxx> #include "attrib.hxx" diff --git a/sc/source/ui/attrdlg/attrdlg.cxx b/sc/source/ui/attrdlg/attrdlg.cxx index 9fd600409211..05bcf624a1b3 100644 --- a/sc/source/ui/attrdlg/attrdlg.cxx +++ b/sc/source/ui/attrdlg/attrdlg.cxx @@ -45,7 +45,7 @@ //CHINA001 #include <svx/chardlg.hxx> //CHINA001 #include <svx/numfmt.hxx> //CHINA001 #include <svx/paragrph.hxx> -#include <svtools/cjkoptions.hxx> +#include <svl/cjkoptions.hxx> #include "tabpages.hxx" #include "attrdlg.hxx" diff --git a/sc/source/ui/attrdlg/condfrmt.cxx b/sc/source/ui/attrdlg/condfrmt.cxx index 704546d76bf6..c08f8fa2dcea 100644 --- a/sc/source/ui/attrdlg/condfrmt.cxx +++ b/sc/source/ui/attrdlg/condfrmt.cxx @@ -33,7 +33,7 @@ #include <sfx2/dispatch.hxx> -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #include "tabvwsh.hxx" #include "reffact.hxx" diff --git a/sc/source/ui/cctrl/tbinsert.cxx b/sc/source/ui/cctrl/tbinsert.cxx index 07505476aa16..4e0689eb13fd 100644 --- a/sc/source/ui/cctrl/tbinsert.cxx +++ b/sc/source/ui/cctrl/tbinsert.cxx @@ -40,7 +40,7 @@ // INCLUDE --------------------------------------------------------------- #include <tools/shl.hxx> -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/viewsh.hxx> diff --git a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx index bf957b889d82..45a48ac21c07 100644 --- a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx +++ b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx @@ -48,7 +48,7 @@ #ifndef _SV_GRADIENT_HXX #include <vcl/gradient.hxx> #endif -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/objsh.hxx> #include <svx/zoomslideritem.hxx> diff --git a/sc/source/ui/dbgui/csvgrid.cxx b/sc/source/ui/dbgui/csvgrid.cxx index ddbfb4426df8..e33ecde514a4 100644 --- a/sc/source/ui/dbgui/csvgrid.cxx +++ b/sc/source/ui/dbgui/csvgrid.cxx @@ -37,7 +37,7 @@ #include <algorithm> #include <svtools/colorcfg.hxx> -#include <svtools/smplhint.hxx> +#include <svl/smplhint.hxx> #include <tools/poly.hxx> #include "scmod.hxx" #include "asciiopt.hxx" @@ -52,7 +52,7 @@ #include <svx/colritem.hxx> #include <svx/fhgtitem.hxx> #include <svx/fontitem.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include "editutil.hxx" // *** edit engine *** @@ -96,12 +96,12 @@ ScCsvGrid::ScCsvGrid( ScCsvControl& rParent ) : InitColors(); InitFonts(); ImplClearSplits(); - StartListening( mrColorConfig ); + mrColorConfig.AddListener(this); } ScCsvGrid::~ScCsvGrid() { - EndListening( mrColorConfig ); + mrColorConfig.RemoveListener(this); } @@ -995,14 +995,10 @@ void ScCsvGrid::DataChanged( const DataChangedEvent& rDCEvt ) ScCsvControl::DataChanged( rDCEvt ); } -void ScCsvGrid::Notify( SfxBroadcaster&, const SfxHint& rHint ) +void ScCsvGrid::ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 ) { - if( rHint.ISA( SfxSimpleHint ) && - (static_cast< const SfxSimpleHint& >( rHint ).GetId() == SFX_HINT_COLORS_CHANGED) ) - { - InitColors(); - Repaint(); - } + InitColors(); + Repaint(); } diff --git a/sc/source/ui/dbgui/pfiltdlg.cxx b/sc/source/ui/dbgui/pfiltdlg.cxx index d6bd29c7fddf..8a44d512cbe6 100644 --- a/sc/source/ui/dbgui/pfiltdlg.cxx +++ b/sc/source/ui/dbgui/pfiltdlg.cxx @@ -55,7 +55,7 @@ #define _PFILTDLG_CXX #include "pfiltdlg.hxx" #undef _PFILTDLG_CXX -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> //================================================================== diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx index 8700c936e0f5..b23836d44cda 100644 --- a/sc/source/ui/dbgui/validate.cxx +++ b/sc/source/ui/dbgui/validate.cxx @@ -36,10 +36,10 @@ #endif #include <vcl/svapp.hxx> -#include <svtools/aeitem.hxx> -#include <svtools/stritem.hxx> -#include <svtools/eitem.hxx> -#include <svtools/intitem.hxx> +#include <svl/aeitem.hxx> +#include <svl/stritem.hxx> +#include <svl/eitem.hxx> +#include <svl/intitem.hxx> #include <basic/sbmeth.hxx> #include <basic/sbstar.hxx> #include <basic/sbmod.hxx> diff --git a/sc/source/ui/docshell/arealink.cxx b/sc/source/ui/docshell/arealink.cxx index fd3a562ecb42..31dc491e3981 100644 --- a/sc/source/ui/docshell/arealink.cxx +++ b/sc/source/ui/docshell/arealink.cxx @@ -40,7 +40,7 @@ #include <sfx2/fcontnr.hxx> #include <sfx2/sfxsids.hrc> #include <svx/linkmgr.hxx> -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #include <vcl/msgbox.hxx> #include "arealink.hxx" diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index cb5d2ead509f..a0c972712568 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -48,8 +48,8 @@ #include <vcl/sound.hxx> #include <vcl/virdev.hxx> #include <vcl/waitobj.hxx> -#include <svtools/zforlist.hxx> -#include <svtools/PasswordHelper.hxx> +#include <svl/zforlist.hxx> +#include <svl/PasswordHelper.hxx> #include <list> diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index 44d77f5517fa..810140545118 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -51,7 +51,7 @@ #include <vcl/waitobj.hxx> #include <svtools/ctrltool.hxx> #include <svtools/sfxecode.hxx> -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include <sfx2/app.hxx> #include <sfx2/bindings.hxx> #include <sfx2/dinfdlg.hxx> @@ -65,8 +65,8 @@ #include <svx/srchitem.hxx> #include <svx/svxmsbas.hxx> #include <unotools/fltrcfg.hxx> -#include <svtools/documentlockfile.hxx> -#include <svtools/sharecontrolfile.hxx> +#include <svl/documentlockfile.hxx> +#include <svl/sharecontrolfile.hxx> #include <unotools/charclass.hxx> #include <vcl/virdev.hxx> #include "chgtrack.hxx" diff --git a/sc/source/ui/docshell/docsh2.cxx b/sc/source/ui/docshell/docsh2.cxx index 7f213175a075..9ac98af7b043 100644 --- a/sc/source/ui/docshell/docsh2.cxx +++ b/sc/source/ui/docshell/docsh2.cxx @@ -43,7 +43,7 @@ #include <svx/flstitem.hxx> #include <svx/drawitem.hxx> #include <sfx2/printer.hxx> -#include <svtools/smplhint.hxx> +#include <svl/smplhint.hxx> #include <svx/svditer.hxx> #include <svx/svdobj.hxx> #include <svx/svdoole2.hxx> diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx index 418dfa65fff2..1416c57f1165 100644 --- a/sc/source/ui/docshell/docsh3.cxx +++ b/sc/source/ui/docshell/docsh3.cxx @@ -44,13 +44,11 @@ #include <svx/pageitem.hxx> #include <svx/paperinf.hxx> #include <svx/postattr.hxx> -//#include <svx/postdlg.hxx> #include <svx/sizeitem.hxx> - +#include <unotools/misccfg.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/app.hxx> #include <sfx2/docfile.hxx> -#include <svtools/misccfg.hxx> #include <sfx2/printer.hxx> #include <svtools/ctrltool.hxx> #include <vcl/virdev.hxx> @@ -443,7 +441,7 @@ void ScDocShell::InitOptions() // Fortsetzung von InitNew (CLOOKs) aDocOpt.SetAutoSpell( bAutoSpell ); // zweistellige Jahreszahleneingabe aus Extras->Optionen->Allgemein->Sonstiges - aDocOpt.SetYear2000( sal::static_int_cast<USHORT>( SFX_APP()->GetMiscConfig()->GetYear2000() ) ); + aDocOpt.SetYear2000( sal::static_int_cast<USHORT>( ::utl::MiscCfg().GetYear2000() ) ); aDocument.SetDocOptions( aDocOpt ); aDocument.SetViewOptions( aViewOpt ); diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index 80b0c76a64be..4827366d3924 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -60,7 +60,7 @@ using namespace ::com::sun::star; #include <svx/ofaitem.hxx> #include <sot/formats.hxx> #include <svtools/printdlg.hxx> -#include <svtools/whiter.hxx> +#include <svl/whiter.hxx> #include <vcl/msgbox.hxx> #include <vcl/waitobj.hxx> #include <tools/multisel.hxx> @@ -73,9 +73,9 @@ using namespace ::com::sun::star; #include <sfx2/passwd.hxx> #include <sfx2/filedlghelper.hxx> #include <sfx2/docinsert.hxx> -#include <svtools/PasswordHelper.hxx> -#include <svtools/documentlockfile.hxx> -#include <svtools/sharecontrolfile.hxx> +#include <svl/PasswordHelper.hxx> +#include <svl/documentlockfile.hxx> +#include <svl/sharecontrolfile.hxx> #include <comphelper/processfactory.hxx> #include "docuno.hxx" diff --git a/sc/source/ui/docshell/docsh5.cxx b/sc/source/ui/docshell/docsh5.cxx index b7c726deeb71..4855ceefb7a1 100644 --- a/sc/source/ui/docshell/docsh5.cxx +++ b/sc/source/ui/docshell/docsh5.cxx @@ -42,7 +42,7 @@ #include <vcl/waitobj.hxx> #include <sfx2/app.hxx> #include <sfx2/bindings.hxx> -#include <svtools/smplhint.hxx> +#include <svl/smplhint.hxx> #include <com/sun/star/sdbc/XResultSet.hpp> diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx index d58777b9b5d5..174207bbf673 100644 --- a/sc/source/ui/docshell/docsh8.cxx +++ b/sc/source/ui/docshell/docsh8.cxx @@ -37,8 +37,8 @@ #include <stdio.h> #include <tools/urlobj.hxx> -#include <svtools/converter.hxx> -#include <svtools/zforlist.hxx> +#include <svl/converter.hxx> +#include <svl/zforlist.hxx> #include <comphelper/types.hxx> #include <ucbhelper/content.hxx> #include <unotools/sharedunocomponent.hxx> diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx index 5cfc833be5dd..2abfd900b21e 100644 --- a/sc/source/ui/docshell/externalrefmgr.cxx +++ b/sc/source/ui/docshell/externalrefmgr.cxx @@ -55,12 +55,12 @@ #include "sfx2/fcontnr.hxx" #include "sfx2/sfxsids.hrc" #include "sfx2/objsh.hxx" -#include "svtools/broadcast.hxx" -#include "svtools/smplhint.hxx" -#include "svtools/itemset.hxx" -#include "svtools/stritem.hxx" -#include "svtools/urihelper.hxx" -#include "svtools/zformat.hxx" +#include "svl/broadcast.hxx" +#include "svl/smplhint.hxx" +#include "svl/itemset.hxx" +#include "svl/stritem.hxx" +#include "svl/urihelper.hxx" +#include "svl/zformat.hxx" #include "svx/linkmgr.hxx" #include "tools/urlobj.hxx" #include "unotools/ucbhelper.hxx" diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx index 1561e4c6efeb..25a1c867b0e3 100644 --- a/sc/source/ui/docshell/impex.cxx +++ b/sc/source/ui/docshell/impex.cxx @@ -53,9 +53,9 @@ class StarBASIC; #include <tools/string.hxx> #include <rtl/math.hxx> #include <svtools/htmlout.hxx> -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #define _SVSTDARR_ULONGS -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #include <sot/formats.hxx> #include <sfx2/mieclip.hxx> #include <unotools/charclass.hxx> diff --git a/sc/source/ui/docshell/tablink.cxx b/sc/source/ui/docshell/tablink.cxx index 570d41f7885d..c86c7591cd36 100644 --- a/sc/source/ui/docshell/tablink.cxx +++ b/sc/source/ui/docshell/tablink.cxx @@ -42,8 +42,8 @@ #include <sfx2/sfxsids.hrc> #include <sfx2/app.hxx> -#include <svtools/itemset.hxx> -#include <svtools/stritem.hxx> +#include <svl/itemset.hxx> +#include <svl/stritem.hxx> #include <sfx2/docfile.hxx> #include <sfx2/docfilt.hxx> #include <sfx2/fcontnr.hxx> diff --git a/sc/source/ui/drawfunc/chartsh.cxx b/sc/source/ui/drawfunc/chartsh.cxx index 7bb3c92dbc9c..e4d39e21d7be 100644 --- a/sc/source/ui/drawfunc/chartsh.cxx +++ b/sc/source/ui/drawfunc/chartsh.cxx @@ -44,7 +44,7 @@ #include <sfx2/app.hxx> #include <sfx2/objface.hxx> #include <sfx2/request.hxx> -#include <svtools/whiter.hxx> +#include <svl/whiter.hxx> #include <vcl/msgbox.hxx> #include "chartsh.hxx" diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx index 63f958763479..08ef8a54b1a8 100644 --- a/sc/source/ui/drawfunc/drawsh.cxx +++ b/sc/source/ui/drawfunc/drawsh.cxx @@ -48,7 +48,7 @@ #include <sfx2/objsh.hxx> #include <sfx2/request.hxx> #include <sfx2/dispatch.hxx> -#include <svtools/whiter.hxx> +#include <svl/whiter.hxx> #include <vcl/msgbox.hxx> #include "drawsh.hxx" @@ -71,7 +71,7 @@ #include "userdat.hxx" #include <sfx2/objsh.hxx> -#include <svtools/macitem.hxx> +#include <svl/macitem.hxx> #include <sfx2/evntconf.hxx> #include <sfx2/viewsh.hxx> #include <com/sun/star/util/XModifiable.hpp> diff --git a/sc/source/ui/drawfunc/drawsh2.cxx b/sc/source/ui/drawfunc/drawsh2.cxx index 4507bc471ebc..ad36ad72e796 100644 --- a/sc/source/ui/drawfunc/drawsh2.cxx +++ b/sc/source/ui/drawfunc/drawsh2.cxx @@ -42,8 +42,8 @@ #include <sfx2/app.hxx> #include <sfx2/objsh.hxx> #include <sfx2/viewfrm.hxx> -#include <svtools/ptitem.hxx> -#include <svtools/whiter.hxx> +#include <svl/ptitem.hxx> +#include <svl/whiter.hxx> #include <svx/svdobj.hxx> #include <svx/svdouno.hxx> #include <svx/extrusionbar.hxx> diff --git a/sc/source/ui/drawfunc/drformsh.cxx b/sc/source/ui/drawfunc/drformsh.cxx index 5e4d5640f74a..8987c9194cb2 100644 --- a/sc/source/ui/drawfunc/drformsh.cxx +++ b/sc/source/ui/drawfunc/drformsh.cxx @@ -45,7 +45,7 @@ #include <sfx2/app.hxx> #include <sfx2/objface.hxx> #include <sfx2/request.hxx> -#include <svtools/whiter.hxx> +#include <svl/whiter.hxx> #include <vcl/msgbox.hxx> #include "drformsh.hxx" diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx index d241843f9745..b85724d37e39 100644 --- a/sc/source/ui/drawfunc/drtxtob.cxx +++ b/sc/source/ui/drawfunc/drtxtob.cxx @@ -65,8 +65,8 @@ #include <sfx2/viewfrm.hxx> #include <svtools/cliplistener.hxx> #include <svtools/transfer.hxx> -#include <svtools/whiter.hxx> -#include <svtools/languageoptions.hxx> +#include <svl/whiter.hxx> +#include <svl/languageoptions.hxx> #include <vcl/msgbox.hxx> #include <svx/svxdlg.hxx> diff --git a/sc/source/ui/drawfunc/drtxtob2.cxx b/sc/source/ui/drawfunc/drtxtob2.cxx index d05e0568c1ca..3389c362901b 100644 --- a/sc/source/ui/drawfunc/drtxtob2.cxx +++ b/sc/source/ui/drawfunc/drtxtob2.cxx @@ -45,7 +45,7 @@ #include <sfx2/objsh.hxx> #include <sfx2/request.hxx> #include <sot/formats.hxx> -#include <svtools/whiter.hxx> +#include <svl/whiter.hxx> #include "sc.hrc" #include "drtxtob.hxx" diff --git a/sc/source/ui/drawfunc/fuconcustomshape.cxx b/sc/source/ui/drawfunc/fuconcustomshape.cxx index fd6fc1ff3e41..0398d5a63b43 100644 --- a/sc/source/ui/drawfunc/fuconcustomshape.cxx +++ b/sc/source/ui/drawfunc/fuconcustomshape.cxx @@ -36,7 +36,7 @@ #include <svx/gallery.hxx> #include <sfx2/request.hxx> #include <svx/fmmodel.hxx> -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> #include <svx/svdpage.hxx> #include <svx/svdoashp.hxx> #include <svx/eeitem.hxx> diff --git a/sc/source/ui/drawfunc/fuins1.cxx b/sc/source/ui/drawfunc/fuins1.cxx index 3274b6752c95..35d46f234182 100644 --- a/sc/source/ui/drawfunc/fuins1.cxx +++ b/sc/source/ui/drawfunc/fuins1.cxx @@ -39,7 +39,7 @@ #include <svx/svdpagv.hxx> #include <svx/svdview.hxx> #include <svtools/filter.hxx> -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #include <vcl/msgbox.hxx> #include <tools/urlobj.hxx> #include <avmedia/mediawindow.hxx> diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx index a40bcf32dd30..1f7534a7fcb4 100644 --- a/sc/source/ui/drawfunc/fuins2.cxx +++ b/sc/source/ui/drawfunc/fuins2.cxx @@ -40,15 +40,15 @@ #include <toolkit/helper/vclunohelper.hxx> #include <sot/exchange.hxx> -#include <svtools/globalnameitem.hxx> +#include <svl/globalnameitem.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/docfile.hxx> -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #include <svx/svdoole2.hxx> #include <svx/pfiledlg.hxx> #include <tools/urlobj.hxx> #include <vcl/msgbox.hxx> -#include <svtools/urihelper.hxx> +#include <svl/urihelper.hxx> #include <unotools/moduleoptions.hxx> #include <svtools/insdlg.hxx> #include <svtools/soerr.hxx> diff --git a/sc/source/ui/drawfunc/futext.cxx b/sc/source/ui/drawfunc/futext.cxx index ebcb2ad30802..a96ce6c18980 100644 --- a/sc/source/ui/drawfunc/futext.cxx +++ b/sc/source/ui/drawfunc/futext.cxx @@ -44,7 +44,7 @@ #include <sfx2/viewfrm.hxx> #include <svx/svxids.hrc> #include <svx/eeitem.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include "futext.hxx" #include "drwlayer.hxx" diff --git a/sc/source/ui/drawfunc/graphsh.cxx b/sc/source/ui/drawfunc/graphsh.cxx index 39b27609e3a8..34c32fb8bc08 100644 --- a/sc/source/ui/drawfunc/graphsh.cxx +++ b/sc/source/ui/drawfunc/graphsh.cxx @@ -38,7 +38,7 @@ #include <sfx2/app.hxx> #include <sfx2/objface.hxx> #include <sfx2/request.hxx> -#include <svtools/whiter.hxx> +#include <svl/whiter.hxx> #include <svx/svdograf.hxx> #include <svx/grfflt.hxx> #include <svx/grafctrl.hxx> diff --git a/sc/source/ui/drawfunc/mediash.cxx b/sc/source/ui/drawfunc/mediash.cxx index 16dcfd9f1cf7..9469cd43c96e 100644 --- a/sc/source/ui/drawfunc/mediash.cxx +++ b/sc/source/ui/drawfunc/mediash.cxx @@ -35,7 +35,7 @@ #include <sfx2/objface.hxx> #include <sfx2/request.hxx> #include <avmedia/mediaitem.hxx> -#include <svtools/whiter.hxx> +#include <svl/whiter.hxx> #include <svx/svdomedia.hxx> #include <svx/sdr/contact/viewcontactofsdrmediaobj.hxx> diff --git a/sc/source/ui/drawfunc/oleobjsh.cxx b/sc/source/ui/drawfunc/oleobjsh.cxx index a0c5bd6d818f..c9da807019c9 100644 --- a/sc/source/ui/drawfunc/oleobjsh.cxx +++ b/sc/source/ui/drawfunc/oleobjsh.cxx @@ -45,7 +45,7 @@ #include <sfx2/app.hxx> #include <sfx2/objface.hxx> #include <sfx2/request.hxx> -#include <svtools/whiter.hxx> +#include <svl/whiter.hxx> #include <vcl/msgbox.hxx> #include "oleobjsh.hxx" diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx index 8d631a9f0609..f9146b96c04c 100644 --- a/sc/source/ui/formdlg/formula.cxx +++ b/sc/source/ui/formdlg/formula.cxx @@ -39,8 +39,8 @@ #include <sfx2/dispatch.hxx> #include <sfx2/docfile.hxx> #include <sfx2/objsh.hxx> -#include <svtools/zforlist.hxx> -#include <svtools/stritem.hxx> +#include <svl/zforlist.hxx> +#include <svl/stritem.hxx> #include <svtools/svtreebx.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/topfrm.hxx> diff --git a/sc/source/ui/inc/AccessibilityHints.hxx b/sc/source/ui/inc/AccessibilityHints.hxx index 8448654014c7..e89069ade49a 100644 --- a/sc/source/ui/inc/AccessibilityHints.hxx +++ b/sc/source/ui/inc/AccessibilityHints.hxx @@ -33,8 +33,8 @@ #include "viewdata.hxx" #include <com/sun/star/uno/XInterface.hpp> -#include <svtools/smplhint.hxx> -#include <svtools/hint.hxx> +#include <svl/smplhint.hxx> +#include <svl/hint.hxx> #define SC_HINT_ACC_SIMPLE_START SFX_HINT_USER00 #define SC_HINT_ACC_TABLECHANGED SC_HINT_ACC_SIMPLE_START + 1 diff --git a/sc/source/ui/inc/AccessibleContextBase.hxx b/sc/source/ui/inc/AccessibleContextBase.hxx index 8d312a0d13d9..98f2afc8e88d 100644 --- a/sc/source/ui/inc/AccessibleContextBase.hxx +++ b/sc/source/ui/inc/AccessibleContextBase.hxx @@ -50,7 +50,7 @@ #include <cppuhelper/interfacecontainer.h> -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include <cppuhelper/compbase5.hxx> #include <cppuhelper/implbase1.hxx> #include <comphelper/servicehelper.hxx> diff --git a/sc/source/ui/inc/DrawModelBroadcaster.hxx b/sc/source/ui/inc/DrawModelBroadcaster.hxx index 7bb71854443c..fac00ea550e4 100644 --- a/sc/source/ui/inc/DrawModelBroadcaster.hxx +++ b/sc/source/ui/inc/DrawModelBroadcaster.hxx @@ -32,7 +32,7 @@ #define _SC_DRAWMODELBROADCASTER_HXX -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include <cppuhelper/interfacecontainer.h> #include <cppuhelper/implbase1.hxx> #include <com/sun/star/document/XEventBroadcaster.hpp> diff --git a/sc/source/ui/inc/acredlin.hxx b/sc/source/ui/inc/acredlin.hxx index 7986935ae9c3..cdde064fc588 100644 --- a/sc/source/ui/inc/acredlin.hxx +++ b/sc/source/ui/inc/acredlin.hxx @@ -55,7 +55,7 @@ #ifndef _SVARRAY_HXX #define _SVARRAY_HXX -#include <svtools/svarray.hxx> +#include <svl/svarray.hxx> #endif #include "chgtrack.hxx" #include "chgviset.hxx" diff --git a/sc/source/ui/inc/csvgrid.hxx b/sc/source/ui/inc/csvgrid.hxx index c8c633060852..583c4fd2c414 100644 --- a/sc/source/ui/inc/csvgrid.hxx +++ b/sc/source/ui/inc/csvgrid.hxx @@ -34,10 +34,8 @@ #define _SC_CSVGRID_HXX #include <vcl/virdev.hxx> -#ifndef _MENU_HXX #include <vcl/menu.hxx> -#endif -#include <svtools/lstner.hxx> +#include <unotools/options.hxx> #include <vector> #include <memory> @@ -100,7 +98,7 @@ typedef ::std::vector< ScCsvColState > ScCsvColStateVec; /** A data grid control for the CSV import dialog. The design of this control simulates a Calc spreadsheet with row and column headers. */ -class SC_DLLPUBLIC ScCsvGrid : public ScCsvControl, public SfxListener +class SC_DLLPUBLIC ScCsvGrid : public ScCsvControl, public utl::ConfigurationListener { private: typedef ::std::auto_ptr< ScEditEngineDefaulter > ScEditEnginePtr; @@ -299,8 +297,7 @@ protected: virtual void DataChanged( const DataChangedEvent& rDCEvt ); - using Control::Notify; - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void ConfigurationChanged( ::utl::ConfigurationBroadcaster*, sal_uInt32 ); // painting --------------------------------------------------------------- protected: diff --git a/sc/source/ui/inc/dwfunctr.hxx b/sc/source/ui/inc/dwfunctr.hxx index 068a05d57711..6a468a415b44 100644 --- a/sc/source/ui/inc/dwfunctr.hxx +++ b/sc/source/ui/inc/dwfunctr.hxx @@ -32,7 +32,7 @@ #include <sfx2/childwin.hxx> #include <sfx2/dockwin.hxx> -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include <svtools/stdctrl.hxx> #ifndef _LSTBOX_HXX //autogen diff --git a/sc/source/ui/inc/formula.hxx b/sc/source/ui/inc/formula.hxx index b25811eb9220..d490e37b93ca 100644 --- a/sc/source/ui/inc/formula.hxx +++ b/sc/source/ui/inc/formula.hxx @@ -44,7 +44,7 @@ #ifndef _SVSTDARR_STRINGS #define _SVSTDARR_STRINGS -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #endif #include "compiler.hxx" diff --git a/sc/source/ui/inc/funcpage.hxx b/sc/source/ui/inc/funcpage.hxx index 753000e290ab..fc8f1813be56 100644 --- a/sc/source/ui/inc/funcpage.hxx +++ b/sc/source/ui/inc/funcpage.hxx @@ -44,7 +44,7 @@ #ifndef _SVSTDARR_STRINGS #define _SVSTDARR_STRINGS -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #endif #include <vcl/tabctrl.hxx> diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx index 48a2a41b0fbc..99d03f2bfa2c 100644 --- a/sc/source/ui/inc/inputwin.hxx +++ b/sc/source/ui/inc/inputwin.hxx @@ -36,7 +36,7 @@ #include <vcl/toolbox.hxx> #endif #include <sfx2/childwin.hxx> -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #ifndef _COMBOBOX_HXX //autogen #include <vcl/combobox.hxx> #endif diff --git a/sc/source/ui/inc/msgpool.hxx b/sc/source/ui/inc/msgpool.hxx index 954d0d7a5d47..44514766601d 100644 --- a/sc/source/ui/inc/msgpool.hxx +++ b/sc/source/ui/inc/msgpool.hxx @@ -35,9 +35,9 @@ #include <svx/srchitem.hxx> -#include <svtools/itempool.hxx> -#include <svtools/stritem.hxx> -#include <svtools/eitem.hxx> +#include <svl/itempool.hxx> +#include <svl/stritem.hxx> +#include <svl/eitem.hxx> //#include <dbitems.hxx> #include "uiitems.hxx" diff --git a/sc/source/ui/inc/navipi.hxx b/sc/source/ui/inc/navipi.hxx index 54434427d459..b14e668fabd0 100644 --- a/sc/source/ui/inc/navipi.hxx +++ b/sc/source/ui/inc/navipi.hxx @@ -36,8 +36,8 @@ #include <vcl/field.hxx> #include <vcl/lstbox.hxx> #include <svtools/stdctrl.hxx> -#include <svtools/poolitem.hxx> -#include <svtools/lstner.hxx> +#include <svl/poolitem.hxx> +#include <svl/lstner.hxx> #include <sfx2/childwin.hxx> #include "content.hxx" #include <svtools/svmedit.hxx> diff --git a/sc/source/ui/inc/parawin.hxx b/sc/source/ui/inc/parawin.hxx index 3835f94157ca..087c8937de9d 100644 --- a/sc/source/ui/inc/parawin.hxx +++ b/sc/source/ui/inc/parawin.hxx @@ -44,7 +44,7 @@ #ifndef _SVSTDARR_STRINGS #define _SVSTDARR_STRINGS -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #endif #include <vcl/tabctrl.hxx> diff --git a/sc/source/ui/inc/servobj.hxx b/sc/source/ui/inc/servobj.hxx index 0eca2cfafaf1..7cd6c04bc91e 100644 --- a/sc/source/ui/inc/servobj.hxx +++ b/sc/source/ui/inc/servobj.hxx @@ -31,8 +31,8 @@ #ifndef SC_SERVOBJ_HXX #define SC_SERVOBJ_HXX -#include <svtools/lstner.hxx> -#include <svtools/listener.hxx> +#include <svl/lstner.hxx> +#include <svl/listener.hxx> #include <sfx2/linksrc.hxx> #include "global.hxx" #include "address.hxx" diff --git a/sc/source/ui/inc/target.hxx b/sc/source/ui/inc/target.hxx index eb3b5f346ccb..1e65821915f3 100644 --- a/sc/source/ui/inc/target.hxx +++ b/sc/source/ui/inc/target.hxx @@ -31,7 +31,7 @@ #ifndef SC_TARGET_HXX #define SC_TARGET_HXX -#include <svtools/undo.hxx> +#include <svl/undo.hxx> class ScTabViewShell; diff --git a/sc/source/ui/inc/tbzoomsliderctrl.hxx b/sc/source/ui/inc/tbzoomsliderctrl.hxx index 0132ec844233..ba1370b1960f 100644 --- a/sc/source/ui/inc/tbzoomsliderctrl.hxx +++ b/sc/source/ui/inc/tbzoomsliderctrl.hxx @@ -39,7 +39,7 @@ #include <vcl/window.hxx> #endif #ifndef _SFXPOOLITEM_HXX //autogen -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #endif #ifndef _SFXTBXCTRL_HXX //autogen #include <sfx2/tbxctrl.hxx> diff --git a/sc/source/ui/inc/ui_pch.hxx b/sc/source/ui/inc/ui_pch.hxx index 335f7e917505..d9b21fd2f0d4 100644 --- a/sc/source/ui/inc/ui_pch.hxx +++ b/sc/source/ui/inc/ui_pch.hxx @@ -43,7 +43,7 @@ #include <tools/solar.h> #include <tools/string.hxx> -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #include <tools/rtti.hxx> #include <string.h> #include <tools/contnr.hxx> @@ -53,9 +53,9 @@ #include <tools/link.hxx> #include <i18npool/lang.h> #include <sfx2/sfx.hrc> -#include <svtools/memberid.hrc> +#include <svl/memberid.hrc> #include <sfx2/sfxsids.hrc> -#include <svtools/cntwids.hrc> +#include <svl/cntwids.hrc> #include <tools/resid.hxx> #include <tools/rc.hxx> #include <tools/resmgr.hxx> @@ -95,28 +95,28 @@ #include <global.hxx> #include <vcl/syswin.hxx> #include <tools/debug.hxx> -#include <svtools/svarray.hxx> +#include <svl/svarray.hxx> #include <vcl/ctrl.hxx> -#include <svtools/hint.hxx> -#include <svtools/poolitem.hxx> +#include <svl/hint.hxx> +#include <svl/poolitem.hxx> #include <vcl/image.hxx> #include <vcl/timer.hxx> #include <tools/unqidx.hxx> #include <vcl/symbol.hxx> #include <vcl/fixed.hxx> -#include <svtools/brdcst.hxx> +#include <svl/brdcst.hxx> #include <vcl/timer.hxx> #include <sc.hrc> #include <stdarg.h> #include <svx/dialogs.hrc> #include <basic/sbxdef.hxx> -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include <sfx2/shell.hxx> #include <vcl/window.hxx> #include <vcl/group.hxx> #include <tools/unqid.hxx> #include <tools/table.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <vcl/dialog.hxx> #include <vcl/button.hxx> #include <rangelst.hxx> @@ -127,15 +127,15 @@ #include <vcl/spinfld.hxx> #include <vcl/combobox.hxx> #include <tools/pstm.hxx> -#include <svtools/eitem.hxx> -#include <svtools/itempool.hxx> +#include <svl/eitem.hxx> +#include <svl/itempool.hxx> #include <sfx2/tabdlg.hxx> #include <vcl/tabdlg.hxx> #include <vcl/tabpage.hxx> #include <vcl/tabctrl.hxx> #include <shellids.hxx> #include <vcl/event.hxx> -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include <svtools/confitem.hxx> #include <markdata.hxx> #include <svx/optgrid.hxx> @@ -150,7 +150,7 @@ #include <column.hxx> #include <markarr.hxx> #include <vcl/mapmod.hxx> -#include <svtools/undo.hxx> +#include <svl/undo.hxx> #include <vcl/seleng.hxx> #include <rsc/rscsfx.hxx> #include <svx/zoomitem.hxx> @@ -165,23 +165,23 @@ #include <sfx2/module.hxx> #include <dbfunc.hxx> #include <vcl/accel.hxx> -#include <svtools/smplhint.hxx> +#include <svl/smplhint.hxx> #include <sfx2/viewfac.hxx> #include <sot/storage.hxx> #include <sfx2/objsh.hxx> #include <target.hxx> #include <tabvwsh.hxx> -#include <svtools/inethist.hxx> -#include <svtools/inetdef.hxx> +#include <svl/inethist.hxx> +#include <svl/inetdef.hxx> #include <sfx2/sfxdefs.hxx> -#include <svtools/cancel.hxx> +#include <svl/cancel.hxx> #include <svtools/compat.hxx> -#include <svtools/inetmsg.hxx> +#include <svl/inetmsg.hxx> #include <sfx2/app.hxx> #include <tools/urlobj.hxx> #include <scdll.hxx> #include <sfx2/msg.hxx> -#include <svtools/ownlist.hxx> +#include <svl/ownlist.hxx> #include <sfx2/objface.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/frame.hxx> @@ -207,9 +207,9 @@ #include <svx/svdtypes.hxx> #include <vcl/btndlg.hxx> #include <vcl/svapp.hxx> -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #include <vcl/edit.hxx> -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #include <collect.hxx> #include <svx/svdsob.hxx> #include <vcl/imagebtn.hxx> @@ -300,7 +300,7 @@ #include <cell.hxx> #include <stddef.h> #include <tools/mempool.hxx> -#include <svtools/style.hrc> +#include <svl/style.hrc> #include <drawview.hxx> #include <svx/view3d.hxx> #include <svx/def3d.hxx> @@ -310,7 +310,7 @@ #include <svx/svxenum.hxx> #include <svx/xtextit0.hxx> #include <svx/svdtrans.hxx> -#include <svtools/style.hxx> +#include <svl/style.hxx> #include <reffact.hxx> #include <svx/svdotext.hxx> #include <svx/svdoattr.hxx> @@ -326,7 +326,7 @@ #include <vcl/button.hxx> #include <svx/srchitem.hxx> #include <svx/svdorect.hxx> -#include <svtools/whiter.hxx> +#include <svl/whiter.hxx> #include <stlpool.hxx> #include <svx/eeitem.hxx> #include <inputhdl.hxx> diff --git a/sc/source/ui/inc/uiitems.hxx b/sc/source/ui/inc/uiitems.hxx index 868e772a2e68..bfa1603adb80 100644 --- a/sc/source/ui/inc/uiitems.hxx +++ b/sc/source/ui/inc/uiitems.hxx @@ -35,7 +35,7 @@ #include "conditio.hxx" #include "sortparam.hxx" #include "paramisc.hxx" -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> class ScEditEngineDefaulter; class EditTextObject; diff --git a/sc/source/ui/inc/undobase.hxx b/sc/source/ui/inc/undobase.hxx index 2d3ee1d14dd7..8398b030ed68 100644 --- a/sc/source/ui/inc/undobase.hxx +++ b/sc/source/ui/inc/undobase.hxx @@ -31,7 +31,7 @@ #ifndef SC_UNDOBASE_HXX #define SC_UNDOBASE_HXX -#include <svtools/undo.hxx> +#include <svl/undo.hxx> #include "global.hxx" #include "address.hxx" diff --git a/sc/source/ui/inc/undodraw.hxx b/sc/source/ui/inc/undodraw.hxx index 7b5d59fbb620..5ded731d5105 100644 --- a/sc/source/ui/inc/undodraw.hxx +++ b/sc/source/ui/inc/undodraw.hxx @@ -31,7 +31,7 @@ #ifndef SC_UNDODRAW_HXX #define SC_UNDODRAW_HXX -#include <svtools/undo.hxx> +#include <svl/undo.hxx> class ScDocShell; diff --git a/sc/source/ui/inc/undotab.hxx b/sc/source/ui/inc/undotab.hxx index a7cf0d094d6b..40177a31e68e 100644 --- a/sc/source/ui/inc/undotab.hxx +++ b/sc/source/ui/inc/undotab.hxx @@ -39,14 +39,14 @@ #ifndef _SVSTDARR_SHORTS #define _SVSTDARR_SHORTS -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #endif #ifndef _SVSTDARR_STRINGS #define _SVSTDARR_STRINGS -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #endif diff --git a/sc/source/ui/inc/viewfunc.hxx b/sc/source/ui/inc/viewfunc.hxx index 066aadca817a..82ddc0bad026 100644 --- a/sc/source/ui/inc/viewfunc.hxx +++ b/sc/source/ui/inc/viewfunc.hxx @@ -34,14 +34,14 @@ #ifndef _SVSTDARR_SHORTS #define _SVSTDARR_SHORTS -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #endif #ifndef _SVSTDARR_STRINGS #define _SVSTDARR_STRINGS -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #endif #include <com/sun/star/embed/XEmbeddedObject.hpp> diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx index 76330036b1f5..ab2cdaba3b69 100644 --- a/sc/source/ui/miscdlgs/acredlin.cxx +++ b/sc/source/ui/miscdlgs/acredlin.cxx @@ -35,7 +35,7 @@ -#include <svtools/undo.hxx> +#include <svl/undo.hxx> #include <unotools/textsearch.hxx> #include <unotools/localedatawrapper.hxx> #include <unotools/collatorwrapper.hxx> diff --git a/sc/source/ui/miscdlgs/autofmt.cxx b/sc/source/ui/miscdlgs/autofmt.cxx index b4fe1f83b220..fb29b6d673ca 100644 --- a/sc/source/ui/miscdlgs/autofmt.cxx +++ b/sc/source/ui/miscdlgs/autofmt.cxx @@ -49,7 +49,7 @@ #include <svx/wghtitem.hxx> #include <sfx2/topfrm.hxx> #include <vcl/svapp.hxx> -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include <vcl/msgbox.hxx> #include <comphelper/processfactory.hxx> diff --git a/sc/source/ui/miscdlgs/filldlg.cxx b/sc/source/ui/miscdlgs/filldlg.cxx index e6a8746a01be..f013c334bf37 100644 --- a/sc/source/ui/miscdlgs/filldlg.cxx +++ b/sc/source/ui/miscdlgs/filldlg.cxx @@ -37,7 +37,7 @@ //---------------------------------------------------------------------------- -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include <vcl/msgbox.hxx> #include <limits.h> diff --git a/sc/source/ui/miscdlgs/optsolver.cxx b/sc/source/ui/miscdlgs/optsolver.cxx index 97cc29ac3e54..8783df43d3df 100644 --- a/sc/source/ui/miscdlgs/optsolver.cxx +++ b/sc/source/ui/miscdlgs/optsolver.cxx @@ -37,7 +37,7 @@ #include "scitems.hxx" #include <sfx2/bindings.hxx> #include <sfx2/imagemgr.hxx> -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include <vcl/msgbox.hxx> #include <vcl/svapp.hxx> diff --git a/sc/source/ui/miscdlgs/scuiautofmt.cxx b/sc/source/ui/miscdlgs/scuiautofmt.cxx index e1ec71344034..32c49cf2a3ad 100644 --- a/sc/source/ui/miscdlgs/scuiautofmt.cxx +++ b/sc/source/ui/miscdlgs/scuiautofmt.cxx @@ -49,7 +49,7 @@ #include <svx/shdditem.hxx> #include <svx/udlnitem.hxx> #include <svx/wghtitem.hxx> -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include <vcl/msgbox.hxx> #include <comphelper/processfactory.hxx> diff --git a/sc/source/ui/miscdlgs/sharedocdlg.cxx b/sc/source/ui/miscdlgs/sharedocdlg.cxx index e349f18a2c27..f9893f1d3faa 100644 --- a/sc/source/ui/miscdlgs/sharedocdlg.cxx +++ b/sc/source/ui/miscdlgs/sharedocdlg.cxx @@ -34,7 +34,7 @@ //----------------------------------------------------------------------------- #include <osl/security.hxx> -#include <svtools/sharecontrolfile.hxx> +#include <svl/sharecontrolfile.hxx> #include <unotools/useroptions.hxx> #include <docsh.hxx> diff --git a/sc/source/ui/miscdlgs/solvrdlg.cxx b/sc/source/ui/miscdlgs/solvrdlg.cxx index b5fc7d8d322a..091329f1d03b 100644 --- a/sc/source/ui/miscdlgs/solvrdlg.cxx +++ b/sc/source/ui/miscdlgs/solvrdlg.cxx @@ -38,7 +38,7 @@ #include "rangelst.hxx" #include "scitems.hxx" #include <sfx2/dispatch.hxx> -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include <vcl/msgbox.hxx> #include "uiitems.hxx" diff --git a/sc/source/ui/miscdlgs/textdlgs.cxx b/sc/source/ui/miscdlgs/textdlgs.cxx index c204266bbb60..a12ad4992bff 100644 --- a/sc/source/ui/miscdlgs/textdlgs.cxx +++ b/sc/source/ui/miscdlgs/textdlgs.cxx @@ -46,13 +46,13 @@ //CHINA001 #include <svx/paragrph.hxx> //CHINA001 #include <svx/tabstpge.hxx> #include <sfx2/objsh.hxx> -#include <svtools/cjkoptions.hxx> +#include <svl/cjkoptions.hxx> #include "textdlgs.hxx" #include "scresid.hxx" #include "sc.hrc" #include <svx/svxids.hrc> //add CHINA001 -#include <svtools/intitem.hxx> //add CHINA001 +#include <svl/intitem.hxx> //add CHINA001 #include <svx/flagsdef.hxx> //CHINA001 // ----------------------------------------------------------------------- diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx index af3b5f0dee5e..8198e6adb0f4 100644 --- a/sc/source/ui/navipi/content.cxx +++ b/sc/source/ui/navipi/content.cxx @@ -46,7 +46,7 @@ #include <vcl/sound.hxx> #include <vcl/svapp.hxx> #include <tools/urlobj.hxx> -#include <svtools/urlbmk.hxx> +#include <svl/urlbmk.hxx> #include <stdlib.h> #include "content.hxx" diff --git a/sc/source/ui/navipi/navcitem.cxx b/sc/source/ui/navipi/navcitem.cxx index 60f6c708e08c..c3807844270a 100644 --- a/sc/source/ui/navipi/navcitem.cxx +++ b/sc/source/ui/navipi/navcitem.cxx @@ -35,8 +35,8 @@ // INCLUDE --------------------------------------------------------------- -#include <svtools/intitem.hxx> -#include <svtools/stritem.hxx> +#include <svl/intitem.hxx> +#include <svl/stritem.hxx> #include "navcitem.hxx" #include "global.hxx" diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx index 9bba01960b32..767fec025df0 100644 --- a/sc/source/ui/navipi/navipi.cxx +++ b/sc/source/ui/navipi/navipi.cxx @@ -41,8 +41,8 @@ #include <sfx2/event.hxx> #include <sfx2/imgmgr.hxx> #include <sfx2/navigat.hxx> -#include <svtools/stritem.hxx> -#include <svtools/urlbmk.hxx> +#include <svl/stritem.hxx> +#include <svl/urlbmk.hxx> #include <vcl/sound.hxx> #include <unotools/charclass.hxx> #include <stdlib.h> diff --git a/sc/source/ui/navipi/scenwnd.cxx b/sc/source/ui/navipi/scenwnd.cxx index 55f26b682034..c03e5efc82bd 100644 --- a/sc/source/ui/navipi/scenwnd.cxx +++ b/sc/source/ui/navipi/scenwnd.cxx @@ -38,8 +38,8 @@ #include <sfx2/bindings.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/viewfrm.hxx> -#include <svtools/slstitm.hxx> -#include <svtools/stritem.hxx> +#include <svl/slstitm.hxx> +#include <svl/stritem.hxx> #include <vcl/msgbox.hxx> #include <vcl/svapp.hxx> #include "navipi.hxx" diff --git a/sc/source/ui/optdlg/tpprint.cxx b/sc/source/ui/optdlg/tpprint.cxx index 498dbed85285..d6e8a3ae5009 100644 --- a/sc/source/ui/optdlg/tpprint.cxx +++ b/sc/source/ui/optdlg/tpprint.cxx @@ -33,7 +33,7 @@ #undef SC_DLLIMPLEMENTATION -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include "tpprint.hxx" #include "printopt.hxx" diff --git a/sc/source/ui/pagedlg/areasdlg.cxx b/sc/source/ui/pagedlg/areasdlg.cxx index 17c00948d3bd..f65105b0a687 100644 --- a/sc/source/ui/pagedlg/areasdlg.cxx +++ b/sc/source/ui/pagedlg/areasdlg.cxx @@ -37,7 +37,7 @@ #include <rangelst.hxx> #include <sfx2/dispatch.hxx> -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #include <vcl/msgbox.hxx> #include <unotools/charclass.hxx> #include <stdlib.h> diff --git a/sc/source/ui/pagedlg/hfedtdlg.cxx b/sc/source/ui/pagedlg/hfedtdlg.cxx index 695ede732edd..7ab719e3e10b 100644 --- a/sc/source/ui/pagedlg/hfedtdlg.cxx +++ b/sc/source/ui/pagedlg/hfedtdlg.cxx @@ -38,7 +38,7 @@ //------------------------------------------------------------------ #include "scitems.hxx" -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include "hfedtdlg.hxx" #include "global.hxx" diff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx b/sc/source/ui/pagedlg/scuitphfedit.cxx index 9e037fbe7d0e..e55c8405fc34 100644 --- a/sc/source/ui/pagedlg/scuitphfedit.cxx +++ b/sc/source/ui/pagedlg/scuitphfedit.cxx @@ -52,7 +52,7 @@ #include <vcl/svapp.hxx> #include <unotools/useroptions.hxx> #define _SVSTDARR_USHORTS -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> //CHINA001 #include "tphfedit.hxx" #include "editutil.hxx" diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx index 5ba7a485ede8..58e5570aa01b 100644 --- a/sc/source/ui/pagedlg/tphf.cxx +++ b/sc/source/ui/pagedlg/tphf.cxx @@ -40,7 +40,7 @@ #define _TPHF_CXX #include "scitems.hxx" #include <sfx2/basedlgs.hxx> -#include <svtools/style.hxx> +#include <svl/style.hxx> #include <vcl/svapp.hxx> #include <vcl/msgbox.hxx> diff --git a/sc/source/ui/styleui/scstyles.src b/sc/source/ui/styleui/scstyles.src index 4eead4a953f2..9c367b9daf7f 100644 --- a/sc/source/ui/styleui/scstyles.src +++ b/sc/source/ui/styleui/scstyles.src @@ -29,7 +29,7 @@ ************************************************************************/ #include "sc.hrc" -#include <svtools/style.hrc> +#include <svl/style.hrc> #define IMPL_FAMILY(family,filter) \ StyleFamily = family; \ FilterList = { filter } diff --git a/sc/source/ui/styleui/styledlg.cxx b/sc/source/ui/styleui/styledlg.cxx index 71066ec27ec3..ea94566b918f 100644 --- a/sc/source/ui/styleui/styledlg.cxx +++ b/sc/source/ui/styleui/styledlg.cxx @@ -47,8 +47,8 @@ //CHINA001 #include <svx/page.hxx> //CHINA001 #include <svx/paragrph.hxx> #include <sfx2/objsh.hxx> -#include <svtools/style.hxx> -#include <svtools/cjkoptions.hxx> +#include <svl/style.hxx> +#include <svl/cjkoptions.hxx> #include "styledlg.hxx" #include "tabpages.hxx" // Zellvorlagen @@ -60,9 +60,9 @@ #include <svx/svxdlg.hxx> //CHINA001 #include <svx/svxids.hrc> //CHINA001 #include <svx/dialogs.hrc> //CHINA001 -#include <svtools/intitem.hxx> //CHINA001 +#include <svl/intitem.hxx> //CHINA001 #include <svx/flstitem.hxx> //CHINA001 -#include <svtools/aeitem.hxx> //CHINA001 +#include <svl/aeitem.hxx> //CHINA001 #include <svx/flagsdef.hxx> //CHINA001 //================================================================== diff --git a/sc/source/ui/undo/undocell.cxx b/sc/source/ui/undo/undocell.cxx index eb23516cafeb..87f83ce7a932 100644 --- a/sc/source/ui/undo/undocell.cxx +++ b/sc/source/ui/undo/undocell.cxx @@ -35,7 +35,7 @@ #include <svx/eeitem.hxx> #include <svx/editobj.hxx> -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include <sfx2/app.hxx> #include "undocell.hxx" diff --git a/sc/source/ui/undo/undostyl.cxx b/sc/source/ui/undo/undostyl.cxx index 01c561e96c83..7e7f3db1d42c 100644 --- a/sc/source/ui/undo/undostyl.cxx +++ b/sc/source/ui/undo/undostyl.cxx @@ -35,7 +35,7 @@ // INCLUDE --------------------------------------------------------------- -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <vcl/virdev.hxx> #include "undostyl.hxx" diff --git a/sc/source/ui/undo/undotab.cxx b/sc/source/ui/undo/undotab.cxx index ce428311d3f8..0fc638b7825e 100644 --- a/sc/source/ui/undo/undotab.cxx +++ b/sc/source/ui/undo/undotab.cxx @@ -46,7 +46,7 @@ #include <sfx2/app.hxx> #include <sfx2/bindings.hxx> #include <sfx2/dispatch.hxx> -#include <svtools/smplhint.hxx> +#include <svl/smplhint.hxx> #include "undotab.hxx" #include "document.hxx" diff --git a/sc/source/ui/unoobj/addruno.cxx b/sc/source/ui/unoobj/addruno.cxx index a3b026396942..9661335bbf35 100644 --- a/sc/source/ui/unoobj/addruno.cxx +++ b/sc/source/ui/unoobj/addruno.cxx @@ -36,7 +36,7 @@ #include <com/sun/star/table/CellAddress.hpp> #include <com/sun/star/table/CellRangeAddress.hpp> -#include <svtools/itemprop.hxx> +#include <svl/itemprop.hxx> #include "docsh.hxx" #include "unonames.hxx" diff --git a/sc/source/ui/unoobj/afmtuno.cxx b/sc/source/ui/unoobj/afmtuno.cxx index d7f1eb13c1b2..e4b9ef8a8765 100644 --- a/sc/source/ui/unoobj/afmtuno.cxx +++ b/sc/source/ui/unoobj/afmtuno.cxx @@ -36,7 +36,7 @@ #include "scitems.hxx" #include <tools/debug.hxx> #include <tools/shl.hxx> -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #include <svx/unomid.hxx> #include "unowids.hxx" #include <rtl/uuid.h> diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx index f3418a84e2ef..babccf9a7053 100644 --- a/sc/source/ui/unoobj/cellsuno.cxx +++ b/sc/source/ui/unoobj/cellsuno.cxx @@ -50,8 +50,8 @@ #include <svx/unotext.hxx> #include <svx/svdpage.hxx> #include <sfx2/bindings.hxx> -#include <svtools/zforlist.hxx> -#include <svtools/zformat.hxx> +#include <svl/zforlist.hxx> +#include <svl/zformat.hxx> #include <rtl/uuid.h> #include <float.h> // DBL_MIN diff --git a/sc/source/ui/unoobj/cursuno.cxx b/sc/source/ui/unoobj/cursuno.cxx index b6dacccec334..99c907113bb8 100644 --- a/sc/source/ui/unoobj/cursuno.cxx +++ b/sc/source/ui/unoobj/cursuno.cxx @@ -34,8 +34,8 @@ #include "scitems.hxx" -#include <svtools/intitem.hxx> -#include <svtools/zforlist.hxx> +#include <svl/intitem.hxx> +#include <svl/zforlist.hxx> #include <rtl/uuid.h> #include "cursuno.hxx" diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx index c68baf36ba2b..ed40d2f5c96a 100644 --- a/sc/source/ui/unoobj/dapiuno.cxx +++ b/sc/source/ui/unoobj/dapiuno.cxx @@ -32,7 +32,7 @@ #include "precompiled_sc.hxx" #include <algorithm> -#include <svtools/smplhint.hxx> +#include <svl/smplhint.hxx> #include <rtl/uuid.h> #include "dapiuno.hxx" diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx index 13f2c26c6e47..0dd364812d48 100644 --- a/sc/source/ui/unoobj/datauno.cxx +++ b/sc/source/ui/unoobj/datauno.cxx @@ -34,8 +34,8 @@ #include <tools/debug.hxx> -#include <svtools/smplhint.hxx> -#include <svtools/zforlist.hxx> +#include <svl/smplhint.hxx> +#include <svl/zforlist.hxx> #include <rtl/uuid.h> #include <com/sun/star/awt/XBitmap.hpp> diff --git a/sc/source/ui/unoobj/defltuno.cxx b/sc/source/ui/unoobj/defltuno.cxx index bc6f135ce174..3df667faad8c 100644 --- a/sc/source/ui/unoobj/defltuno.cxx +++ b/sc/source/ui/unoobj/defltuno.cxx @@ -33,8 +33,8 @@ -#include <svtools/smplhint.hxx> -#include <svtools/itemprop.hxx> +#include <svl/smplhint.hxx> +#include <svl/itemprop.hxx> #include <svx/unomid.hxx> #include <i18npool/mslangid.hxx> diff --git a/sc/source/ui/unoobj/dispuno.cxx b/sc/source/ui/unoobj/dispuno.cxx index 1e2309dd2c0a..99bce5579e14 100644 --- a/sc/source/ui/unoobj/dispuno.cxx +++ b/sc/source/ui/unoobj/dispuno.cxx @@ -36,7 +36,7 @@ #include <sfx2/viewfrm.hxx> #include <comphelper/uno3.hxx> #include <svx/dataaccessdescriptor.hxx> -#include <svtools/smplhint.hxx> +#include <svl/smplhint.hxx> #include <com/sun/star/frame/XDispatchProviderInterception.hpp> #include <com/sun/star/view/XSelectionSupplier.hpp> diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index befb6a6f76e2..4c37d7d4a780 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -40,8 +40,8 @@ #include <svx/svdpage.hxx> #include <svx/svxids.hrc> -#include <svtools/numuno.hxx> -#include <svtools/smplhint.hxx> +#include <svl/numuno.hxx> +#include <svl/smplhint.hxx> #include <unotools/undoopt.hxx> #include <sfx2/printer.hxx> #include <sfx2/bindings.hxx> diff --git a/sc/source/ui/unoobj/fielduno.cxx b/sc/source/ui/unoobj/fielduno.cxx index 94078ff91af4..8fd4bba512eb 100644 --- a/sc/source/ui/unoobj/fielduno.cxx +++ b/sc/source/ui/unoobj/fielduno.cxx @@ -30,7 +30,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sc.hxx" -#include <svtools/smplhint.hxx> +#include <svl/smplhint.hxx> #include <svx/eeitem.hxx> diff --git a/sc/source/ui/unoobj/funcuno.cxx b/sc/source/ui/unoobj/funcuno.cxx index a50b4003b0ac..a60bb836b142 100644 --- a/sc/source/ui/unoobj/funcuno.cxx +++ b/sc/source/ui/unoobj/funcuno.cxx @@ -35,7 +35,7 @@ #include <tools/debug.hxx> #include <sfx2/app.hxx> -#include <svtools/itemprop.hxx> +#include <svl/itemprop.hxx> #include "funcuno.hxx" #include "miscuno.hxx" diff --git a/sc/source/ui/unoobj/linkuno.cxx b/sc/source/ui/unoobj/linkuno.cxx index 0a07b057740b..ddb5dc3b0496 100644 --- a/sc/source/ui/unoobj/linkuno.cxx +++ b/sc/source/ui/unoobj/linkuno.cxx @@ -33,7 +33,7 @@ -#include <svtools/smplhint.hxx> +#include <svl/smplhint.hxx> #include <svx/linkmgr.hxx> #include "linkuno.hxx" diff --git a/sc/source/ui/unoobj/nameuno.cxx b/sc/source/ui/unoobj/nameuno.cxx index 536e1f2a1a65..ab8576949b75 100644 --- a/sc/source/ui/unoobj/nameuno.cxx +++ b/sc/source/ui/unoobj/nameuno.cxx @@ -33,7 +33,7 @@ -#include <svtools/smplhint.hxx> +#include <svl/smplhint.hxx> #include <com/sun/star/sheet/NamedRangeFlag.hpp> #include <com/sun/star/awt/XBitmap.hpp> diff --git a/sc/source/ui/unoobj/notesuno.cxx b/sc/source/ui/unoobj/notesuno.cxx index e44dab865d46..8477d1f17779 100644 --- a/sc/source/ui/unoobj/notesuno.cxx +++ b/sc/source/ui/unoobj/notesuno.cxx @@ -30,7 +30,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sc.hxx" -#include <svtools/smplhint.hxx> +#include <svl/smplhint.hxx> #include "rangelst.hxx" diff --git a/sc/source/ui/unoobj/optuno.cxx b/sc/source/ui/unoobj/optuno.cxx index 8c3deefba6d5..f7c8d2827f50 100644 --- a/sc/source/ui/unoobj/optuno.cxx +++ b/sc/source/ui/unoobj/optuno.cxx @@ -33,7 +33,7 @@ -#include <svtools/itemprop.hxx> +#include <svl/itemprop.hxx> #include <com/sun/star/util/Date.hpp> diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx index 6ed8181091ac..4600244cf2df 100644 --- a/sc/source/ui/unoobj/scdetect.cxx +++ b/sc/source/ui/unoobj/scdetect.cxx @@ -64,10 +64,10 @@ #include <svtools/parhtml.hxx> #include <rtl/ustring.h> #include <rtl/logfile.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <vcl/window.hxx> -#include <svtools/eitem.hxx> -#include <svtools/stritem.hxx> +#include <svl/eitem.hxx> +#include <svl/stritem.hxx> #include <tools/urlobj.hxx> #include <vos/mutex.hxx> #include <svtools/sfxecode.hxx> diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx index 12cbdbdde1a1..941f586a73c9 100644 --- a/sc/source/ui/unoobj/styleuno.cxx +++ b/sc/source/ui/unoobj/styleuno.cxx @@ -45,10 +45,10 @@ #include <sfx2/bindings.hxx> #include <sfx2/printer.hxx> #include <vcl/virdev.hxx> -#include <svtools/itempool.hxx> -#include <svtools/itemset.hxx> -#include <svtools/intitem.hxx> -#include <svtools/zformat.hxx> +#include <svl/itempool.hxx> +#include <svl/itemset.hxx> +#include <svl/intitem.hxx> +#include <svl/zformat.hxx> #include <rtl/uuid.h> #include <com/sun/star/table/BorderLine.hpp> diff --git a/sc/source/ui/unoobj/targuno.cxx b/sc/source/ui/unoobj/targuno.cxx index 0fed003b751b..c63bec535e71 100644 --- a/sc/source/ui/unoobj/targuno.cxx +++ b/sc/source/ui/unoobj/targuno.cxx @@ -37,8 +37,8 @@ #include <vcl/virdev.hxx> //#include <toolkit/unoiface.hxx> #include <toolkit/unohlp.hxx> -#include <svtools/itemprop.hxx> -#include <svtools/smplhint.hxx> +#include <svl/itemprop.hxx> +#include <svl/smplhint.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> #include <com/sun/star/awt/XBitmap.hpp> diff --git a/sc/source/ui/unoobj/tokenuno.cxx b/sc/source/ui/unoobj/tokenuno.cxx index e6e194d7eb75..9d31b15fdf47 100644 --- a/sc/source/ui/unoobj/tokenuno.cxx +++ b/sc/source/ui/unoobj/tokenuno.cxx @@ -39,7 +39,7 @@ #include <com/sun/star/sheet/AddressConvention.hpp> #include <com/sun/star/table/CellAddress.hpp> -#include <svtools/itemprop.hxx> +#include <svl/itemprop.hxx> #include "miscuno.hxx" #include "convuno.hxx" diff --git a/sc/source/ui/unoobj/warnpassword.cxx b/sc/source/ui/unoobj/warnpassword.cxx index 6b11ac7c6641..4bf4163aad3c 100644 --- a/sc/source/ui/unoobj/warnpassword.cxx +++ b/sc/source/ui/unoobj/warnpassword.cxx @@ -35,7 +35,7 @@ #include "warnpassword.hxx" #include <com/sun/star/task/XInteractionHandler.hpp> #include <com/sun/star/task/XInteractionRequest.hpp> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <sfx2/docfile.hxx> #include <sfx2/sfxsids.hrc> #include <ucbhelper/simpleinteractionrequest.hxx> diff --git a/sc/source/ui/vba/vbafont.cxx b/sc/source/ui/vba/vbafont.cxx index 9855d5e056af..ee7004ae2fba 100644 --- a/sc/source/ui/vba/vbafont.cxx +++ b/sc/source/ui/vba/vbafont.cxx @@ -38,7 +38,7 @@ #include <com/sun/star/table/XColumnRowRange.hpp> #include <ooo/vba/excel/XlColorIndex.hpp> #include <ooo/vba/excel/XlUnderlineStyle.hpp> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include "vbafont.hxx" #include "scitems.hxx" #include "cellsuno.hxx" diff --git a/sc/source/ui/vba/vbahelper.cxx b/sc/source/ui/vba/vbahelper.cxx index 353c036393c2..359a6c3d42ce 100644 --- a/sc/source/ui/vba/vbahelper.cxx +++ b/sc/source/ui/vba/vbahelper.cxx @@ -45,7 +45,7 @@ #include <sfx2/viewfrm.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/app.hxx> -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #include <docuno.hxx> diff --git a/sc/source/ui/vba/vbaworksheets.cxx b/sc/source/ui/vba/vbaworksheets.cxx index 546eda854056..8a4dd0455bb5 100644 --- a/sc/source/ui/vba/vbaworksheets.cxx +++ b/sc/source/ui/vba/vbaworksheets.cxx @@ -35,8 +35,8 @@ #include <sfx2/request.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/itemwrapper.hxx> -#include <svtools/itemset.hxx> -#include <svtools/eitem.hxx> +#include <svl/itemset.hxx> +#include <svl/eitem.hxx> #include <comphelper/processfactory.hxx> #include <cppuhelper/implbase3.hxx> diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx index 3dfd6e2479c2..e9116b19c87b 100644 --- a/sc/source/ui/view/cellsh.cxx +++ b/sc/source/ui/view/cellsh.cxx @@ -35,9 +35,9 @@ #include "scitems.hxx" -#include <svtools/slstitm.hxx> -#include <svtools/stritem.hxx> -#include <svtools/whiter.hxx> +#include <svl/slstitm.hxx> +#include <svl/stritem.hxx> +#include <svl/whiter.hxx> #include <unotools/moduleoptions.hxx> #include <svtools/cliplistener.hxx> #include <svtools/insdlg.hxx> diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx index cf9cbeb468ad..6bdf172b9fb5 100644 --- a/sc/source/ui/view/cellsh1.cxx +++ b/sc/source/ui/view/cellsh1.cxx @@ -55,10 +55,10 @@ #include <sfx2/viewfrm.hxx> #define _ZFORLIST_DECLARE_TABLE -#include <svtools/stritem.hxx> -#include <svtools/whiter.hxx> -#include <svtools/zforlist.hxx> -#include <svtools/zformat.hxx> +#include <svl/stritem.hxx> +#include <svl/whiter.hxx> +#include <svl/zforlist.hxx> +#include <svl/zformat.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/request.hxx> #include <vcl/msgbox.hxx> diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx index d17fa7160834..2d2cdd8efde3 100644 --- a/sc/source/ui/view/cellsh2.cxx +++ b/sc/source/ui/view/cellsh2.cxx @@ -41,13 +41,13 @@ #include <sfx2/viewfrm.hxx> #include <sfx2/app.hxx> #include <sfx2/request.hxx> -#include <svtools/aeitem.hxx> +#include <svl/aeitem.hxx> #include <basic/sbxcore.hxx> -#include <svtools/whiter.hxx> -#include <svtools/zforlist.hxx> +#include <svl/whiter.hxx> +#include <svl/zforlist.hxx> #include <vcl/msgbox.hxx> -#include <svtools/stritem.hxx> -#include <svtools/visitem.hxx> +#include <svl/stritem.hxx> +#include <svl/visitem.hxx> #include <unotools/moduleoptions.hxx> #include <com/sun/star/frame/FrameSearchFlag.hpp> diff --git a/sc/source/ui/view/cellsh3.cxx b/sc/source/ui/view/cellsh3.cxx index dd79bb52a112..2f96aec815fb 100644 --- a/sc/source/ui/view/cellsh3.cxx +++ b/sc/source/ui/view/cellsh3.cxx @@ -40,7 +40,7 @@ #include <sfx2/bindings.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/request.hxx> -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #include <vcl/msgbox.hxx> #include <sfx2/app.hxx> #include "globstr.hrc" diff --git a/sc/source/ui/view/dbfunc3.cxx b/sc/source/ui/view/dbfunc3.cxx index 36667ee43c0f..5fd4a5f470f5 100644 --- a/sc/source/ui/view/dbfunc3.cxx +++ b/sc/source/ui/view/dbfunc3.cxx @@ -42,7 +42,7 @@ #include <vcl/msgbox.hxx> #include <vcl/sound.hxx> #include <vcl/waitobj.hxx> -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include <sfx2/app.hxx> #include <com/sun/star/sheet/DataPilotFieldOrientation.hpp> #include <com/sun/star/sheet/DataPilotFieldSortMode.hpp> diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx index 022eabdc11cf..b0f2197ad826 100644 --- a/sc/source/ui/view/editsh.cxx +++ b/sc/source/ui/view/editsh.cxx @@ -64,12 +64,12 @@ #include <sfx2/viewfrm.hxx> #include <sot/exchange.hxx> #include <svtools/cliplistener.hxx> -#include <svtools/whiter.hxx> +#include <svl/whiter.hxx> #include <vcl/msgbox.hxx> #include <vcl/sound.hxx> #include <sot/formats.hxx> #include <svtools/transfer.hxx> -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #define _EDITSH_CXX #include "editsh.hxx" diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx index 36f6c682832f..fb83ed5624d6 100644 --- a/sc/source/ui/view/formatsh.cxx +++ b/sc/source/ui/view/formatsh.cxx @@ -60,13 +60,13 @@ #include <sfx2/viewfrm.hxx> #include <sfx2/objface.hxx> #include <sfx2/request.hxx> -#include <svtools/whiter.hxx> +#include <svl/whiter.hxx> #include <vcl/msgbox.hxx> #define _ZFORLIST_DECLARE_TABLE -#include <svtools/stritem.hxx> -#include <svtools/zformat.hxx> -#include <svtools/languageoptions.hxx> +#include <svl/stritem.hxx> +#include <svl/zformat.hxx> +#include <svl/languageoptions.hxx> #include <svx/boxitem.hxx> #include <svx/langitem.hxx> #include <svx/numinf.hxx> diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index de2b962f3272..aca88c554317 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -45,10 +45,10 @@ #include <sfx2/dispatch.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/docfile.hxx> -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #include <svtools/svlbox.hxx> #include <svtools/svtabbx.hxx> -#include <svtools/urlbmk.hxx> +#include <svl/urlbmk.hxx> #include <tools/urlobj.hxx> #include <vcl/cursor.hxx> #include <vcl/sound.hxx> diff --git a/sc/source/ui/view/gridwin3.cxx b/sc/source/ui/view/gridwin3.cxx index 5d87806076ab..6683a75e777b 100644 --- a/sc/source/ui/view/gridwin3.cxx +++ b/sc/source/ui/view/gridwin3.cxx @@ -39,7 +39,7 @@ #include <svx/svdpagv.hxx> #include <svx/sizeitem.hxx> #include <sfx2/bindings.hxx> -#include <svtools/ptitem.hxx> +#include <svl/ptitem.hxx> #include "tabvwsh.hxx" #include "gridwin.hxx" diff --git a/sc/source/ui/view/notemark.cxx b/sc/source/ui/view/notemark.cxx index 359c789e43de..419124596147 100644 --- a/sc/source/ui/view/notemark.cxx +++ b/sc/source/ui/view/notemark.cxx @@ -37,7 +37,7 @@ #include <svx/svdocapt.hxx> #include <sfx2/printer.hxx> #include <unotools/pathoptions.hxx> -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> #include <vcl/svapp.hxx> #include "notemark.hxx" diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx index f5688171b145..700c32e4698f 100644 --- a/sc/source/ui/view/output2.cxx +++ b/sc/source/ui/view/output2.cxx @@ -55,7 +55,7 @@ #include <svx/scripttypeitem.hxx> #include <svx/udlnitem.hxx> #include <svx/unolingu.hxx> -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include <vcl/svapp.hxx> #include <vcl/metric.hxx> #include <vcl/outdev.hxx> @@ -63,7 +63,7 @@ #ifndef _SVSTDARR_USHORTS #define _SVSTDARR_USHORTS -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #endif #include "output.hxx" diff --git a/sc/source/ui/view/pgbrksh.cxx b/sc/source/ui/view/pgbrksh.cxx index 421e76eaa8ce..3ab72f37ac35 100644 --- a/sc/source/ui/view/pgbrksh.cxx +++ b/sc/source/ui/view/pgbrksh.cxx @@ -41,7 +41,7 @@ #include <sfx2/objface.hxx> #include <sfx2/objsh.hxx> #include <sfx2/request.hxx> -#include <svtools/whiter.hxx> +#include <svl/whiter.hxx> #include "pgbrksh.hxx" #include "tabvwsh.hxx" diff --git a/sc/source/ui/view/pivotsh.cxx b/sc/source/ui/view/pivotsh.cxx index 273b8965451e..2039934a6e45 100644 --- a/sc/source/ui/view/pivotsh.cxx +++ b/sc/source/ui/view/pivotsh.cxx @@ -41,7 +41,7 @@ #include <sfx2/objface.hxx> #include <sfx2/objsh.hxx> #include <sfx2/request.hxx> -#include <svtools/whiter.hxx> +#include <svl/whiter.hxx> #include <vcl/msgbox.hxx> #include "sc.hrc" diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx index b94837fc1793..31121f35aa1b 100644 --- a/sc/source/ui/view/preview.cxx +++ b/sc/source/ui/view/preview.cxx @@ -47,7 +47,7 @@ #include <sfx2/viewfrm.hxx> #include <sfx2/dispatch.hxx> #include <svtools/accessibilityoptions.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <tools/multisel.hxx> #include <vcl/waitobj.hxx> #include <vcl/sound.hxx> diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx index 360c05e2f84a..ec4c317c7ad5 100644 --- a/sc/source/ui/view/prevwsh.cxx +++ b/sc/source/ui/view/prevwsh.cxx @@ -49,8 +49,8 @@ #include <sfx2/request.hxx> #include <sfx2/topfrm.hxx> #include <svtools/printdlg.hxx> -#include <svtools/stritem.hxx> -#include <svtools/whiter.hxx> +#include <svl/stritem.hxx> +#include <svl/whiter.hxx> #include <vcl/msgbox.hxx> #include <vcl/help.hxx> #include <tools/urlobj.hxx> diff --git a/sc/source/ui/view/prevwsh2.cxx b/sc/source/ui/view/prevwsh2.cxx index 157f4bffa4ec..58dc2d913c58 100644 --- a/sc/source/ui/view/prevwsh2.cxx +++ b/sc/source/ui/view/prevwsh2.cxx @@ -300,7 +300,7 @@ // INCLUDE --------------------------------------------------------------- #include <svx/svdmodel.hxx> -#include <svtools/smplhint.hxx> +#include <svl/smplhint.hxx> #include "prevwsh.hxx" #include "docsh.hxx" diff --git a/sc/source/ui/view/tabvwsh2.cxx b/sc/source/ui/view/tabvwsh2.cxx index 20f5250bca00..08b7f5f4ad85 100644 --- a/sc/source/ui/view/tabvwsh2.cxx +++ b/sc/source/ui/view/tabvwsh2.cxx @@ -41,10 +41,10 @@ #include <sfx2/bindings.hxx> #include <sfx2/viewfrm.hxx> -#include <svtools/aeitem.hxx> -#include <svtools/whiter.hxx> +#include <svl/aeitem.hxx> +#include <svl/whiter.hxx> #include <unotools/moduleoptions.hxx> -#include <svtools/languageoptions.hxx> +#include <svl/languageoptions.hxx> #include <sfx2/dispatch.hxx> #include "tabvwsh.hxx" @@ -67,7 +67,7 @@ // #98185# Create default drawing objects via keyboard #include <svx/svdpagv.hxx> -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #include <svx/svdpage.hxx> #include <fuconcustomshape.hxx> diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx index 525ea1f14578..c49af4cdae77 100644 --- a/sc/source/ui/view/tabvwsh3.cxx +++ b/sc/source/ui/view/tabvwsh3.cxx @@ -45,8 +45,8 @@ #include <sfx2/passwd.hxx> #include <sfx2/request.hxx> #include <sfx2/topfrm.hxx> -#include <svtools/ptitem.hxx> -#include <svtools/stritem.hxx> +#include <svl/ptitem.hxx> +#include <svl/stritem.hxx> #include <tools/urlobj.hxx> #include <vcl/msgbox.hxx> @@ -78,9 +78,9 @@ #include "tabprotection.hxx" #include "protectiondlg.hxx" -#include <svtools/ilstitem.hxx> +#include <svl/ilstitem.hxx> #define _SVSTDARR_ULONGS -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #include <svx/zoomslideritem.hxx> #include <svx/svxdlg.hxx> //CHINA001 diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx index 8e32b1c9a2af..359c34ec3685 100644 --- a/sc/source/ui/view/tabvwsh4.cxx +++ b/sc/source/ui/view/tabvwsh4.cxx @@ -51,7 +51,7 @@ #include <sfx2/printer.hxx> #include <sfx2/dispatch.hxx> #include <svtools/printdlg.hxx> -#include <svtools/whiter.hxx> +#include <svl/whiter.hxx> #include <unotools/moduleoptions.hxx> #include <rtl/logfile.hxx> #include <tools/urlobj.hxx> diff --git a/sc/source/ui/view/tabvwsh5.cxx b/sc/source/ui/view/tabvwsh5.cxx index 92cf03cdf5d6..a870171450ad 100644 --- a/sc/source/ui/view/tabvwsh5.cxx +++ b/sc/source/ui/view/tabvwsh5.cxx @@ -36,8 +36,8 @@ // INCLUDE --------------------------------------------------------------- #define _ZFORLIST_DECLARE_TABLE #include "scitems.hxx" -#include <svtools/smplhint.hxx> -#include <svtools/zforlist.hxx> +#include <svl/smplhint.hxx> +#include <svl/zforlist.hxx> #include <svx/numfmtsh.hxx> #include <svx/numinf.hxx> #include <svx/svxids.hrc> diff --git a/sc/source/ui/view/tabvwsh9.cxx b/sc/source/ui/view/tabvwsh9.cxx index 7562e7d592a0..d3020756bbb5 100644 --- a/sc/source/ui/view/tabvwsh9.cxx +++ b/sc/source/ui/view/tabvwsh9.cxx @@ -44,7 +44,7 @@ #include <sfx2/request.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/dispatch.hxx> -#include <svtools/whiter.hxx> +#include <svl/whiter.hxx> #include <avmedia/mediaplayer.hxx> #include "tabvwsh.hxx" diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx index 9e844f970909..63f876cccf34 100644 --- a/sc/source/ui/view/tabvwsha.cxx +++ b/sc/source/ui/view/tabvwsha.cxx @@ -37,10 +37,10 @@ #define _ZFORLIST_DECLARE_TABLE #include "scitems.hxx" -#include <svtools/slstitm.hxx> -#include <svtools/stritem.hxx> -#include <svtools/whiter.hxx> -#include <svtools/zformat.hxx> +#include <svl/slstitm.hxx> +#include <svl/stritem.hxx> +#include <svl/whiter.hxx> +#include <svl/zformat.hxx> #include <svx/boxitem.hxx> #include <svx/numinf.hxx> #include <svx/srchitem.hxx> diff --git a/sc/source/ui/view/tabvwshb.cxx b/sc/source/ui/view/tabvwshb.cxx index 6312ff9e3b50..72ffe6d5ab10 100644 --- a/sc/source/ui/view/tabvwshb.cxx +++ b/sc/source/ui/view/tabvwshb.cxx @@ -63,8 +63,8 @@ #include <sfx2/dispatch.hxx> #include <sfx2/viewfrm.hxx> #include <svtools/soerr.hxx> -#include <svtools/rectitem.hxx> -#include <svtools/whiter.hxx> +#include <svl/rectitem.hxx> +#include <svl/whiter.hxx> #include <unotools/moduleoptions.hxx> #include <sot/exchange.hxx> diff --git a/sc/source/ui/view/tabvwshe.cxx b/sc/source/ui/view/tabvwshe.cxx index 8eafd476d00d..9866a5aa0a0a 100644 --- a/sc/source/ui/view/tabvwshe.cxx +++ b/sc/source/ui/view/tabvwshe.cxx @@ -45,7 +45,7 @@ #include <sfx2/viewfrm.hxx> #include <sfx2/request.hxx> #include <sfx2/objface.hxx> -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #include <vcl/sound.hxx> #include "tabvwsh.hxx" diff --git a/sc/source/ui/view/tabvwshf.cxx b/sc/source/ui/view/tabvwshf.cxx index 744481c4441c..4ef21a24e1ff 100644 --- a/sc/source/ui/view/tabvwshf.cxx +++ b/sc/source/ui/view/tabvwshf.cxx @@ -39,9 +39,9 @@ #include <sfx2/request.hxx> #include <basic/sbstar.hxx> #include <layout/layout.hxx> -#include <svtools/languageoptions.hxx> -#include <svtools/stritem.hxx> -#include <svtools/whiter.hxx> +#include <svl/languageoptions.hxx> +#include <svl/stritem.hxx> +#include <svl/whiter.hxx> #include <vcl/msgbox.hxx> #include "tabvwsh.hxx" diff --git a/sc/source/ui/view/tabvwshh.cxx b/sc/source/ui/view/tabvwshh.cxx index 7526a3de19bd..2d3ffc75340b 100644 --- a/sc/source/ui/view/tabvwshh.cxx +++ b/sc/source/ui/view/tabvwshh.cxx @@ -42,7 +42,7 @@ #include <sfx2/objsh.hxx> #include <sfx2/request.hxx> #include <basic/sbxcore.hxx> -#include <svtools/whiter.hxx> +#include <svl/whiter.hxx> #include <vcl/msgbox.hxx> #include "tabvwsh.hxx" diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx index 50ede74ab06b..4c1bcc9e35fe 100644 --- a/sc/source/ui/view/viewfun2.cxx +++ b/sc/source/ui/view/viewfun2.cxx @@ -50,9 +50,9 @@ #include <sfx2/docfile.hxx> #include <sfx2/objitem.hxx> #include <sfx2/viewfrm.hxx> -#include <svtools/stritem.hxx> -#include <svtools/zforlist.hxx> -#include <svtools/svstdarr.hxx> +#include <svl/stritem.hxx> +#include <svl/zforlist.hxx> +#include <svl/svstdarr.hxx> #include <vcl/msgbox.hxx> #include <vcl/sound.hxx> #include <vcl/waitobj.hxx> diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx index 3065aa2fd4e1..3327ea3fe88d 100644 --- a/sc/source/ui/view/viewfun3.cxx +++ b/sc/source/ui/view/viewfun3.cxx @@ -173,9 +173,9 @@ #include <svx/svdetc.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/docfile.hxx> -#include <svtools/stritem.hxx> -#include <svtools/ptitem.hxx> -#include <svtools/urlbmk.hxx> +#include <svl/stritem.hxx> +#include <svl/ptitem.hxx> +#include <svl/urlbmk.hxx> #include <sot/clsids.hxx> #include <sot/formats.hxx> #include <vcl/graph.hxx> diff --git a/sc/source/ui/view/viewfun4.cxx b/sc/source/ui/view/viewfun4.cxx index 578f6c1fe733..b57653af5f9b 100644 --- a/sc/source/ui/view/viewfun4.cxx +++ b/sc/source/ui/view/viewfun4.cxx @@ -54,9 +54,9 @@ #include <sfx2/fcontnr.hxx> #include <svtools/langtab.hxx> #include <svtools/filter.hxx> -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #include <svtools/transfer.hxx> -#include <svtools/urlbmk.hxx> +#include <svl/urlbmk.hxx> #include <vcl/msgbox.hxx> #include <avmedia/mediawindow.hxx> diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx index 71e8b4f9ae0b..0b429a21b6d3 100644 --- a/sc/source/ui/view/viewfun5.cxx +++ b/sc/source/ui/view/viewfun5.cxx @@ -54,8 +54,8 @@ #include <sot/formats.hxx> #include <sot/filelist.hxx> #include <unotools/pathoptions.hxx> -#include <svtools/ptitem.hxx> -#include <svtools/stritem.hxx> +#include <svl/ptitem.hxx> +#include <svl/stritem.hxx> #include <svtools/transfer.hxx> #include <vcl/graph.hxx> diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx index 79343c31f85b..a3e695e7a3f8 100644 --- a/sc/source/ui/view/viewfunc.cxx +++ b/sc/source/ui/view/viewfunc.cxx @@ -48,8 +48,8 @@ #include <svx/langitem.hxx> #include <svx/scripttypeitem.hxx> #include <sfx2/bindings.hxx> -#include <svtools/zforlist.hxx> -#include <svtools/zformat.hxx> +#include <svl/zforlist.hxx> +#include <svl/zformat.hxx> #include <vcl/msgbox.hxx> #include <vcl/sound.hxx> #include <vcl/virdev.hxx> diff --git a/sc/source/ui/view/viewutil.cxx b/sc/source/ui/view/viewutil.cxx index d0a6f2acf015..cc51c48f67ed 100644 --- a/sc/source/ui/view/viewutil.cxx +++ b/sc/source/ui/view/viewutil.cxx @@ -43,17 +43,17 @@ #include <svx/fontitem.hxx> #include <svx/langitem.hxx> #include <svx/scripttypeitem.hxx> -#include <svtools/itempool.hxx> -#include <svtools/itemset.hxx> -#include <svtools/cjkoptions.hxx> -#include <svtools/ctloptions.hxx> +#include <svl/itempool.hxx> +#include <svl/itemset.hxx> +#include <svl/cjkoptions.hxx> +#include <svl/ctloptions.hxx> #include <vcl/svapp.hxx> #include <vcl/msgbox.hxx> #include <vcl/wrkwin.hxx> #include <sfx2/request.hxx> #include <sfx2/objsh.hxx> -#include <svtools/stritem.hxx> -#include <svtools/eitem.hxx> +#include <svl/stritem.hxx> +#include <svl/eitem.hxx> #include <com/sun/star/i18n/TransliterationModules.hpp> diff --git a/sc/workben/addin.cxx b/sc/workben/addin.cxx index 8520fb1337fe..527ae01b5c01 100644 --- a/sc/workben/addin.cxx +++ b/sc/workben/addin.cxx @@ -39,7 +39,7 @@ #include <vcl/svapp.hxx> #include <tools/debug.hxx> #include <tools/date.hxx> -#include <svtools/itemprop.hxx> +#include <svl/itemprop.hxx> #include <usr/proptypehlp.hxx> #include <cppuhelper/factory.hxx> #include <uno/lbnames.h> diff --git a/sc/workben/result.hxx b/sc/workben/result.hxx index 15b04a386399..9b901f93db22 100644 --- a/sc/workben/result.hxx +++ b/sc/workben/result.hxx @@ -31,7 +31,7 @@ #ifndef SC_RESULT_HXX #define SC_RESULT_HXX -#include <svtools/svarray.hxx> +#include <svl/svarray.hxx> #include <vcl/timer.hxx> #include <tools/string.hxx> |