Kaydet (Commit) 08906623 authored tarafından Markus Mohrhard's avatar Markus Mohrhard Kaydeden (comit) Markus Mohrhard

remove whitespace

Change-Id: I69454c3d9bddfe01da2622117a16bbb37797062a
üst 4074f6f9
...@@ -34,8 +34,6 @@ namespace oox { ...@@ -34,8 +34,6 @@ namespace oox {
namespace drawingml { namespace drawingml {
namespace chart { namespace chart {
/** Enumerates different chart types. */ /** Enumerates different chart types. */
enum TypeId enum TypeId
{ {
...@@ -55,8 +53,6 @@ enum TypeId ...@@ -55,8 +53,6 @@ enum TypeId
TYPEID_UNKNOWN /// Default for unknown chart types. TYPEID_UNKNOWN /// Default for unknown chart types.
}; };
/** Enumerates different categories of similar chart types. */ /** Enumerates different categories of similar chart types. */
enum TypeCategory enum TypeCategory
{ {
...@@ -68,8 +64,6 @@ enum TypeCategory ...@@ -68,8 +64,6 @@ enum TypeCategory
TYPECATEGORY_SURFACE /// Surface charts. TYPECATEGORY_SURFACE /// Surface charts.
}; };
/** Enumerates modes for varying point colors in a series. */ /** Enumerates modes for varying point colors in a series. */
enum VarPointMode enum VarPointMode
{ {
...@@ -78,8 +72,6 @@ enum VarPointMode ...@@ -78,8 +72,6 @@ enum VarPointMode
VARPOINTMODE_MULTI /// Supported for multiple series in a chart type group. VARPOINTMODE_MULTI /// Supported for multiple series in a chart type group.
}; };
/** Contains info for a chart type related to the OpenOffice.org chart module. */ /** Contains info for a chart type related to the OpenOffice.org chart module. */
struct TypeGroupInfo struct TypeGroupInfo
{ {
...@@ -101,8 +93,6 @@ struct TypeGroupInfo ...@@ -101,8 +93,6 @@ struct TypeGroupInfo
bool mbPictureOptions; /// True = bitmaps support options from c:pictureOptions. bool mbPictureOptions; /// True = bitmaps support options from c:pictureOptions.
}; };
struct UpDownBarsModel; struct UpDownBarsModel;
class UpDownBarsConverter : public ConverterBase< UpDownBarsModel > class UpDownBarsConverter : public ConverterBase< UpDownBarsModel >
...@@ -116,8 +106,6 @@ public: ...@@ -116,8 +106,6 @@ public:
const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& rxChartType ); const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& rxChartType );
}; };
struct TypeGroupModel; struct TypeGroupModel;
struct View3DModel; struct View3DModel;
...@@ -187,8 +175,6 @@ private: ...@@ -187,8 +175,6 @@ private:
bool mb3dChart; /// True = type is a 3D chart type. bool mb3dChart; /// True = type is a 3D chart type.
}; };
} // namespace chart } // namespace chart
} // namespace drawingml } // namespace drawingml
} // namespace oox } // namespace oox
......
...@@ -38,8 +38,6 @@ namespace drawingml { ...@@ -38,8 +38,6 @@ namespace drawingml {
class ShapePropertyMap; class ShapePropertyMap;
struct GradientFillProperties struct GradientFillProperties
{ {
typedef ::std::map< double, Color > GradientStopMap; typedef ::std::map< double, Color > GradientStopMap;
...@@ -57,8 +55,6 @@ struct GradientFillProperties ...@@ -57,8 +55,6 @@ struct GradientFillProperties
void assignUsed( const GradientFillProperties& rSourceProps ); void assignUsed( const GradientFillProperties& rSourceProps );
}; };
struct PatternFillProperties struct PatternFillProperties
{ {
Color maPattFgColor; /// Pattern foreground color. Color maPattFgColor; /// Pattern foreground color.
...@@ -69,8 +65,6 @@ struct PatternFillProperties ...@@ -69,8 +65,6 @@ struct PatternFillProperties
void assignUsed( const PatternFillProperties& rSourceProps ); void assignUsed( const PatternFillProperties& rSourceProps );
}; };
struct BlipFillProperties struct BlipFillProperties
{ {
::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >
...@@ -99,8 +93,6 @@ struct BlipFillProperties ...@@ -99,8 +93,6 @@ struct BlipFillProperties
void assignUsed( const BlipFillProperties& rSourceProps ); void assignUsed( const BlipFillProperties& rSourceProps );
}; };
struct OOX_DLLPUBLIC FillProperties struct OOX_DLLPUBLIC FillProperties
{ {
OptValue< sal_Int32 > moFillType; /// Fill type (OOXML token). OptValue< sal_Int32 > moFillType; /// Fill type (OOXML token).
...@@ -126,8 +118,6 @@ struct OOX_DLLPUBLIC FillProperties ...@@ -126,8 +118,6 @@ struct OOX_DLLPUBLIC FillProperties
bool bFlipV = false ) const; bool bFlipV = false ) const;
}; };
struct GraphicProperties struct GraphicProperties
{ {
BlipFillProperties maBlipProps; /// Properties for the graphic. BlipFillProperties maBlipProps; /// Properties for the graphic.
...@@ -143,8 +133,6 @@ struct GraphicProperties ...@@ -143,8 +133,6 @@ struct GraphicProperties
sal_Int32 nPhClr = API_RGB_TRANSPARENT ) const; sal_Int32 nPhClr = API_RGB_TRANSPARENT ) const;
}; };
} // namespace drawingml } // namespace drawingml
} // namespace oox } // namespace oox
......
...@@ -27,8 +27,6 @@ ...@@ -27,8 +27,6 @@
namespace oox { namespace oox {
namespace drawingml { namespace drawingml {
struct LineArrowProperties struct LineArrowProperties
{ {
OptValue< sal_Int32 > moArrowType; OptValue< sal_Int32 > moArrowType;
...@@ -39,8 +37,6 @@ struct LineArrowProperties ...@@ -39,8 +37,6 @@ struct LineArrowProperties
void assignUsed( const LineArrowProperties& rSourceProps ); void assignUsed( const LineArrowProperties& rSourceProps );
}; };
struct OOX_DLLPUBLIC LineProperties struct OOX_DLLPUBLIC LineProperties
{ {
typedef ::std::pair< sal_Int32, sal_Int32 > DashStop; typedef ::std::pair< sal_Int32, sal_Int32 > DashStop;
...@@ -73,8 +69,6 @@ struct OOX_DLLPUBLIC LineProperties ...@@ -73,8 +69,6 @@ struct OOX_DLLPUBLIC LineProperties
sal_Int32 getLineWidth() const; sal_Int32 getLineWidth() const;
}; };
} // namespace drawingml } // namespace drawingml
} // namespace oox } // namespace oox
......
...@@ -54,8 +54,6 @@ struct ShapeStyleRef ...@@ -54,8 +54,6 @@ struct ShapeStyleRef
typedef ::std::map< sal_Int32, ShapeStyleRef > ShapeStyleRefMap; typedef ::std::map< sal_Int32, ShapeStyleRef > ShapeStyleRefMap;
/** Additional information for a chart embedded in a drawing shape. */ /** Additional information for a chart embedded in a drawing shape. */
struct ChartShapeInfo struct ChartShapeInfo
{ {
...@@ -65,8 +63,6 @@ struct ChartShapeInfo ...@@ -65,8 +63,6 @@ struct ChartShapeInfo
explicit ChartShapeInfo( bool bEmbedShapes ) : mbEmbedShapes( bEmbedShapes ) {} explicit ChartShapeInfo( bool bEmbedShapes ) : mbEmbedShapes( bEmbedShapes ) {}
}; };
class OOX_DLLPUBLIC Shape class OOX_DLLPUBLIC Shape
: public boost::enable_shared_from_this< Shape > : public boost::enable_shared_from_this< Shape >
{ {
...@@ -287,8 +283,6 @@ private: ...@@ -287,8 +283,6 @@ private:
com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> maDiagramDoms; com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> maDiagramDoms;
}; };
} } } }
#endif // INCLUDED_OOX_DRAWINGML_SHAPE_HXX #endif // INCLUDED_OOX_DRAWINGML_SHAPE_HXX
......
...@@ -39,15 +39,11 @@ namespace oox { ...@@ -39,15 +39,11 @@ namespace oox {
namespace drawingml { namespace drawingml {
namespace chart { namespace chart {
using namespace ::com::sun::star::beans; using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::chart2; using namespace ::com::sun::star::chart2;
using namespace ::com::sun::star::chart2::data; using namespace ::com::sun::star::chart2::data;
using namespace ::com::sun::star::uno; using namespace ::com::sun::star::uno;
namespace { namespace {
/** nastied-up sgn function - employs some gratuity around 0 - values /** nastied-up sgn function - employs some gratuity around 0 - values
...@@ -168,8 +164,6 @@ void lclConvertLabelFormatting( PropertySet& rPropSet, ObjectFormatter& rFormatt ...@@ -168,8 +164,6 @@ void lclConvertLabelFormatting( PropertySet& rPropSet, ObjectFormatter& rFormatt
} // namespace } // namespace
DataLabelConverter::DataLabelConverter( const ConverterRoot& rParent, DataLabelModel& rModel ) : DataLabelConverter::DataLabelConverter( const ConverterRoot& rParent, DataLabelModel& rModel ) :
ConverterBase< DataLabelModel >( rParent, rModel ) ConverterBase< DataLabelModel >( rParent, rModel )
{ {
...@@ -213,8 +207,6 @@ void DataLabelConverter::convertFromModel( const Reference< XDataSeries >& rxDat ...@@ -213,8 +207,6 @@ void DataLabelConverter::convertFromModel( const Reference< XDataSeries >& rxDat
} }
} }
DataLabelsConverter::DataLabelsConverter( const ConverterRoot& rParent, DataLabelsModel& rModel ) : DataLabelsConverter::DataLabelsConverter( const ConverterRoot& rParent, DataLabelsModel& rModel ) :
ConverterBase< DataLabelsModel >( rParent, rModel ) ConverterBase< DataLabelsModel >( rParent, rModel )
{ {
...@@ -244,8 +236,6 @@ void DataLabelsConverter::convertFromModel( const Reference< XDataSeries >& rxDa ...@@ -244,8 +236,6 @@ void DataLabelsConverter::convertFromModel( const Reference< XDataSeries >& rxDa
} }
} }
ErrorBarConverter::ErrorBarConverter( const ConverterRoot& rParent, ErrorBarModel& rModel ) : ErrorBarConverter::ErrorBarConverter( const ConverterRoot& rParent, ErrorBarModel& rModel ) :
ConverterBase< ErrorBarModel >( rParent, rModel ) ConverterBase< ErrorBarModel >( rParent, rModel )
{ {
...@@ -346,8 +336,6 @@ void ErrorBarConverter::convertFromModel( const Reference< XDataSeries >& rxData ...@@ -346,8 +336,6 @@ void ErrorBarConverter::convertFromModel( const Reference< XDataSeries >& rxData
} }
} }
// private --------------------------------------------------------------------
Reference< XLabeledDataSequence > ErrorBarConverter::createLabeledDataSequence( ErrorBarModel::SourceType eSourceType ) Reference< XLabeledDataSequence > ErrorBarConverter::createLabeledDataSequence( ErrorBarModel::SourceType eSourceType )
{ {
OUString aRole; OUString aRole;
...@@ -372,8 +360,6 @@ Reference< XLabeledDataSequence > ErrorBarConverter::createLabeledDataSequence( ...@@ -372,8 +360,6 @@ Reference< XLabeledDataSequence > ErrorBarConverter::createLabeledDataSequence(
return lclCreateLabeledDataSequence( *this, mrModel.maSources.get( eSourceType ).get(), aRole ); return lclCreateLabeledDataSequence( *this, mrModel.maSources.get( eSourceType ).get(), aRole );
} }
TrendlineLabelConverter::TrendlineLabelConverter( const ConverterRoot& rParent, TrendlineLabelModel& rModel ) : TrendlineLabelConverter::TrendlineLabelConverter( const ConverterRoot& rParent, TrendlineLabelModel& rModel ) :
ConverterBase< TrendlineLabelModel >( rParent, rModel ) ConverterBase< TrendlineLabelModel >( rParent, rModel )
{ {
...@@ -389,8 +375,6 @@ void TrendlineLabelConverter::convertFromModel( PropertySet& rPropSet ) ...@@ -389,8 +375,6 @@ void TrendlineLabelConverter::convertFromModel( PropertySet& rPropSet )
getFormatter().convertFormatting( rPropSet, mrModel.mxShapeProp, mrModel.mxTextProp, OBJECTTYPE_TRENDLINELABEL ); getFormatter().convertFormatting( rPropSet, mrModel.mxShapeProp, mrModel.mxTextProp, OBJECTTYPE_TRENDLINELABEL );
} }
TrendlineConverter::TrendlineConverter( const ConverterRoot& rParent, TrendlineModel& rModel ) : TrendlineConverter::TrendlineConverter( const ConverterRoot& rParent, TrendlineModel& rModel ) :
ConverterBase< TrendlineModel >( rParent, rModel ) ConverterBase< TrendlineModel >( rParent, rModel )
{ {
...@@ -479,8 +463,6 @@ void TrendlineConverter::convertFromModel( const Reference< XDataSeries >& rxDat ...@@ -479,8 +463,6 @@ void TrendlineConverter::convertFromModel( const Reference< XDataSeries >& rxDat
} }
} }
DataPointConverter::DataPointConverter( const ConverterRoot& rParent, DataPointModel& rModel ) : DataPointConverter::DataPointConverter( const ConverterRoot& rParent, DataPointModel& rModel ) :
ConverterBase< DataPointModel >( rParent, rModel ) ConverterBase< DataPointModel >( rParent, rModel )
{ {
...@@ -519,8 +501,6 @@ void DataPointConverter::convertFromModel( const Reference< XDataSeries >& rxDat ...@@ -519,8 +501,6 @@ void DataPointConverter::convertFromModel( const Reference< XDataSeries >& rxDat
} }
} }
SeriesConverter::SeriesConverter( const ConverterRoot& rParent, SeriesModel& rModel ) : SeriesConverter::SeriesConverter( const ConverterRoot& rParent, SeriesModel& rModel ) :
ConverterBase< SeriesModel >( rParent, rModel ) ConverterBase< SeriesModel >( rParent, rModel )
{ {
...@@ -683,8 +663,6 @@ Reference< XLabeledDataSequence > SeriesConverter::createLabeledDataSequence( ...@@ -683,8 +663,6 @@ Reference< XLabeledDataSequence > SeriesConverter::createLabeledDataSequence(
return lclCreateLabeledDataSequence( *this, pValues, rRole, pTitle ); return lclCreateLabeledDataSequence( *this, pValues, rRole, pTitle );
} }
} // namespace chart } // namespace chart
} // namespace drawingml } // namespace drawingml
} // namespace oox } // namespace oox
......
...@@ -26,13 +26,9 @@ namespace oox { ...@@ -26,13 +26,9 @@ namespace oox {
namespace drawingml { namespace drawingml {
namespace chart { namespace chart {
using ::oox::core::ContextHandler2Helper; using ::oox::core::ContextHandler2Helper;
using ::oox::core::ContextHandlerRef; using ::oox::core::ContextHandlerRef;
UpDownBarsContext::UpDownBarsContext( ContextHandler2Helper& rParent, UpDownBarsModel& rModel ) : UpDownBarsContext::UpDownBarsContext( ContextHandler2Helper& rParent, UpDownBarsModel& rModel ) :
ContextBase< UpDownBarsModel >( rParent, rModel ) ContextBase< UpDownBarsModel >( rParent, rModel )
{ {
...@@ -62,8 +58,6 @@ ContextHandlerRef UpDownBarsContext::onCreateContext( sal_Int32 nElement, const ...@@ -62,8 +58,6 @@ ContextHandlerRef UpDownBarsContext::onCreateContext( sal_Int32 nElement, const
return 0; return 0;
} }
AreaTypeGroupContext::AreaTypeGroupContext( ContextHandler2Helper& rParent, TypeGroupModel& rModel ) : AreaTypeGroupContext::AreaTypeGroupContext( ContextHandler2Helper& rParent, TypeGroupModel& rModel ) :
TypeGroupContextBase( rParent, rModel ) TypeGroupContextBase( rParent, rModel )
{ {
...@@ -100,8 +94,6 @@ ContextHandlerRef AreaTypeGroupContext::onCreateContext( sal_Int32 nElement, con ...@@ -100,8 +94,6 @@ ContextHandlerRef AreaTypeGroupContext::onCreateContext( sal_Int32 nElement, con
return 0; return 0;
} }
BarTypeGroupContext::BarTypeGroupContext( ContextHandler2Helper& rParent, TypeGroupModel& rModel ) : BarTypeGroupContext::BarTypeGroupContext( ContextHandler2Helper& rParent, TypeGroupModel& rModel ) :
TypeGroupContextBase( rParent, rModel ) TypeGroupContextBase( rParent, rModel )
{ {
...@@ -151,8 +143,6 @@ ContextHandlerRef BarTypeGroupContext::onCreateContext( sal_Int32 nElement, cons ...@@ -151,8 +143,6 @@ ContextHandlerRef BarTypeGroupContext::onCreateContext( sal_Int32 nElement, cons
return 0; return 0;
} }
BubbleTypeGroupContext::BubbleTypeGroupContext( ContextHandler2Helper& rParent, TypeGroupModel& rModel ) : BubbleTypeGroupContext::BubbleTypeGroupContext( ContextHandler2Helper& rParent, TypeGroupModel& rModel ) :
TypeGroupContextBase( rParent, rModel ) TypeGroupContextBase( rParent, rModel )
{ {
...@@ -195,8 +185,6 @@ ContextHandlerRef BubbleTypeGroupContext::onCreateContext( sal_Int32 nElement, c ...@@ -195,8 +185,6 @@ ContextHandlerRef BubbleTypeGroupContext::onCreateContext( sal_Int32 nElement, c
return 0; return 0;
} }
LineTypeGroupContext::LineTypeGroupContext( ContextHandler2Helper& rParent, TypeGroupModel& rModel ) : LineTypeGroupContext::LineTypeGroupContext( ContextHandler2Helper& rParent, TypeGroupModel& rModel ) :
TypeGroupContextBase( rParent, rModel ) TypeGroupContextBase( rParent, rModel )
{ {
...@@ -246,8 +234,6 @@ ContextHandlerRef LineTypeGroupContext::onCreateContext( sal_Int32 nElement, con ...@@ -246,8 +234,6 @@ ContextHandlerRef LineTypeGroupContext::onCreateContext( sal_Int32 nElement, con
return 0; return 0;
} }
PieTypeGroupContext::PieTypeGroupContext( ContextHandler2Helper& rParent, TypeGroupModel& rModel ) : PieTypeGroupContext::PieTypeGroupContext( ContextHandler2Helper& rParent, TypeGroupModel& rModel ) :
TypeGroupContextBase( rParent, rModel ) TypeGroupContextBase( rParent, rModel )
{ {
...@@ -296,8 +282,6 @@ ContextHandlerRef PieTypeGroupContext::onCreateContext( sal_Int32 nElement, cons ...@@ -296,8 +282,6 @@ ContextHandlerRef PieTypeGroupContext::onCreateContext( sal_Int32 nElement, cons
return 0; return 0;
} }
RadarTypeGroupContext::RadarTypeGroupContext( ContextHandler2Helper& rParent, TypeGroupModel& rModel ) : RadarTypeGroupContext::RadarTypeGroupContext( ContextHandler2Helper& rParent, TypeGroupModel& rModel ) :
TypeGroupContextBase( rParent, rModel ) TypeGroupContextBase( rParent, rModel )
{ {
...@@ -329,8 +313,6 @@ ContextHandlerRef RadarTypeGroupContext::onCreateContext( sal_Int32 nElement, co ...@@ -329,8 +313,6 @@ ContextHandlerRef RadarTypeGroupContext::onCreateContext( sal_Int32 nElement, co
return 0; return 0;
} }
ScatterTypeGroupContext::ScatterTypeGroupContext( ContextHandler2Helper& rParent, TypeGroupModel& rModel ) : ScatterTypeGroupContext::ScatterTypeGroupContext( ContextHandler2Helper& rParent, TypeGroupModel& rModel ) :
TypeGroupContextBase( rParent, rModel ) TypeGroupContextBase( rParent, rModel )
{ {
...@@ -362,8 +344,6 @@ ContextHandlerRef ScatterTypeGroupContext::onCreateContext( sal_Int32 nElement, ...@@ -362,8 +344,6 @@ ContextHandlerRef ScatterTypeGroupContext::onCreateContext( sal_Int32 nElement,
return 0; return 0;
} }
SurfaceTypeGroupContext::SurfaceTypeGroupContext( ContextHandler2Helper& rParent, TypeGroupModel& rModel ) : SurfaceTypeGroupContext::SurfaceTypeGroupContext( ContextHandler2Helper& rParent, TypeGroupModel& rModel ) :
TypeGroupContextBase( rParent, rModel ) TypeGroupContextBase( rParent, rModel )
{ {
...@@ -390,8 +370,6 @@ ContextHandlerRef SurfaceTypeGroupContext::onCreateContext( sal_Int32 nElement, ...@@ -390,8 +370,6 @@ ContextHandlerRef SurfaceTypeGroupContext::onCreateContext( sal_Int32 nElement,
return 0; return 0;
} }
} // namespace chart } // namespace chart
} // namespace drawingml } // namespace drawingml
} // namespace oox } // namespace oox
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment