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 /chart2 | |
parent | 20ade6a1d2fc888edec120f09079ed26d3bd80ff (diff) |
#i103496#: split svtools; improve ConfitItems
Diffstat (limited to 'chart2')
61 files changed, 118 insertions, 104 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> |