summaryrefslogtreecommitdiff
path: root/oox/source/drawingml
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@collabora.co.uk>2014-06-25 05:22:57 +0200
committerMarkus Mohrhard <markus.mohrhard@collabora.co.uk>2014-06-25 05:41:11 +0200
commitca362d6348e4d0a29317492b3c8ef9637a656f4f (patch)
tree80e13761f3d287077dfb0620638fd0397087c9e4 /oox/source/drawingml
parent37e6631cc5d4147e9d0a4ebefbd0c9d2a8137d24 (diff)
remove whitespaces
Change-Id: Ie14ba3dcb97f20479a04538748ef2c1c9e6c5dac
Diffstat (limited to 'oox/source/drawingml')
-rw-r--r--oox/source/drawingml/chart/axiscontext.cxx16
-rw-r--r--oox/source/drawingml/chart/axisconverter.cxx9
-rw-r--r--oox/source/drawingml/chart/axismodel.cxx6
-rw-r--r--oox/source/drawingml/chart/chartcontextbase.cxx8
-rw-r--r--oox/source/drawingml/chart/chartconverter.cxx8
-rw-r--r--oox/source/drawingml/chart/chartdrawingfragment.cxx7
-rw-r--r--oox/source/drawingml/chart/chartspaceconverter.cxx6
-rw-r--r--oox/source/drawingml/chart/chartspacefragment.cxx6
-rw-r--r--oox/source/drawingml/chart/chartspacemodel.cxx4
-rw-r--r--oox/source/drawingml/chart/converterbase.cxx20
-rw-r--r--oox/source/drawingml/chart/datasourcecontext.cxx10
-rw-r--r--oox/source/drawingml/chart/datasourceconverter.cxx8
-rw-r--r--oox/source/drawingml/chart/datasourcemodel.cxx6
-rw-r--r--oox/source/drawingml/chart/modelbase.cxx5
-rw-r--r--oox/source/drawingml/chart/objectformatter.cxx48
-rw-r--r--oox/source/drawingml/chart/plotareacontext.cxx14
-rw-r--r--oox/source/drawingml/chart/plotareaconverter.cxx18
-rw-r--r--oox/source/drawingml/chart/plotareamodel.cxx10
-rw-r--r--oox/source/drawingml/chart/seriescontext.cxx38
-rw-r--r--oox/source/drawingml/chart/seriesmodel.cxx20
-rw-r--r--oox/source/drawingml/chart/titlecontext.cxx10
-rw-r--r--oox/source/drawingml/chart/titleconverter.cxx10
-rw-r--r--oox/source/drawingml/chart/titlemodel.cxx8
-rw-r--r--oox/source/drawingml/chart/typegroupconverter.cxx11
-rw-r--r--oox/source/drawingml/chart/typegroupmodel.cxx6
-rw-r--r--oox/source/drawingml/clrscheme.cxx2
-rw-r--r--oox/source/drawingml/color.cxx15
-rw-r--r--oox/source/drawingml/colorchoicecontext.cxx6
-rw-r--r--oox/source/drawingml/customshapegeometry.cxx21
-rw-r--r--oox/source/drawingml/customshapeproperties.cxx1
-rw-r--r--oox/source/drawingml/diagram/constraintlistcontext.cxx2
-rw-r--r--oox/source/drawingml/diagram/datamodelcontext.cxx9
-rw-r--r--oox/source/drawingml/diagram/diagram.cxx6
-rw-r--r--oox/source/drawingml/diagram/diagram.hxx14
-rw-r--r--oox/source/drawingml/diagram/diagramdefinitioncontext.cxx3
-rw-r--r--oox/source/drawingml/diagram/diagramfragmenthandler.cxx11
-rw-r--r--oox/source/drawingml/diagram/diagramfragmenthandler.hxx3
-rw-r--r--oox/source/drawingml/diagram/diagramlayoutatoms.cxx9
-rw-r--r--oox/source/drawingml/diagram/diagramlayoutatoms.hxx3
-rw-r--r--oox/source/drawingml/diagram/layoutnodecontext.cxx11
-rw-r--r--oox/source/drawingml/drawingmltypes.cxx11
-rw-r--r--oox/source/drawingml/effectproperties.cxx4
-rw-r--r--oox/source/drawingml/effectproperties.hxx8
-rw-r--r--oox/source/drawingml/effectpropertiescontext.cxx1
-rw-r--r--oox/source/drawingml/embeddedwavaudiofile.cxx3
-rw-r--r--oox/source/drawingml/fillproperties.cxx15
-rw-r--r--oox/source/drawingml/graphicshapecontext.cxx8
-rw-r--r--oox/source/drawingml/lineproperties.cxx10
-rw-r--r--oox/source/drawingml/linepropertiescontext.cxx1
-rw-r--r--oox/source/drawingml/shape.cxx8
-rw-r--r--oox/source/drawingml/shape3dproperties.cxx3
-rw-r--r--oox/source/drawingml/shapecontext.cxx2
-rw-r--r--oox/source/drawingml/shapepropertiescontext.cxx4
-rw-r--r--oox/source/drawingml/shapepropertymap.cxx8
-rw-r--r--oox/source/drawingml/shapestylecontext.cxx1
-rw-r--r--oox/source/drawingml/table/tableproperties.cxx1
-rw-r--r--oox/source/drawingml/textbody.cxx1
-rw-r--r--oox/source/drawingml/textbodycontext.cxx18
-rw-r--r--oox/source/drawingml/textbodyproperties.cxx4
-rw-r--r--oox/source/drawingml/textcharacterproperties.cxx4
-rw-r--r--oox/source/drawingml/textfont.cxx6
-rw-r--r--oox/source/drawingml/textliststylecontext.cxx4
-rw-r--r--oox/source/drawingml/textparagraph.cxx1
-rw-r--r--oox/source/drawingml/textparagraphproperties.cxx1
-rw-r--r--oox/source/drawingml/textparagraphpropertiescontext.cxx4
-rw-r--r--oox/source/drawingml/textrun.cxx1
-rw-r--r--oox/source/drawingml/textspacingcontext.cxx1
-rw-r--r--oox/source/drawingml/theme.cxx4
-rw-r--r--oox/source/drawingml/themeelementscontext.cxx12
-rw-r--r--oox/source/drawingml/themefragmenthandler.cxx4
70 files changed, 0 insertions, 581 deletions
diff --git a/oox/source/drawingml/chart/axiscontext.cxx b/oox/source/drawingml/chart/axiscontext.cxx
index 783afb2b9ded..b91bbe57b08d 100644
--- a/oox/source/drawingml/chart/axiscontext.cxx
+++ b/oox/source/drawingml/chart/axiscontext.cxx
@@ -28,13 +28,9 @@ namespace oox {
namespace drawingml {
namespace chart {
-
-
using ::oox::core::ContextHandlerRef;
using ::oox::core::ContextHandler2Helper;
-
-
AxisDispUnitsContext::AxisDispUnitsContext( ContextHandler2Helper& rParent, AxisDispUnitsModel& rModel ) :
ContextBase< AxisDispUnitsModel >( rParent, rModel )
{
@@ -79,8 +75,6 @@ ContextHandlerRef AxisDispUnitsContext::onCreateContext( sal_Int32 nElement, con
return 0;
}
-
-
AxisContextBase::AxisContextBase( ContextHandler2Helper& rParent, AxisModel& rModel ) :
ContextBase< AxisModel >( rParent, rModel )
{
@@ -166,8 +160,6 @@ ContextHandlerRef AxisContextBase::onCreateContext( sal_Int32 nElement, const At
return 0;
}
-
-
CatAxisContext::CatAxisContext( ContextHandler2Helper& rParent, AxisModel& rModel ) :
AxisContextBase( rParent, rModel )
{
@@ -208,8 +200,6 @@ ContextHandlerRef CatAxisContext::onCreateContext( sal_Int32 nElement, const Att
return AxisContextBase::onCreateContext( nElement, rAttribs );
}
-
-
DateAxisContext::DateAxisContext( ContextHandler2Helper& rParent, AxisModel& rModel ) :
AxisContextBase( rParent, rModel )
{
@@ -249,8 +239,6 @@ ContextHandlerRef DateAxisContext::onCreateContext( sal_Int32 nElement, const At
return AxisContextBase::onCreateContext( nElement, rAttribs );
}
-
-
SerAxisContext::SerAxisContext( ContextHandler2Helper& rParent, AxisModel& rModel ) :
AxisContextBase( rParent, rModel )
{
@@ -274,8 +262,6 @@ ContextHandlerRef SerAxisContext::onCreateContext( sal_Int32 nElement, const Att
return AxisContextBase::onCreateContext( nElement, rAttribs );
}
-
-
ValAxisContext::ValAxisContext( ContextHandler2Helper& rParent, AxisModel& rModel ) :
AxisContextBase( rParent, rModel )
{
@@ -304,8 +290,6 @@ ContextHandlerRef ValAxisContext::onCreateContext( sal_Int32 nElement, const Att
return AxisContextBase::onCreateContext( nElement, rAttribs );
}
-
-
} // namespace chart
} // namespace drawingml
} // namespace oox
diff --git a/oox/source/drawingml/chart/axisconverter.cxx b/oox/source/drawingml/chart/axisconverter.cxx
index 6767c3ee9f45..26cd5871dd34 100644
--- a/oox/source/drawingml/chart/axisconverter.cxx
+++ b/oox/source/drawingml/chart/axisconverter.cxx
@@ -42,14 +42,10 @@ namespace oox {
namespace drawingml {
namespace chart {
-
-
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::chart2;
using namespace ::com::sun::star::uno;
-
-
namespace {
inline void lclSetValueOrClearAny( Any& orAny, const OptValue< double >& rofValue )
@@ -109,8 +105,6 @@ sal_Int32 lclGetTickMark( sal_Int32 nToken )
} // namespace
-
-
AxisConverter::AxisConverter( const ConverterRoot& rParent, AxisModel& rModel ) :
ConverterBase< AxisModel >( rParent, rModel )
{
@@ -362,8 +356,6 @@ void AxisConverter::convertFromModel( const Reference< XCoordinateSystem >& rxCo
}
}
-
-
AxisDispUnitsConverter::AxisDispUnitsConverter( const ConverterRoot& rParent, AxisDispUnitsModel& rModel ) :
ConverterBase< AxisDispUnitsModel >( rParent, rModel )
{
@@ -383,7 +375,6 @@ void AxisDispUnitsConverter::convertFromModel( const Reference< XAxis >& rxAxis
}
}
-
} // namespace chart
} // namespace drawingml
} // namespace oox
diff --git a/oox/source/drawingml/chart/axismodel.cxx b/oox/source/drawingml/chart/axismodel.cxx
index 244741459718..e655f91786db 100644
--- a/oox/source/drawingml/chart/axismodel.cxx
+++ b/oox/source/drawingml/chart/axismodel.cxx
@@ -23,8 +23,6 @@ namespace oox {
namespace drawingml {
namespace chart {
-
-
AxisDispUnitsModel::AxisDispUnitsModel() :
mfCustomUnit( 0.0 )
{
@@ -34,8 +32,6 @@ AxisDispUnitsModel::~AxisDispUnitsModel()
{
}
-
-
AxisModel::AxisModel( sal_Int32 nTypeId ) :
mnAxisId( -1 ),
mnAxisPos( XML_TOKEN_INVALID ),
@@ -63,8 +59,6 @@ AxisModel::~AxisModel()
{
}
-
-
} // namespace chart
} // namespace drawingml
} // namespace oox
diff --git a/oox/source/drawingml/chart/chartcontextbase.cxx b/oox/source/drawingml/chart/chartcontextbase.cxx
index c4567c8cbcdd..858a3af642d3 100644
--- a/oox/source/drawingml/chart/chartcontextbase.cxx
+++ b/oox/source/drawingml/chart/chartcontextbase.cxx
@@ -26,13 +26,9 @@ namespace oox {
namespace drawingml {
namespace chart {
-
-
using ::oox::core::ContextHandler2Helper;
using ::oox::core::ContextHandlerRef;
-
-
ShapePrWrapperContext::ShapePrWrapperContext( ContextHandler2Helper& rParent, Shape& rModel ) :
ContextBase< Shape >( rParent, rModel )
{
@@ -47,8 +43,6 @@ ContextHandlerRef ShapePrWrapperContext::onCreateContext( sal_Int32 nElement, co
return (isRootElement() && (nElement == C_TOKEN( spPr ))) ? new ShapePropertiesContext( *this, mrModel ) : 0;
}
-
-
LayoutContext::LayoutContext( ContextHandler2Helper& rParent, LayoutModel& rModel ) :
ContextBase< LayoutModel >( rParent, rModel )
{
@@ -107,8 +101,6 @@ ContextHandlerRef LayoutContext::onCreateContext( sal_Int32 nElement, const Attr
return 0;
}
-
-
} // namespace chart
} // namespace drawingml
} // namespace oox
diff --git a/oox/source/drawingml/chart/chartconverter.cxx b/oox/source/drawingml/chart/chartconverter.cxx
index b320e8aa9796..4fc8e3b7650e 100644
--- a/oox/source/drawingml/chart/chartconverter.cxx
+++ b/oox/source/drawingml/chart/chartconverter.cxx
@@ -31,8 +31,6 @@ namespace oox {
namespace drawingml {
namespace chart {
-
-
using namespace ::com::sun::star;
using namespace ::com::sun::star::chart2;
using namespace ::com::sun::star::chart2::data;
@@ -41,8 +39,6 @@ using namespace ::com::sun::star::uno;
using ::oox::core::XmlFilterBase;
-
-
static const sal_Unicode API_TOKEN_ARRAY_OPEN = '{';
static const sal_Unicode API_TOKEN_ARRAY_CLOSE = '}';
static const sal_Unicode API_TOKEN_ARRAY_ROWSEP = '|';
@@ -85,8 +81,6 @@ static OUString lclGenerateApiArray( const Matrix< Any >& rMatrix )
return aBuffer.makeStringAndClear();
}
-
-
ChartConverter::ChartConverter()
{
}
@@ -152,8 +146,6 @@ Reference< XDataSequence > ChartConverter::createDataSequence( const Reference<
return 0;
}
-
-
} // namespace chart
} // namespace drawingml
} // namespace oox
diff --git a/oox/source/drawingml/chart/chartdrawingfragment.cxx b/oox/source/drawingml/chart/chartdrawingfragment.cxx
index 929f70c9be13..73056f1f7715 100644
--- a/oox/source/drawingml/chart/chartdrawingfragment.cxx
+++ b/oox/source/drawingml/chart/chartdrawingfragment.cxx
@@ -29,15 +29,11 @@ namespace oox {
namespace drawingml {
namespace chart {
-
-
using namespace ::com::sun::star;
using namespace ::com::sun::star::drawing;
using namespace ::com::sun::star::uno;
using namespace ::oox::core;
-
-
ShapeAnchor::ShapeAnchor( bool bRelSize ) :
mbRelSize( bRelSize )
{
@@ -110,7 +106,6 @@ EmuRectangle ShapeAnchor::calcAnchorRectEmu( const EmuRectangle& rChartRect ) co
return aAnchorRect;
}
-
ChartDrawingFragment::ChartDrawingFragment( XmlFilterBase& rFilter,
const OUString& rFragmentPath, const Reference< XShapes >& rxDrawPage,
const awt::Size& rChartSize, const awt::Point& rShapesOffset, bool bOleSupport ) :
@@ -223,8 +218,6 @@ void ChartDrawingFragment::onEndElement()
}
}
-
-
} // namespace chart
} // namespace drawingml
} // namespace oox
diff --git a/oox/source/drawingml/chart/chartspaceconverter.cxx b/oox/source/drawingml/chart/chartspaceconverter.cxx
index e24388d5c00f..e5705361df24 100644
--- a/oox/source/drawingml/chart/chartspaceconverter.cxx
+++ b/oox/source/drawingml/chart/chartspaceconverter.cxx
@@ -50,8 +50,6 @@ namespace oox {
namespace drawingml {
namespace chart {
-
-
using namespace ::com::sun::star::awt;
using namespace ::com::sun::star::chart2;
using namespace ::com::sun::star::chart2::data;
@@ -59,8 +57,6 @@ using namespace ::com::sun::star::drawing;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::util;
-
-
ChartSpaceConverter::ChartSpaceConverter( const ConverterRoot& rParent, ChartSpaceModel& rModel ) :
ConverterBase< ChartSpaceModel >( rParent, rModel )
{
@@ -221,8 +217,6 @@ void ChartSpaceConverter::convertFromModel( const Reference< XShapes >& rxExtern
}
}
-
-
} // namespace chart
} // namespace drawingml
} // namespace oox
diff --git a/oox/source/drawingml/chart/chartspacefragment.cxx b/oox/source/drawingml/chart/chartspacefragment.cxx
index eec0f1c79bb7..66e9d986d48e 100644
--- a/oox/source/drawingml/chart/chartspacefragment.cxx
+++ b/oox/source/drawingml/chart/chartspacefragment.cxx
@@ -29,12 +29,8 @@ namespace oox {
namespace drawingml {
namespace chart {
-
-
using namespace ::oox::core;
-
-
ChartSpaceFragment::ChartSpaceFragment( XmlFilterBase& rFilter, const OUString& rFragmentPath, ChartSpaceModel& rModel ) :
FragmentBase< ChartSpaceModel >( rFilter, rFragmentPath, rModel ),
mpFilterBase(rFilter)
@@ -118,8 +114,6 @@ ContextHandlerRef ChartSpaceFragment::onCreateContext( sal_Int32 nElement, const
return 0;
}
-
-
} // namespace chart
} // namespace drawingml
} // namespace oox
diff --git a/oox/source/drawingml/chart/chartspacemodel.cxx b/oox/source/drawingml/chart/chartspacemodel.cxx
index d6e920d85488..47f1cb07da92 100644
--- a/oox/source/drawingml/chart/chartspacemodel.cxx
+++ b/oox/source/drawingml/chart/chartspacemodel.cxx
@@ -23,8 +23,6 @@ namespace oox {
namespace drawingml {
namespace chart {
-
-
ChartSpaceModel::ChartSpaceModel() :
mnDispBlanksAs( XML_gap ), // not zero as specified
mnStyle( 2 ),
@@ -39,8 +37,6 @@ ChartSpaceModel::~ChartSpaceModel()
{
}
-
-
} // namespace chart
} // namespace drawingml
} // namespace oox
diff --git a/oox/source/drawingml/chart/converterbase.cxx b/oox/source/drawingml/chart/converterbase.cxx
index c2d3771457b0..c3c5844c522e 100644
--- a/oox/source/drawingml/chart/converterbase.cxx
+++ b/oox/source/drawingml/chart/converterbase.cxx
@@ -40,8 +40,6 @@ namespace oox {
namespace drawingml {
namespace chart {
-
-
namespace cssc = ::com::sun::star::chart;
using namespace ::com::sun::star;
@@ -53,8 +51,6 @@ using namespace ::com::sun::star::uno;
using ::oox::core::XmlFilterBase;
-
-
namespace {
struct TitleKey : public ::std::pair< ObjectType, ::std::pair< sal_Int32, sal_Int32 > >
@@ -63,8 +59,6 @@ struct TitleKey : public ::std::pair< ObjectType, ::std::pair< sal_Int32, sal_In
{ first = eObjType; second.first = nMainIdx; second.second = nSubIdx; }
};
-
-
/** A helper structure to store all data related to title objects. Needed for
the conversion of manual title positions that needs the old Chart1 API.
*/
@@ -103,8 +97,6 @@ void TitleLayoutInfo::convertTitlePos( ConverterRoot& rRoot, const Reference< cs
}
}
-
-
/* The following local functions implement getting the XShape interface of all
supported title objects (chart and axes). This needs some effort due to the
design of the old Chart1 API used to access these objects. */
@@ -143,8 +135,6 @@ OOX_DEFINEFUNC_GETAXISTITLESHAPE( lclGetSecYAxisTitleShape, XSecondAxisTitleSupp
} // namespace
-
-
struct ConverterData
{
typedef ::std::map< TitleKey, TitleLayoutInfo > TitleMap;
@@ -165,8 +155,6 @@ struct ConverterData
~ConverterData();
};
-
-
ConverterData::ConverterData(
XmlFilterBase& rFilter,
ChartConverter& rChartConverter,
@@ -210,8 +198,6 @@ ConverterData::~ConverterData()
}
}
-
-
ConverterRoot::ConverterRoot(
XmlFilterBase& rFilter,
ChartConverter& rChartConverter,
@@ -295,8 +281,6 @@ void ConverterRoot::convertTitlePositions()
}
}
-
-
namespace {
/** Returns a position value in the chart area in 1/100 mm. */
@@ -350,8 +334,6 @@ double lclCalcRelSize( double fPos, double fSize, sal_Int32 nSizeMode )
} // namespace
-
-
LayoutConverter::LayoutConverter( const ConverterRoot& rParent, LayoutModel& rModel ) :
ConverterBase< LayoutModel >( rParent, rModel )
{
@@ -430,8 +412,6 @@ bool LayoutConverter::convertFromModel( const Reference< XShape >& rxShape, doub
return false;
}
-
-
} // namespace chart
} // namespace drawingml
} // namespace oox
diff --git a/oox/source/drawingml/chart/datasourcecontext.cxx b/oox/source/drawingml/chart/datasourcecontext.cxx
index b6aed1936a8d..0529849e8837 100644
--- a/oox/source/drawingml/chart/datasourcecontext.cxx
+++ b/oox/source/drawingml/chart/datasourcecontext.cxx
@@ -25,13 +25,9 @@ namespace oox {
namespace drawingml {
namespace chart {
-
-
using ::oox::core::ContextHandler2Helper;
using ::oox::core::ContextHandlerRef;
-
-
DoubleSequenceContext::DoubleSequenceContext( ContextHandler2Helper& rParent, DataSequenceModel& rModel ) :
DataSequenceContextBase( rParent, rModel ),
mnPtIndex( -1 )
@@ -108,8 +104,6 @@ void DoubleSequenceContext::onCharacters( const OUString& rChars )
}
}
-
-
StringSequenceContext::StringSequenceContext( ContextHandler2Helper& rParent, DataSequenceModel& rModel )
: DataSequenceContextBase( rParent, rModel )
, mnPtIndex(-1)
@@ -179,8 +173,6 @@ void StringSequenceContext::onCharacters( const OUString& rChars )
}
}
-
-
DataSourceContext::DataSourceContext( ContextHandler2Helper& rParent, DataSourceModel& rModel ) :
ContextBase< DataSourceModel >( rParent, rModel )
{
@@ -228,8 +220,6 @@ ContextHandlerRef DataSourceContext::onCreateContext( sal_Int32 nElement, const
return 0;
}
-
-
} // namespace chart
} // namespace drawingml
} // namespace oox
diff --git a/oox/source/drawingml/chart/datasourceconverter.cxx b/oox/source/drawingml/chart/datasourceconverter.cxx
index 93166fbfd8be..40e536b71b27 100644
--- a/oox/source/drawingml/chart/datasourceconverter.cxx
+++ b/oox/source/drawingml/chart/datasourceconverter.cxx
@@ -28,13 +28,9 @@ namespace oox {
namespace drawingml {
namespace chart {
-
-
using namespace ::com::sun::star::chart2::data;
using namespace ::com::sun::star::uno;
-
-
DataSequenceConverter::DataSequenceConverter( const ConverterRoot& rParent, DataSequenceModel& rModel ) :
ConverterBase< DataSequenceModel >( rParent, rModel )
{
@@ -87,8 +83,6 @@ Reference< XDataSequence > DataSequenceConverter::createDataSequence( const OUSt
return xDataSeq;
}
-
-
DataSourceConverter::DataSourceConverter( const ConverterRoot& rParent, DataSourceModel& rModel ) :
ConverterBase< DataSourceModel >( rParent, rModel )
{
@@ -109,8 +103,6 @@ Reference< XDataSequence > DataSourceConverter::createDataSequence( const OUStri
return xDataSeq;
}
-
-
} // namespace chart
} // namespace drawingml
} // namespace oox
diff --git a/oox/source/drawingml/chart/datasourcemodel.cxx b/oox/source/drawingml/chart/datasourcemodel.cxx
index 190cce2e785f..5d56bddb538f 100644
--- a/oox/source/drawingml/chart/datasourcemodel.cxx
+++ b/oox/source/drawingml/chart/datasourcemodel.cxx
@@ -23,8 +23,6 @@ namespace oox {
namespace drawingml {
namespace chart {
-
-
DataSequenceModel::DataSequenceModel() :
mnPointCount( -1 )
{
@@ -34,8 +32,6 @@ DataSequenceModel::~DataSequenceModel()
{
}
-
-
DataSourceModel::DataSourceModel()
{
}
@@ -44,8 +40,6 @@ DataSourceModel::~DataSourceModel()
{
}
-
-
} // namespace chart
} // namespace drawingml
} // namespace oox
diff --git a/oox/source/drawingml/chart/modelbase.cxx b/oox/source/drawingml/chart/modelbase.cxx
index d1e87ebb7830..d3e6961aa1b3 100644
--- a/oox/source/drawingml/chart/modelbase.cxx
+++ b/oox/source/drawingml/chart/modelbase.cxx
@@ -25,7 +25,6 @@ namespace oox {
namespace drawingml {
namespace chart {
-
NumberFormat::NumberFormat() :
mbSourceLinked( true )
{
@@ -38,8 +37,6 @@ void NumberFormat::setAttributes( const AttributeList& rAttribs )
mbSourceLinked = rAttribs.getBool( XML_sourceLinked, false );
}
-
-
LayoutModel::LayoutModel() :
mfX( 0.0 ),
mfY( 0.0 ),
@@ -58,8 +55,6 @@ LayoutModel::~LayoutModel()
{
}
-
-
} // namespace chart
} // namespace drawingml
} // namespace oox
diff --git a/oox/source/drawingml/chart/objectformatter.cxx b/oox/source/drawingml/chart/objectformatter.cxx
index bfcd5f2eeb15..b3787dc06c4c 100644
--- a/oox/source/drawingml/chart/objectformatter.cxx
+++ b/oox/source/drawingml/chart/objectformatter.cxx
@@ -37,8 +37,6 @@ namespace oox {
namespace drawingml {
namespace chart {
-
-
using namespace ::com::sun::star::chart2;
using namespace ::com::sun::star::frame;
using namespace ::com::sun::star::graphic;
@@ -48,8 +46,6 @@ using namespace ::com::sun::star::util;
using ::oox::core::XmlFilterBase;
-
-
namespace {
struct AutoFormatPatternEntry
@@ -116,8 +112,6 @@ static const AutoFormatPatternEntry spAutoFormatPattern4[] =
#undef AUTOFORMAT_PATTERN_COLORMOD
#undef AUTOFORMAT_PATTERN_END
-
-
struct AutoFormatEntry
{
sal_Int32 mnFirstStyleIdx; /// First chart style index.
@@ -409,8 +403,6 @@ const AutoFormatEntry* lclGetAutoFormatEntry( const AutoFormatEntry* pEntries, s
return 0;
}
-
-
struct AutoTextEntry
{
sal_Int32 mnFirstStyleIdx; /// First chart style index.
@@ -460,8 +452,6 @@ const AutoTextEntry* lclGetAutoTextEntry( const AutoTextEntry* pEntries, sal_Int
return 0;
}
-
-
/** Property identifiers for common chart objects, to be used in ShapePropertyInfo. */
static const sal_Int32 spnCommonPropIds[] =
{
@@ -520,8 +510,6 @@ static const ShapePropertyInfo saLinearPropInfo( spnLinearPropIds, false, true,
/** Property info for filled data series, to be used in ShapePropertyMap. */
static const ShapePropertyInfo saFilledPropInfo( spnFilledPropIds, false, true, true, true );
-
-
/** Contains information about formatting of a specific chart object type. */
struct ObjectTypeFormatEntry
{
@@ -574,8 +562,6 @@ static const ObjectTypeFormatEntry spObjTypeFormatEntries[] =
#undef TYPEFORMAT_FRAME
#undef TYPEFORMAT_LINE
-
-
void lclConvertPictureOptions( FillProperties& orFillProps, const PictureOptionsModel& rPicOptions )
{
bool bStacked = (rPicOptions.mnPictureFormat == XML_stack) || (rPicOptions.mnPictureFormat == XML_stackScale);
@@ -584,12 +570,8 @@ void lclConvertPictureOptions( FillProperties& orFillProps, const PictureOptions
} // namespace
-
-
struct ObjectFormatterData;
-
-
class DetailFormatterBase
{
public:
@@ -616,8 +598,6 @@ protected:
ColorPatternVec maColorPattern; /// Different cycling colors for data series.
};
-
-
class LineFormatter : public DetailFormatterBase
{
public:
@@ -635,8 +615,6 @@ private:
LinePropertiesPtr mxAutoLine; /// Automatic line properties.
};
-
-
class FillFormatter : public DetailFormatterBase
{
public:
@@ -655,8 +633,6 @@ private:
FillPropertiesPtr mxAutoFill; /// Automatic fill properties.
};
-
-
class EffectFormatter : public DetailFormatterBase
{
public:
@@ -671,8 +647,6 @@ public:
sal_Int32 nSeriesIdx ) const;
};
-
-
class TextFormatter : public DetailFormatterBase
{
public:
@@ -694,8 +668,6 @@ private:
TextCharacterPropertiesPtr mxAutoText; /// Automatic text properties.
};
-
-
/** Formatter for a specific object type. */
class ObjectTypeFormatter
{
@@ -742,8 +714,6 @@ private:
const ObjectTypeFormatEntry& mrEntry; /// Additional settings.
};
-
-
struct ObjectFormatterData
{
typedef RefMap< ObjectType, ObjectTypeFormatter > ObjectTypeFormatterMap;
@@ -765,8 +735,6 @@ struct ObjectFormatterData
ObjectTypeFormatter* getTypeFormatter( ObjectType eObjType );
};
-
-
DetailFormatterBase::DetailFormatterBase( ObjectFormatterData& rData, const AutoFormatEntry* pAutoFormatEntry ) :
mrData( rData ),
mnPhClr( -1 )
@@ -857,8 +825,6 @@ sal_Int32 DetailFormatterBase::getSchemeColor( sal_Int32 nColorToken, sal_Int32
return aColor.getColor( mrData.mrFilter.getGraphicHelper() );
}
-
-
LineFormatter::LineFormatter( ObjectFormatterData& rData, const AutoFormatEntry* pAutoFormatEntry ) :
DetailFormatterBase( rData, pAutoFormatEntry )
{
@@ -885,8 +851,6 @@ void LineFormatter::convertFormatting( ShapePropertyMap& rPropMap, const ModelRe
aLineProps.pushToPropMap( rPropMap, mrData.mrFilter.getGraphicHelper(), getPhColor( nSeriesIdx ) );
}
-
-
FillFormatter::FillFormatter( ObjectFormatterData& rData, const AutoFormatEntry* pAutoFormatEntry ) :
DetailFormatterBase( rData, pAutoFormatEntry )
{
@@ -911,8 +875,6 @@ void FillFormatter::convertFormatting( ShapePropertyMap& rPropMap, const ModelRe
aFillProps.pushToPropMap( rPropMap, mrData.mrFilter.getGraphicHelper(), 0, getPhColor( nSeriesIdx ) );
}
-
-
EffectFormatter::EffectFormatter( ObjectFormatterData& rData, const AutoFormatEntry* pAutoFormatEntry ) :
DetailFormatterBase( rData, pAutoFormatEntry )
{
@@ -922,8 +884,6 @@ void EffectFormatter::convertFormatting( ShapePropertyMap& /*rPropMap*/, const M
{
}
-
-
namespace {
const TextCharacterProperties* lclGetTextProperties( const ModelRef< TextBody >& rxTextProp )
@@ -973,8 +933,6 @@ void TextFormatter::convertFormatting( PropertySet& rPropSet, const ModelRef< Te
convertFormatting( rPropSet, lclGetTextProperties( rxTextProp ) );
}
-
-
ObjectTypeFormatter::ObjectTypeFormatter( ObjectFormatterData& rData, const ObjectTypeFormatEntry& rEntry, const ChartSpaceModel& rChartSpace ) :
maLineFormatter( rData, lclGetAutoFormatEntry( rEntry.mpAutoLines, rChartSpace.mnStyle ) ),
maFillFormatter( rData, lclGetAutoFormatEntry( rEntry.mpAutoFills, rChartSpace.mnStyle ) ),
@@ -1020,8 +978,6 @@ void ObjectTypeFormatter::convertAutomaticFill( PropertySet& rPropSet, sal_Int32
rPropSet.setProperties( aPropMap );
}
-
-
ObjectFormatterData::ObjectFormatterData( const XmlFilterBase& rFilter, const Reference< XChartDocument >& rxChartDoc, const ChartSpaceModel& rChartSpace ) :
mrFilter( rFilter ),
maModelObjHelper( Reference< XMultiServiceFactory >( rxChartDoc, UNO_QUERY ) ),
@@ -1050,8 +1006,6 @@ ObjectTypeFormatter* ObjectFormatterData::getTypeFormatter( ObjectType eObjType
return maTypeFormatters.get( eObjType ).get();
}
-
-
ObjectFormatter::ObjectFormatter( const XmlFilterBase& rFilter, const Reference< XChartDocument >& rxChartDoc, const ChartSpaceModel& rChartSpace ) :
mxData( new ObjectFormatterData( rFilter, rxChartDoc, rChartSpace ) )
{
@@ -1162,8 +1116,6 @@ bool ObjectFormatter::isAutomaticFill( const ModelRef< Shape >& rxShapeProp )
return !rxShapeProp || !rxShapeProp->getFillProperties().moFillType.has();
}
-
-
} // namespace chart
} // namespace drawingml
} // namespace oox
diff --git a/oox/source/drawingml/chart/plotareacontext.cxx b/oox/source/drawingml/chart/plotareacontext.cxx
index 184bad7ce033..96b082b0181f 100644
--- a/oox/source/drawingml/chart/plotareacontext.cxx
+++ b/oox/source/drawingml/chart/plotareacontext.cxx
@@ -30,13 +30,9 @@ namespace oox {
namespace drawingml {
namespace chart {
-
-
using ::oox::core::ContextHandler2Helper;
using ::oox::core::ContextHandlerRef;
-
-
View3DContext::View3DContext( ContextHandler2Helper& rParent, View3DModel& rModel ) :
ContextBase< View3DModel >( rParent, rModel )
{
@@ -80,8 +76,6 @@ ContextHandlerRef View3DContext::onCreateContext( sal_Int32 nElement, const Attr
return 0;
}
-
-
WallFloorContext::WallFloorContext( ContextHandler2Helper& rParent, WallFloorModel& rModel ) :
ContextBase< WallFloorModel >( rParent, rModel )
{
@@ -110,9 +104,6 @@ ContextHandlerRef WallFloorContext::onCreateContext( sal_Int32 nElement, const A
return 0;
}
-
-
-
DataTableContext::DataTableContext( ContextHandler2Helper& rParent, DataTableModel& rModel ) :
ContextBase< DataTableModel >( rParent, rModel )
{
@@ -144,9 +135,6 @@ ContextHandlerRef DataTableContext::onCreateContext( sal_Int32 nElement, const A
return 0;
}
-
-
-
PlotAreaContext::PlotAreaContext( ContextHandler2Helper& rParent, PlotAreaModel& rModel ) :
ContextBase< PlotAreaModel >( rParent, rModel )
{
@@ -209,8 +197,6 @@ ContextHandlerRef PlotAreaContext::onCreateContext( sal_Int32 nElement, const At
return 0;
}
-
-
} // namespace chart
} // namespace drawingml
} // namespace oox
diff --git a/oox/source/drawingml/chart/plotareaconverter.cxx b/oox/source/drawingml/chart/plotareaconverter.cxx
index b405a9c5916d..257f6e0710a1 100644
--- a/oox/source/drawingml/chart/plotareaconverter.cxx
+++ b/oox/source/drawingml/chart/plotareaconverter.cxx
@@ -35,14 +35,10 @@ namespace oox {
namespace drawingml {
namespace chart {
-
-
using namespace ::com::sun::star;
using namespace ::com::sun::star::chart2;
using namespace ::com::sun::star::uno;
-
-
namespace {
/** Axes set model. This is a helper for the plot area converter collecting all
@@ -59,8 +55,6 @@ struct AxesSetModel
inline ~AxesSetModel() {}
};
-
-
/** Axes set converter. This is a helper class for the plot area converter. */
class AxesSetConverter : public ConverterBase< AxesSetModel >
{
@@ -92,8 +86,6 @@ private:
bool mbPieChart;
};
-
-
AxesSetConverter::AxesSetConverter( const ConverterRoot& rParent, AxesSetModel& rModel ) :
ConverterBase< AxesSetModel >( rParent, rModel ),
mb3dChart( false ),
@@ -194,8 +186,6 @@ void AxesSetConverter::convertFromModel( const Reference< XDiagram >& rxDiagram,
} // namespace
-
-
View3DConverter::View3DConverter( const ConverterRoot& rParent, View3DModel& rModel ) :
ConverterBase< View3DModel >( rParent, rModel )
{
@@ -270,8 +260,6 @@ void View3DConverter::convertFromModel( const Reference< XDiagram >& rxDiagram,
aPropSet.setProperty( PROP_D3DSceneLightDirection2, cssd::Direction3D( 0.2, 0.4, 1.0 ) );
}
-
-
WallFloorConverter::WallFloorConverter( const ConverterRoot& rParent, WallFloorModel& rModel ) :
ConverterBase< WallFloorModel >( rParent, rModel )
{
@@ -297,8 +285,6 @@ void WallFloorConverter::convertFromModel( const Reference< XDiagram >& rxDiagra
}
}
-
-
DataTableConverter::DataTableConverter( const ConverterRoot& rParent, DataTableModel& rModel ) :
ConverterBase< DataTableModel >( rParent, rModel )
{
@@ -319,8 +305,6 @@ void DataTableConverter::convertFromModel( const Reference< XDiagram >& rxDiagra
aPropSet.setProperty( PROP_DataTableOutline, mrModel.mbShowOutline );
}
-
-
PlotAreaConverter::PlotAreaConverter( const ConverterRoot& rParent, PlotAreaModel& rModel ) :
ConverterBase< PlotAreaModel >( rParent, rModel ),
mb3dChart( false ),
@@ -459,8 +443,6 @@ void PlotAreaConverter::convertPositionFromModel()
}
}
-
-
} // namespace chart
} // namespace drawingml
} // namespace oox
diff --git a/oox/source/drawingml/chart/plotareamodel.cxx b/oox/source/drawingml/chart/plotareamodel.cxx
index 1bcdd3ddcc98..4c199107c702 100644
--- a/oox/source/drawingml/chart/plotareamodel.cxx
+++ b/oox/source/drawingml/chart/plotareamodel.cxx
@@ -23,8 +23,6 @@ namespace oox {
namespace drawingml {
namespace chart {
-
-
View3DModel::View3DModel() :
mnDepthPercent( 100 ),
mnPerspective( 30 ),
@@ -36,8 +34,6 @@ View3DModel::~View3DModel()
{
}
-
-
WallFloorModel::WallFloorModel()
{
}
@@ -46,8 +42,6 @@ WallFloorModel::~WallFloorModel()
{
}
-
-
DataTableModel::DataTableModel() :
mbShowHBorder(false),
mbShowVBorder(false),
@@ -59,8 +53,6 @@ DataTableModel::~DataTableModel()
{
}
-
-
PlotAreaModel::PlotAreaModel()
{
}
@@ -69,8 +61,6 @@ PlotAreaModel::~PlotAreaModel()
{
}
-
-
} // namespace chart
} // namespace drawingml
} // namespace oox
diff --git a/oox/source/drawingml/chart/seriescontext.cxx b/oox/source/drawingml/chart/seriescontext.cxx
index fde29520cb1e..5070f26df9c8 100644
--- a/oox/source/drawingml/chart/seriescontext.cxx
+++ b/oox/source/drawingml/chart/seriescontext.cxx
@@ -29,14 +29,10 @@ namespace oox {
namespace drawingml {
namespace chart {
-
-
using ::oox::core::ContextHandler2;
using ::oox::core::ContextHandler2Helper;
using ::oox::core::ContextHandlerRef;
-
-
namespace {
ContextHandlerRef lclDataLabelSharedCreateContext( ContextHandler2& rContext,
@@ -91,8 +87,6 @@ void lclDataLabelSharedCharacters( ContextHandler2& rContext, const OUString& rC
} // namespace
-
-
DataLabelContext::DataLabelContext( ContextHandler2Helper& rParent, DataLabelModel& rModel ) :
ContextBase< DataLabelModel >( rParent, rModel )
{
@@ -122,8 +116,6 @@ void DataLabelContext::onCharacters( const OUString& rChars )
lclDataLabelSharedCharacters( *this, rChars, mrModel );
}
-
-
DataLabelsContext::DataLabelsContext( ContextHandler2Helper& rParent, DataLabelsModel& rModel ) :
ContextBase< DataLabelsModel >( rParent, rModel )
{
@@ -154,8 +146,6 @@ void DataLabelsContext::onCharacters( const OUString& rChars )
lclDataLabelSharedCharacters( *this, rChars, mrModel );
}
-
-
PictureOptionsContext::PictureOptionsContext( ContextHandler2Helper& rParent, PictureOptionsModel& rModel ) :
ContextBase< PictureOptionsModel >( rParent, rModel )
{
@@ -191,8 +181,6 @@ ContextHandlerRef PictureOptionsContext::onCreateContext( sal_Int32 nElement, co
return 0;
}
-
-
ErrorBarContext::ErrorBarContext( ContextHandler2Helper& rParent, ErrorBarModel& rModel ) :
ContextBase< ErrorBarModel >( rParent, rModel )
{
@@ -232,8 +220,6 @@ ContextHandlerRef ErrorBarContext::onCreateContext( sal_Int32 nElement, const At
return 0;
}
-
-
TrendlineLabelContext::TrendlineLabelContext( ContextHandler2Helper& rParent, TrendlineLabelModel& rModel ) :
ContextBase< TrendlineLabelModel >( rParent, rModel )
{
@@ -262,8 +248,6 @@ ContextHandlerRef TrendlineLabelContext::onCreateContext( sal_Int32 nElement, co
return 0;
}
-
-
TrendlineContext::TrendlineContext( ContextHandler2Helper& rParent, TrendlineModel& rModel ) :
ContextBase< TrendlineModel >( rParent, rModel )
{
@@ -319,8 +303,6 @@ void TrendlineContext::onCharacters( const OUString& rChars )
mrModel.maName = rChars;
}
-
-
DataPointContext::DataPointContext( ContextHandler2Helper& rParent, DataPointModel& rModel ) :
ContextBase< DataPointModel >( rParent, rModel )
{
@@ -377,8 +359,6 @@ ContextHandlerRef DataPointContext::onCreateContext( sal_Int32 nElement, const A
return 0;
}
-
-
SeriesContextBase::SeriesContextBase( ContextHandler2Helper& rParent, SeriesModel& rModel ) :
ContextBase< SeriesModel >( rParent, rModel )
{
@@ -425,8 +405,6 @@ ContextHandlerRef SeriesContextBase::onCreateContext( sal_Int32 nElement, const
return 0;
}
-
-
AreaSeriesContext::AreaSeriesContext( ContextHandler2Helper& rParent, SeriesModel& rModel ) :
SeriesContextBase( rParent, rModel )
{
@@ -461,8 +439,6 @@ ContextHandlerRef AreaSeriesContext::onCreateContext( sal_Int32 nElement, const
return SeriesContextBase::onCreateContext( nElement, rAttribs );
}
-
-
BarSeriesContext::BarSeriesContext( ContextHandler2Helper& rParent, SeriesModel& rModel ) :
SeriesContextBase( rParent, rModel )
{
@@ -507,8 +483,6 @@ ContextHandlerRef BarSeriesContext::onCreateContext( sal_Int32 nElement, const A
return SeriesContextBase::onCreateContext( nElement, rAttribs );
}
-
-
BubbleSeriesContext::BubbleSeriesContext( ContextHandler2Helper& rParent, SeriesModel& rModel ) :
SeriesContextBase( rParent, rModel )
{
@@ -553,8 +527,6 @@ ContextHandlerRef BubbleSeriesContext::onCreateContext( sal_Int32 nElement, cons
return SeriesContextBase::onCreateContext( nElement, rAttribs );
}
-
-
LineSeriesContext::LineSeriesContext( ContextHandler2Helper& rParent, SeriesModel& rModel ) :
SeriesContextBase( rParent, rModel )
{
@@ -596,8 +568,6 @@ ContextHandlerRef LineSeriesContext::onCreateContext( sal_Int32 nElement, const
return SeriesContextBase::onCreateContext( nElement, rAttribs );
}
-
-
PieSeriesContext::PieSeriesContext( ContextHandler2Helper& rParent, SeriesModel& rModel ) :
SeriesContextBase( rParent, rModel )
{
@@ -631,8 +601,6 @@ ContextHandlerRef PieSeriesContext::onCreateContext( sal_Int32 nElement, const A
return SeriesContextBase::onCreateContext( nElement, rAttribs );
}
-
-
RadarSeriesContext::RadarSeriesContext( ContextHandler2Helper& rParent, SeriesModel& rModel ) :
SeriesContextBase( rParent, rModel )
{
@@ -670,8 +638,6 @@ ContextHandlerRef RadarSeriesContext::onCreateContext( sal_Int32 nElement, const
return SeriesContextBase::onCreateContext( nElement, rAttribs );
}
-
-
ScatterSeriesContext::ScatterSeriesContext( ContextHandler2Helper& rParent, SeriesModel& rModel ) :
SeriesContextBase( rParent, rModel )
{
@@ -713,8 +679,6 @@ ContextHandlerRef ScatterSeriesContext::onCreateContext( sal_Int32 nElement, con
return SeriesContextBase::onCreateContext( nElement, rAttribs );
}
-
-
SurfaceSeriesContext::SurfaceSeriesContext( ContextHandler2Helper& rParent, SeriesModel& rModel ) :
SeriesContextBase( rParent, rModel )
{
@@ -741,8 +705,6 @@ ContextHandlerRef SurfaceSeriesContext::onCreateContext( sal_Int32 nElement, con
return SeriesContextBase::onCreateContext( nElement, rAttribs );
}
-
-
} // namespace chart
} // namespace drawingml
} // namespace oox
diff --git a/oox/source/drawingml/chart/seriesmodel.cxx b/oox/source/drawingml/chart/seriesmodel.cxx
index fb67e2d9fd7f..6888d6e105ee 100644
--- a/oox/source/drawingml/chart/seriesmodel.cxx
+++ b/oox/source/drawingml/chart/seriesmodel.cxx
@@ -23,8 +23,6 @@ namespace oox {
namespace drawingml {
namespace chart {
-
-
DataLabelModelBase::DataLabelModelBase() :
mbDeleted( false )
{
@@ -34,8 +32,6 @@ DataLabelModelBase::~DataLabelModelBase()
{
}
-
-
DataLabelModel::DataLabelModel() :
mnIndex( -1 )
{
@@ -45,8 +41,6 @@ DataLabelModel::~DataLabelModel()
{
}
-
-
DataLabelsModel::DataLabelsModel() :
mbShowLeaderLines( false )
{
@@ -56,8 +50,6 @@ DataLabelsModel::~DataLabelsModel()
{
}
-
-
PictureOptionsModel::PictureOptionsModel() :
mfStackUnit( 1.0 ),
mnPictureFormat( XML_stretch ),
@@ -71,8 +63,6 @@ PictureOptionsModel::~PictureOptionsModel()
{
}
-
-
ErrorBarModel::ErrorBarModel() :
mfValue( 0.0 ),
mnDirection( XML_y ),
@@ -86,8 +76,6 @@ ErrorBarModel::~ErrorBarModel()
{
}
-
-
TrendlineLabelModel::TrendlineLabelModel()
{
}
@@ -96,8 +84,6 @@ TrendlineLabelModel::~TrendlineLabelModel()
{
}
-
-
TrendlineModel::TrendlineModel() :
mnOrder( 2 ),
mnPeriod( 2 ),
@@ -111,8 +97,6 @@ TrendlineModel::~TrendlineModel()
{
}
-
-
DataPointModel::DataPointModel() :
mnIndex( -1 ),
mbInvertNeg( false )
@@ -123,8 +107,6 @@ DataPointModel::~DataPointModel()
{
}
-
-
SeriesModel::SeriesModel() :
mnExplosion( 0 ),
mnIndex( -1 ),
@@ -141,8 +123,6 @@ SeriesModel::~SeriesModel()
{
}
-
-
} // namespace chart
} // namespace drawingml
} // namespace oox
diff --git a/oox/source/drawingml/chart/titlecontext.cxx b/oox/source/drawingml/chart/titlecontext.cxx
index ded50ca237ce..f2760bfb1456 100644
--- a/oox/source/drawingml/chart/titlecontext.cxx
+++ b/oox/source/drawingml/chart/titlecontext.cxx
@@ -30,13 +30,9 @@ namespace oox {
namespace drawingml {
namespace chart {
-
-
using ::oox::core::ContextHandler2Helper;
using ::oox::core::ContextHandlerRef;
-
-
TextContext::TextContext( ContextHandler2Helper& rParent, TextModel& rModel ) :
ContextBase< TextModel >( rParent, rModel )
{
@@ -79,8 +75,6 @@ void TextContext::onCharacters( const OUString& rChars )
}
}
-
-
TitleContext::TitleContext( ContextHandler2Helper& rParent, TitleModel& rModel ) :
ContextBase< TitleModel >( rParent, rModel )
{
@@ -115,8 +109,6 @@ ContextHandlerRef TitleContext::onCreateContext( sal_Int32 nElement, const Attri
return 0;
}
-
-
LegendContext::LegendContext( ContextHandler2Helper& rParent, LegendModel& rModel ) :
ContextBase< LegendModel >( rParent, rModel )
{
@@ -152,8 +144,6 @@ ContextHandlerRef LegendContext::onCreateContext( sal_Int32 nElement, const Attr
return 0;
}
-
-
} // namespace chart
} // namespace drawingml
} // namespace oox
diff --git a/oox/source/drawingml/chart/titleconverter.cxx b/oox/source/drawingml/chart/titleconverter.cxx
index 2cf3e1279a13..13c39780aaf1 100644
--- a/oox/source/drawingml/chart/titleconverter.cxx
+++ b/oox/source/drawingml/chart/titleconverter.cxx
@@ -39,8 +39,6 @@ namespace oox {
namespace drawingml {
namespace chart {
-
-
using namespace ::com::sun::star::awt;
using namespace ::com::sun::star::chart2;
using namespace ::com::sun::star::chart2::data;
@@ -49,8 +47,6 @@ using namespace ::com::sun::star::uno;
using ::oox::core::XmlFilterBase;
-
-
TextConverter::TextConverter( const ConverterRoot& rParent, TextModel& rModel ) :
ConverterBase< TextModel >( rParent, rModel )
{
@@ -134,8 +130,6 @@ Reference< XFormattedString > TextConverter::appendFormattedString(
return xFmtStr;
}
-
-
TitleConverter::TitleConverter( const ConverterRoot& rParent, TitleModel& rModel ) :
ConverterBase< TitleModel >( rParent, rModel )
{
@@ -178,8 +172,6 @@ void TitleConverter::convertFromModel( const Reference< XTitled >& rxTitled, con
}
}
-
-
LegendConverter::LegendConverter( const ConverterRoot& rParent, LegendModel& rModel ) :
ConverterBase< LegendModel >( rParent, rModel )
{
@@ -260,8 +252,6 @@ void LegendConverter::convertFromModel( const Reference< XDiagram >& rxDiagram )
}
}
-
-
} // namespace chart
} // namespace drawingml
} // namespace oox
diff --git a/oox/source/drawingml/chart/titlemodel.cxx b/oox/source/drawingml/chart/titlemodel.cxx
index e34e92c74423..3a903fd7c107 100644
--- a/oox/source/drawingml/chart/titlemodel.cxx
+++ b/oox/source/drawingml/chart/titlemodel.cxx
@@ -23,8 +23,6 @@ namespace oox {
namespace drawingml {
namespace chart {
-
-
TextModel::TextModel()
{
}
@@ -33,8 +31,6 @@ TextModel::~TextModel()
{
}
-
-
TitleModel::TitleModel() :
mbOverlay( false )
{
@@ -44,8 +40,6 @@ TitleModel::~TitleModel()
{
}
-
-
LegendModel::LegendModel() :
mnPosition( XML_r ),
mbOverlay( false )
@@ -56,8 +50,6 @@ LegendModel::~LegendModel()
{
}
-
-
} // namespace chart
} // namespace drawingml
} // namespace oox
diff --git a/oox/source/drawingml/chart/typegroupconverter.cxx b/oox/source/drawingml/chart/typegroupconverter.cxx
index 5127bbcac4d8..5b271e1547f5 100644
--- a/oox/source/drawingml/chart/typegroupconverter.cxx
+++ b/oox/source/drawingml/chart/typegroupconverter.cxx
@@ -42,15 +42,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 {
// chart type service names
@@ -100,8 +96,6 @@ const TypeGroupInfo& lclGetTypeInfoFromTypeId( TypeId eTypeId )
} // namespace
-
-
UpDownBarsConverter::UpDownBarsConverter( const ConverterRoot& rParent, UpDownBarsModel& rModel ) :
ConverterBase< UpDownBarsModel >( rParent, rModel )
{
@@ -132,8 +126,6 @@ void UpDownBarsConverter::convertFromModel( const Reference< XChartType >& rxCha
}
}
-
-
TypeGroupConverter::TypeGroupConverter( const ConverterRoot& rParent, TypeGroupModel& rModel ) :
ConverterBase< TypeGroupModel >( rParent, rModel ),
mb3dChart( false )
@@ -198,7 +190,6 @@ bool TypeGroupConverter::isPercent() const
return maTypeInfo.mbSupportsStacking && (mrModel.mnGrouping == XML_percentStacked);
}
-
bool TypeGroupConverter::isWall3dChart() const
{
return mb3dChart && (maTypeInfo.meTypeCategory != TYPECATEGORY_PIE);
@@ -573,8 +564,6 @@ void TypeGroupConverter::insertDataSeries( const Reference< XChartType >& rxChar
}
}
-
-
} // namespace chart
} // namespace drawingml
} // namespace oox
diff --git a/oox/source/drawingml/chart/typegroupmodel.cxx b/oox/source/drawingml/chart/typegroupmodel.cxx
index ae3e1f218f45..bc3e6d1988cc 100644
--- a/oox/source/drawingml/chart/typegroupmodel.cxx
+++ b/oox/source/drawingml/chart/typegroupmodel.cxx
@@ -23,8 +23,6 @@ namespace oox {
namespace drawingml {
namespace chart {
-
-
UpDownBarsModel::UpDownBarsModel() :
mnGapWidth( 150 )
{
@@ -34,8 +32,6 @@ UpDownBarsModel::~UpDownBarsModel()
{
}
-
-
TypeGroupModel::TypeGroupModel( sal_Int32 nTypeId ) :
mfSplitPos( 0.0 ),
mnBarDir( XML_col ),
@@ -67,8 +63,6 @@ TypeGroupModel::~TypeGroupModel()
{
}
-
-
} // namespace chart
} // namespace drawingml
} // namespace oox
diff --git a/oox/source/drawingml/clrscheme.cxx b/oox/source/drawingml/clrscheme.cxx
index d1018017ef4e..e4a7a8e84975 100644
--- a/oox/source/drawingml/clrscheme.cxx
+++ b/oox/source/drawingml/clrscheme.cxx
@@ -43,8 +43,6 @@ void ClrMap::setColorMap( sal_Int32 nClrToken, sal_Int32 nMappedClrToken )
maClrMap[ nClrToken ] = nMappedClrToken;
}
-
-
ClrScheme::ClrScheme()
{
}
diff --git a/oox/source/drawingml/color.cxx b/oox/source/drawingml/color.cxx
index 0703cd07cadf..ffbca223332d 100644
--- a/oox/source/drawingml/color.cxx
+++ b/oox/source/drawingml/color.cxx
@@ -29,8 +29,6 @@
namespace oox {
namespace drawingml {
-
-
namespace {
/** Global storage for predefined color values used in OOXML file formats. */
@@ -44,8 +42,6 @@ struct PresetColorsPool
explicit PresetColorsPool();
};
-
-
PresetColorsPool::PresetColorsPool() :
maDmlColors( static_cast< size_t >( XML_TOKEN_COUNT ), API_RGB_TRANSPARENT ),
maVmlColors( static_cast< size_t >( XML_TOKEN_COUNT ), API_RGB_TRANSPARENT )
@@ -143,17 +139,11 @@ PresetColorsPool::PresetColorsPool() :
maVmlColors[ static_cast< size_t >( pnEntry[ 0 ] ) ] = pnEntry[ 1 ];
}
-
-
struct StaticPresetColorsPool : public ::rtl::Static< PresetColorsPool, StaticPresetColorsPool > {};
-
-
const double DEC_GAMMA = 2.3;
const double INC_GAMMA = 1.0 / DEC_GAMMA;
-
-
inline void lclRgbToRgbComponents( sal_Int32& ornR, sal_Int32& ornG, sal_Int32& ornB, sal_Int32 nRgb )
{
ornR = (nRgb >> 16) & 0xFF;
@@ -202,8 +192,6 @@ void lclOffValue( sal_Int32& ornValue, sal_Int32 nOff, sal_Int32 nMax = MAX_PERC
} // namespace
-
-
Color::Color() :
meMode( COLOR_UNUSED ),
mnC1( 0 ),
@@ -340,7 +328,6 @@ void Color::clearTransformations()
clearTransparence();
}
-
OUString Color::getColorTransformationName( sal_Int32 nElement )
{
switch( nElement )
@@ -762,8 +749,6 @@ void Color::toHsl() const
}
}
-
-
} // namespace drawingml
} // namespace oox
diff --git a/oox/source/drawingml/colorchoicecontext.cxx b/oox/source/drawingml/colorchoicecontext.cxx
index 1ee3129ba91c..7c38409d7f5f 100644
--- a/oox/source/drawingml/colorchoicecontext.cxx
+++ b/oox/source/drawingml/colorchoicecontext.cxx
@@ -32,8 +32,6 @@ using ::oox::core::ContextHandler;
namespace oox {
namespace drawingml {
-
-
ColorValueContext::ColorValueContext( ContextHandler2Helper& rParent, Color& rColor ) :
ContextHandler2( rParent ),
mrColor( rColor )
@@ -124,8 +122,6 @@ void ColorValueContext::onStartElement( const AttributeList& rAttribs )
return 0;
}
-
-
ColorContext::ColorContext( ContextHandler2Helper& rParent, Color& rColor ) :
ContextHandler2( rParent ),
mrColor( rColor )
@@ -148,8 +144,6 @@ ColorContext::ColorContext( ContextHandler2Helper& rParent, Color& rColor ) :
return 0;
}
-
-
} // namespace drawingml
} // namespace oox
diff --git a/oox/source/drawingml/customshapegeometry.cxx b/oox/source/drawingml/customshapegeometry.cxx
index ce730d5468f9..87d330447fa5 100644
--- a/oox/source/drawingml/customshapegeometry.cxx
+++ b/oox/source/drawingml/customshapegeometry.cxx
@@ -86,7 +86,6 @@ typedef boost::unordered_map< OUString, FormularCommand, OUStringHash > FormulaC
static const FormulaCommandHMap* pCommandHashMap;
-
OUString GetFormulaParameter( const EnhancedCustomShapeParameter& rParameter )
{
OUString aRet;
@@ -220,8 +219,6 @@ OUString GetFormulaParameter( const EnhancedCustomShapeParameter& rParameter )
return aRet;
}
-
-
static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCustomShapeProperties, const OUString& rValue, bool bNoSymbols = true )
{
com::sun::star::drawing::EnhancedCustomShapeParameter aRet;
@@ -260,7 +257,6 @@ static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCu
}
break;
-
case XML_hd10 : // !!PASSTHROUGH INTENDED
nIntVal += 2; // */ h 1.0 10.0
case XML_hd8 : // */ h 1.0 8.0
@@ -437,7 +433,6 @@ static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCu
return aRet;
}
-
// CT_GeomGuideList
class GeomGuideListContext : public ContextHandler2
{
@@ -635,14 +630,11 @@ ContextHandlerRef GeomGuideListContext::onCreateContext( sal_Int32 aElementToken
return this;
}
-
-
static const OUString GetGeomGuideName( const OUString& rValue )
{
return rValue;
}
-
// CT_AdjPoint2D
class AdjPoint2DContext : public ContextHandler2
{
@@ -657,7 +649,6 @@ AdjPoint2DContext::AdjPoint2DContext( ContextHandler2Helper& rParent, const Attr
rAdjPoint2D.Second = GetAdjCoordinate( rCustomShapeProperties, rAttribs.getString( XML_y ).get(), true );
}
-
// CT_XYAdjustHandle
class XYAdjustHandleContext : public ContextHandler2
{
@@ -709,7 +700,6 @@ ContextHandlerRef XYAdjustHandleContext::onCreateContext( sal_Int32 aElementToke
return 0;
}
-
// CT_PolarAdjustHandle
class PolarAdjustHandleContext : public ContextHandler2
{
@@ -761,7 +751,6 @@ ContextHandlerRef PolarAdjustHandleContext::onCreateContext( sal_Int32 aElementT
return 0;
}
-
// CT_AdjustHandleList
class AdjustHandleListContext : public ContextHandler2
{
@@ -798,7 +787,6 @@ ContextHandlerRef AdjustHandleListContext::onCreateContext( sal_Int32 aElementTo
return 0;
}
-
// CT_ConnectionSite
class ConnectionSiteContext : public ContextHandler2
{
@@ -826,7 +814,6 @@ ContextHandlerRef ConnectionSiteContext::onCreateContext( sal_Int32 aElementToke
return 0;
}
-
// CT_Path2DMoveTo
class Path2DMoveToContext : public ContextHandler2
{
@@ -853,7 +840,6 @@ ContextHandlerRef Path2DMoveToContext::onCreateContext( sal_Int32 aElementToken,
return 0;
}
-
// CT_Path2DLineTo
class Path2DLineToContext : public ContextHandler2
{
@@ -880,7 +866,6 @@ ContextHandlerRef Path2DLineToContext::onCreateContext( sal_Int32 aElementToken,
return 0;
}
-
// CT_Path2DQuadBezierTo
class Path2DQuadBezierToContext : public ContextHandler2
{
@@ -914,7 +899,6 @@ ContextHandlerRef Path2DQuadBezierToContext::onCreateContext( sal_Int32 aElement
return 0;
}
-
// CT_Path2DCubicBezierTo
class Path2DCubicBezierToContext : public ContextHandler2
{
@@ -952,7 +936,6 @@ ContextHandlerRef Path2DCubicBezierToContext::onCreateContext( sal_Int32 aElemen
return 0;
}
-
// CT_Path2DContext
class Path2DContext : public ContextHandler2
{
@@ -1151,7 +1134,6 @@ ContextHandlerRef Path2DContext::onCreateContext( sal_Int32 aElementToken,
return 0;
}
-
// CT_Path2DList
class Path2DListContext : public ContextHandler2
{
@@ -1188,7 +1170,6 @@ ContextHandlerRef Path2DListContext::onCreateContext( sal_Int32 aElementToken, c
return 0;
}
-
// CT_CustomGeometry2D
CustomShapeGeometryContext::CustomShapeGeometryContext( ContextHandler2Helper& rParent, const AttributeList& /* rAttribs */, CustomShapeProperties& rCustomShapeProperties )
: ContextHandler2( rParent )
@@ -1232,7 +1213,6 @@ ContextHandlerRef CustomShapeGeometryContext::onCreateContext( sal_Int32 aElemen
return 0;
}
-
// CT_PresetGeometry2D
PresetShapeGeometryContext::PresetShapeGeometryContext( ContextHandler2Helper& rParent, const AttributeList& rAttribs, CustomShapeProperties& rCustomShapeProperties )
: ContextHandler2( rParent )
@@ -1251,7 +1231,6 @@ ContextHandlerRef PresetShapeGeometryContext::onCreateContext( sal_Int32 aElemen
return this;
}
-
// CT_PresetTextShape
PresetTextShapeContext::PresetTextShapeContext( ContextHandler2Helper& rParent, const AttributeList& rAttribs, CustomShapeProperties& rCustomShapeProperties )
: ContextHandler2( rParent )
diff --git a/oox/source/drawingml/customshapeproperties.cxx b/oox/source/drawingml/customshapeproperties.cxx
index 81171a37fc74..5dcc12202bf1 100644
--- a/oox/source/drawingml/customshapeproperties.cxx
+++ b/oox/source/drawingml/customshapeproperties.cxx
@@ -109,7 +109,6 @@ static OUString GetConnectorShapeType( sal_Int32 nType )
return sType;
}
-
void CustomShapeProperties::pushToPropSet( const ::oox::core::FilterBase& /* rFilterBase */,
const Reference < XPropertySet >& xPropSet, const Reference < XShape > & xShape, const awt::Size &aSize )
{
diff --git a/oox/source/drawingml/diagram/constraintlistcontext.cxx b/oox/source/drawingml/diagram/constraintlistcontext.cxx
index b93ac3d09582..04b14fb5c285 100644
--- a/oox/source/drawingml/diagram/constraintlistcontext.cxx
+++ b/oox/source/drawingml/diagram/constraintlistcontext.cxx
@@ -36,7 +36,6 @@ ConstraintListContext::ConstraintListContext( ContextHandler2Helper& rParent,
OSL_ENSURE( pNode, "Node must NOT be NULL" );
}
-
ConstraintListContext::~ConstraintListContext()
{
}
@@ -72,7 +71,6 @@ ConstraintListContext::onCreateContext( ::sal_Int32 aElement,
return this;
}
-
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/drawingml/diagram/datamodelcontext.cxx b/oox/source/drawingml/diagram/datamodelcontext.cxx
index dba149e018e6..ef8f9e4ab9cd 100644
--- a/oox/source/drawingml/diagram/datamodelcontext.cxx
+++ b/oox/source/drawingml/diagram/datamodelcontext.cxx
@@ -76,7 +76,6 @@ private:
dgm::Connections& mrConnection;
};
-
// CT_presLayoutVars
class PresLayoutVarsContext
: public ContextHandler2
@@ -130,7 +129,6 @@ private:
dgm::Point& mrPoint;
};
-
// CT_prSet
class PropertiesContext
: public ContextHandler2
@@ -197,7 +195,6 @@ private:
dgm::Point& mrPoint;
};
-
// CL_Pt
class PtContext
: public ContextHandler2
@@ -220,7 +217,6 @@ public:
mrPoint.msCnxId = rAttribs.getString( XML_cxnId ).get();
}
-
virtual ContextHandlerRef
onCreateContext( sal_Int32 aElementToken,
const AttributeList& rAttribs ) SAL_OVERRIDE
@@ -256,8 +252,6 @@ private:
dgm::Point& mrPoint;
};
-
-
// CT_PtList
class PtListContext
: public ContextHandler2
@@ -330,8 +324,6 @@ private:
DiagramDataPtr mpDataModel;
};
-
-
DataModelContext::DataModelContext( ContextHandler2Helper& rParent,
const DiagramDataPtr & pDataModel )
: ContextHandler2( rParent )
@@ -340,7 +332,6 @@ DataModelContext::DataModelContext( ContextHandler2Helper& rParent,
OSL_ENSURE( pDataModel, "Data Model must not be NULL" );
}
-
DataModelContext::~DataModelContext()
{
// some debug
diff --git a/oox/source/drawingml/diagram/diagram.cxx b/oox/source/drawingml/diagram/diagram.cxx
index a4ad2798a309..9f29bd68ed07 100644
--- a/oox/source/drawingml/diagram/diagram.cxx
+++ b/oox/source/drawingml/diagram/diagram.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <functional>
#include <boost/bind.hpp>
@@ -86,13 +85,11 @@ void DiagramData::dump()
boost::bind( &dgm::Point::dump, _1 ) );
}
-
void Diagram::setData( const DiagramDataPtr & pData)
{
mpData = pData;
}
-
void Diagram::setLayout( const DiagramLayoutPtr & pLayout)
{
mpLayout = pLayout;
@@ -143,12 +140,10 @@ static sal_Int32 calcDepth( const OUString& rNodeName,
return 0;
}
-
void Diagram::build( )
{
// build name-object maps
-
#if OSL_DEBUG_LEVEL > 1
std::ofstream output("/tmp/tree.dot");
@@ -423,7 +418,6 @@ void loadDiagram( ShapePtr& pShape,
pDiagram->getDataRelsMap() = pShape->resolveRelationshipsOfTypeFromOfficeDoc( rFilter,
xRefDataModel->getFragmentPath(), "image" );
-
// Pass the info to pShape
for( ::std::vector<OUString>::const_iterator aIt = pData->getExtDrawings().begin(), aEnd = pData->getExtDrawings().end();
aIt != aEnd; ++aIt )
diff --git a/oox/source/drawingml/diagram/diagram.hxx b/oox/source/drawingml/diagram/diagram.hxx
index 1218187d1474..2b811f91f408 100644
--- a/oox/source/drawingml/diagram/diagram.hxx
+++ b/oox/source/drawingml/diagram/diagram.hxx
@@ -65,7 +65,6 @@ struct Connection
typedef std::vector< Connection > Connections;
-
/** A point
*/
struct Point
@@ -152,13 +151,9 @@ typedef std::vector< Point > Points;
class LayoutNode;
typedef boost::shared_ptr< LayoutNode > LayoutNodePtr;
-
-
typedef std::map< OUString, css::uno::Reference<css::xml::dom::XDocument> > DiagramDomMap;
typedef css::uno::Sequence< css::uno::Sequence< css::uno::Any > > DiagramRelsMap;
-
-
class DiagramData
{
public:
@@ -200,10 +195,6 @@ private:
typedef boost::shared_ptr< DiagramData > DiagramDataPtr;
-
-
-
-
class DiagramLayout
{
public:
@@ -250,8 +241,6 @@ private:
typedef boost::shared_ptr< DiagramLayout > DiagramLayoutPtr;
-
-
struct DiagramStyle
{
ShapeStyleRef maFillStyle;
@@ -274,8 +263,6 @@ struct DiagramColor
typedef std::map<OUString,DiagramColor> DiagramColorMap;
-
-
class Diagram
{
public:
@@ -310,7 +297,6 @@ private:
DiagramRelsMap maDataRelsMap;
};
-
typedef boost::shared_ptr< Diagram > DiagramPtr;
} }
diff --git a/oox/source/drawingml/diagram/diagramdefinitioncontext.cxx b/oox/source/drawingml/diagram/diagramdefinitioncontext.cxx
index d5d5411bb0a0..cd304b93d81c 100644
--- a/oox/source/drawingml/diagram/diagramdefinitioncontext.cxx
+++ b/oox/source/drawingml/diagram/diagramdefinitioncontext.cxx
@@ -27,7 +27,6 @@ using namespace ::com::sun::star::xml::sax;
namespace oox { namespace drawingml {
-
// CT_DiagramDefinition
DiagramDefinitionContext::DiagramDefinitionContext( ContextHandler2Helper& rParent,
const AttributeList& rAttributes,
@@ -46,7 +45,6 @@ DiagramDefinitionContext::DiagramDefinitionContext( ContextHandler2Helper& rPare
mpLayout->setUniqueId( rAttributes.getString( XML_uniqueId ).get() );
}
-
DiagramDefinitionContext::~DiagramDefinitionContext()
{
mpLayout->getNode()->dump(0);
@@ -92,7 +90,6 @@ DiagramDefinitionContext::onCreateContext( ::sal_Int32 aElement,
return this;
}
-
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/drawingml/diagram/diagramfragmenthandler.cxx b/oox/source/drawingml/diagram/diagramfragmenthandler.cxx
index 7c132340340e..59b183634e97 100644
--- a/oox/source/drawingml/diagram/diagramfragmenthandler.cxx
+++ b/oox/source/drawingml/diagram/diagramfragmenthandler.cxx
@@ -50,7 +50,6 @@ void SAL_CALL DiagramDataFragmentHandler::endDocument()
}
-
ContextHandlerRef
DiagramDataFragmentHandler::onCreateContext( ::sal_Int32 aElement,
const AttributeList& )
@@ -66,8 +65,6 @@ DiagramDataFragmentHandler::onCreateContext( ::sal_Int32 aElement,
return this;
}
-
-
DiagramLayoutFragmentHandler::DiagramLayoutFragmentHandler( XmlFilterBase& rFilter,
const OUString& rFragmentPath,
const DiagramLayoutPtr pDataPtr )
@@ -88,7 +85,6 @@ void SAL_CALL DiagramLayoutFragmentHandler::endDocument()
}
-
ContextHandlerRef
DiagramLayoutFragmentHandler::onCreateContext( ::sal_Int32 aElement,
const AttributeList& rAttribs )
@@ -104,8 +100,6 @@ DiagramLayoutFragmentHandler::onCreateContext( ::sal_Int32 aElement,
return this;
}
-
-
DiagramQStylesFragmentHandler::DiagramQStylesFragmentHandler( XmlFilterBase& rFilter,
const OUString& rFragmentPath,
DiagramQStyleMap& rStylesMap ) :
@@ -163,7 +157,6 @@ DiagramQStylesFragmentHandler::DiagramQStylesFragmentHandler( XmlFilterBase& rFi
return 0;
}
-
void DiagramQStylesFragmentHandler::onStartElement( const AttributeList& rAttribs )
{
if( getCurrentElement() == DGM_TOKEN( styleLbl ) )
@@ -173,8 +166,6 @@ void DiagramQStylesFragmentHandler::onStartElement( const AttributeList& rAttrib
}
}
-
-
void DiagramQStylesFragmentHandler::onEndElement( )
{
if( getCurrentElement() == DGM_TOKEN(styleLbl) )
@@ -231,7 +222,6 @@ ColorFragmentHandler::ColorFragmentHandler( ::oox::core::XmlFilterBase& rFilter,
return 0;
}
-
void ColorFragmentHandler::onStartElement( const AttributeList& rAttribs )
{
if( getCurrentElement() == DGM_TOKEN(styleLbl) )
@@ -247,7 +237,6 @@ void ColorFragmentHandler::onEndElement( )
mrColorsMap[maColorName] = maColorEntry;
}
-
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/drawingml/diagram/diagramfragmenthandler.hxx b/oox/source/drawingml/diagram/diagramfragmenthandler.hxx
index 6c2ffd6183b9..9d38870fcacf 100644
--- a/oox/source/drawingml/diagram/diagramfragmenthandler.hxx
+++ b/oox/source/drawingml/diagram/diagramfragmenthandler.hxx
@@ -25,7 +25,6 @@
namespace oox { namespace drawingml {
-
class DiagramDataFragmentHandler : public ::oox::core::FragmentHandler2
{
public:
@@ -40,8 +39,6 @@ private:
DiagramDataPtr mpDataPtr;
};
-
-
class DiagramLayoutFragmentHandler : public ::oox::core::FragmentHandler2
{
public:
diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
index ba1f8574961e..f1692ec30fb0 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
@@ -40,7 +40,6 @@ using namespace ::oox::core;
namespace oox { namespace drawingml {
-
IteratorAttr::IteratorAttr( )
: mnAxis( 0 )
, mnCnt( -1 )
@@ -62,8 +61,6 @@ void IteratorAttr::loadFromXAttr( const Reference< XFastAttributeList >& xAttr )
mnStep = attr.getInteger( XML_step, 1 );
}
-
-
ConditionAttr::ConditionAttr()
: mnFunc( 0 )
, mnArg( 0 )
@@ -72,7 +69,6 @@ ConditionAttr::ConditionAttr()
}
-
void ConditionAttr::loadFromXAttr( const Reference< XFastAttributeList >& xAttr )
{
mnFunc = xAttr->getOptionalValueToken( XML_func, 0 );
@@ -82,7 +78,6 @@ void ConditionAttr::loadFromXAttr( const Reference< XFastAttributeList >& xAttr
msVal = xAttr->getOptionalValue( XML_val );
}
-
void LayoutAtom::dump(int level)
{
OSL_TRACE( "level = %d - %s of type %s", level,
@@ -93,7 +88,6 @@ void LayoutAtom::dump(int level)
boost::bind( &LayoutAtom::dump, _1, level + 1 ) );
}
-
ForEachAtom::ForEachAtom(const Reference< XFastAttributeList >& xAttributes)
{
maIter.loadFromXAttr(xAttributes);
@@ -506,11 +500,8 @@ bool LayoutNode::setupShape( const ShapePtr& rShape, const Diagram& rDgm, sal_uI
return false;
}
-
-
// Visitation
-
class ShapeLayoutingVisitor : public LayoutAtomVisitor
{
ShapePtr mpParentShape;
diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.hxx b/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
index ade9bde96bdd..6d57510d090c 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
@@ -32,7 +32,6 @@
#include "oox/drawingml/shape.hxx"
#include "diagram.hxx"
-
namespace oox { namespace drawingml {
class DiagramLayout;
@@ -194,7 +193,6 @@ private:
typedef boost::shared_ptr< ForEachAtom > ForEachAtomPtr;
-
class ConditionAtom
: public LayoutAtom
{
@@ -221,7 +219,6 @@ private:
typedef boost::shared_ptr< ConditionAtom > ConditionAtomPtr;
-
/** "choose" statements. Atoms will be tested in order. */
class ChooseAtom
: public LayoutAtom
diff --git a/oox/source/drawingml/diagram/layoutnodecontext.cxx b/oox/source/drawingml/diagram/layoutnodecontext.cxx
index 10de2df161e7..1d092dc663a9 100644
--- a/oox/source/drawingml/diagram/layoutnodecontext.cxx
+++ b/oox/source/drawingml/diagram/layoutnodecontext.cxx
@@ -43,8 +43,6 @@ public:
{}
};
-
-
class AlgorithmContext
: public ContextHandler2
{
@@ -84,7 +82,6 @@ private:
AlgAtomPtr mpNode;
};
-
class ChooseContext
: public ContextHandler2
{
@@ -135,9 +132,6 @@ private:
ConditionAtomPtr mpConditionNode;
};
-
-
-
class ForEachContext
: public LayoutNodeContext
{
@@ -150,7 +144,6 @@ public:
}
};
-
// CT_LayoutVariablePropertySet
class LayoutVariablePropertySetContext
: public ContextHandler2
@@ -181,7 +174,6 @@ private:
LayoutNode::VarMap & mVariables;
};
-
// CT_LayoutNode
LayoutNodeContext::LayoutNodeContext( ContextHandler2Helper& rParent,
const AttributeList& rAttribs,
@@ -193,7 +185,6 @@ LayoutNodeContext::LayoutNodeContext( ContextHandler2Helper& rParent,
mpNode->setName( rAttribs.getString( XML_name ).get() );
}
-
LayoutNodeContext::~LayoutNodeContext()
{
}
@@ -240,7 +231,6 @@ sal_Int32 LayoutNodeContext::tagToVarIdx( sal_Int32 aTag )
return nIdx;
}
-
ContextHandlerRef
LayoutNodeContext::onCreateContext( ::sal_Int32 aElement,
const AttributeList& rAttribs )
@@ -346,7 +336,6 @@ LayoutNodeContext::onCreateContext( ::sal_Int32 aElement,
return this;
}
-
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/drawingml/drawingmltypes.cxx b/oox/source/drawingml/drawingmltypes.cxx
index b3c646eb2dcb..c2fb438ba2e9 100644
--- a/oox/source/drawingml/drawingmltypes.cxx
+++ b/oox/source/drawingml/drawingmltypes.cxx
@@ -35,8 +35,6 @@ using namespace ::com::sun::star::style;
namespace oox {
namespace drawingml {
-
-
/** converts EMUs into 1/100th mmm */
sal_Int32 GetCoordinate( sal_Int32 nValue )
{
@@ -68,16 +66,12 @@ double GetPositiveFixedPercentage( const OUString& sValue )
return fPercent;
}
-
-
/** converts the attributes from an CT_TLPoint into an awt Point with 1/1000% */
awt::Point GetPointPercent( const Reference< XFastAttributeList >& xAttribs )
{
return awt::Point( GetPercent( xAttribs->getOptionalValue( XML_x ) ), GetCoordinate( xAttribs->getOptionalValue( XML_y ) ) );
}
-
-
/** converts the ST_TextFontSize to point */
float GetTextSize( const OUString& sValue )
{
@@ -88,7 +82,6 @@ float GetTextSize( const OUString& sValue )
return fRet;
}
-
/** converts the ST_TextSpacingPoint to 1/100mm */
sal_Int32 GetTextSpacingPoint( const OUString& sValue )
{
@@ -383,8 +376,6 @@ IntegerRectangle2D GetRelativeRect( const Reference< XFastAttributeList >& xAttr
return r;
}
-
-
/** converts the attributes from an CT_Size2D into an awt Size with 1/100thmm */
awt::Size GetSize2D( const Reference< XFastAttributeList >& xAttribs )
{
@@ -399,8 +390,6 @@ IndexRange GetIndexRange( const Reference< XFastAttributeList >& xAttributes )
return range;
}
-
-
} // namespace drawingml
} // namespace oox
diff --git a/oox/source/drawingml/effectproperties.cxx b/oox/source/drawingml/effectproperties.cxx
index f195932aed5a..da94669561ab 100644
--- a/oox/source/drawingml/effectproperties.cxx
+++ b/oox/source/drawingml/effectproperties.cxx
@@ -18,8 +18,6 @@
namespace oox {
namespace drawingml {
-
-
void EffectShadowProperties::assignUsed(const EffectShadowProperties& rSourceProps)
{
moShadowDist.assignIfUsed( rSourceProps.moShadowDist );
@@ -84,8 +82,6 @@ css::beans::PropertyValue Effect::getEffect()
return pRet;
}
-
-
} // namespace drawingml
} // namespace oox
diff --git a/oox/source/drawingml/effectproperties.hxx b/oox/source/drawingml/effectproperties.hxx
index 0b3527ec5f85..dae858c82db4 100644
--- a/oox/source/drawingml/effectproperties.hxx
+++ b/oox/source/drawingml/effectproperties.hxx
@@ -17,8 +17,6 @@
namespace oox {
namespace drawingml {
-
-
struct EffectShadowProperties
{
OptValue< sal_Int64 > moShadowDist;
@@ -30,8 +28,6 @@ struct EffectShadowProperties
void assignUsed( const EffectShadowProperties& rSourceProps );
};
-
-
struct Effect
{
OUString msName;
@@ -41,8 +37,6 @@ struct Effect
css::beans::PropertyValue getEffect();
};
-
-
struct EffectProperties
{
EffectShadowProperties maShadow;
@@ -59,8 +53,6 @@ struct EffectProperties
const GraphicHelper& rGraphicHelper ) const;
};
-
-
} // namespace drawingml
} // namespace oox
diff --git a/oox/source/drawingml/effectpropertiescontext.cxx b/oox/source/drawingml/effectpropertiescontext.cxx
index e803644fb16d..c99d364c83c6 100644
--- a/oox/source/drawingml/effectpropertiescontext.cxx
+++ b/oox/source/drawingml/effectpropertiescontext.cxx
@@ -21,7 +21,6 @@ using namespace ::com::sun::star::xml::sax;
namespace oox { namespace drawingml {
-
EffectPropertiesContext::EffectPropertiesContext( ContextHandler2Helper& rParent,
EffectProperties& rEffectProperties ) throw()
: ContextHandler2( rParent )
diff --git a/oox/source/drawingml/embeddedwavaudiofile.cxx b/oox/source/drawingml/embeddedwavaudiofile.cxx
index 327a0e71d746..6b2f29ef8fd4 100644
--- a/oox/source/drawingml/embeddedwavaudiofile.cxx
+++ b/oox/source/drawingml/embeddedwavaudiofile.cxx
@@ -24,10 +24,8 @@ using namespace ::oox::core;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::xml::sax;
-
namespace oox { namespace drawingml {
-
// CT_EmbeddedWAVAudioFile
void getEmbeddedWAVAudioFile( const Relations& rRelations,
const Reference< XFastAttributeList >& xAttribs, EmbeddedWAVAudioFile & aAudio )
@@ -40,7 +38,6 @@ namespace oox { namespace drawingml {
aAudio.msName = xAttribs->getOptionalValue( XML_name );
}
-
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/drawingml/fillproperties.cxx b/oox/source/drawingml/fillproperties.cxx
index 7abd50089d46..6507e6fac8ff 100644
--- a/oox/source/drawingml/fillproperties.cxx
+++ b/oox/source/drawingml/fillproperties.cxx
@@ -48,8 +48,6 @@ using ::com::sun::star::geometry::IntegerRectangle2D;
namespace oox {
namespace drawingml {
-
-
namespace {
Reference< XGraphic > lclCheckAndApplyDuotoneTransform( const BlipFillProperties& aBlipProps, Reference< XGraphic > xGraphic,
@@ -105,7 +103,6 @@ Reference< XGraphic > applyBrightnessContrast( Reference< XGraphic > xGraphic, s
return xGraphic;
}
-
BitmapMode lclGetBitmapMode( sal_Int32 nToken )
{
OSL_ASSERT((nToken & sal_Int32(0xFFFF0000))==0);
@@ -159,8 +156,6 @@ const awt::Size lclGetOriginalSize( const GraphicHelper& rGraphicHelper, const R
} // namespace
-
-
void GradientFillProperties::assignUsed( const GradientFillProperties& rSourceProps )
{
if( !rSourceProps.maGradientStops.empty() )
@@ -174,8 +169,6 @@ void GradientFillProperties::assignUsed( const GradientFillProperties& rSourcePr
moRotateWithShape.assignIfUsed( rSourceProps.moRotateWithShape );
}
-
-
void PatternFillProperties::assignUsed( const PatternFillProperties& rSourceProps )
{
maPattFgColor.assignIfUsed( rSourceProps.maPattFgColor );
@@ -183,8 +176,6 @@ void PatternFillProperties::assignUsed( const PatternFillProperties& rSourceProp
moPattPreset.assignIfUsed( rSourceProps.moPattPreset );
}
-
-
void BlipFillProperties::assignUsed( const BlipFillProperties& rSourceProps )
{
if( rSourceProps.mxGraphic.is() )
@@ -208,8 +199,6 @@ void BlipFillProperties::assignUsed( const BlipFillProperties& rSourceProps )
maEffect.assignUsed( rSourceProps.maEffect );
}
-
-
void FillProperties::assignUsed( const FillProperties& rSourceProps )
{
moFillType.assignIfUsed( rSourceProps.moFillType );
@@ -528,8 +517,6 @@ void FillProperties::pushToPropMap( ShapePropertyMap& rPropMap,
}
}
-
-
void GraphicProperties::pushToPropMap( PropertyMap& rPropMap, const GraphicHelper& rGraphicHelper, sal_Int32 nPhClr ) const
{
sal_Int16 nBrightness = getLimitedValue< sal_Int16, sal_Int32 >( maBlipProps.moBrightness.get( 0 ) / PER_PERCENT, -100, 100 );
@@ -801,8 +788,6 @@ sal_Int32 ArtisticEffectProperties::getEffectToken( const OUString& sName )
return XML_none;
}
-
-
} // namespace drawingml
} // namespace oox
diff --git a/oox/source/drawingml/graphicshapecontext.cxx b/oox/source/drawingml/graphicshapecontext.cxx
index 8f016be3bede..8adc9c61f618 100644
--- a/oox/source/drawingml/graphicshapecontext.cxx
+++ b/oox/source/drawingml/graphicshapecontext.cxx
@@ -50,7 +50,6 @@ using namespace ::oox::core;
namespace oox {
namespace drawingml {
-
// CT_Picture
GraphicShapeContext::GraphicShapeContext( ContextHandler2Helper& rParent, ShapePtr pMasterShapePtr, ShapePtr pShapePtr )
@@ -99,7 +98,6 @@ ContextHandlerRef GraphicShapeContext::onCreateContext( sal_Int32 aElementToken,
return ShapeContext::onCreateContext( aElementToken, rAttribs );
}
-
// CT_GraphicalObjectFrameContext
GraphicalObjectFrameContext::GraphicalObjectFrameContext( ContextHandler2Helper& rParent, ShapePtr pMasterShapePtr, ShapePtr pShapePtr, bool bEmbedShapesInChart ) :
@@ -218,8 +216,6 @@ ContextHandlerRef OleObjectGraphicDataContext::onCreateContext( sal_Int32 nEleme
return 0;
}
-
-
DiagramGraphicDataContext::DiagramGraphicDataContext( ContextHandler2Helper& rParent, ShapePtr pShapePtr )
: ShapeContext( rParent, ShapePtr(), pShapePtr )
{
@@ -263,8 +259,6 @@ ContextHandlerRef DiagramGraphicDataContext::onCreateContext( ::sal_Int32 aEleme
return ShapeContext::onCreateContext( aElementToken, rAttribs );
}
-
-
ChartGraphicDataContext::ChartGraphicDataContext( ContextHandler2Helper& rParent, const ShapePtr& rxShape, bool bEmbedShapes ) :
ShapeContext( rParent, ShapePtr(), rxShape ),
mrChartShapeInfo( rxShape->setChartType( bEmbedShapes ) )
@@ -280,8 +274,6 @@ ContextHandlerRef ChartGraphicDataContext::onCreateContext( ::sal_Int32 nElement
return 0;
}
-
-
} // namespace drawingml
} // namespace oox
diff --git a/oox/source/drawingml/lineproperties.cxx b/oox/source/drawingml/lineproperties.cxx
index 372740b36006..e8199815669b 100644
--- a/oox/source/drawingml/lineproperties.cxx
+++ b/oox/source/drawingml/lineproperties.cxx
@@ -45,8 +45,6 @@ using ::com::sun::star::container::XNameContainer;
namespace oox {
namespace drawingml {
-
-
namespace {
void lclSetDashData( LineDash& orLineDash, sal_Int16 nDots, sal_Int32 nDotLen,
@@ -175,8 +173,6 @@ sal_Int32 lclGetArrowSize( sal_Int32 nToken )
return OOX_ARROWSIZE_MEDIUM;
}
-
-
void lclPushMarkerProperties( ShapePropertyMap& rPropMap,
const LineArrowProperties& rArrowProps, sal_Int32 nLineWidth, bool bLineEnd )
{
@@ -342,8 +338,6 @@ void lclPushMarkerProperties( ShapePropertyMap& rPropMap,
} // namespace
-
-
void LineArrowProperties::assignUsed( const LineArrowProperties& rSourceProps )
{
moArrowType.assignIfUsed( rSourceProps.moArrowType );
@@ -351,8 +345,6 @@ void LineArrowProperties::assignUsed( const LineArrowProperties& rSourceProps )
moArrowLength.assignIfUsed( rSourceProps.moArrowLength );
}
-
-
void LineProperties::assignUsed( const LineProperties& rSourceProps )
{
maStartArrow.assignUsed( rSourceProps.maStartArrow );
@@ -449,8 +441,6 @@ sal_Int32 LineProperties::getLineWidth() const
return convertEmuToHmm( moLineWidth.get( 0 ) );
}
-
-
} // namespace drawingml
} // namespace oox
diff --git a/oox/source/drawingml/linepropertiescontext.cxx b/oox/source/drawingml/linepropertiescontext.cxx
index ee49fbaddbb5..45a4a0eb8abb 100644
--- a/oox/source/drawingml/linepropertiescontext.cxx
+++ b/oox/source/drawingml/linepropertiescontext.cxx
@@ -31,7 +31,6 @@ using namespace ::com::sun::star::xml::sax;
namespace oox { namespace drawingml {
-
LinePropertiesContext::LinePropertiesContext( ContextHandler2Helper& rParent, const AttributeList& rAttribs,
LineProperties& rLineProperties ) throw()
: ContextHandler2( rParent )
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 7b16832440c6..db2fa16ca00b 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -150,7 +150,6 @@ Shape::Shape( const ShapePtr& pSourceShape )
, maDiagramDoms( pSourceShape->maDiagramDoms )
{}
-
Shape::~Shape()
{
}
@@ -215,7 +214,6 @@ void Shape::setServiceName( const sal_Char* pServiceName )
msServiceName = OUString::createFromAscii( pServiceName );
}
-
const ShapeStyleRef* Shape::getShapeStyleRef( sal_Int32 nRefType ) const
{
ShapeStyleRefMap::const_iterator aIt = maShapeStyleRefs.find( nRefType );
@@ -251,7 +249,6 @@ void Shape::addShape(
if ( xShapes.is() )
addChildren( rFilterBase, *this, pTheme, xShapes, pShapeRect ? *pShapeRect : awt::Rectangle( maPosition.X, maPosition.Y, maSize.Width, maSize.Height ), pShapeMap, aMatrix );
-
if( meFrameType == FRAMETYPE_DIAGRAM )
{
if( !SvtFilterOptions::Get().IsSmartArt2Shape() )
@@ -270,13 +267,11 @@ void Shape::setLockedCanvas(bool bLockedCanvas)
mbLockedCanvas = bLockedCanvas;
}
-
void Shape::setWps(bool bWps)
{
mbWps = bWps;
}
-
void Shape::setTextBox(bool bTextBox)
{
mbTextBox = bTextBox;
@@ -507,7 +502,6 @@ Reference< XShape > Shape::createAndInsert(
// now set transformation for this object
HomogenMatrix3 aMatrix;
-
aMatrix.Line1.Column1 = aTransformation.get(0,0);
aMatrix.Line1.Column2 = aTransformation.get(0,1);
aMatrix.Line1.Column3 = aTransformation.get(0,2);
@@ -1171,8 +1165,6 @@ void Shape::setTextBody(const TextBodyPtr & pTextBody)
mpTextBody = pTextBody;
}
-
-
void Shape::setMasterTextListStyle( const TextListStylePtr& pMasterTextListStyle )
{
SAL_INFO("oox.drawingml", OSL_THIS_FUNC << "set master text list style to shape id: " << msId);
diff --git a/oox/source/drawingml/shape3dproperties.cxx b/oox/source/drawingml/shape3dproperties.cxx
index e3f39b6267a9..2060f18c52ff 100644
--- a/oox/source/drawingml/shape3dproperties.cxx
+++ b/oox/source/drawingml/shape3dproperties.cxx
@@ -46,7 +46,6 @@ using ::oox::core::XmlFilterBase;
namespace oox {
namespace drawingml {
-
OUString Shape3DProperties::getCameraPrstName( sal_Int32 nElement )
{
switch( nElement )
@@ -406,8 +405,6 @@ css::uno::Sequence< css::beans::PropertyValue > Shape3DProperties::getShape3DAtt
return aSeq;
}
-
-
} // namespace drawingml
} // namespace oox
diff --git a/oox/source/drawingml/shapecontext.cxx b/oox/source/drawingml/shapecontext.cxx
index 1b709ba201b0..536bbc7d4d4a 100644
--- a/oox/source/drawingml/shapecontext.cxx
+++ b/oox/source/drawingml/shapecontext.cxx
@@ -58,7 +58,6 @@ ShapeContext::~ShapeContext()
mpMasterShapePtr->addChild( mpShapePtr );
}
-
ContextHandlerRef ShapeContext::onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs )
{
switch( getBaseToken( aElementToken ) )
@@ -128,7 +127,6 @@ ContextHandlerRef ShapeContext::onCreateContext( sal_Int32 aElementToken, const
return this;
}
-
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/drawingml/shapepropertiescontext.cxx b/oox/source/drawingml/shapepropertiescontext.cxx
index e5b19249e62c..9eb71b2ba08a 100644
--- a/oox/source/drawingml/shapepropertiescontext.cxx
+++ b/oox/source/drawingml/shapepropertiescontext.cxx
@@ -41,8 +41,6 @@ using namespace ::com::sun::star::xml::sax;
namespace oox { namespace drawingml {
-
-
// CT_ShapeProperties
ShapePropertiesContext::ShapePropertiesContext( ContextHandler2Helper& rParent, Shape& rShape )
: ContextHandler2( rParent )
@@ -50,8 +48,6 @@ ShapePropertiesContext::ShapePropertiesContext( ContextHandler2Helper& rParent,
{
}
-
-
ContextHandlerRef ShapePropertiesContext::onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs )
{
switch( aElementToken )
diff --git a/oox/source/drawingml/shapepropertymap.cxx b/oox/source/drawingml/shapepropertymap.cxx
index 21281cdd5664..25b0bcc241f4 100644
--- a/oox/source/drawingml/shapepropertymap.cxx
+++ b/oox/source/drawingml/shapepropertymap.cxx
@@ -28,15 +28,11 @@
namespace oox {
namespace drawingml {
-
-
using namespace ::com::sun::star;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::drawing;
using namespace ::com::sun::star::uno;
-
-
namespace {
static const sal_Int32 spnDefaultShapeIds[ SHAPEPROP_END + 1 ] = // one for the PROP_END_LIST
@@ -74,8 +70,6 @@ ShapePropertyInfo::ShapePropertyInfo( const sal_Int32* pnPropertyIds,
}
}
-
-
ShapePropertyMap::ShapePropertyMap( ModelObjectHelper& rModelObjHelper, const ShapePropertyInfo& rShapePropInfo ) :
mrModelObjHelper( rModelObjHelper ),
maShapePropInfo( rShapePropInfo )
@@ -217,8 +211,6 @@ bool ShapePropertyMap::setFillBitmapNameFromUrl( sal_Int32 /*nPropId*/, const An
return false;
}
-
-
} // namespace drawingml
} // namespace oox
diff --git a/oox/source/drawingml/shapestylecontext.cxx b/oox/source/drawingml/shapestylecontext.cxx
index 4d54a9ab736a..aeb6278b3ec7 100644
--- a/oox/source/drawingml/shapestylecontext.cxx
+++ b/oox/source/drawingml/shapestylecontext.cxx
@@ -28,7 +28,6 @@ using namespace ::com::sun::star::xml::sax;
namespace oox { namespace drawingml {
-
// CT_ShapeStyle
ShapeStyleContext::ShapeStyleContext( ContextHandler2Helper& rParent, Shape& rShape )
diff --git a/oox/source/drawingml/table/tableproperties.cxx b/oox/source/drawingml/table/tableproperties.cxx
index 3dbc8145ebcb..c7c6fff1a417 100644
--- a/oox/source/drawingml/table/tableproperties.cxx
+++ b/oox/source/drawingml/table/tableproperties.cxx
@@ -36,7 +36,6 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::table;
-
namespace oox { namespace drawingml { namespace table {
TableProperties::TableProperties()
diff --git a/oox/source/drawingml/textbody.cxx b/oox/source/drawingml/textbody.cxx
index c90e4826e6e0..9e9d0ddd2c99 100644
--- a/oox/source/drawingml/textbody.cxx
+++ b/oox/source/drawingml/textbody.cxx
@@ -29,7 +29,6 @@ using namespace ::com::sun::star::frame;
namespace oox { namespace drawingml {
-
TextBody::TextBody()
{
}
diff --git a/oox/source/drawingml/textbodycontext.cxx b/oox/source/drawingml/textbodycontext.cxx
index 69b23960e7f2..9cfffdc186f9 100644
--- a/oox/source/drawingml/textbodycontext.cxx
+++ b/oox/source/drawingml/textbodycontext.cxx
@@ -33,8 +33,6 @@ using namespace ::com::sun::star::xml::sax;
namespace oox { namespace drawingml {
-
-
// CT_TextParagraph
class TextParagraphContext : public ContextHandler2
{
@@ -47,7 +45,6 @@ protected:
TextParagraph& mrParagraph;
};
-
TextParagraphContext::TextParagraphContext( ContextHandler2Helper& rParent, TextParagraph& rPara )
: ContextHandler2( rParent )
, mrParagraph( rPara )
@@ -55,8 +52,6 @@ TextParagraphContext::TextParagraphContext( ContextHandler2Helper& rParent, Text
mbEnableTrimSpace = false;
}
-
-
ContextHandlerRef TextParagraphContext::onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs )
{
// EG_TextRun
@@ -102,7 +97,6 @@ ContextHandlerRef TextParagraphContext::onCreateContext( sal_Int32 aElementToken
return 0;
}
-
RegularTextRunContext::RegularTextRunContext( ContextHandler2Helper& rParent, TextRunPtr pRunPtr )
: ContextHandler2( rParent )
, mpRunPtr( pRunPtr )
@@ -110,8 +104,6 @@ RegularTextRunContext::RegularTextRunContext( ContextHandler2Helper& rParent, Te
{
}
-
-
void RegularTextRunContext::onEndElement( )
{
switch( getCurrentElement() )
@@ -130,8 +122,6 @@ void RegularTextRunContext::onEndElement( )
}
}
-
-
void RegularTextRunContext::onCharacters( const OUString& aChars )
{
if( mbIsInText )
@@ -140,8 +130,6 @@ void RegularTextRunContext::onCharacters( const OUString& aChars )
}
}
-
-
ContextHandlerRef RegularTextRunContext::onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs)
{
switch( aElementToken )
@@ -163,16 +151,12 @@ ContextHandlerRef RegularTextRunContext::onCreateContext( sal_Int32 aElementToke
return this;
}
-
-
TextBodyContext::TextBodyContext( ContextHandler2Helper& rParent, TextBody& rTextBody )
: ContextHandler2( rParent )
, mrTextBody( rTextBody )
{
}
-
-
ContextHandlerRef TextBodyContext::onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs )
{
switch( aElementToken )
@@ -199,8 +183,6 @@ ContextHandlerRef TextBodyContext::onCreateContext( sal_Int32 aElementToken, con
return 0;
}
-
-
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/drawingml/textbodyproperties.cxx b/oox/source/drawingml/textbodyproperties.cxx
index dfa3d6007bb5..1c1b4f2f861c 100644
--- a/oox/source/drawingml/textbodyproperties.cxx
+++ b/oox/source/drawingml/textbodyproperties.cxx
@@ -29,8 +29,6 @@ using namespace ::com::sun::star::text;
namespace oox {
namespace drawingml {
-
-
TextBodyProperties::TextBodyProperties()
: mbAnchorCtr(false)
, meVA( TextVerticalAdjust_TOP )
@@ -96,8 +94,6 @@ void TextBodyProperties::pushRotationAdjustments( sal_Int32 nRotation )
}
}
-
-
} // namespace drawingml
} // namespace oox
diff --git a/oox/source/drawingml/textcharacterproperties.cxx b/oox/source/drawingml/textcharacterproperties.cxx
index 3ade36328702..d91988246695 100644
--- a/oox/source/drawingml/textcharacterproperties.cxx
+++ b/oox/source/drawingml/textcharacterproperties.cxx
@@ -37,8 +37,6 @@ using namespace ::com::sun::star::beans;
namespace oox {
namespace drawingml {
-
-
void TextCharacterProperties::assignUsed( const TextCharacterProperties& rSourceProps )
{
// overwrite all properties exisiting in rSourceProps
@@ -197,8 +195,6 @@ float TextCharacterProperties::getCharHeightPoints( float fDefault ) const
return moHeight.has() ? GetFontHeight( moHeight.get() ) : fDefault;
}
-
-
} // namespace drawingml
} // namespace oox
diff --git a/oox/source/drawingml/textfont.cxx b/oox/source/drawingml/textfont.cxx
index e5706c9c32e1..2bda567cc115 100644
--- a/oox/source/drawingml/textfont.cxx
+++ b/oox/source/drawingml/textfont.cxx
@@ -29,8 +29,6 @@ using ::oox::core::XmlFilterBase;
namespace oox {
namespace drawingml {
-
-
namespace {
sal_Int16 lclGetFontPitch( sal_Int32 nOoxValue )
@@ -49,8 +47,6 @@ sal_Int16 lclGetFontFamily( sal_Int32 nOoxValue )
} // namespace
-
-
TextFont::TextFont() :
mnPitch( 0 ),
mnCharset( WINDOWS_CHARSET_ANSI )
@@ -95,8 +91,6 @@ bool TextFont::implGetFontData( OUString& rFontName, sal_Int16& rnFontPitch, sal
return !rFontName.isEmpty();
}
-
-
} // namespace drawingml
} // namespace oox
diff --git a/oox/source/drawingml/textliststylecontext.cxx b/oox/source/drawingml/textliststylecontext.cxx
index 41db7b43d863..117351bea284 100644
--- a/oox/source/drawingml/textliststylecontext.cxx
+++ b/oox/source/drawingml/textliststylecontext.cxx
@@ -38,8 +38,6 @@ TextListStyleContext::~TextListStyleContext()
{
}
-
-
ContextHandlerRef TextListStyleContext::onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs )
{
switch( aElementToken )
@@ -73,8 +71,6 @@ ContextHandlerRef TextListStyleContext::onCreateContext( sal_Int32 aElementToken
return this;
}
-
-
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/drawingml/textparagraph.cxx b/oox/source/drawingml/textparagraph.cxx
index e22096619745..f76631c03fbf 100644
--- a/oox/source/drawingml/textparagraph.cxx
+++ b/oox/source/drawingml/textparagraph.cxx
@@ -136,7 +136,6 @@ void TextParagraph::insertAt(
}
}
-
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/drawingml/textparagraphproperties.cxx b/oox/source/drawingml/textparagraphproperties.cxx
index 76e162218240..924a5e4d14e8 100644
--- a/oox/source/drawingml/textparagraphproperties.cxx
+++ b/oox/source/drawingml/textparagraphproperties.cxx
@@ -245,7 +245,6 @@ void BulletList::setBulletSize(sal_Int16 nSize)
mnSize <<= nSize;
}
-
void BulletList::setFontSize(sal_Int16 nSize)
{
mnFontSize <<= nSize;
diff --git a/oox/source/drawingml/textparagraphpropertiescontext.cxx b/oox/source/drawingml/textparagraphpropertiescontext.cxx
index e592841000e2..035f99ac2a0f 100644
--- a/oox/source/drawingml/textparagraphpropertiescontext.cxx
+++ b/oox/source/drawingml/textparagraphpropertiescontext.cxx
@@ -126,7 +126,6 @@ TextParagraphPropertiesContext::TextParagraphPropertiesContext( ContextHandler2H
}
}
-
TextParagraphPropertiesContext::~TextParagraphPropertiesContext()
{
PropertyMap& rPropertyMap( mrTextParagraphProperties.getTextParagraphPropertyMap() );
@@ -135,7 +134,6 @@ TextParagraphPropertiesContext::~TextParagraphPropertiesContext()
else
rPropertyMap.setProperty( PROP_ParaLineSpacing, ::com::sun::star::style::LineSpacing( ::com::sun::star::style::LineSpacingMode::PROP, 100 ));
-
::std::list< TabStop >::size_type nTabCount = maTabList.size();
if( nTabCount != 0 )
{
@@ -159,8 +157,6 @@ TextParagraphPropertiesContext::~TextParagraphPropertiesContext()
rPropertyMap.setProperty( PROP_ParaAdjust, mrTextParagraphProperties.getParaAdjust().get());
}
-
-
ContextHandlerRef TextParagraphPropertiesContext::onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs )
{
Reference< XFastContextHandler > xRet;
diff --git a/oox/source/drawingml/textrun.cxx b/oox/source/drawingml/textrun.cxx
index 953794810e2e..fae5d26c5bc3 100644
--- a/oox/source/drawingml/textrun.cxx
+++ b/oox/source/drawingml/textrun.cxx
@@ -173,7 +173,6 @@ sal_Int32 TextRun::insertAt(
return nCharHeight;
}
-
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/drawingml/textspacingcontext.cxx b/oox/source/drawingml/textspacingcontext.cxx
index 2c14530196db..8ef0caec6a83 100644
--- a/oox/source/drawingml/textspacingcontext.cxx
+++ b/oox/source/drawingml/textspacingcontext.cxx
@@ -25,7 +25,6 @@ using namespace ::oox::core;
using namespace ::com::sun::star::xml::sax;
using namespace ::com::sun::star::uno;
-
namespace oox { namespace drawingml {
TextSpacingContext::TextSpacingContext( ContextHandler2Helper& rParent, TextSpacing & aSpacing )
diff --git a/oox/source/drawingml/theme.cxx b/oox/source/drawingml/theme.cxx
index 859488f25105..31c3c1bd12cf 100644
--- a/oox/source/drawingml/theme.cxx
+++ b/oox/source/drawingml/theme.cxx
@@ -22,8 +22,6 @@
namespace oox {
namespace drawingml {
-
-
Theme::Theme()
{
}
@@ -106,8 +104,6 @@ const TextFont* Theme::resolveFont( const OUString& rName ) const
return 0;
}
-
-
} // namespace drawingml
} // namespace oox
diff --git a/oox/source/drawingml/themeelementscontext.cxx b/oox/source/drawingml/themeelementscontext.cxx
index cc1c10e3b8e4..0b6ab7a6b127 100644
--- a/oox/source/drawingml/themeelementscontext.cxx
+++ b/oox/source/drawingml/themeelementscontext.cxx
@@ -35,8 +35,6 @@ using namespace ::com::sun::star::xml::sax;
namespace oox {
namespace drawingml {
-
-
class FillStyleListContext : public ContextHandler2
{
public:
@@ -69,8 +67,6 @@ ContextHandlerRef FillStyleListContext::onCreateContext( sal_Int32 nElement, con
return 0;
}
-
-
class LineStyleListContext : public ContextHandler2
{
public:
@@ -98,8 +94,6 @@ ContextHandlerRef LineStyleListContext::onCreateContext( sal_Int32 nElement, con
return 0;
}
-
-
class EffectStyleListContext : public ContextHandler2
{
public:
@@ -132,8 +126,6 @@ ContextHandlerRef EffectStyleListContext::onCreateContext( sal_Int32 nElement, c
return 0;
}
-
-
class FontSchemeContext : public ContextHandler2
{
public:
@@ -192,8 +184,6 @@ void FontSchemeContext::onEndElement()
}
}
-
-
ThemeElementsContext::ThemeElementsContext( ContextHandler2Helper& rParent, Theme& rTheme ) :
ContextHandler2( rParent ),
mrTheme( rTheme )
@@ -226,8 +216,6 @@ ContextHandlerRef ThemeElementsContext::onCreateContext( sal_Int32 nElement, con
return 0;
}
-
-
} // namespace drawingml
} // namespace oox
diff --git a/oox/source/drawingml/themefragmenthandler.cxx b/oox/source/drawingml/themefragmenthandler.cxx
index 48693830e036..b0f4f85a3a8d 100644
--- a/oox/source/drawingml/themefragmenthandler.cxx
+++ b/oox/source/drawingml/themefragmenthandler.cxx
@@ -27,8 +27,6 @@ using namespace ::oox::core;
namespace oox {
namespace drawingml {
-
-
ThemeFragmentHandler::ThemeFragmentHandler( XmlFilterBase& rFilter, const OUString& rFragmentPath, Theme& rTheme ) :
FragmentHandler2( rFilter, rFragmentPath ),
mrTheme( rTheme )
@@ -71,8 +69,6 @@ ContextHandlerRef ThemeFragmentHandler::onCreateContext( sal_Int32 nElement, con
return 0;
}
-
-
} // namespace drawingml
} // namespace oox