summaryrefslogtreecommitdiff
path: root/oox/source/vml
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@suse.cz>2013-05-09 17:30:54 +0200
committerLuboš Luňák <l.lunak@suse.cz>2013-05-14 19:48:32 +0200
commitc2703b63fa8d16ce8efaa55e0431ae829fdd23c1 (patch)
tree3901146d6a00f1f2fe429b7a7a665ead9fc11463 /oox/source/vml
parenta69f31a322a8ff26814db194551c719ea140b027 (diff)
remove non-sensical /*static*/ comments
They are presumably meant to say the functions are class-static, but at the function definition it's pretty confusing (looks like file-static). Change-Id: I28c69244c9eb7aa3f20f07d8784f3704dc6a57bf
Diffstat (limited to 'oox/source/vml')
-rw-r--r--oox/source/vml/vmlformatting.cxx14
-rw-r--r--oox/source/vml/vmlshapecontext.cxx2
2 files changed, 8 insertions, 8 deletions
diff --git a/oox/source/vml/vmlformatting.cxx b/oox/source/vml/vmlformatting.cxx
index b3cac88b5c04..7932acd1d2c6 100644
--- a/oox/source/vml/vmlformatting.cxx
+++ b/oox/source/vml/vmlformatting.cxx
@@ -62,7 +62,7 @@ bool lclExtractDouble( double& orfValue, sal_Int32& ornEndPos, const OUString& r
// ----------------------------------------------------------------------------
-/*static*/ bool ConversionHelper::separatePair( OUString& orValue1, OUString& orValue2,
+bool ConversionHelper::separatePair( OUString& orValue1, OUString& orValue2,
const OUString& rValue, sal_Unicode cSep )
{
sal_Int32 nSepPos = rValue.indexOf( cSep );
@@ -78,14 +78,14 @@ bool lclExtractDouble( double& orfValue, sal_Int32& ornEndPos, const OUString& r
return !orValue1.isEmpty() && !orValue2.isEmpty();
}
-/*static*/ bool ConversionHelper::decodeBool( const OUString& rValue )
+bool ConversionHelper::decodeBool( const OUString& rValue )
{
sal_Int32 nToken = AttributeConversion::decodeToken( rValue );
// anything else than 't' or 'true' is considered to be false, as specified
return (nToken == XML_t) || (nToken == XML_true);
}
-/*static*/ double ConversionHelper::decodePercent( const OUString& rValue, double fDefValue )
+double ConversionHelper::decodePercent( const OUString& rValue, double fDefValue )
{
if( rValue.isEmpty() )
return fDefValue;
@@ -108,7 +108,7 @@ bool lclExtractDouble( double& orfValue, sal_Int32& ornEndPos, const OUString& r
return fDefValue;
}
-/*static*/ sal_Int64 ConversionHelper::decodeMeasureToEmu( const GraphicHelper& rGraphicHelper,
+sal_Int64 ConversionHelper::decodeMeasureToEmu( const GraphicHelper& rGraphicHelper,
const OUString& rValue, sal_Int32 nRefValue, bool bPixelX, bool bDefaultAsPixel )
{
// default for missing values is 0
@@ -168,13 +168,13 @@ bool lclExtractDouble( double& orfValue, sal_Int32& ornEndPos, const OUString& r
return static_cast< sal_Int64 >( fValue + 0.5 );
}
-/*static*/ sal_Int32 ConversionHelper::decodeMeasureToHmm( const GraphicHelper& rGraphicHelper,
+sal_Int32 ConversionHelper::decodeMeasureToHmm( const GraphicHelper& rGraphicHelper,
const OUString& rValue, sal_Int32 nRefValue, bool bPixelX, bool bDefaultAsPixel )
{
return ::oox::drawingml::convertEmuToHmm( decodeMeasureToEmu( rGraphicHelper, rValue, nRefValue, bPixelX, bDefaultAsPixel ) );
}
-/*static*/ Color ConversionHelper::decodeColor( const GraphicHelper& rGraphicHelper,
+Color ConversionHelper::decodeColor( const GraphicHelper& rGraphicHelper,
const OptValue< OUString >& roVmlColor, const OptValue< double >& roVmlOpacity,
sal_Int32 nDefaultRgb, sal_Int32 nPrimaryRgb )
{
@@ -266,7 +266,7 @@ bool lclExtractDouble( double& orfValue, sal_Int32& ornEndPos, const OUString& r
return aDmlColor;
}
-/*static*/ void ConversionHelper::decodeVmlPath( ::std::vector< ::std::vector< Point > >& rPointLists, ::std::vector< ::std::vector< PolygonFlags > >& rFlagLists, const OUString& rPath )
+void ConversionHelper::decodeVmlPath( ::std::vector< ::std::vector< Point > >& rPointLists, ::std::vector< ::std::vector< PolygonFlags > >& rFlagLists, const OUString& rPath )
{
::std::vector< sal_Int32 > aCoordList;
Point aCurrentPoint;
diff --git a/oox/source/vml/vmlshapecontext.cxx b/oox/source/vml/vmlshapecontext.cxx
index e0f8cfb659a7..658215a27cb7 100644
--- a/oox/source/vml/vmlshapecontext.cxx
+++ b/oox/source/vml/vmlshapecontext.cxx
@@ -232,7 +232,7 @@ ShapeContextBase::ShapeContextBase( ContextHandler2Helper& rParent ) :
{
}
-/*static*/ ContextHandlerRef ShapeContextBase::createShapeContext( ContextHandler2Helper& rParent,
+ContextHandlerRef ShapeContextBase::createShapeContext( ContextHandler2Helper& rParent,
ShapeContainer& rShapes, sal_Int32 nElement, const AttributeList& rAttribs )
{
switch( nElement )