diff options
Diffstat (limited to 'chart2/source/inc')
49 files changed, 0 insertions, 232 deletions
diff --git a/chart2/source/inc/AxisHelper.hxx b/chart2/source/inc/AxisHelper.hxx index 7659aecef3c8..75bc69c1cc67 100644 --- a/chart2/source/inc/AxisHelper.hxx +++ b/chart2/source/inc/AxisHelper.hxx @@ -30,12 +30,9 @@ #include <vector> -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** */ @@ -244,9 +241,7 @@ public: static bool isAxisPositioningEnabled(); }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/inc/CachedDataSequence.hxx b/chart2/source/inc/CachedDataSequence.hxx index 3fa9ee7b9034..581dc9f1954e 100644 --- a/chart2/source/inc/CachedDataSequence.hxx +++ b/chart2/source/inc/CachedDataSequence.hxx @@ -40,7 +40,6 @@ #include <vector> -// ____________________ namespace chart { @@ -179,7 +178,6 @@ private: } // namespace chart - // _CHART_CACHEDDATASEQUENCE_HXX #endif diff --git a/chart2/source/inc/ChartModelHelper.hxx b/chart2/source/inc/ChartModelHelper.hxx index 2464ac02c670..903d5c497a49 100644 --- a/chart2/source/inc/ChartModelHelper.hxx +++ b/chart2/source/inc/ChartModelHelper.hxx @@ -33,12 +33,9 @@ #include <vector> -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** */ @@ -100,9 +97,7 @@ public: ::com::sun::star::frame::XModel >& xChartModel ); }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/inc/ChartTypeHelper.hxx b/chart2/source/inc/ChartTypeHelper.hxx index c1165429c2a8..fbe41dcdeb13 100644 --- a/chart2/source/inc/ChartTypeHelper.hxx +++ b/chart2/source/inc/ChartTypeHelper.hxx @@ -27,12 +27,9 @@ #include <com/sun/star/drawing/Direction3D.hpp> #include "charttoolsdllapi.hxx" -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** */ @@ -91,9 +88,7 @@ public: static bool isSupportingOnlyDeepStackingFor3D( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType ); }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/inc/ChartViewHelper.hxx b/chart2/source/inc/ChartViewHelper.hxx index 1c478b4839ba..61ecde01cdb2 100644 --- a/chart2/source/inc/ChartViewHelper.hxx +++ b/chart2/source/inc/ChartViewHelper.hxx @@ -22,12 +22,9 @@ #include <com/sun/star/frame/XModel.hpp> #include "charttoolsdllapi.hxx" -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** */ @@ -37,9 +34,7 @@ public: static void setViewToDirtyState( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel ); }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/inc/ColorPerPointHelper.hxx b/chart2/source/inc/ColorPerPointHelper.hxx index ff3d0c0e8830..247cf2987dbe 100644 --- a/chart2/source/inc/ColorPerPointHelper.hxx +++ b/chart2/source/inc/ColorPerPointHelper.hxx @@ -23,12 +23,9 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include "charttoolsdllapi.hxx" -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** */ @@ -51,9 +48,7 @@ public: , sal_Int32 nPointIndex ); }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/inc/CommonConverters.hxx b/chart2/source/inc/CommonConverters.hxx index 32885299aab4..8abfea83acf1 100644 --- a/chart2/source/inc/CommonConverters.hxx +++ b/chart2/source/inc/CommonConverters.hxx @@ -40,61 +40,49 @@ #include <vector> #include <algorithm> -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** diverse methods for class conversions; e.g. ::basegfx::B3DHomMatrix to HomogenMatrix and operations e.g drawing::Position3D + drawing::Direction3D */ -//----------------------------------------------------------------------------- /** ::basegfx::B3DHomMatrix -> HomogenMatrix */ OOO_DLLPUBLIC_CHARTTOOLS com::sun::star::drawing::HomogenMatrix B3DHomMatrixToHomogenMatrix( const ::basegfx::B3DHomMatrix& rM ); -//----------------------------------------------------------------------------- /** HomogenMatrix -> ::basegfx::B3DHomMatrix */ OOO_DLLPUBLIC_CHARTTOOLS ::basegfx::B3DHomMatrix HomogenMatrixToB3DHomMatrix( const com::sun::star::drawing::HomogenMatrix& rHM ); -//----------------------------------------------------------------------------- /** ::basegfx::B3DHomMatrix -> B2DHomMatrix */ OOO_DLLPUBLIC_CHARTTOOLS ::basegfx::B2DHomMatrix IgnoreZ( const ::basegfx::B3DHomMatrix& rM ); -//----------------------------------------------------------------------------- /** B2DHomMatrix <-> HomogenMatrix3 */ OOO_DLLPUBLIC_CHARTTOOLS com::sun::star::drawing::HomogenMatrix3 B2DHomMatrixToHomogenMatrix3( const ::basegfx::B2DHomMatrix& rM ); -//----------------------------------------------------------------------------- /** Position3D -> B3DPoint */ OOO_DLLPUBLIC_CHARTTOOLS ::basegfx::B3DPoint Position3DToB3DPoint( const com::sun::star::drawing::Position3D& rPosition ); -//----------------------------------------------------------------------------- /** B3DVector -> Direction3D */ OOO_DLLPUBLIC_CHARTTOOLS com::sun::star::drawing::Direction3D B3DVectorToDirection3D( const ::basegfx::B3DVector& rVector); -//----------------------------------------------------------------------------- /** B3DPoint -> Position3D */ OOO_DLLPUBLIC_CHARTTOOLS com::sun::star::drawing::Position3D B3DPointToPosition3D( const ::basegfx::B3DPoint& rPoint); -//----------------------------------------------------------------------------- /** Direction3D -> B3DVector */ OOO_DLLPUBLIC_CHARTTOOLS ::basegfx::B3DVector Direction3DToB3DVector( const com::sun::star::drawing::Direction3D& rDirection); -//----------------------------------------------------------------------------- /** PolyPolygonShape3D + drawing::Position3D -> PolyPolygonShape3D */ OOO_DLLPUBLIC_CHARTTOOLS @@ -102,105 +90,88 @@ void AddPointToPoly( ::com::sun::star::drawing::PolyPolygonShape3D& rPoly , const com::sun::star::drawing::Position3D& rPos , sal_Int32 nSequenceIndex=0 ); -//----------------------------------------------------------------------------- /** get a single Point from a Polygon */ OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::drawing::Position3D getPointFromPoly( const ::com::sun::star::drawing::PolyPolygonShape3D& rPolygon , sal_Int32 nPointIndex, sal_Int32 nPolyIndex=0 ); -//----------------------------------------------------------------------------- OOO_DLLPUBLIC_CHARTTOOLS void addPolygon( com::sun::star::drawing::PolyPolygonShape3D& rRet , const com::sun::star::drawing::PolyPolygonShape3D& rAdd ); -//----------------------------------------------------------------------------- /** PolyPolygonShape3D + PolyPolygonShape3D -> PolyPolygonShape3D */ OOO_DLLPUBLIC_CHARTTOOLS void appendPoly( com::sun::star::drawing::PolyPolygonShape3D& rRet , const com::sun::star::drawing::PolyPolygonShape3D& rAdd ); -//----------------------------------------------------------------------------- /** PolyPolygonBezierCoords -> PolyPolygonShape3D */ OOO_DLLPUBLIC_CHARTTOOLS com::sun::star::drawing::PolyPolygonShape3D BezierToPoly( const com::sun::star::drawing::PolyPolygonBezierCoords& rBezier ); -//----------------------------------------------------------------------------- /** PolyPolygonShape3D -> drawing::PointSequenceSequence (2D) */ OOO_DLLPUBLIC_CHARTTOOLS com::sun::star::drawing::PointSequenceSequence PolyToPointSequence( const com::sun::star::drawing::PolyPolygonShape3D& rPolyPolygon ); -//----------------------------------------------------------------------------- /** drawing::PointSequenceSequence + drawing::PointSequenceSequence */ OOO_DLLPUBLIC_CHARTTOOLS void appendPointSequence( com::sun::star::drawing::PointSequenceSequence& rTarget , com::sun::star::drawing::PointSequenceSequence& rAdd ); -//----------------------------------------------------------------------------- /** Position3D + Direction3D == Position3D */ OOO_DLLPUBLIC_CHARTTOOLS com::sun::star::drawing::Position3D operator+( const com::sun::star::drawing::Position3D& rPos , const com::sun::star::drawing::Direction3D& rDirection); -//----------------------------------------------------------------------------- /** Position3D - Position3D == Direction3D */ OOO_DLLPUBLIC_CHARTTOOLS com::sun::star::drawing::Direction3D operator-( const com::sun::star::drawing::Position3D& rPos1 , const com::sun::star::drawing::Position3D& rPos2); -//----------------------------------------------------------------------------- /** Position3D == Position3D ? */ OOO_DLLPUBLIC_CHARTTOOLS bool operator==( const com::sun::star::drawing::Position3D& rPos1 , const com::sun::star::drawing::Position3D& rPos2); -//----------------------------------------------------------------------------- /** awt::Rect --> awt::Point (2D) */ OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::awt::Point ToPoint( const com::sun::star::awt::Rectangle& rRectangle ); -//----------------------------------------------------------------------------- /** awt::Rect --> awt::Size (2D) */ OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::awt::Size ToSize( const com::sun::star::awt::Rectangle& rRectangle ); -//----------------------------------------------------------------------------- /** Position3D --> awt::Point (2D) */ OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::awt::Point Position3DToAWTPoint( const com::sun::star::drawing::Position3D& rPos ); -//----------------------------------------------------------------------------- /** Direction3D --> awt::Size (2D) */ OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::awt::Size Direction3DToAWTSize( const com::sun::star::drawing::Direction3D& rDirection ); -//----------------------------------------------------------------------------- /** B3DPoint -> Sequence<double> */ OOO_DLLPUBLIC_CHARTTOOLS com::sun::star::uno::Sequence< double > B3DPointToSequence( const ::basegfx::B3DPoint& rPoint ); -//----------------------------------------------------------------------------- /** Sequence<double> -> drawing::Position3D */ OOO_DLLPUBLIC_CHARTTOOLS com::sun::star::drawing::Position3D SequenceToPosition3D( const com::sun::star::uno::Sequence< double >& rSeq ); -//----------------------------------------------------------------------------- /** drawing::Position3D -> Sequence<double> */ OOO_DLLPUBLIC_CHARTTOOLS com::sun::star::uno::Sequence< double > Position3DToSequence( const com::sun::star::drawing::Position3D& rPosition ); -//----------------------------------------------------------------------------- /** chart2::XDataSequence -> uno::Sequence< double > */ @@ -214,7 +185,6 @@ OOO_DLLPUBLIC_CHARTTOOLS const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > & xDataSequence ); -//----------------------------------------------------------------------------- /** uno::Sequence< uno::Sequence< T > > -> uno::Sequence< T > */ template< typename T > @@ -265,9 +235,7 @@ bool replaceParamterInString( OUString & rInOutResourceString, const OUString & rParamToReplace, const OUString & rReplaceWith ); -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/inc/CommonFunctors.hxx b/chart2/source/inc/CommonFunctors.hxx index 458d29d7177f..31bf3a0c40fc 100644 --- a/chart2/source/inc/CommonFunctors.hxx +++ b/chart2/source/inc/CommonFunctors.hxx @@ -135,8 +135,6 @@ struct OOO_DLLPUBLIC_CHARTTOOLS DoubleToOUString : public ::std::unary_function< } }; -// ================================================================================ - /** can be used to find an element with a specific first element in e.g. a vector of pairs (for searching keys in maps you will of course use map::find) */ diff --git a/chart2/source/inc/ConfigColorScheme.hxx b/chart2/source/inc/ConfigColorScheme.hxx index e6d5a3686bce..7617f49c5e35 100644 --- a/chart2/source/inc/ConfigColorScheme.hxx +++ b/chart2/source/inc/ConfigColorScheme.hxx @@ -30,7 +30,6 @@ #include <memory> - namespace chart { diff --git a/chart2/source/inc/ContainerHelper.hxx b/chart2/source/inc/ContainerHelper.hxx index c92803097860..2d166c5643b9 100644 --- a/chart2/source/inc/ContainerHelper.hxx +++ b/chart2/source/inc/ContainerHelper.hxx @@ -130,8 +130,6 @@ template< typename T > return SequenceToSTLContainer< ::std::set< T > >( rSeq ); } -// ---------------------------------------- - /** converts the keys of a Pair Associative Container into a UNO sequence example: diff --git a/chart2/source/inc/DataSeriesHelper.hxx b/chart2/source/inc/DataSeriesHelper.hxx index 02f64f8ee5f3..8bd0a35d129b 100644 --- a/chart2/source/inc/DataSeriesHelper.hxx +++ b/chart2/source/inc/DataSeriesHelper.hxx @@ -86,7 +86,6 @@ OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > > & aSeries ); - /** Get the label of a series (e.g. for the legend) @param rLabelSequenceRole diff --git a/chart2/source/inc/DataSourceHelper.hxx b/chart2/source/inc/DataSourceHelper.hxx index d5ab613b5ada..d3b9ac13de0f 100644 --- a/chart2/source/inc/DataSourceHelper.hxx +++ b/chart2/source/inc/DataSourceHelper.hxx @@ -32,12 +32,9 @@ #include <vector> -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** */ @@ -150,9 +147,7 @@ public: ::com::sun::star::chart2::data::XDataSource > & xSource ); }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/inc/DiagramHelper.hxx b/chart2/source/inc/DiagramHelper.hxx index 5b1bb7bda23f..b89c55516d78 100644 --- a/chart2/source/inc/DiagramHelper.hxx +++ b/chart2/source/inc/DiagramHelper.hxx @@ -36,7 +36,6 @@ #include <utility> #include <vector> - namespace chart { @@ -266,7 +265,6 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xSecondType ); - /** * Test if a series can be moved. * diff --git a/chart2/source/inc/EventListenerHelper.hxx b/chart2/source/inc/EventListenerHelper.hxx index f9f0ee42edff..8764d1e3027d 100644 --- a/chart2/source/inc/EventListenerHelper.hxx +++ b/chart2/source/inc/EventListenerHelper.hxx @@ -113,8 +113,6 @@ private: } // namespace impl -// -------------------------------------------------------------------------------- - template< class InterfaceRef > void addListener( const InterfaceRef & xObject, diff --git a/chart2/source/inc/FillProperties.hxx b/chart2/source/inc/FillProperties.hxx index 2cda35fa3622..a0db12cdd707 100644 --- a/chart2/source/inc/FillProperties.hxx +++ b/chart2/source/inc/FillProperties.hxx @@ -47,7 +47,6 @@ public: // , PROP_FILL_GRADIENT //optional , PROP_FILL_HATCH_NAME // , PROP_FILL_HATCH //optional - //------------------------ // bitmap properties start , PROP_FILL_BITMAP_NAME // , PROP_FILL_BITMAP //optional @@ -62,7 +61,6 @@ public: , PROP_FILL_BITMAP_SIZEY , PROP_FILL_BITMAP_MODE // bitmap properties end - //------------------------ , PROP_FILL_BACKGROUND }; diff --git a/chart2/source/inc/FormattedStringHelper.hxx b/chart2/source/inc/FormattedStringHelper.hxx index cd24645ddd2c..147b2c417008 100644 --- a/chart2/source/inc/FormattedStringHelper.hxx +++ b/chart2/source/inc/FormattedStringHelper.hxx @@ -24,10 +24,8 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include "charttoolsdllapi.hxx" -//............................................................................. namespace chart { -//............................................................................. class OOO_DLLPUBLIC_CHARTTOOLS FormattedStringHelper { @@ -43,9 +41,7 @@ public: ::com::sun::star::beans::XPropertySet > & xTextProperties ) throw(); }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/inc/LegendHelper.hxx b/chart2/source/inc/LegendHelper.hxx index cb5c96a4d6e5..f914ce8a2fae 100644 --- a/chart2/source/inc/LegendHelper.hxx +++ b/chart2/source/inc/LegendHelper.hxx @@ -27,12 +27,9 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include "charttoolsdllapi.hxx" -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** */ @@ -64,9 +61,7 @@ public: static bool hasLegend( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram > & xDiagram ); }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/inc/LifeTime.hxx b/chart2/source/inc/LifeTime.hxx index 753e80267e7c..9d5cf9189b75 100644 --- a/chart2/source/inc/LifeTime.hxx +++ b/chart2/source/inc/LifeTime.hxx @@ -123,7 +123,6 @@ protected: } }; -//----------------------------------------------------------------- /* Use this Guard in your apicalls to protect access on resources which will be released in dispose. @@ -185,7 +184,6 @@ your XComponent::dispose method has to be implemented in the following way: } */ -//----------------------------------------------------------------- class OOO_DLLPUBLIC_CHARTTOOLS LifeTimeGuard { @@ -216,7 +214,6 @@ private: LifeTimeGuard& operator= ( const LifeTimeGuard& ); }; - template<class T> class NegativeGuard { diff --git a/chart2/source/inc/MediaDescriptorHelper.hxx b/chart2/source/inc/MediaDescriptorHelper.hxx index 48896c7c9003..279c2fc0b496 100644 --- a/chart2/source/inc/MediaDescriptorHelper.hxx +++ b/chart2/source/inc/MediaDescriptorHelper.hxx @@ -55,7 +55,6 @@ public: ::com::sun::star::beans::PropertyValue > getReducedForModel(); public: - //--------------------- //all properties given in the constructor are stored in the following three sequences ::com::sun::star::uno::Sequence< @@ -70,13 +69,11 @@ public: ::com::sun::star::beans::PropertyValue > m_aAdditionalProperties; //these are properties which are not described in service com.sun.star.document.MediaDescriptor - //---------------------- //properties which should be given to a model are additionally stored in this sequence (not documented properties and deprecated properties are not included!) ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > m_aModelProperties; //these are properties which are not described in service com.sun.star.document.MediaDescriptor - //@todo define this for debug only, except URL sal_Bool AsTemplate; //document is a template. sal_Bool ISSET_AsTemplate; @@ -110,7 +107,6 @@ public: OUString HierarchicalDocumentName; sal_Bool ISSET_HierarchicalDocumentName; - ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > OutputStream; //a stream to receive the document data for saving sal_Bool ISSET_OutputStream; diff --git a/chart2/source/inc/ModifyListenerHelper.hxx b/chart2/source/inc/ModifyListenerHelper.hxx index 2eee3a819027..935f8b8e8629 100644 --- a/chart2/source/inc/ModifyListenerHelper.hxx +++ b/chart2/source/inc/ModifyListenerHelper.hxx @@ -43,8 +43,6 @@ namespace ModifyListenerHelper OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener > createModifyEventForwarder(); -// ================================================================================ - /** This helper class serves as forwarder of modify events. It can be used whenever an object has to send modify events after it gets a modify event of one of its children. @@ -108,8 +106,6 @@ private: tListenerMap m_aListenerMap; }; -// ================================================================================ - namespace impl { @@ -191,9 +187,6 @@ private: } // namespace impl -// -------------------------------------------------------------------------------- - - template< class InterfaceRef > void addListener( const InterfaceRef & xObject, diff --git a/chart2/source/inc/NameContainer.hxx b/chart2/source/inc/NameContainer.hxx index 029f4521674e..89f5ac436d2d 100644 --- a/chart2/source/inc/NameContainer.hxx +++ b/chart2/source/inc/NameContainer.hxx @@ -29,10 +29,8 @@ #include <map> -//............................................................................. namespace chart { -//............................................................................. OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > createNameContainer( const ::com::sun::star::uno::Type& rType, const OUString& rServicename, const OUString& rImplementationName ); @@ -90,9 +88,7 @@ private: //member tContentMap m_aMap; }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/inc/NumberFormatterWrapper.hxx b/chart2/source/inc/NumberFormatterWrapper.hxx index f15f65150464..4e9620b657ce 100644 --- a/chart2/source/inc/NumberFormatterWrapper.hxx +++ b/chart2/source/inc/NumberFormatterWrapper.hxx @@ -23,12 +23,9 @@ #include <svl/zforlist.hxx> #include <com/sun/star/util/XNumberFormatsSupplier.hpp> -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** */ class FixedNumberFormatter; @@ -54,7 +51,6 @@ private: //private member ::com::sun::star::uno::Any m_aNullDate; }; - class OOO_DLLPUBLIC_CHARTTOOLS FixedNumberFormatter { public: @@ -69,9 +65,7 @@ private: sal_uLong m_nNumberFormatKey; }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/inc/OPropertySet.hxx b/chart2/source/inc/OPropertySet.hxx index cc226a5031bd..73cc75dc1f93 100644 --- a/chart2/source/inc/OPropertySet.hxx +++ b/chart2/source/inc/OPropertySet.hxx @@ -41,7 +41,6 @@ namespace property namespace impl { class ImplOPropertySet; } - class OOO_DLLPUBLIC_CHARTTOOLS OPropertySet : public ::cppu::OBroadcastHelper, // includes beans::XPropertySet, XMultiPropertySet and XFastPropertySet @@ -79,7 +78,6 @@ protected: */ virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() = 0; - /** Try to convert the value <code>rValue</code> to the type required by the property associated with <code>nHandle</code>. @@ -154,9 +152,7 @@ protected: /// call this when a derived component is disposed virtual void disposePropertySet(); - // ======================================== // Interfaces - // ======================================== // ____ XInterface ____ virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) diff --git a/chart2/source/inc/ObjectIdentifier.hxx b/chart2/source/inc/ObjectIdentifier.hxx index b2e127dbb6be..49ef8f67be2d 100644 --- a/chart2/source/inc/ObjectIdentifier.hxx +++ b/chart2/source/inc/ObjectIdentifier.hxx @@ -34,12 +34,9 @@ #include <com/sun/star/awt/Point.hpp> #include <com/sun/star/drawing/XShape.hpp> -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** */ enum ObjectType @@ -132,7 +129,6 @@ public: , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel ); - static OUString createParticleForCoordinateSystem( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem >& xCooSys @@ -263,9 +259,7 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > m_xAdditionalShape; }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/inc/PolynomialRegressionCurveCalculator.hxx b/chart2/source/inc/PolynomialRegressionCurveCalculator.hxx index 6c1d990f9d58..e2cb51bcb44d 100644 --- a/chart2/source/inc/PolynomialRegressionCurveCalculator.hxx +++ b/chart2/source/inc/PolynomialRegressionCurveCalculator.hxx @@ -25,7 +25,6 @@ namespace chart { - class PolynomialRegressionCurveCalculator : public RegressionCurveCalculator { public: diff --git a/chart2/source/inc/PotentialRegressionCurveCalculator.hxx b/chart2/source/inc/PotentialRegressionCurveCalculator.hxx index 10a999047cbe..de5c4d9450ad 100644 --- a/chart2/source/inc/PotentialRegressionCurveCalculator.hxx +++ b/chart2/source/inc/PotentialRegressionCurveCalculator.hxx @@ -25,7 +25,6 @@ namespace chart { - class PotentialRegressionCurveCalculator : public RegressionCurveCalculator { diff --git a/chart2/source/inc/PropertyHelper.hxx b/chart2/source/inc/PropertyHelper.hxx index 9bbcb84c3e01..48a8ccabd110 100644 --- a/chart2/source/inc/PropertyHelper.hxx +++ b/chart2/source/inc/PropertyHelper.hxx @@ -95,8 +95,6 @@ OOO_DLLPUBLIC_CHARTTOOLS OUString addBitmapUniqueNameToTable( ::com::sun::star::lang::XMultiServiceFactory > & xFact, const OUString & rPreferredName ); -// -------------------------------------------------------------------------------- - /** Set a property to a certain value in the given map. This works for properties that are already set, and those which are not yet in the map. @@ -142,11 +140,8 @@ template<> */ OOO_DLLPUBLIC_CHARTTOOLS void setEmptyPropertyValueDefault( tPropertyValueMap & rOutMap, tPropertyValueMapKey key ); - } // namespace PropertyHelper -// ================================================================================ - struct OOO_DLLPUBLIC_CHARTTOOLS PropertyNameLess { inline bool operator() ( const ::com::sun::star::beans::Property & first, diff --git a/chart2/source/inc/ReferenceSizeProvider.hxx b/chart2/source/inc/ReferenceSizeProvider.hxx index 1a23608c51e2..b1c626808e8c 100644 --- a/chart2/source/inc/ReferenceSizeProvider.hxx +++ b/chart2/source/inc/ReferenceSizeProvider.hxx @@ -31,7 +31,6 @@ namespace chart2 { } }}} -// ---------------------------------------- namespace chart { @@ -73,7 +72,6 @@ public: */ void toggleAutoResizeState(); - /** Sets the ReferencePageSize according to the internal settings of this class at the XPropertySet, and the adapted font sizes if bAdaptFontSizes is </sal_True>. diff --git a/chart2/source/inc/RegressionCurveHelper.hxx b/chart2/source/inc/RegressionCurveHelper.hxx index 4efa6f46aabf..6c90f6d49901 100644 --- a/chart2/source/inc/RegressionCurveHelper.hxx +++ b/chart2/source/inc/RegressionCurveHelper.hxx @@ -52,8 +52,6 @@ public: ::com::sun::star::uno::XComponentContext > & xContext, OUString aServiceName ); - // ------------------------------------------------------------ - static bool hasMeanValueLine( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XRegressionCurveContainer > & xRegCnt ); @@ -154,8 +152,6 @@ public: const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > & xContext ); - // ------------------------------------------------------------ - /// returns a calculator object for regression curves (used by the view) static com::sun::star::uno::Reference< com::sun::star::chart2::XRegressionCurveCalculator > createRegressionCurveCalculatorByServiceName( OUString aServiceName ); diff --git a/chart2/source/inc/RelativePositionHelper.hxx b/chart2/source/inc/RelativePositionHelper.hxx index 872180be68c6..1a1503d75030 100644 --- a/chart2/source/inc/RelativePositionHelper.hxx +++ b/chart2/source/inc/RelativePositionHelper.hxx @@ -27,12 +27,9 @@ #include <com/sun/star/awt/Size.hpp> #include "charttoolsdllapi.hxx" -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** */ @@ -106,9 +103,7 @@ public: bool bCheck = true ); }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/inc/Scaling.hxx b/chart2/source/inc/Scaling.hxx index ac25d268d8a6..0047af5d0866 100644 --- a/chart2/source/inc/Scaling.hxx +++ b/chart2/source/inc/Scaling.hxx @@ -25,12 +25,9 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/implbase3.hxx> -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** */ @@ -73,8 +70,6 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; }; -// ---------------------------------------- - class ExponentialScaling : public ::cppu::WeakImplHelper3 < ::com::sun::star::chart2::XScaling, @@ -114,8 +109,6 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; }; -// ---------------------------------------- - class LinearScaling : public ::cppu::WeakImplHelper3 < ::com::sun::star::chart2::XScaling, ::com::sun::star::lang::XServiceName, @@ -155,8 +148,6 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; }; -// ---------------------------------------- - class PowerScaling : public ::cppu::WeakImplHelper3 < ::com::sun::star::chart2::XScaling, ::com::sun::star::lang::XServiceName, @@ -195,9 +186,7 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/inc/ServiceMacros.hxx b/chart2/source/inc/ServiceMacros.hxx index ab60ee5a6c04..f1a727b70777 100644 --- a/chart2/source/inc/ServiceMacros.hxx +++ b/chart2/source/inc/ServiceMacros.hxx @@ -27,11 +27,9 @@ static com::sun::star::uno::Sequence< OUString > Class::getSupportedServiceNames_Static(); */ -//========================================================================= // // XServiceInfo decl // -//========================================================================= namespace apphelper { @@ -50,11 +48,9 @@ namespace apphelper static ::com::sun::star::uno::Sequence< OUString > \ getSupportedServiceNames_Static(); -//========================================================================= // // XServiceInfo impl // -//========================================================================= #define APPHELPER_XSERVICEINFO_IMPL( Class, ImplName ) \ OUString SAL_CALL Class::getImplementationName() \ @@ -91,14 +87,12 @@ Class::getSupportedServiceNames() \ return getSupportedServiceNames_Static(); \ } -//========================================================================= // // Service factory helper decl+impl // //to use this macro you need to provide a constructor: //class( Reference< XComponentContext > const & xContext ) //and implement OWeakObject -//========================================================================= #define APPHELPER_SERVICE_FACTORY_HELPER(Class) \ static ::com::sun::star::uno::Reference< \ diff --git a/chart2/source/inc/ThreeDHelper.hxx b/chart2/source/inc/ThreeDHelper.hxx index 2586893d2715..342c1d11fe9c 100644 --- a/chart2/source/inc/ThreeDHelper.hxx +++ b/chart2/source/inc/ThreeDHelper.hxx @@ -25,12 +25,9 @@ #include <com/sun/star/drawing/ShadeMode.hpp> #include "charttoolsdllapi.hxx" -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** */ @@ -145,9 +142,7 @@ public: , sal_Int32 nRoundedEdges, sal_Int32 nObjectLines ); }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/inc/TitleHelper.hxx b/chart2/source/inc/TitleHelper.hxx index ec9db23e2401..c954acfb6633 100644 --- a/chart2/source/inc/TitleHelper.hxx +++ b/chart2/source/inc/TitleHelper.hxx @@ -26,10 +26,8 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/chart2/XDiagram.hpp> -//............................................................................. namespace chart { -//............................................................................. class OOO_DLLPUBLIC_CHARTTOOLS TitleHelper { @@ -87,9 +85,7 @@ public: ::com::sun::star::frame::XModel >& xModel ); }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/inc/UncachedDataSequence.hxx b/chart2/source/inc/UncachedDataSequence.hxx index 6dc447be4045..4df0ffc3d845 100644 --- a/chart2/source/inc/UncachedDataSequence.hxx +++ b/chart2/source/inc/UncachedDataSequence.hxx @@ -44,7 +44,6 @@ #include <vector> -// ____________________ namespace chart { @@ -193,7 +192,6 @@ private: } // namespace chart - // _CHART_UNCACHEDDATASEQUENCE_HXX #endif diff --git a/chart2/source/inc/WeakListenerAdapter.hxx b/chart2/source/inc/WeakListenerAdapter.hxx index c47cf56062f1..779c59558f21 100644 --- a/chart2/source/inc/WeakListenerAdapter.hxx +++ b/chart2/source/inc/WeakListenerAdapter.hxx @@ -28,7 +28,6 @@ namespace chart { -// -------------------------------------------------------------------------------- /** Adapter that enables adding listeners as weak UNO references. Thus, adding an object as listener to a broadcaster does not increase its reference @@ -80,8 +79,6 @@ private: ::com::sun::star::uno::WeakReference< Listener > m_xListener; }; -// -------------------------------------------------------------------------------- - class WeakModifyListenerAdapter : public WeakListenerAdapter< ::com::sun::star::util::XModifyListener > { @@ -96,8 +93,6 @@ protected: throw (::com::sun::star::uno::RuntimeException); }; -// -------------------------------------------------------------------------------- - class WeakSelectionChangeListenerAdapter : public WeakListenerAdapter< ::com::sun::star::view::XSelectionChangeListener > { diff --git a/chart2/source/inc/WrappedIgnoreProperty.hxx b/chart2/source/inc/WrappedIgnoreProperty.hxx index 9d55c8a94025..420a5c489a81 100644 --- a/chart2/source/inc/WrappedIgnoreProperty.hxx +++ b/chart2/source/inc/WrappedIgnoreProperty.hxx @@ -24,10 +24,8 @@ #include <vector> -//............................................................................. namespace chart { -//............................................................................. class OOO_DLLPUBLIC_CHARTTOOLS WrappedIgnoreProperty : public WrappedProperty { @@ -65,9 +63,7 @@ public: SAL_DLLPRIVATE static void addIgnoreFillProperties_only_BitmapProperties( std::vector< WrappedProperty* >& rList ); }; -//............................................................................. } //namespace chart -//............................................................................. // CHART_WRAPPED_IGNORE_PROPERTY_HXX #endif diff --git a/chart2/source/inc/WrappedProperty.hxx b/chart2/source/inc/WrappedProperty.hxx index 1410ee1e37e6..11692faea6fc 100644 --- a/chart2/source/inc/WrappedProperty.hxx +++ b/chart2/source/inc/WrappedProperty.hxx @@ -25,10 +25,8 @@ #include <map> -//............................................................................. namespace chart { -//............................................................................. class OOO_DLLPUBLIC_CHARTTOOLS WrappedProperty { @@ -66,13 +64,9 @@ protected: OUString m_aInnerName; }; -//............................................................................. - typedef ::std::map< sal_Int32, const WrappedProperty* > tWrappedPropertyMap; -//............................................................................. } //namespace chart -//............................................................................. // CHART_WRAPPEDPROPERTY_HXX #endif diff --git a/chart2/source/inc/WrappedPropertySet.hxx b/chart2/source/inc/WrappedPropertySet.hxx index 6968f319ff9f..911eb625c4e3 100644 --- a/chart2/source/inc/WrappedPropertySet.hxx +++ b/chart2/source/inc/WrappedPropertySet.hxx @@ -34,10 +34,8 @@ #include <vector> -//............................................................................. namespace chart { -//............................................................................. class OOO_DLLPUBLIC_CHARTTOOLS WrappedPropertySet : public MutexContainer @@ -126,9 +124,7 @@ protected: //member //OMultiTypeInterfaceContainerHelperInt32 m_aVetoableListenerContainer; }; -//............................................................................. } //namespace chart -//............................................................................. // CHART_WRAPPEDPROPERTYSET_HXX #endif diff --git a/chart2/source/inc/XMLRangeHelper.hxx b/chart2/source/inc/XMLRangeHelper.hxx index e583f5a67fd2..7148a0ec6e2f 100644 --- a/chart2/source/inc/XMLRangeHelper.hxx +++ b/chart2/source/inc/XMLRangeHelper.hxx @@ -58,7 +58,6 @@ CellRange getCellRangeFromXMLString( const OUString & rXMLString ); OUString getXMLStringFromCellRange( const CellRange & rRange ); - } // namespace XMLRangeHelper } // namespace chart diff --git a/chart2/source/inc/chartview/ChartSfxItemIds.hxx b/chart2/source/inc/chartview/ChartSfxItemIds.hxx index 62b1204f5a58..92582090d992 100644 --- a/chart2/source/inc/chartview/ChartSfxItemIds.hxx +++ b/chart2/source/inc/chartview/ChartSfxItemIds.hxx @@ -19,9 +19,7 @@ #ifndef CHARTSFXITEMIDS_HXX #define CHARTSFXITEMIDS_HXX -// ============================================================ // SCHATTR -// ============================================================ // can't this be changed to 0? #define SCHATTR_START 1 @@ -65,9 +63,7 @@ #define SCHATTR_STAT_ERRORBAR_TYPE (SCHATTR_STAT_START + 9) #define SCHATTR_STAT_END SCHATTR_STAT_ERRORBAR_TYPE -// -------------------------------------------------------- // these attributes are for replacement of enum eChartStyle -// -------------------------------------------------------- #define SCHATTR_STYLE_START ( SCHATTR_STAT_END +1 ) @@ -88,8 +84,6 @@ #define SCHATTR_STYLE_SHAPE ( SCHATTR_STYLE_START + 9 ) #define SCHATTR_STYLE_END ( SCHATTR_STYLE_SHAPE ) -// -------------------------------------------------------------------------- - #define SCHATTR_AXIS (SCHATTR_STYLE_END + 1)// see chtmodel.hxx defines CHART_AXIS_PRIMARY_X, etc. //Re-mapped: #define SCHATTR_AXIS_START (SCHATTR_AXIS + 1) @@ -177,9 +171,7 @@ #define SCHATTR_END SCHATTR_REGRESSION_END -// ============================================================ // values for Items -// ============================================================ // values for SCHATTR_AXIS_TICKS and SCHATTR_AXIS_HELPTICKS items #define CHAXIS_MARK_BOTH 3 @@ -210,9 +202,6 @@ #define CHART_AXIS_SECONDARY_Y 4 #define CHART_AXIS_SECONDARY_X 5 -// ============================================================ -// ============================================================ - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/inc/chartview/DataPointSymbolSupplier.hxx b/chart2/source/inc/chartview/DataPointSymbolSupplier.hxx index feb8685ffd80..5ec31eff119a 100644 --- a/chart2/source/inc/chartview/DataPointSymbolSupplier.hxx +++ b/chart2/source/inc/chartview/DataPointSymbolSupplier.hxx @@ -25,12 +25,9 @@ #include <com/sun/star/drawing/XShapes.hpp> #include "chartviewdllapi.hxx" -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** */ @@ -45,9 +42,7 @@ public: , const ::com::sun::star::drawing::Direction3D& rSize ); }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/inc/chartview/DrawModelWrapper.hxx b/chart2/source/inc/chartview/DrawModelWrapper.hxx index 1872ed49534b..34646a5b3199 100644 --- a/chart2/source/inc/chartview/DrawModelWrapper.hxx +++ b/chart2/source/inc/chartview/DrawModelWrapper.hxx @@ -31,10 +31,8 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include "chartviewdllapi.hxx" -//............................................................................. namespace chart { -//............................................................................. class OOO_DLLPUBLIC_CHARTVIEW DrawModelWrapper : private SdrModel { @@ -68,7 +66,6 @@ public: getChartRootShape( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage>& xPage ); - SAL_DLLPRIVATE void lockControllers(); SAL_DLLPRIVATE void unlockControllers(); @@ -100,9 +97,7 @@ public: static bool removeShape( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ); }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/inc/chartview/ExplicitScaleValues.hxx b/chart2/source/inc/chartview/ExplicitScaleValues.hxx index d945b9e97ee7..bb3bd4b8a624 100644 --- a/chart2/source/inc/chartview/ExplicitScaleValues.hxx +++ b/chart2/source/inc/chartview/ExplicitScaleValues.hxx @@ -27,12 +27,9 @@ #include <com/sun/star/chart2/XScaling.hpp> #include <tools/date.hxx> #include <vector> -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** This structure contains the explicit values for a scale like Minimum and Maximum. See also ::com::sun::star::chart2::ScaleData. */ @@ -151,9 +148,7 @@ struct OOO_DLLPUBLIC_CHARTVIEW ExplicitIncrementData ::std::vector< ExplicitSubIncrement > SubIncrements; }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/inc/chartview/ExplicitValueProvider.hxx b/chart2/source/inc/chartview/ExplicitValueProvider.hxx index dfe7afccaaad..0f3f8a444ce6 100644 --- a/chart2/source/inc/chartview/ExplicitValueProvider.hxx +++ b/chart2/source/inc/chartview/ExplicitValueProvider.hxx @@ -32,12 +32,9 @@ #include <com/sun/star/util/XNumberFormatsSupplier.hpp> #include "chartviewdllapi.hxx" -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** */ @@ -105,9 +102,7 @@ protected: ~ExplicitValueProvider() {} }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/inc/chartview/servicenames_charttypes.hxx b/chart2/source/inc/chartview/servicenames_charttypes.hxx index 37dea3c8fecb..231dee194c78 100644 --- a/chart2/source/inc/chartview/servicenames_charttypes.hxx +++ b/chart2/source/inc/chartview/servicenames_charttypes.hxx @@ -19,10 +19,8 @@ #ifndef _CHART2_SERVICENAMES_CHARTTYPES_HXX #define _CHART2_SERVICENAMES_CHARTTYPES_HXX -//............................................................................. namespace chart { -//............................................................................. #define CHART2_VIEW_BARCHART_SERVICE_IMPLEMENTATION_NAME "com.sun.star.chart2.view.BarChart_Impl" #define CHART2_VIEW_BARCHART_SERVICE_NAME "com.sun.star.chart2.view.BarChart" @@ -33,9 +31,7 @@ namespace chart #define CHART2_VIEW_AREACHART_SERVICE_IMPLEMENTATION_NAME "com.sun.star.chart2.view.AreaChart_Impl" #define CHART2_VIEW_AREACHART_SERVICE_NAME "com.sun.star.chart2.view.AreaChart" -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/inc/servicenames.hxx b/chart2/source/inc/servicenames.hxx index 7e024583b453..1444d32098ec 100644 --- a/chart2/source/inc/servicenames.hxx +++ b/chart2/source/inc/servicenames.hxx @@ -19,10 +19,8 @@ #ifndef _CHART_SERVICENAMES_HXX #define _CHART_SERVICENAMES_HXX -//............................................................................. namespace chart { -//............................................................................. #define CHART_MODEL_SERVICE_IMPLEMENTATION_NAME OUString( "com.sun.star.comp.chart2.ChartModel" ) #define CHART_MODEL_SERVICE_NAME OUString( "com.sun.star.chart2.ChartDocument" ) @@ -52,9 +50,7 @@ namespace chart #define CHART_ACCESSIBLE_TEXT_IMPLEMENTATION_NAME OUString( "com.sun.star.comp.chart2.AccessibleTextComponent" ) #define CHART_ACCESSIBLE_TEXT_SERVICE_NAME OUString( "com.sun.star.accessibility.AccessibleTextComponent" ) -//............................................................................. } //namespace chart -//............................................................................. #endif diff --git a/chart2/source/inc/servicenames_charttypes.hxx b/chart2/source/inc/servicenames_charttypes.hxx index 53741e2129fb..2f370a1e29e2 100644 --- a/chart2/source/inc/servicenames_charttypes.hxx +++ b/chart2/source/inc/servicenames_charttypes.hxx @@ -19,10 +19,8 @@ #ifndef _CHART2_SERVICENAMES_CHARTTYPES_HXX #define _CHART2_SERVICENAMES_CHARTTYPES_HXX -//............................................................................. namespace chart { -//............................................................................. #define CHART2_SERVICE_NAME_CHARTTYPE_AREA OUString( "com.sun.star.chart2.AreaChartType" ) #define CHART2_SERVICE_NAME_CHARTTYPE_BAR OUString( "com.sun.star.chart2.BarChartType" ) @@ -35,9 +33,7 @@ namespace chart #define CHART2_SERVICE_NAME_CHARTTYPE_CANDLESTICK OUString( "com.sun.star.chart2.CandleStickChartType" ) #define CHART2_SERVICE_NAME_CHARTTYPE_BUBBLE OUString( "com.sun.star.chart2.BubbleChartType" ) -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/inc/servicenames_coosystems.hxx b/chart2/source/inc/servicenames_coosystems.hxx index 5f2f3d5c42f0..4fa10bc3ffbe 100644 --- a/chart2/source/inc/servicenames_coosystems.hxx +++ b/chart2/source/inc/servicenames_coosystems.hxx @@ -19,19 +19,15 @@ #ifndef _CHART2_SERVICENAMES_COOSYSTEMS_HXX #define _CHART2_SERVICENAMES_COOSYSTEMS_HXX -//............................................................................. namespace chart { -//............................................................................. #define CHART2_COOSYSTEM_CARTESIAN_SERVICE_NAME OUString( "com.sun.star.chart2.CoordinateSystems.Cartesian" ) #define CHART2_COOSYSTEM_CARTESIAN_VIEW_SERVICE_NAME OUString( "com.sun.star.chart2.CoordinateSystems.CartesianView" ) #define CHART2_COOSYSTEM_POLAR_SERVICE_NAME OUString( "com.sun.star.chart2.CoordinateSystems.Polar" ) #define CHART2_COOSYSTEM_POLAR_VIEW_SERVICE_NAME OUString( "com.sun.star.chart2.CoordinateSystems.PolarView" ) -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |