diff options
author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-04-06 00:58:22 +0200 |
---|---|---|
committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-04-06 01:45:31 +0200 |
commit | 08906623da9f8c0749f12276832c95d229d9436c (patch) | |
tree | cc4f7acf10088cb70e316f06f7bd21e7ab2e3fa8 | |
parent | 4074f6f92d64fab4cbeae1e19e1abebae6646b78 (diff) |
remove whitespace
Change-Id: I69454c3d9bddfe01da2622117a16bbb37797062a
-rw-r--r-- | include/oox/drawingml/chart/typegroupconverter.hxx | 14 | ||||
-rw-r--r-- | include/oox/drawingml/fillproperties.hxx | 12 | ||||
-rw-r--r-- | include/oox/drawingml/lineproperties.hxx | 6 | ||||
-rw-r--r-- | include/oox/drawingml/shape.hxx | 6 | ||||
-rw-r--r-- | oox/source/drawingml/chart/seriesconverter.cxx | 22 | ||||
-rw-r--r-- | oox/source/drawingml/chart/typegroupcontext.cxx | 22 |
6 files changed, 0 insertions, 82 deletions
diff --git a/include/oox/drawingml/chart/typegroupconverter.hxx b/include/oox/drawingml/chart/typegroupconverter.hxx index 2219e88df9fb..e61f81fdcf0a 100644 --- a/include/oox/drawingml/chart/typegroupconverter.hxx +++ b/include/oox/drawingml/chart/typegroupconverter.hxx @@ -34,8 +34,6 @@ namespace oox { namespace drawingml { namespace chart { - - /** Enumerates different chart types. */ enum TypeId { @@ -55,8 +53,6 @@ enum TypeId TYPEID_UNKNOWN /// Default for unknown chart types. }; - - /** Enumerates different categories of similar chart types. */ enum TypeCategory { @@ -68,8 +64,6 @@ enum TypeCategory TYPECATEGORY_SURFACE /// Surface charts. }; - - /** Enumerates modes for varying point colors in a series. */ enum VarPointMode { @@ -78,8 +72,6 @@ enum VarPointMode VARPOINTMODE_MULTI /// Supported for multiple series in a chart type group. }; - - /** Contains info for a chart type related to the OpenOffice.org chart module. */ struct TypeGroupInfo { @@ -101,8 +93,6 @@ struct TypeGroupInfo bool mbPictureOptions; /// True = bitmaps support options from c:pictureOptions. }; - - struct UpDownBarsModel; class UpDownBarsConverter : public ConverterBase< UpDownBarsModel > @@ -116,8 +106,6 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& rxChartType ); }; - - struct TypeGroupModel; struct View3DModel; @@ -187,8 +175,6 @@ private: bool mb3dChart; /// True = type is a 3D chart type. }; - - } // namespace chart } // namespace drawingml } // namespace oox diff --git a/include/oox/drawingml/fillproperties.hxx b/include/oox/drawingml/fillproperties.hxx index f58803374f7e..447cba2fa76c 100644 --- a/include/oox/drawingml/fillproperties.hxx +++ b/include/oox/drawingml/fillproperties.hxx @@ -38,8 +38,6 @@ namespace drawingml { class ShapePropertyMap; - - struct GradientFillProperties { typedef ::std::map< double, Color > GradientStopMap; @@ -57,8 +55,6 @@ struct GradientFillProperties void assignUsed( const GradientFillProperties& rSourceProps ); }; - - struct PatternFillProperties { Color maPattFgColor; /// Pattern foreground color. @@ -69,8 +65,6 @@ struct PatternFillProperties void assignUsed( const PatternFillProperties& rSourceProps ); }; - - struct BlipFillProperties { ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > @@ -99,8 +93,6 @@ struct BlipFillProperties void assignUsed( const BlipFillProperties& rSourceProps ); }; - - struct OOX_DLLPUBLIC FillProperties { OptValue< sal_Int32 > moFillType; /// Fill type (OOXML token). @@ -126,8 +118,6 @@ struct OOX_DLLPUBLIC FillProperties bool bFlipV = false ) const; }; - - struct GraphicProperties { BlipFillProperties maBlipProps; /// Properties for the graphic. @@ -143,8 +133,6 @@ struct GraphicProperties sal_Int32 nPhClr = API_RGB_TRANSPARENT ) const; }; - - } // namespace drawingml } // namespace oox diff --git a/include/oox/drawingml/lineproperties.hxx b/include/oox/drawingml/lineproperties.hxx index 5e0c06212eaa..c38c7e14a0e4 100644 --- a/include/oox/drawingml/lineproperties.hxx +++ b/include/oox/drawingml/lineproperties.hxx @@ -27,8 +27,6 @@ namespace oox { namespace drawingml { - - struct LineArrowProperties { OptValue< sal_Int32 > moArrowType; @@ -39,8 +37,6 @@ struct LineArrowProperties void assignUsed( const LineArrowProperties& rSourceProps ); }; - - struct OOX_DLLPUBLIC LineProperties { typedef ::std::pair< sal_Int32, sal_Int32 > DashStop; @@ -73,8 +69,6 @@ struct OOX_DLLPUBLIC LineProperties sal_Int32 getLineWidth() const; }; - - } // namespace drawingml } // namespace oox diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx index 5b5966bd67a9..a7232fa6870f 100644 --- a/include/oox/drawingml/shape.hxx +++ b/include/oox/drawingml/shape.hxx @@ -54,8 +54,6 @@ struct ShapeStyleRef typedef ::std::map< sal_Int32, ShapeStyleRef > ShapeStyleRefMap; - - /** Additional information for a chart embedded in a drawing shape. */ struct ChartShapeInfo { @@ -65,8 +63,6 @@ struct ChartShapeInfo explicit ChartShapeInfo( bool bEmbedShapes ) : mbEmbedShapes( bEmbedShapes ) {} }; - - class OOX_DLLPUBLIC Shape : public boost::enable_shared_from_this< Shape > { @@ -287,8 +283,6 @@ private: com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> maDiagramDoms; }; - - } } #endif // INCLUDED_OOX_DRAWINGML_SHAPE_HXX diff --git a/oox/source/drawingml/chart/seriesconverter.cxx b/oox/source/drawingml/chart/seriesconverter.cxx index 240255c9016c..b33aabe9e86a 100644 --- a/oox/source/drawingml/chart/seriesconverter.cxx +++ b/oox/source/drawingml/chart/seriesconverter.cxx @@ -39,15 +39,11 @@ namespace oox { namespace drawingml { namespace chart { - - using namespace ::com::sun::star::beans; using namespace ::com::sun::star::chart2; using namespace ::com::sun::star::chart2::data; using namespace ::com::sun::star::uno; - - namespace { /** nastied-up sgn function - employs some gratuity around 0 - values @@ -168,8 +164,6 @@ void lclConvertLabelFormatting( PropertySet& rPropSet, ObjectFormatter& rFormatt } // namespace - - DataLabelConverter::DataLabelConverter( const ConverterRoot& rParent, DataLabelModel& rModel ) : ConverterBase< DataLabelModel >( rParent, rModel ) { @@ -213,8 +207,6 @@ void DataLabelConverter::convertFromModel( const Reference< XDataSeries >& rxDat } } - - DataLabelsConverter::DataLabelsConverter( const ConverterRoot& rParent, DataLabelsModel& rModel ) : ConverterBase< DataLabelsModel >( rParent, rModel ) { @@ -244,8 +236,6 @@ void DataLabelsConverter::convertFromModel( const Reference< XDataSeries >& rxDa } } - - ErrorBarConverter::ErrorBarConverter( const ConverterRoot& rParent, ErrorBarModel& rModel ) : ConverterBase< ErrorBarModel >( rParent, rModel ) { @@ -346,8 +336,6 @@ void ErrorBarConverter::convertFromModel( const Reference< XDataSeries >& rxData } } -// private -------------------------------------------------------------------- - Reference< XLabeledDataSequence > ErrorBarConverter::createLabeledDataSequence( ErrorBarModel::SourceType eSourceType ) { OUString aRole; @@ -372,8 +360,6 @@ Reference< XLabeledDataSequence > ErrorBarConverter::createLabeledDataSequence( return lclCreateLabeledDataSequence( *this, mrModel.maSources.get( eSourceType ).get(), aRole ); } - - TrendlineLabelConverter::TrendlineLabelConverter( const ConverterRoot& rParent, TrendlineLabelModel& rModel ) : ConverterBase< TrendlineLabelModel >( rParent, rModel ) { @@ -389,8 +375,6 @@ void TrendlineLabelConverter::convertFromModel( PropertySet& rPropSet ) getFormatter().convertFormatting( rPropSet, mrModel.mxShapeProp, mrModel.mxTextProp, OBJECTTYPE_TRENDLINELABEL ); } - - TrendlineConverter::TrendlineConverter( const ConverterRoot& rParent, TrendlineModel& rModel ) : ConverterBase< TrendlineModel >( rParent, rModel ) { @@ -479,8 +463,6 @@ void TrendlineConverter::convertFromModel( const Reference< XDataSeries >& rxDat } } - - DataPointConverter::DataPointConverter( const ConverterRoot& rParent, DataPointModel& rModel ) : ConverterBase< DataPointModel >( rParent, rModel ) { @@ -519,8 +501,6 @@ void DataPointConverter::convertFromModel( const Reference< XDataSeries >& rxDat } } - - SeriesConverter::SeriesConverter( const ConverterRoot& rParent, SeriesModel& rModel ) : ConverterBase< SeriesModel >( rParent, rModel ) { @@ -683,8 +663,6 @@ Reference< XLabeledDataSequence > SeriesConverter::createLabeledDataSequence( return lclCreateLabeledDataSequence( *this, pValues, rRole, pTitle ); } - - } // namespace chart } // namespace drawingml } // namespace oox diff --git a/oox/source/drawingml/chart/typegroupcontext.cxx b/oox/source/drawingml/chart/typegroupcontext.cxx index 22107e97ffd7..b39dfb02e96e 100644 --- a/oox/source/drawingml/chart/typegroupcontext.cxx +++ b/oox/source/drawingml/chart/typegroupcontext.cxx @@ -26,13 +26,9 @@ namespace oox { namespace drawingml { namespace chart { - - using ::oox::core::ContextHandler2Helper; using ::oox::core::ContextHandlerRef; - - UpDownBarsContext::UpDownBarsContext( ContextHandler2Helper& rParent, UpDownBarsModel& rModel ) : ContextBase< UpDownBarsModel >( rParent, rModel ) { @@ -62,8 +58,6 @@ ContextHandlerRef UpDownBarsContext::onCreateContext( sal_Int32 nElement, const return 0; } - - AreaTypeGroupContext::AreaTypeGroupContext( ContextHandler2Helper& rParent, TypeGroupModel& rModel ) : TypeGroupContextBase( rParent, rModel ) { @@ -100,8 +94,6 @@ ContextHandlerRef AreaTypeGroupContext::onCreateContext( sal_Int32 nElement, con return 0; } - - BarTypeGroupContext::BarTypeGroupContext( ContextHandler2Helper& rParent, TypeGroupModel& rModel ) : TypeGroupContextBase( rParent, rModel ) { @@ -151,8 +143,6 @@ ContextHandlerRef BarTypeGroupContext::onCreateContext( sal_Int32 nElement, cons return 0; } - - BubbleTypeGroupContext::BubbleTypeGroupContext( ContextHandler2Helper& rParent, TypeGroupModel& rModel ) : TypeGroupContextBase( rParent, rModel ) { @@ -195,8 +185,6 @@ ContextHandlerRef BubbleTypeGroupContext::onCreateContext( sal_Int32 nElement, c return 0; } - - LineTypeGroupContext::LineTypeGroupContext( ContextHandler2Helper& rParent, TypeGroupModel& rModel ) : TypeGroupContextBase( rParent, rModel ) { @@ -246,8 +234,6 @@ ContextHandlerRef LineTypeGroupContext::onCreateContext( sal_Int32 nElement, con return 0; } - - PieTypeGroupContext::PieTypeGroupContext( ContextHandler2Helper& rParent, TypeGroupModel& rModel ) : TypeGroupContextBase( rParent, rModel ) { @@ -296,8 +282,6 @@ ContextHandlerRef PieTypeGroupContext::onCreateContext( sal_Int32 nElement, cons return 0; } - - RadarTypeGroupContext::RadarTypeGroupContext( ContextHandler2Helper& rParent, TypeGroupModel& rModel ) : TypeGroupContextBase( rParent, rModel ) { @@ -329,8 +313,6 @@ ContextHandlerRef RadarTypeGroupContext::onCreateContext( sal_Int32 nElement, co return 0; } - - ScatterTypeGroupContext::ScatterTypeGroupContext( ContextHandler2Helper& rParent, TypeGroupModel& rModel ) : TypeGroupContextBase( rParent, rModel ) { @@ -362,8 +344,6 @@ ContextHandlerRef ScatterTypeGroupContext::onCreateContext( sal_Int32 nElement, return 0; } - - SurfaceTypeGroupContext::SurfaceTypeGroupContext( ContextHandler2Helper& rParent, TypeGroupModel& rModel ) : TypeGroupContextBase( rParent, rModel ) { @@ -390,8 +370,6 @@ ContextHandlerRef SurfaceTypeGroupContext::onCreateContext( sal_Int32 nElement, return 0; } - - } // namespace chart } // namespace drawingml } // namespace oox |