diff options
Diffstat (limited to 'chart2/source/model/main')
-rw-r--r-- | chart2/source/model/main/Axis.cxx | 7 | ||||
-rw-r--r-- | chart2/source/model/main/BaseCoordinateSystem.cxx | 2 | ||||
-rw-r--r-- | chart2/source/model/main/CartesianCoordinateSystem.cxx | 3 | ||||
-rw-r--r-- | chart2/source/model/main/ChartModel.cxx | 15 | ||||
-rw-r--r-- | chart2/source/model/main/ChartModel_Persistence.cxx | 2 | ||||
-rw-r--r-- | chart2/source/model/main/DataPoint.cxx | 2 | ||||
-rw-r--r-- | chart2/source/model/main/DataPointProperties.cxx | 2 | ||||
-rw-r--r-- | chart2/source/model/main/DataSeries.cxx | 3 | ||||
-rw-r--r-- | chart2/source/model/main/DataSeriesProperties.cxx | 4 | ||||
-rw-r--r-- | chart2/source/model/main/Diagram.cxx | 7 | ||||
-rw-r--r-- | chart2/source/model/main/FormattedString.cxx | 4 | ||||
-rw-r--r-- | chart2/source/model/main/GridProperties.cxx | 6 | ||||
-rw-r--r-- | chart2/source/model/main/Legend.cxx | 4 | ||||
-rw-r--r-- | chart2/source/model/main/PageBackground.cxx | 5 | ||||
-rw-r--r-- | chart2/source/model/main/PolarCoordinateSystem.cxx | 3 | ||||
-rw-r--r-- | chart2/source/model/main/StockBar.cxx | 5 | ||||
-rw-r--r-- | chart2/source/model/main/Title.cxx | 6 | ||||
-rw-r--r-- | chart2/source/model/main/Wall.cxx | 9 |
18 files changed, 20 insertions, 69 deletions
diff --git a/chart2/source/model/main/Axis.cxx b/chart2/source/model/main/Axis.cxx index fe589063dd97..7f0e0c07233e 100644 --- a/chart2/source/model/main/Axis.cxx +++ b/chart2/source/model/main/Axis.cxx @@ -33,15 +33,8 @@ #include <com/sun/star/chart/ChartAxisLabelPosition.hpp> #include <com/sun/star/chart/ChartAxisMarkPosition.hpp> #include <com/sun/star/chart/ChartAxisPosition.hpp> -#include <com/sun/star/chart2/AxisType.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> -#include <com/sun/star/lang/Locale.hpp> -#include <com/sun/star/drawing/LineStyle.hpp> -#include <com/sun/star/drawing/LineDash.hpp> -#include <com/sun/star/drawing/LineJoint.hpp> #include <com/sun/star/awt/Size.hpp> -#include <rtl/uuid.h> -#include <cppuhelper/queryinterface.hxx> #include <cppuhelper/supportsservice.hxx> #include <tools/diagnose_ex.h> diff --git a/chart2/source/model/main/BaseCoordinateSystem.cxx b/chart2/source/model/main/BaseCoordinateSystem.cxx index 34f497a149fd..cd5b1e4fab36 100644 --- a/chart2/source/model/main/BaseCoordinateSystem.cxx +++ b/chart2/source/model/main/BaseCoordinateSystem.cxx @@ -24,14 +24,12 @@ #include <CloneHelper.hxx> #include <ModifyListenerHelper.hxx> #include "Axis.hxx" -#include <AxisHelper.hxx> #include <com/sun/star/chart2/AxisType.hpp> #include <com/sun/star/container/NoSuchElementException.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <tools/diagnose_ex.h> #include <algorithm> -#include <iterator> #include <com/sun/star/beans/PropertyAttribute.hpp> diff --git a/chart2/source/model/main/CartesianCoordinateSystem.cxx b/chart2/source/model/main/CartesianCoordinateSystem.cxx index c06fbb95766b..766afaddda11 100644 --- a/chart2/source/model/main/CartesianCoordinateSystem.cxx +++ b/chart2/source/model/main/CartesianCoordinateSystem.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <com/sun/star/uno/XComponentContext.hpp> #include <CartesianCoordinateSystem.hxx> #include <servicenames_coosystems.hxx> #include <cppuhelper/supportsservice.hxx> @@ -28,6 +27,8 @@ using ::com::sun::star::uno::RuntimeException; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; +namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } + namespace { diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx index 019703701d9e..1940b16f04c3 100644 --- a/chart2/source/model/main/ChartModel.cxx +++ b/chart2/source/model/main/ChartModel.cxx @@ -19,10 +19,8 @@ #include <ChartModel.hxx> #include <servicenames.hxx> -#include <MediaDescriptorHelper.hxx> #include <DataSourceHelper.hxx> #include <ChartModelHelper.hxx> -#include <DiagramHelper.hxx> #include <DisposeHelper.hxx> #include <ControllerLockGuard.hxx> #include <ObjectIdentifier.hxx> @@ -33,7 +31,6 @@ #include <ChartView.hxx> #include <PopupRequest.hxx> #include <ModifyListenerHelper.hxx> -#include <svx/charthelper.hxx> #include <com/sun/star/chart/ChartDataRowSource.hpp> #include <com/sun/star/chart2/data/XPivotTableDataProvider.hpp> @@ -46,25 +43,15 @@ #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/view/XSelectionSupplier.hpp> -#include <com/sun/star/embed/XEmbedObjectCreator.hpp> -#include <com/sun/star/embed/XEmbedPersist.hpp> -#include <com/sun/star/embed/EmbedStates.hpp> -#include <com/sun/star/embed/XComponentSupplier.hpp> -#include <com/sun/star/embed/XStorage.hpp> #include <com/sun/star/embed/EmbedMapUnits.hpp> #include <com/sun/star/embed/Aspects.hpp> -#include <com/sun/star/awt/Gradient.hpp> -#include <com/sun/star/awt/XWindow.hpp> -#include <com/sun/star/awt/PosSize.hpp> #include <com/sun/star/datatransfer/UnsupportedFlavorException.hpp> #include <com/sun/star/datatransfer/XTransferable.hpp> -#include <com/sun/star/drawing/Hatch.hpp> -#include <com/sun/star/drawing/LineDash.hpp> #include <com/sun/star/drawing/XShapes.hpp> #include <com/sun/star/document/DocumentProperties.hpp> -#include <com/sun/star/chart2/XTimeBased.hpp> #include <com/sun/star/util/CloseVetoException.hpp> #include <com/sun/star/util/XModifyBroadcaster.hpp> +#include <com/sun/star/chart2/XChartTypeTemplate.hpp> #include <sal/log.hxx> #include <svl/zforlist.hxx> diff --git a/chart2/source/model/main/ChartModel_Persistence.cxx b/chart2/source/model/main/ChartModel_Persistence.cxx index 369fd6d61bd5..dcf867eede57 100644 --- a/chart2/source/model/main/ChartModel_Persistence.cxx +++ b/chart2/source/model/main/ChartModel_Persistence.cxx @@ -40,7 +40,6 @@ #include <com/sun/star/embed/StorageFactory.hpp> #include <com/sun/star/io/IOException.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> -#include <com/sun/star/sheet/XSpreadsheetDocument.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/io/TempFile.hpp> #include <com/sun/star/io/XSeekable.hpp> @@ -54,7 +53,6 @@ #include <vcl/cvtgrf.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/storagehelper.hxx> -#include <vcl/svapp.hxx> #include <vcl/settings.hxx> #include <tools/diagnose_ex.h> #include <sal/log.hxx> diff --git a/chart2/source/model/main/DataPoint.cxx b/chart2/source/model/main/DataPoint.cxx index bfe56b09a19a..6bbdd6f525ac 100644 --- a/chart2/source/model/main/DataPoint.cxx +++ b/chart2/source/model/main/DataPoint.cxx @@ -23,8 +23,6 @@ #include <UserDefinedProperties.hxx> #include <PropertyHelper.hxx> #include <ModifyListenerHelper.hxx> -#include <com/sun/star/beans/PropertyAttribute.hpp> -#include <com/sun/star/style/XStyle.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/uno/Sequence.hxx> #include <cppuhelper/supportsservice.hxx> diff --git a/chart2/source/model/main/DataPointProperties.cxx b/chart2/source/model/main/DataPointProperties.cxx index 54cc26b325b3..1cb709d0559c 100644 --- a/chart2/source/model/main/DataPointProperties.cxx +++ b/chart2/source/model/main/DataPointProperties.cxx @@ -26,8 +26,6 @@ #include <com/sun/star/drawing/FillStyle.hpp> #include <com/sun/star/drawing/LineStyle.hpp> #include <com/sun/star/drawing/LineDash.hpp> -#include <com/sun/star/drawing/PolyPolygonBezierCoords.hpp> -#include <com/sun/star/style/XStyle.hpp> #include <com/sun/star/drawing/BitmapMode.hpp> #include <com/sun/star/drawing/RectanglePoint.hpp> #include <com/sun/star/chart2/XDataPointCustomLabelField.hpp> diff --git a/chart2/source/model/main/DataSeries.cxx b/chart2/source/model/main/DataSeries.cxx index 9ef10eb0ae12..85452f2f6911 100644 --- a/chart2/source/model/main/DataSeries.cxx +++ b/chart2/source/model/main/DataSeries.cxx @@ -30,12 +30,13 @@ #include <EventListenerHelper.hxx> #include <com/sun/star/container/NoSuchElementException.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/supportsservice.hxx> #include <tools/diagnose_ex.h> #include <algorithm> +namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } + using namespace ::com::sun::star; using ::com::sun::star::beans::Property; diff --git a/chart2/source/model/main/DataSeriesProperties.cxx b/chart2/source/model/main/DataSeriesProperties.cxx index b26d7db1c674..6c7e38d7e038 100644 --- a/chart2/source/model/main/DataSeriesProperties.cxx +++ b/chart2/source/model/main/DataSeriesProperties.cxx @@ -19,13 +19,9 @@ #include "DataSeriesProperties.hxx" #include "DataPointProperties.hxx" -#include "DataPoint.hxx" #include <com/sun/star/beans/PropertyAttribute.hpp> -#include <com/sun/star/style/XStyle.hpp> #include <com/sun/star/chart2/StackingDirection.hpp> -#include <algorithm> - using namespace ::com::sun::star; using ::com::sun::star::beans::Property; diff --git a/chart2/source/model/main/Diagram.cxx b/chart2/source/model/main/Diagram.cxx index bc680705783e..0e627e6787e6 100644 --- a/chart2/source/model/main/Diagram.cxx +++ b/chart2/source/model/main/Diagram.cxx @@ -26,10 +26,7 @@ #include <DiagramHelper.hxx> #include <ThreeDHelper.hxx> #include <CloneHelper.hxx> -#include <AxisHelper.hxx> #include <SceneProperties.hxx> -#include <DisposeHelper.hxx> -#include <BaseGFXHelper.hxx> #include <unonames.hxx> #include <basegfx/numeric/ftools.hxx> @@ -38,17 +35,13 @@ #include <com/sun/star/chart2/RelativePosition.hpp> #include <com/sun/star/chart2/RelativeSize.hpp> #include <com/sun/star/container/NoSuchElementException.hpp> -#include <com/sun/star/drawing/CameraGeometry.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/drawing/HomogenMatrix.hpp> #include <cppuhelper/supportsservice.hxx> #include <tools/diagnose_ex.h> #include <algorithm> -#include <iterator> -#include <functional> using namespace ::com::sun::star; using namespace ::com::sun::star::beans::PropertyAttribute; diff --git a/chart2/source/model/main/FormattedString.cxx b/chart2/source/model/main/FormattedString.cxx index eb9ded888cd3..b93dbb31104a 100644 --- a/chart2/source/model/main/FormattedString.cxx +++ b/chart2/source/model/main/FormattedString.cxx @@ -22,11 +22,11 @@ #include <CharacterProperties.hxx> #include <PropertyHelper.hxx> #include <ModifyListenerHelper.hxx> -#include <com/sun/star/beans/PropertyAttribute.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/supportsservice.hxx> #include <tools/diagnose_ex.h> +namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } + using namespace ::com::sun::star; using ::com::sun::star::beans::Property; diff --git a/chart2/source/model/main/GridProperties.cxx b/chart2/source/model/main/GridProperties.cxx index 3abd7313267f..abe70b6f9288 100644 --- a/chart2/source/model/main/GridProperties.cxx +++ b/chart2/source/model/main/GridProperties.cxx @@ -22,14 +22,14 @@ #include <UserDefinedProperties.hxx> #include <PropertyHelper.hxx> #include <ModifyListenerHelper.hxx> -#include <com/sun/star/style/XStyle.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/uno/Sequence.hxx> -#include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/supportsservice.hxx> #include <tools/diagnose_ex.h> +namespace com { namespace sun { namespace star { namespace beans { class XPropertySetInfo; } } } } +namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } + using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; diff --git a/chart2/source/model/main/Legend.cxx b/chart2/source/model/main/Legend.cxx index aa72ddeebd7d..07a56608e562 100644 --- a/chart2/source/model/main/Legend.cxx +++ b/chart2/source/model/main/Legend.cxx @@ -22,9 +22,7 @@ #include <FillProperties.hxx> #include <CharacterProperties.hxx> #include <UserDefinedProperties.hxx> -#include <LegendHelper.hxx> #include <ModifyListenerHelper.hxx> -#include <CloneHelper.hxx> #include <PropertyHelper.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/awt/Size.hpp> @@ -37,6 +35,8 @@ #include <algorithm> +namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } + using namespace ::com::sun::star; using namespace ::com::sun::star::beans::PropertyAttribute; diff --git a/chart2/source/model/main/PageBackground.cxx b/chart2/source/model/main/PageBackground.cxx index e7be1dfc30bf..a424bf2144f2 100644 --- a/chart2/source/model/main/PageBackground.cxx +++ b/chart2/source/model/main/PageBackground.cxx @@ -25,15 +25,14 @@ #include <ModifyListenerHelper.hxx> #include <com/sun/star/drawing/LineStyle.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> -#include <rtl/uuid.h> -#include <cppuhelper/queryinterface.hxx> #include <cppuhelper/supportsservice.hxx> #include <tools/diagnose_ex.h> #include <vector> #include <algorithm> +namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } + using namespace ::com::sun::star; using ::com::sun::star::beans::Property; diff --git a/chart2/source/model/main/PolarCoordinateSystem.cxx b/chart2/source/model/main/PolarCoordinateSystem.cxx index d84be4322485..fac2c282485b 100644 --- a/chart2/source/model/main/PolarCoordinateSystem.cxx +++ b/chart2/source/model/main/PolarCoordinateSystem.cxx @@ -20,7 +20,8 @@ #include <PolarCoordinateSystem.hxx> #include <servicenames_coosystems.hxx> #include <cppuhelper/supportsservice.hxx> -#include <com/sun/star/uno/XComponentContext.hpp> + +namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } using namespace ::com::sun::star; diff --git a/chart2/source/model/main/StockBar.cxx b/chart2/source/model/main/StockBar.cxx index 3d3b34bce17c..bd512244cfd5 100644 --- a/chart2/source/model/main/StockBar.cxx +++ b/chart2/source/model/main/StockBar.cxx @@ -23,14 +23,13 @@ #include <UserDefinedProperties.hxx> #include <PropertyHelper.hxx> #include <ModifyListenerHelper.hxx> -#include <com/sun/star/beans/PropertyAttribute.hpp> -#include <com/sun/star/style/XStyle.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/uno/Sequence.hxx> #include <tools/diagnose_ex.h> #include <algorithm> +namespace com { namespace sun { namespace star { namespace beans { class XPropertySetInfo; } } } } + using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; diff --git a/chart2/source/model/main/Title.cxx b/chart2/source/model/main/Title.cxx index 7ce84c505b50..d082d5190eb8 100644 --- a/chart2/source/model/main/Title.cxx +++ b/chart2/source/model/main/Title.cxx @@ -18,7 +18,6 @@ */ #include "Title.hxx" -#include "FormattedString.hxx" #include <LinePropertiesHelper.hxx> #include <FillProperties.hxx> #include <ContainerHelper.hxx> @@ -30,16 +29,15 @@ #include <com/sun/star/drawing/FillStyle.hpp> #include <com/sun/star/drawing/LineStyle.hpp> #include <com/sun/star/chart2/RelativePosition.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/awt/Size.hpp> -#include <rtl/uuid.h> -#include <cppuhelper/queryinterface.hxx> #include <cppuhelper/supportsservice.hxx> #include <tools/diagnose_ex.h> #include <vector> #include <algorithm> +namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } + using namespace ::com::sun::star; using namespace ::com::sun::star::beans::PropertyAttribute; diff --git a/chart2/source/model/main/Wall.cxx b/chart2/source/model/main/Wall.cxx index 75b8f4bcdb9c..7814d7095366 100644 --- a/chart2/source/model/main/Wall.cxx +++ b/chart2/source/model/main/Wall.cxx @@ -23,22 +23,13 @@ #include <UserDefinedProperties.hxx> #include <PropertyHelper.hxx> #include <ModifyListenerHelper.hxx> -#include <com/sun/star/beans/PropertyAttribute.hpp> -#include <com/sun/star/drawing/FillStyle.hpp> -#include <com/sun/star/awt/Gradient.hpp> -#include <com/sun/star/drawing/Hatch.hpp> #include <com/sun/star/drawing/LineStyle.hpp> -#include <com/sun/star/drawing/LineDash.hpp> -#include <com/sun/star/drawing/LineJoint.hpp> -#include <rtl/uuid.h> -#include <cppuhelper/queryinterface.hxx> #include <tools/diagnose_ex.h> #include <vector> #include <algorithm> using namespace ::com::sun::star; -using namespace ::com::sun::star::beans::PropertyAttribute; using ::com::sun::star::beans::Property; |