summaryrefslogtreecommitdiff
path: root/oox/source/drawingml
diff options
context:
space:
mode:
Diffstat (limited to 'oox/source/drawingml')
-rw-r--r--oox/source/drawingml/chart/converterbase.cxx8
-rw-r--r--oox/source/drawingml/chart/objectformatter.cxx24
-rw-r--r--oox/source/drawingml/chart/plotareaconverter.cxx2
-rw-r--r--oox/source/drawingml/clrscheme.cxx2
-rw-r--r--oox/source/drawingml/color.cxx8
-rw-r--r--oox/source/drawingml/customshapegeometry.cxx34
-rw-r--r--oox/source/drawingml/drawingmltypes.cxx4
-rw-r--r--oox/source/drawingml/effectpropertiescontext.cxx2
-rw-r--r--oox/source/drawingml/lineproperties.cxx2
-rw-r--r--oox/source/drawingml/linepropertiescontext.cxx2
-rw-r--r--oox/source/drawingml/shapepropertiescontext.cxx2
-rw-r--r--oox/source/drawingml/shapestylecontext.cxx4
-rw-r--r--oox/source/drawingml/textbodycontext.cxx20
-rw-r--r--oox/source/drawingml/textliststylecontext.cxx4
-rw-r--r--oox/source/drawingml/textparagraphpropertiescontext.cxx2
15 files changed, 60 insertions, 60 deletions
diff --git a/oox/source/drawingml/chart/converterbase.cxx b/oox/source/drawingml/chart/converterbase.cxx
index cba883f84d00..01296719f69b 100644
--- a/oox/source/drawingml/chart/converterbase.cxx
+++ b/oox/source/drawingml/chart/converterbase.cxx
@@ -63,7 +63,7 @@ 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,7 +103,7 @@ 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
@@ -165,7 +165,7 @@ struct ConverterData
~ConverterData();
};
-// ----------------------------------------------------------------------------
+
ConverterData::ConverterData(
XmlFilterBase& rFilter,
@@ -350,7 +350,7 @@ double lclCalcRelSize( double fPos, double fSize, sal_Int32 nSizeMode )
} // namespace
-// ----------------------------------------------------------------------------
+
LayoutConverter::LayoutConverter( const ConverterRoot& rParent, LayoutModel& rModel ) :
ConverterBase< LayoutModel >( rParent, rModel )
diff --git a/oox/source/drawingml/chart/objectformatter.cxx b/oox/source/drawingml/chart/objectformatter.cxx
index a840381df2cc..1d21c74ed0d8 100644
--- a/oox/source/drawingml/chart/objectformatter.cxx
+++ b/oox/source/drawingml/chart/objectformatter.cxx
@@ -116,7 +116,7 @@ static const AutoFormatPatternEntry spAutoFormatPattern4[] =
#undef AUTOFORMAT_PATTERN_COLORMOD
#undef AUTOFORMAT_PATTERN_END
-// ----------------------------------------------------------------------------
+
struct AutoFormatEntry
{
@@ -409,7 +409,7 @@ const AutoFormatEntry* lclGetAutoFormatEntry( const AutoFormatEntry* pEntries, s
return 0;
}
-// ----------------------------------------------------------------------------
+
struct AutoTextEntry
{
@@ -460,7 +460,7 @@ 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[] =
@@ -499,7 +499,7 @@ 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
@@ -553,7 +553,7 @@ static const ObjectTypeFormatEntry spObjTypeFormatEntries[] =
#undef TYPEFORMAT_FRAME
#undef TYPEFORMAT_LINE
-// ----------------------------------------------------------------------------
+
void lclConvertPictureOptions( FillProperties& orFillProps, const PictureOptionsModel& rPicOptions )
{
@@ -567,7 +567,7 @@ void lclConvertPictureOptions( FillProperties& orFillProps, const PictureOptions
struct ObjectFormatterData;
-// ----------------------------------------------------------------------------
+
class DetailFormatterBase
{
@@ -595,7 +595,7 @@ protected:
ColorPatternVec maColorPattern; /// Different cycling colors for data series.
};
-// ----------------------------------------------------------------------------
+
class LineFormatter : public DetailFormatterBase
{
@@ -614,7 +614,7 @@ private:
LinePropertiesPtr mxAutoLine; /// Automatic line properties.
};
-// ----------------------------------------------------------------------------
+
class FillFormatter : public DetailFormatterBase
{
@@ -634,7 +634,7 @@ private:
FillPropertiesPtr mxAutoFill; /// Automatic fill properties.
};
-// ----------------------------------------------------------------------------
+
class EffectFormatter : public DetailFormatterBase
{
@@ -650,7 +650,7 @@ public:
sal_Int32 nSeriesIdx ) const;
};
-// ----------------------------------------------------------------------------
+
class TextFormatter : public DetailFormatterBase
{
@@ -673,7 +673,7 @@ private:
TextCharacterPropertiesPtr mxAutoText; /// Automatic text properties.
};
-// ----------------------------------------------------------------------------
+
/** Formatter for a specific object type. */
class ObjectTypeFormatter
@@ -721,7 +721,7 @@ private:
const ObjectTypeFormatEntry& mrEntry; /// Additional settings.
};
-// ----------------------------------------------------------------------------
+
struct ObjectFormatterData
{
diff --git a/oox/source/drawingml/chart/plotareaconverter.cxx b/oox/source/drawingml/chart/plotareaconverter.cxx
index 8fcb6253bb5f..7244b6035906 100644
--- a/oox/source/drawingml/chart/plotareaconverter.cxx
+++ b/oox/source/drawingml/chart/plotareaconverter.cxx
@@ -92,7 +92,7 @@ private:
bool mbPieChart;
};
-// ----------------------------------------------------------------------------
+
AxesSetConverter::AxesSetConverter( const ConverterRoot& rParent, AxesSetModel& rModel ) :
ConverterBase< AxesSetModel >( rParent, rModel ),
diff --git a/oox/source/drawingml/clrscheme.cxx b/oox/source/drawingml/clrscheme.cxx
index d2640ff11e79..88ceccfb1269 100644
--- a/oox/source/drawingml/clrscheme.cxx
+++ b/oox/source/drawingml/clrscheme.cxx
@@ -43,7 +43,7 @@ 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 84dbd35774d0..da050d837cd9 100644
--- a/oox/source/drawingml/color.cxx
+++ b/oox/source/drawingml/color.cxx
@@ -44,7 +44,7 @@ struct PresetColorsPool
explicit PresetColorsPool();
};
-// ----------------------------------------------------------------------------
+
PresetColorsPool::PresetColorsPool() :
maDmlColors( static_cast< size_t >( XML_TOKEN_COUNT ), API_RGB_TRANSPARENT ),
@@ -143,16 +143,16 @@ 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 )
{
diff --git a/oox/source/drawingml/customshapegeometry.cxx b/oox/source/drawingml/customshapegeometry.cxx
index 32b73a812292..cd43a1507f15 100644
--- a/oox/source/drawingml/customshapegeometry.cxx
+++ b/oox/source/drawingml/customshapegeometry.cxx
@@ -220,7 +220,7 @@ OUString GetFormulaParameter( const EnhancedCustomShapeParameter& rParameter )
return aRet;
}
-// ---------------------------------------------------------------------
+
static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCustomShapeProperties, const OUString& rValue, bool bNoSymbols = true )
{
@@ -437,7 +437,7 @@ static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCu
return aRet;
}
-// ---------------------------------------------------------------------
+
// CT_GeomGuideList
class GeomGuideListContext : public ContextHandler2
{
@@ -635,14 +635,14 @@ 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 +657,7 @@ AdjPoint2DContext::AdjPoint2DContext( ContextHandler2Helper& rParent, const Attr
rAdjPoint2D.Second = GetAdjCoordinate( rCustomShapeProperties, rAttribs.getString( XML_y ).get(), true );
}
-// ---------------------------------------------------------------------
+
// CT_XYAdjustHandle
class XYAdjustHandleContext : public ContextHandler2
{
@@ -709,7 +709,7 @@ ContextHandlerRef XYAdjustHandleContext::onCreateContext( sal_Int32 aElementToke
return 0;
}
-// ---------------------------------------------------------------------
+
// CT_PolarAdjustHandle
class PolarAdjustHandleContext : public ContextHandler2
{
@@ -761,7 +761,7 @@ ContextHandlerRef PolarAdjustHandleContext::onCreateContext( sal_Int32 aElementT
return 0;
}
-// ---------------------------------------------------------------------
+
// CT_AdjustHandleList
class AdjustHandleListContext : public ContextHandler2
{
@@ -798,7 +798,7 @@ ContextHandlerRef AdjustHandleListContext::onCreateContext( sal_Int32 aElementTo
return 0;
}
-// ---------------------------------------------------------------------
+
// CT_ConnectionSite
class ConnectionSiteContext : public ContextHandler2
{
@@ -826,7 +826,7 @@ ContextHandlerRef ConnectionSiteContext::onCreateContext( sal_Int32 aElementToke
return 0;
}
-// ---------------------------------------------------------------------
+
// CT_Path2DMoveTo
class Path2DMoveToContext : public ContextHandler2
{
@@ -853,7 +853,7 @@ ContextHandlerRef Path2DMoveToContext::onCreateContext( sal_Int32 aElementToken,
return 0;
}
-// ---------------------------------------------------------------------
+
// CT_Path2DLineTo
class Path2DLineToContext : public ContextHandler2
{
@@ -880,7 +880,7 @@ ContextHandlerRef Path2DLineToContext::onCreateContext( sal_Int32 aElementToken,
return 0;
}
-// ---------------------------------------------------------------------
+
// CT_Path2DQuadBezierTo
class Path2DQuadBezierToContext : public ContextHandler2
{
@@ -914,7 +914,7 @@ ContextHandlerRef Path2DQuadBezierToContext::onCreateContext( sal_Int32 aElement
return 0;
}
-// ---------------------------------------------------------------------
+
// CT_Path2DCubicBezierTo
class Path2DCubicBezierToContext : public ContextHandler2
{
@@ -952,7 +952,7 @@ ContextHandlerRef Path2DCubicBezierToContext::onCreateContext( sal_Int32 aElemen
return 0;
}
-// ---------------------------------------------------------------------
+
// CT_Path2DContext
class Path2DContext : public ContextHandler2
{
@@ -1151,7 +1151,7 @@ ContextHandlerRef Path2DContext::onCreateContext( sal_Int32 aElementToken,
return 0;
}
-// ---------------------------------------------------------------------
+
// CT_Path2DList
class Path2DListContext : public ContextHandler2
{
@@ -1188,7 +1188,7 @@ ContextHandlerRef Path2DListContext::onCreateContext( sal_Int32 aElementToken, c
return 0;
}
-// ---------------------------------------------------------------------
+
// CT_CustomGeometry2D
CustomShapeGeometryContext::CustomShapeGeometryContext( ContextHandler2Helper& rParent, const AttributeList& /* rAttribs */, CustomShapeProperties& rCustomShapeProperties )
: ContextHandler2( rParent )
@@ -1232,7 +1232,7 @@ ContextHandlerRef CustomShapeGeometryContext::onCreateContext( sal_Int32 aElemen
return 0;
}
-// ---------------------------------------------------------------------
+
// CT_PresetGeometry2D
PresetShapeGeometryContext::PresetShapeGeometryContext( ContextHandler2Helper& rParent, const AttributeList& rAttribs, CustomShapeProperties& rCustomShapeProperties )
: ContextHandler2( rParent )
@@ -1251,7 +1251,7 @@ 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/drawingmltypes.cxx b/oox/source/drawingml/drawingmltypes.cxx
index 1c5de59bbba3..821d7f477b57 100644
--- a/oox/source/drawingml/drawingmltypes.cxx
+++ b/oox/source/drawingml/drawingmltypes.cxx
@@ -68,7 +68,7 @@ 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 )
@@ -76,7 +76,7 @@ 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 )
diff --git a/oox/source/drawingml/effectpropertiescontext.cxx b/oox/source/drawingml/effectpropertiescontext.cxx
index 2364ee64757f..53997888e6aa 100644
--- a/oox/source/drawingml/effectpropertiescontext.cxx
+++ b/oox/source/drawingml/effectpropertiescontext.cxx
@@ -20,7 +20,7 @@ using namespace ::com::sun::star::xml::sax;
// CT_EffectProperties
namespace oox { namespace drawingml {
-// ---------------------------------------------------------------------
+
EffectPropertiesContext::EffectPropertiesContext( ContextHandler2Helper& rParent,
EffectProperties& rEffectProperties ) throw()
diff --git a/oox/source/drawingml/lineproperties.cxx b/oox/source/drawingml/lineproperties.cxx
index 2fca061a8482..34a208a37218 100644
--- a/oox/source/drawingml/lineproperties.cxx
+++ b/oox/source/drawingml/lineproperties.cxx
@@ -168,7 +168,7 @@ sal_Int32 lclGetArrowSize( sal_Int32 nToken )
return OOX_ARROWSIZE_MEDIUM;
}
-// ----------------------------------------------------------------------------
+
void lclPushMarkerProperties( ShapePropertyMap& rPropMap,
const LineArrowProperties& rArrowProps, sal_Int32 nLineWidth, bool bLineEnd )
diff --git a/oox/source/drawingml/linepropertiescontext.cxx b/oox/source/drawingml/linepropertiescontext.cxx
index 5761ed0ee273..3195e569881b 100644
--- a/oox/source/drawingml/linepropertiescontext.cxx
+++ b/oox/source/drawingml/linepropertiescontext.cxx
@@ -30,7 +30,7 @@ using namespace ::com::sun::star::xml::sax;
// CT_LineProperties
namespace oox { namespace drawingml {
-// ---------------------------------------------------------------------
+
LinePropertiesContext::LinePropertiesContext( ContextHandler2Helper& rParent, const AttributeList& rAttribs,
LineProperties& rLineProperties ) throw()
diff --git a/oox/source/drawingml/shapepropertiescontext.cxx b/oox/source/drawingml/shapepropertiescontext.cxx
index da1b2b9f742f..d6d1f27cdcc6 100644
--- a/oox/source/drawingml/shapepropertiescontext.cxx
+++ b/oox/source/drawingml/shapepropertiescontext.cxx
@@ -50,7 +50,7 @@ ShapePropertiesContext::ShapePropertiesContext( ContextHandler2Helper& rParent,
{
}
-// --------------------------------------------------------------------
+
ContextHandlerRef ShapePropertiesContext::onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs )
{
diff --git a/oox/source/drawingml/shapestylecontext.cxx b/oox/source/drawingml/shapestylecontext.cxx
index 9dc27f02d0a8..4d54a9ab736a 100644
--- a/oox/source/drawingml/shapestylecontext.cxx
+++ b/oox/source/drawingml/shapestylecontext.cxx
@@ -28,9 +28,9 @@ using namespace ::com::sun::star::xml::sax;
namespace oox { namespace drawingml {
-// ---------------
+
// CT_ShapeStyle
-// ---------------
+
ShapeStyleContext::ShapeStyleContext( ContextHandler2Helper& rParent, Shape& rShape )
: ContextHandler2( rParent )
, mrShape( rShape )
diff --git a/oox/source/drawingml/textbodycontext.cxx b/oox/source/drawingml/textbodycontext.cxx
index 48cf3ec5e72b..9821149cf98c 100644
--- a/oox/source/drawingml/textbodycontext.cxx
+++ b/oox/source/drawingml/textbodycontext.cxx
@@ -33,7 +33,7 @@ using namespace ::com::sun::star::xml::sax;
namespace oox { namespace drawingml {
-// --------------------------------------------------------------------
+
// CT_TextParagraph
class TextParagraphContext : public ContextHandler2
@@ -47,7 +47,7 @@ protected:
TextParagraph& mrParagraph;
};
-// --------------------------------------------------------------------
+
TextParagraphContext::TextParagraphContext( ContextHandler2Helper& rParent, TextParagraph& rPara )
: ContextHandler2( rParent )
, mrParagraph( rPara )
@@ -55,7 +55,7 @@ TextParagraphContext::TextParagraphContext( ContextHandler2Helper& rParent, Text
mbEnableTrimSpace = false;
}
-// --------------------------------------------------------------------
+
ContextHandlerRef TextParagraphContext::onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs )
{
@@ -94,7 +94,7 @@ ContextHandlerRef TextParagraphContext::onCreateContext( sal_Int32 aElementToken
return 0;
}
-// --------------------------------------------------------------------
+
RegularTextRunContext::RegularTextRunContext( ContextHandler2Helper& rParent, TextRunPtr pRunPtr )
: ContextHandler2( rParent )
@@ -103,7 +103,7 @@ RegularTextRunContext::RegularTextRunContext( ContextHandler2Helper& rParent, Te
{
}
-// --------------------------------------------------------------------
+
void RegularTextRunContext::onEndElement( )
{
@@ -123,7 +123,7 @@ void RegularTextRunContext::onEndElement( )
}
}
-// --------------------------------------------------------------------
+
void RegularTextRunContext::onCharacters( const OUString& aChars )
{
@@ -133,7 +133,7 @@ void RegularTextRunContext::onCharacters( const OUString& aChars )
}
}
-// --------------------------------------------------------------------
+
ContextHandlerRef RegularTextRunContext::onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs)
{
@@ -154,7 +154,7 @@ ContextHandlerRef RegularTextRunContext::onCreateContext( sal_Int32 aElementToke
return this;
}
-// --------------------------------------------------------------------
+
TextBodyContext::TextBodyContext( ContextHandler2Helper& rParent, TextBody& rTextBody )
: ContextHandler2( rParent )
@@ -162,7 +162,7 @@ TextBodyContext::TextBodyContext( ContextHandler2Helper& rParent, TextBody& rTex
{
}
-// --------------------------------------------------------------------
+
ContextHandlerRef TextBodyContext::onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs )
{
@@ -188,7 +188,7 @@ ContextHandlerRef TextBodyContext::onCreateContext( sal_Int32 aElementToken, con
return 0;
}
-// --------------------------------------------------------------------
+
} }
diff --git a/oox/source/drawingml/textliststylecontext.cxx b/oox/source/drawingml/textliststylecontext.cxx
index b57171455463..41db7b43d863 100644
--- a/oox/source/drawingml/textliststylecontext.cxx
+++ b/oox/source/drawingml/textliststylecontext.cxx
@@ -38,7 +38,7 @@ TextListStyleContext::~TextListStyleContext()
{
}
-// --------------------------------------------------------------------
+
ContextHandlerRef TextListStyleContext::onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs )
{
@@ -73,7 +73,7 @@ ContextHandlerRef TextListStyleContext::onCreateContext( sal_Int32 aElementToken
return this;
}
-// --------------------------------------------------------------------
+
} }
diff --git a/oox/source/drawingml/textparagraphpropertiescontext.cxx b/oox/source/drawingml/textparagraphpropertiescontext.cxx
index 99a0c0c18ee4..9e0544616d8f 100644
--- a/oox/source/drawingml/textparagraphpropertiescontext.cxx
+++ b/oox/source/drawingml/textparagraphpropertiescontext.cxx
@@ -161,7 +161,7 @@ TextParagraphPropertiesContext::~TextParagraphPropertiesContext()
rPropertyMap[ PROP_ParaAdjust ] <<= mrTextParagraphProperties.getParaAdjust().get();
}
-// --------------------------------------------------------------------
+
ContextHandlerRef TextParagraphPropertiesContext::onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs )
{
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-30 15:59:17 +0000