diff options
Diffstat (limited to 'chart2/source')
27 files changed, 48 insertions, 48 deletions
diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx b/chart2/source/controller/accessibility/AccessibleBase.cxx index 81b85cfacf34..46cb2e0ae396 100644 --- a/chart2/source/controller/accessibility/AccessibleBase.cxx +++ b/chart2/source/controller/accessibility/AccessibleBase.cxx @@ -42,7 +42,7 @@ #include <com/sun/star/accessibility/AccessibleEventObject.hpp> #include <com/sun/star/accessibility/AccessibleStateType.hpp> #include <com/sun/star/accessibility/AccessibleRole.hpp> - +#include <comphelper/serviceinfohelper.hxx> #include <com/sun/star/drawing/LineStyle.hpp> #include <com/sun/star/drawing/FillStyle.hpp> #include <rtl/ustrbuf.hxx> @@ -51,8 +51,8 @@ #include <rtl/uuid.h> #include <cppuhelper/queryinterface.hxx> #include <svl/itemset.hxx> -#include <svx/unofdesc.hxx> -#include <svx/outliner.hxx> +#include <editeng/unofdesc.hxx> +#include <editeng/outliner.hxx> #include <svx/svdoutl.hxx> #include <svx/svdetc.hxx> #include <svx/unoshape.hxx> @@ -947,7 +947,7 @@ OUString SAL_CALL AccessibleBase::getImplementationName() sal_Bool SAL_CALL AccessibleBase::supportsService( const OUString& ServiceName ) throw (RuntimeException) { - return SvxServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() ); + return comphelper::ServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() ); } uno::Sequence< OUString > SAL_CALL AccessibleBase::getSupportedServiceNames() diff --git a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx index ecd3bffeb5d9..9957948de00f 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx @@ -46,7 +46,7 @@ #include <com/sun/star/graphic/XGraphicProvider.hpp> // for UNO_NAME_GRAPHOBJ_URLPREFIX -#include <svx/unoprnms.hxx> +#include <editeng/unoprnms.hxx> // for Graphic #include <vcl/graph.hxx> diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx index ec8a0eaaa784..248e316a846a 100644 --- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx +++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx @@ -76,7 +76,7 @@ #include <svx/svxgrahicitem.hxx> #include <svx/dialogs.hrc> -#include <svx/flstitem.hxx> +#include <editeng/flstitem.hxx> #include <svx/tabline.hxx> #include <svx/flagsdef.hxx> diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx b/chart2/source/controller/dialogs/res_DataLabel.cxx index 44fd27f7d09a..bb8905898889 100644 --- a/chart2/source/controller/dialogs/res_DataLabel.cxx +++ b/chart2/source/controller/dialogs/res_DataLabel.cxx @@ -49,8 +49,8 @@ #include <svl/stritem.hxx> //SfxIntegerListItem #include <svl/ilstitem.hxx> -#include <svx/eeitem.hxx> -#include <svx/frmdiritem.hxx> +#include <editeng/eeitem.hxx> +#include <editeng/frmdiritem.hxx> // header for define RET_OK #include <vcl/msgbox.hxx> diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx index dbed68f2417b..84e8efef1e12 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx @@ -42,7 +42,7 @@ #include "ChartTypeHelper.hxx" #include "ThreeDHelper.hxx" #include <rtl/math.hxx> -#include <svx/unoprnms.hxx> +#include <editeng/unoprnms.hxx> #include <com/sun/star/drawing/ProjectionMode.hpp> //............................................................................. diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.cxx b/chart2/source/controller/dialogs/tp_AxisLabel.cxx index a7407b4781ee..d510d2c685b3 100644 --- a/chart2/source/controller/dialogs/tp_AxisLabel.cxx +++ b/chart2/source/controller/dialogs/tp_AxisLabel.cxx @@ -42,8 +42,8 @@ // header for SfxInt32Item #include <svl/intitem.hxx> -#include <svx/eeitem.hxx> -#include <svx/frmdiritem.hxx> +#include <editeng/eeitem.hxx> +#include <editeng/frmdiritem.hxx> //............................................................................. namespace chart diff --git a/chart2/source/controller/dialogs/tp_LegendPosition.cxx b/chart2/source/controller/dialogs/tp_LegendPosition.cxx index c2c0ad7e28c4..276b9fd3298f 100644 --- a/chart2/source/controller/dialogs/tp_LegendPosition.cxx +++ b/chart2/source/controller/dialogs/tp_LegendPosition.cxx @@ -37,8 +37,8 @@ #include "chartview/ChartSfxItemIds.hxx" #include "NoWarningThisInCTOR.hxx" #include <svx/chrtitem.hxx> -#include <svx/eeitem.hxx> -#include <svx/frmdiritem.hxx> +#include <editeng/eeitem.hxx> +#include <editeng/frmdiritem.hxx> //............................................................................. namespace chart diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.cxx b/chart2/source/controller/dialogs/tp_TitleRotation.cxx index d04f43c7031b..a8b5d461dd75 100644 --- a/chart2/source/controller/dialogs/tp_TitleRotation.cxx +++ b/chart2/source/controller/dialogs/tp_TitleRotation.cxx @@ -36,8 +36,8 @@ #include "TabPages.hrc" #include "chartview/ChartSfxItemIds.hxx" #include "HelpIds.hrc" -#include <svx/eeitem.hxx> -#include <svx/frmdiritem.hxx> +#include <editeng/eeitem.hxx> +#include <editeng/frmdiritem.hxx> // header for class SfxInt32Item #include <svl/intitem.hxx> diff --git a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx index fa285f98d991..9856cdc682d7 100644 --- a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx +++ b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx @@ -46,7 +46,7 @@ #include <svx/svdoutl.hxx> // header for class SvxForbiddenCharactersTable -#include <svx/forbiddencharacterstable.hxx> +#include <editeng/forbiddencharacterstable.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> diff --git a/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx index ee83459d4429..ae52561f5edc 100644 --- a/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx @@ -35,13 +35,14 @@ #include "macros.hxx" #include "ItemPropertyMap.hxx" #include "RelativeSizeHelper.hxx" -#include <svx/eeitem.hxx> -#include <svx/udlnitem.hxx> -#include <svx/fontitem.hxx> -#include <svx/crsditem.hxx> -#include <svx/postitem.hxx> -#include <svx/wghtitem.hxx> -#include <svx/fhgtitem.hxx> +#include <editeng/memberids.hrc> +#include <editeng/eeitem.hxx> +#include <editeng/udlnitem.hxx> +#include <editeng/fontitem.hxx> +#include <editeng/crsditem.hxx> +#include <editeng/postitem.hxx> +#include <editeng/wghtitem.hxx> +#include <editeng/fhgtitem.hxx> #include <svl/stritem.hxx> #include <com/sun/star/beans/XPropertyState.hpp> diff --git a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx index c27fa016d00d..8c2e2cd8cf52 100644 --- a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx @@ -50,10 +50,10 @@ // header for class XFillColorItem #include <svx/xflclit.hxx> #include <svl/intitem.hxx> -#include <svx/sizeitem.hxx> +#include <editeng/sizeitem.hxx> // header for class SfxStringItem #include <svl/stritem.hxx> -#include <svx/brshitem.hxx> +#include <editeng/brshitem.hxx> //SfxIntegerListItem #include <svl/ilstitem.hxx> #define _SVSTDARR_ULONGS diff --git a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx index 1c7273f44c89..f9dc30952359 100644 --- a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx @@ -36,10 +36,7 @@ #include "ItemPropertyMap.hxx" #include "PropertyHelper.hxx" #include "CommonConverters.hxx" - -// #ifndef _SFXINTITEM_HXX -// #include <svl/intitem.hxx> -// #endif +#include <editeng/memberids.hrc> #include <svx/xflclit.hxx> #include <svx/xlnclit.hxx> #include <svx/xflbmtit.hxx> @@ -51,7 +48,7 @@ #include <svx/xflgrit.hxx> #include <svx/xfltrit.hxx> #include <svx/xlntrit.hxx> -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> // for SfxBoolItem #include <svl/eitem.hxx> // for XFillGradientStepCountItem diff --git a/chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx b/chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx index dbefb0e7f025..adc09a270bb8 100644 --- a/chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx +++ b/chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx @@ -35,7 +35,7 @@ #endif #include <svx/xdef.hxx> #include <svx/svddef.hxx> -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include "chartview/ChartSfxItemIds.hxx" @@ -136,7 +136,7 @@ const USHORT nDataLabelWhichPairs[] = #define CHART_POINT_WHICHPAIRS \ XATTR_LINE_FIRST, XATTR_LINE_LAST, /* 1000 - 1016 svx/xdef.hxx */ \ XATTR_FILL_FIRST, XATTR_FILL_LAST, /* 1018 - 1046 svx/xdef.hxx */ \ - EE_ITEMS_START, EE_ITEMS_END, /* 3994 - 4037 svx/eeitem.hxx */ \ + EE_ITEMS_START, EE_ITEMS_END, /* 3994 - 4037 editeng/eeitem.hxx */ \ SID_CHAR_DLG_PREVIEW_STRING, SID_CHAR_DLG_PREVIEW_STRING, \ SCHATTR_DATADESCR_START, SCHATTR_DATADESCR_END, /* 1 - 2 sch/schattr.hxx*/ \ SID_ATTR_NUMBERFORMAT_VALUE, SID_ATTR_NUMBERFORMAT_INFO, /* 10585 - 10585 svx/svxids.hrc */ \ diff --git a/chart2/source/controller/main/ChartController_TextEdit.cxx b/chart2/source/controller/main/ChartController_TextEdit.cxx index 855357ce701b..540d65630fa4 100644 --- a/chart2/source/controller/main/ChartController_TextEdit.cxx +++ b/chart2/source/controller/main/ChartController_TextEdit.cxx @@ -55,7 +55,7 @@ #include <vos/mutex.hxx> #include <com/sun/star/beans/XPropertySet.hpp> #include <svl/stritem.hxx> -#include <svx/fontitem.hxx> +#include <editeng/fontitem.hxx> //............................................................................. namespace chart diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx index 8dca62d93ee1..e90b4c4a8db9 100644 --- a/chart2/source/controller/main/ChartController_Tools.cxx +++ b/chart2/source/controller/main/ChartController_Tools.cxx @@ -81,7 +81,7 @@ #include <vcl/svapp.hxx> #include <vos/mutex.hxx> // for OutlinerView -#include <svx/outliner.hxx> +#include <editeng/outliner.hxx> using namespace ::com::sun::star; diff --git a/chart2/source/controller/makefile.mk b/chart2/source/controller/makefile.mk index cdc84b2224b2..831e35e6eb44 100644 --- a/chart2/source/controller/makefile.mk +++ b/chart2/source/controller/makefile.mk @@ -80,6 +80,7 @@ SHL1LIBS= $(LIB1TARGET) SHL1STDLIBS= $(CHARTTOOLS) \ $(CHARTVIEW) \ + $(EDITENGLIB) \ $(CPPULIB) \ $(CPPUHELPERLIB) \ $(COMPHELPERLIB) \ diff --git a/chart2/source/tools/ThreeDHelper.cxx b/chart2/source/tools/ThreeDHelper.cxx index 1b584a9fb39a..cfd79b6bb32b 100644 --- a/chart2/source/tools/ThreeDHelper.cxx +++ b/chart2/source/tools/ThreeDHelper.cxx @@ -37,7 +37,7 @@ #include "ChartTypeHelper.hxx" #include "BaseGFXHelper.hxx" #include "DataSeriesHelper.hxx" -#include <svx/unoprnms.hxx> +#include <editeng/unoprnms.hxx> #include <com/sun/star/beans/XPropertyState.hpp> #include <com/sun/star/chart2/XDiagram.hpp> #include <com/sun/star/drawing/LineStyle.hpp> diff --git a/chart2/source/view/axes/VCartesianAxis.cxx b/chart2/source/view/axes/VCartesianAxis.cxx index 0f18029254ef..895c92364acf 100644 --- a/chart2/source/view/axes/VCartesianAxis.cxx +++ b/chart2/source/view/axes/VCartesianAxis.cxx @@ -50,7 +50,7 @@ #include <tools/debug.hxx> #include <com/sun/star/text/XText.hpp> #include <com/sun/star/text/WritingMode2.hpp> -#include <svx/unoprnms.hxx> +#include <editeng/unoprnms.hxx> #include <algorithm> #include <memory> diff --git a/chart2/source/view/charttypes/AreaChart.cxx b/chart2/source/view/charttypes/AreaChart.cxx index 406e5d119cd6..2b62dec29d5e 100644 --- a/chart2/source/view/charttypes/AreaChart.cxx +++ b/chart2/source/view/charttypes/AreaChart.cxx @@ -51,7 +51,7 @@ #include <com/sun/star/chart/DataLabelPlacement.hpp> #include <com/sun/star/chart/MissingValueTreatment.hpp> #include <tools/debug.hxx> -#include <svx/unoprnms.hxx> +#include <editeng/unoprnms.hxx> #include <rtl/math.hxx> #include <com/sun/star/drawing/DoubleSequence.hpp> #include <com/sun/star/drawing/NormalsKind.hpp> diff --git a/chart2/source/view/charttypes/BubbleChart.cxx b/chart2/source/view/charttypes/BubbleChart.cxx index 6069189ff0ac..ce9a803dab92 100644 --- a/chart2/source/view/charttypes/BubbleChart.cxx +++ b/chart2/source/view/charttypes/BubbleChart.cxx @@ -46,7 +46,7 @@ #include <com/sun/star/chart2/Symbol.hpp> #include <com/sun/star/chart/DataLabelPlacement.hpp> #include <tools/debug.hxx> -#include <svx/unoprnms.hxx> +#include <editeng/unoprnms.hxx> #include <rtl/math.hxx> #include <com/sun/star/drawing/DoubleSequence.hpp> #include <com/sun/star/drawing/NormalsKind.hpp> diff --git a/chart2/source/view/charttypes/CandleStickChart.cxx b/chart2/source/view/charttypes/CandleStickChart.cxx index e19a44cdcda6..22a1f8163049 100644 --- a/chart2/source/view/charttypes/CandleStickChart.cxx +++ b/chart2/source/view/charttypes/CandleStickChart.cxx @@ -45,7 +45,7 @@ #include "DataSeriesHelper.hxx" #include <tools/debug.hxx> #include <rtl/math.hxx> -#include <svx/unoprnms.hxx> +#include <editeng/unoprnms.hxx> //............................................................................. namespace chart diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx index c8f473d226d0..ef76aea88403 100644 --- a/chart2/source/view/charttypes/VSeriesPlotter.cxx +++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx @@ -68,7 +68,7 @@ #include <com/sun/star/chart2/XRegressionCurveContainer.hpp> #include <com/sun/star/container/XChild.hpp> #include <com/sun/star/chart2/RelativePosition.hpp> -#include <svx/unoprnms.hxx> +#include <editeng/unoprnms.hxx> #include <tools/color.hxx> // header for class OUStringBuffer #include <rtl/ustrbuf.hxx> diff --git a/chart2/source/view/diagram/VDiagram.cxx b/chart2/source/view/diagram/VDiagram.cxx index 5e0db2644cc5..70fa5900beb7 100644 --- a/chart2/source/view/diagram/VDiagram.cxx +++ b/chart2/source/view/diagram/VDiagram.cxx @@ -41,7 +41,7 @@ #include "CommonConverters.hxx" #include "ChartTypeHelper.hxx" #include "ThreeDHelper.hxx" -#include <svx/unoprnms.hxx> +#include <editeng/unoprnms.hxx> #include <tools/color.hxx> #include <tools/debug.hxx> #include <com/sun/star/drawing/FillStyle.hpp> diff --git a/chart2/source/view/main/ChartItemPool.cxx b/chart2/source/view/main/ChartItemPool.cxx index 3da8fe225f8c..5336fd9f9a66 100644 --- a/chart2/source/view/main/ChartItemPool.cxx +++ b/chart2/source/view/main/ChartItemPool.cxx @@ -37,14 +37,14 @@ #include "chartview/ChartSfxItemIds.hxx" #include <svx/chrtitem.hxx> #include <svl/intitem.hxx> -#include <svx/brshitem.hxx> -#include <svx/sizeitem.hxx> -// header for class SfxStringItem +#include <editeng/brshitem.hxx> +#include <editeng/sizeitem.hxx> #include <svl/stritem.hxx> -//SfxIntegerListItem #include <svl/ilstitem.hxx> #define _SVSTDARR_ULONGS #include <svl/svstdarr.hxx> +#include <editeng/editids.hrc> +#include <svx/svxids.hrc> namespace chart { diff --git a/chart2/source/view/main/DrawModelWrapper.cxx b/chart2/source/view/main/DrawModelWrapper.cxx index 4212640033ac..cdee0bdac475 100644 --- a/chart2/source/view/main/DrawModelWrapper.cxx +++ b/chart2/source/view/main/DrawModelWrapper.cxx @@ -41,7 +41,7 @@ // header for class SfxBoolItem #include <svl/eitem.hxx> // header for define EE_PARA_HYPHENATE -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> // header for class Svx3DPercentDiagonalItem #include <svx/svx3ditems.hxx> // header for class SvtPathOptions @@ -57,7 +57,7 @@ // header for class SdrOutliner #include <svx/svdoutl.hxx> // header for class LinguMgr -#include <svx/unolingu.hxx> +#include <editeng/unolingu.hxx> // header for class Application #include <vcl/svapp.hxx> // header for class VirtualDevice diff --git a/chart2/source/view/main/ShapeFactory.cxx b/chart2/source/view/main/ShapeFactory.cxx index 8a19e66334fb..658bee26c5dd 100644 --- a/chart2/source/view/main/ShapeFactory.cxx +++ b/chart2/source/view/main/ShapeFactory.cxx @@ -55,7 +55,7 @@ #include <com/sun/star/uno/Any.hxx> -#include <svx/unoprnms.hxx> +#include <editeng/unoprnms.hxx> #include <tools/color.hxx> #include <tools/debug.hxx> #include <rtl/math.hxx> diff --git a/chart2/source/view/makefile.mk b/chart2/source/view/makefile.mk index 8ab947b9cedc..e256e7931267 100644 --- a/chart2/source/view/makefile.mk +++ b/chart2/source/view/makefile.mk @@ -77,6 +77,7 @@ SHL1LIBS= $(LIB1TARGET) SHL1STDLIBS= $(CHARTTOOLS) \ $(CPPULIB) \ + $(EDITENGLIB) \ $(CPPUHELPERLIB) \ $(COMPHELPERLIB) \ $(SALLIB) \ |