diff options
author | Alexander Wilms <f.alexander.wilms@gmail.com> | 2014-02-22 21:20:15 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-23 03:38:49 +0000 |
commit | 0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf (patch) | |
tree | 5024cba9f9ea5e3b23ea26025323f6aef39488d0 /oox | |
parent | b81ac16e65b311d6e43c05c22c65d2040c9d7e04 (diff) |
Remove unneccessary comments
Change-Id: I939160ae72fecbe3d4a60ce755730bd4c38497fb
Reviewed-on: https://gerrit.libreoffice.org/8182
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'oox')
40 files changed, 123 insertions, 123 deletions
diff --git a/oox/source/core/recordparser.cxx b/oox/source/core/recordparser.cxx index 0f302b840bec..68fc0c821750 100644 --- a/oox/source/core/recordparser.cxx +++ b/oox/source/core/recordparser.cxx @@ -59,7 +59,7 @@ private: RecordParser* mpParser; }; -// ---------------------------------------------------------------------------- + void Locator::dispose() { @@ -118,7 +118,7 @@ private: ContextInfoVec maStack; }; -// ---------------------------------------------------------------------------- + ContextStack::ContextStack( FragmentHandlerRef xHandler ) : mxHandler( xHandler ) diff --git a/oox/source/core/xmlfilterbase.cxx b/oox/source/core/xmlfilterbase.cxx index ea2cc07f86f0..fdee37b8bb3b 100644 --- a/oox/source/core/xmlfilterbase.cxx +++ b/oox/source/core/xmlfilterbase.cxx @@ -186,7 +186,7 @@ XmlFilterBase::~XmlFilterBase() { } -// ---------------------------------------------------------------------------- + void XmlFilterBase::importDocumentProperties() { diff --git a/oox/source/docprop/docprophandler.cxx b/oox/source/docprop/docprophandler.cxx index 39082a2d9c66..f7091bd8dec1 100644 --- a/oox/source/docprop/docprophandler.cxx +++ b/oox/source/docprop/docprophandler.cxx @@ -36,7 +36,7 @@ using namespace ::com::sun::star; namespace oox { namespace docprop { -// ------------------------------------------------ + OOXMLDocPropHandler::OOXMLDocPropHandler( const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< document::XDocumentProperties > xDocProp ) : m_xContext( xContext ) @@ -50,12 +50,12 @@ OOXMLDocPropHandler::OOXMLDocPropHandler( const uno::Reference< uno::XComponentC throw uno::RuntimeException(); } -// ------------------------------------------------ + OOXMLDocPropHandler::~OOXMLDocPropHandler() { } -// ------------------------------------------------ + void OOXMLDocPropHandler::InitNew() { m_nState = 0; @@ -65,7 +65,7 @@ void OOXMLDocPropHandler::InitNew() m_nInBlock = 0; } -// ------------------------------------------------ + void OOXMLDocPropHandler::AddCustomProperty( const uno::Any& aAny ) { if ( !m_aCustomPropertyName.isEmpty() ) @@ -91,7 +91,7 @@ void OOXMLDocPropHandler::AddCustomProperty( const uno::Any& aAny ) } } -// ------------------------------------------------ + util::DateTime OOXMLDocPropHandler::GetDateTimeFromW3CDTF( const OUString& aChars ) { oslDateTime aOslDTime = { 0, 0, 0, 0, 0, 0, 0, 0 }; @@ -189,7 +189,7 @@ util::DateTime OOXMLDocPropHandler::GetDateTimeFromW3CDTF( const OUString& aChar aOslDTime.Day, aOslDTime.Month, aOslDTime.Year, false); } -// ------------------------------------------------ + uno::Sequence< OUString > OOXMLDocPropHandler::GetKeywordsSet( const OUString& aChars ) { if ( !aChars.isEmpty() ) @@ -212,7 +212,7 @@ uno::Sequence< OUString > OOXMLDocPropHandler::GetKeywordsSet( const OUString& a return uno::Sequence< OUString >(); } -// ------------------------------------------------ + void OOXMLDocPropHandler::UpdateDocStatistic( const OUString& aChars ) { uno::Sequence< beans::NamedValue > aSet = m_xDocProp->getDocumentStatistics(); @@ -264,22 +264,22 @@ void OOXMLDocPropHandler::UpdateDocStatistic( const OUString& aChars ) } } -// ------------------------------------------------ + // com.sun.star.xml.sax.XFastDocumentHandler -// ------------------------------------------------ + void SAL_CALL OOXMLDocPropHandler::startDocument() throw (xml::sax::SAXException, uno::RuntimeException) { } -// ------------------------------------------------ + void SAL_CALL OOXMLDocPropHandler::endDocument() throw (xml::sax::SAXException, uno::RuntimeException) { InitNew(); } -// ------------------------------------------------ + void SAL_CALL OOXMLDocPropHandler::setDocumentLocator( const uno::Reference< xml::sax::XLocator >& ) throw (xml::sax::SAXException, uno::RuntimeException) { @@ -287,7 +287,7 @@ void SAL_CALL OOXMLDocPropHandler::setDocumentLocator( const uno::Reference< xml // com.sun.star.xml.sax.XFastContextHandler -// ------------------------------------------------ + void SAL_CALL OOXMLDocPropHandler::startFastElement( ::sal_Int32 nElement, const uno::Reference< xml::sax::XFastAttributeList >& xAttribs ) throw (xml::sax::SAXException, uno::RuntimeException) { @@ -329,7 +329,7 @@ void SAL_CALL OOXMLDocPropHandler::startFastElement( ::sal_Int32 nElement, const m_nInBlock++; } -// ------------------------------------------------ + void SAL_CALL OOXMLDocPropHandler::startUnknownElement( const OUString& aNamespace, const OUString& aName, const uno::Reference< xml::sax::XFastAttributeList >& ) throw (xml::sax::SAXException, uno::RuntimeException) { @@ -341,7 +341,7 @@ void SAL_CALL OOXMLDocPropHandler::startUnknownElement( const OUString& aNamespa m_nInBlock++; } -// ------------------------------------------------ + void SAL_CALL OOXMLDocPropHandler::endFastElement( ::sal_Int32 ) throw (xml::sax::SAXException, uno::RuntimeException) { @@ -361,7 +361,7 @@ void SAL_CALL OOXMLDocPropHandler::endFastElement( ::sal_Int32 ) } } -// ------------------------------------------------ + void SAL_CALL OOXMLDocPropHandler::endUnknownElement( const OUString&, const OUString& ) throw (xml::sax::SAXException, uno::RuntimeException) { @@ -369,7 +369,7 @@ void SAL_CALL OOXMLDocPropHandler::endUnknownElement( const OUString&, const OUS m_nInBlock--; } -// ------------------------------------------------ + uno::Reference< xml::sax::XFastContextHandler > SAL_CALL OOXMLDocPropHandler::createFastChildContext( ::sal_Int32, const uno::Reference< xml::sax::XFastAttributeList >& ) throw (xml::sax::SAXException, uno::RuntimeException) { @@ -377,14 +377,14 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL OOXMLDocPropHandler::cr return uno::Reference< xml::sax::XFastContextHandler >( static_cast< xml::sax::XFastContextHandler* >( this ) ); } -// ------------------------------------------------ + uno::Reference< xml::sax::XFastContextHandler > SAL_CALL OOXMLDocPropHandler::createUnknownChildContext( const OUString&, const OUString&, const uno::Reference< xml::sax::XFastAttributeList >& ) throw (xml::sax::SAXException, uno::RuntimeException) { return uno::Reference< xml::sax::XFastContextHandler >( static_cast< xml::sax::XFastContextHandler* >( this ) ); } -// ------------------------------------------------ + void SAL_CALL OOXMLDocPropHandler::characters( const OUString& aChars ) throw (xml::sax::SAXException, uno::RuntimeException) { @@ -668,13 +668,13 @@ void SAL_CALL OOXMLDocPropHandler::characters( const OUString& aChars ) } } -// ------------------------------------------------ + void SAL_CALL OOXMLDocPropHandler::ignorableWhitespace( const OUString& ) throw (xml::sax::SAXException, uno::RuntimeException) { } -// ------------------------------------------------ + void SAL_CALL OOXMLDocPropHandler::processingInstruction( const OUString&, const OUString& ) throw (xml::sax::SAXException, uno::RuntimeException) { 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 ) { diff --git a/oox/source/dump/dumperbase.cxx b/oox/source/dump/dumperbase.cxx index fc46d830d688..271b5e0bf557 100644 --- a/oox/source/dump/dumperbase.cxx +++ b/oox/source/dump/dumperbase.cxx @@ -1536,7 +1536,7 @@ Output::Output( const Reference< XComponentContext >& rxContext, const OUString& mxStrm->writeString( OUString( OOX_DUMP_BOM ) ); } -// ---------------------------------------------------------------------------- + void Output::newLine() { @@ -1692,7 +1692,7 @@ void Output::endMultiItems() newLine(); } -// ---------------------------------------------------------------------------- + void Output::writeChar( sal_Unicode cChar, sal_Int32 nCount ) { @@ -1741,7 +1741,7 @@ void Output::writeDateTime( const util::DateTime& rDateTime ) writeDec( rDateTime.Seconds, 2, '0' ); } -// ---------------------------------------------------------------------------- + bool Output::implIsValid() const { diff --git a/oox/source/dump/oledumper.cxx b/oox/source/dump/oledumper.cxx index d488b7d12d70..94251ef2c90c 100644 --- a/oox/source/dump/oledumper.cxx +++ b/oox/source/dump/oledumper.cxx @@ -1601,7 +1601,7 @@ const sal_uInt16 VBA_FORMSITE_CLASSTABLEMASK = 0x7FFF; } // namespace -// ---------------------------------------------------------------------------- + VbaFormSiteObject::VbaFormSiteObject( const InputObjectBase& rParent, VbaFormSharedData& rFormData ) : mrFormData( rFormData ) @@ -1674,7 +1674,7 @@ const sal_uInt8 AX_FORM_SITECOUNTTYPE_MASK = 0x7F; } // namespace -// ---------------------------------------------------------------------------- + VbaFStreamObject::VbaFStreamObject( const ObjectBase& rParent, const BinaryInputStreamRef& rxStrm, const OUString& rSysFileName, VbaFormSharedData& rFormData ) : mrFormData( rFormData ) diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx index 7fea8e36bb30..46fe76c8eb94 100644 --- a/oox/source/export/chartexport.cxx +++ b/oox/source/export/chartexport.cxx @@ -842,7 +842,7 @@ void ChartExport::exportChart( Reference< ::com::sun::star::chart::XChartDocumen } // if( xDocPropSet.is()) // chart element - // ------------- + FSHelperPtr pFS = GetFS(); pFS->startElement( FSNS( XML_c, XML_chart ), FSEND ); @@ -1028,7 +1028,7 @@ void ChartExport::exportPlotArea( ) return; // plot-area element - // ----------------- + FSHelperPtr pFS = GetFS(); pFS->startElement( FSNS( XML_c, XML_plotArea ), FSEND ); diff --git a/oox/source/helper/attributelist.cxx b/oox/source/helper/attributelist.cxx index 8f0707a80703..f455a6ecb6fd 100644 --- a/oox/source/helper/attributelist.cxx +++ b/oox/source/helper/attributelist.cxx @@ -67,7 +67,7 @@ sal_Unicode lclGetXChar( const sal_Unicode*& rpcStr, const sal_Unicode* pcEnd ) } // namespace -// ---------------------------------------------------------------------------- + sal_Int32 AttributeConversion::decodeToken( const OUString& rValue ) { diff --git a/oox/source/helper/containerhelper.cxx b/oox/source/helper/containerhelper.cxx index bc2f76ffae1c..d233db353c9e 100644 --- a/oox/source/helper/containerhelper.cxx +++ b/oox/source/helper/containerhelper.cxx @@ -48,7 +48,7 @@ struct ValueRangeComp } // namespace -// ---------------------------------------------------------------------------- + void ValueRangeSet::insert( const ValueRange& rRange ) { diff --git a/oox/source/helper/progressbar.cxx b/oox/source/helper/progressbar.cxx index 6b6dd014e540..926ef1b36dbe 100644 --- a/oox/source/helper/progressbar.cxx +++ b/oox/source/helper/progressbar.cxx @@ -41,7 +41,7 @@ IProgressBar::~IProgressBar() { } -// ---------------------------------------------------------------------------- + ISegmentProgressBar::~ISegmentProgressBar() { @@ -100,7 +100,7 @@ private: double mfFreeStart; }; -// ---------------------------------------------------------------------------- + SubSegment::SubSegment( IProgressBar& rParentProgress, double fStartPos, double fLength ) : mrParentProgress( rParentProgress ), diff --git a/oox/source/helper/propertymap.cxx b/oox/source/helper/propertymap.cxx index e168cbba6fbc..20e232dec62d 100644 --- a/oox/source/helper/propertymap.cxx +++ b/oox/source/helper/propertymap.cxx @@ -127,7 +127,7 @@ private: PropertyNameMap maPropMap; }; -// ---------------------------------------------------------------------------- + GenericPropertySet::GenericPropertySet( const PropertyMap& rPropMap ) { diff --git a/oox/source/helper/storagebase.cxx b/oox/source/helper/storagebase.cxx index b0755bc2ec04..9e270094d2b1 100644 --- a/oox/source/helper/storagebase.cxx +++ b/oox/source/helper/storagebase.cxx @@ -61,7 +61,7 @@ void lclSplitFirstElement( OUString& orElement, OUString& orRemainder, OUString } // namespace -// ---------------------------------------------------------------------------- + StorageBase::StorageBase( const Reference< XInputStream >& rxInStream, bool bBaseStreamAccess ) : mxInStream( rxInStream ), diff --git a/oox/source/helper/textinputstream.cxx b/oox/source/helper/textinputstream.cxx index 92c0a2d9c484..0a10ac2fa0ec 100644 --- a/oox/source/helper/textinputstream.cxx +++ b/oox/source/helper/textinputstream.cxx @@ -64,7 +64,7 @@ private: BinaryInputStream* mpInStrm; }; -// ---------------------------------------------------------------------------- + UnoBinaryInputStream::UnoBinaryInputStream( BinaryInputStream& rInStrm ) : mpInStrm( &rInStrm ) diff --git a/oox/source/ole/axbinaryreader.cxx b/oox/source/ole/axbinaryreader.cxx index b78f428794fd..38f8575e5240 100644 --- a/oox/source/ole/axbinaryreader.cxx +++ b/oox/source/ole/axbinaryreader.cxx @@ -127,7 +127,7 @@ bool lclReadString( AxAlignedInputStream& rInStrm, OUString& rValue, sal_uInt32 } // namespace -// ---------------------------------------------------------------------------- + AxBinaryPropertyReader::ComplexProperty::~ComplexProperty() { @@ -175,7 +175,7 @@ bool AxBinaryPropertyReader::PictureProperty::readProperty( AxAlignedInputStream return OleHelper::importStdPic( mrPicData, rInStrm, true ); } -// ---------------------------------------------------------------------------- + AxBinaryPropertyReader::AxBinaryPropertyReader( BinaryInputStream& rInStrm, bool b64BitPropFlags ) : maInStrm( rInStrm ), diff --git a/oox/source/ole/axbinarywriter.cxx b/oox/source/ole/axbinarywriter.cxx index a6408b279bb9..09826b50ad67 100644 --- a/oox/source/ole/axbinarywriter.cxx +++ b/oox/source/ole/axbinarywriter.cxx @@ -100,7 +100,7 @@ void lclWriteString( AxAlignedOutputStream& rOutStrm, OUString& rValue, sal_uInt } // namespace -// ---------------------------------------------------------------------------- + AxBinaryPropertyWriter::ComplexProperty::~ComplexProperty() { @@ -118,7 +118,7 @@ bool AxBinaryPropertyWriter::StringProperty::writeProperty( AxAlignedOutputStrea return true; } -// ---------------------------------------------------------------------------- + AxBinaryPropertyWriter::AxBinaryPropertyWriter( BinaryOutputStream& rOutStrm, bool b64BitPropFlags ) : maOutStrm( rOutStrm ), diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx index 8b7d7b0868f4..f25e8afa3250 100644 --- a/oox/source/ole/axcontrol.cxx +++ b/oox/source/ole/axcontrol.cxx @@ -90,7 +90,7 @@ const sal_uInt32 COMCTL_SCROLLBAR_HOR = 0x00000010; const sal_uInt32 COMCTL_ID_PROGRESSBAR_50 = 0xE6E17E84; const sal_uInt32 COMCTL_ID_PROGRESSBAR_60 = 0x97AB8A01; -// ---------------------------------------------------------------------------- + const sal_uInt32 AX_CMDBUTTON_DEFFLAGS = 0x0000001B; const sal_uInt32 AX_LABEL_DEFFLAGS = 0x0080001B; @@ -150,7 +150,7 @@ const sal_Int32 AX_CONTAINER_CYCLEALL = 0; const sal_Int32 AX_CONTAINER_SCR_NONE = 0x00; -// ---------------------------------------------------------------------------- + const sal_Int16 API_BORDER_NONE = 0; const sal_Int16 API_BORDER_SUNKEN = 1; @@ -160,7 +160,7 @@ const sal_Int16 API_STATE_UNCHECKED = 0; const sal_Int16 API_STATE_CHECKED = 1; const sal_Int16 API_STATE_DONTKNOW = 2; -// ---------------------------------------------------------------------------- + /** Tries to extract a range address from a defined name. */ bool lclExtractRangeFromName( CellRangeAddress& orRangeAddr, const Reference< XModel >& rxDocModel, const OUString& rAddressString ) diff --git a/oox/source/ole/olehelper.cxx b/oox/source/ole/olehelper.cxx index cf1f3beb8954..584fbec11ea8 100644 --- a/oox/source/ole/olehelper.cxx +++ b/oox/source/ole/olehelper.cxx @@ -96,7 +96,7 @@ inline sal_Int32 lclDecodeBgrColor( sal_uInt32 nOleColor ) return static_cast< sal_Int32 >( lclSwapRedBlue( nOleColor ) & 0xFFFFFF ); } -// ---------------------------------------------------------------------------- + const sal_uInt32 OLE_STDPIC_ID = 0x0000746C; @@ -197,7 +197,7 @@ GUIDCNamePairMap& classIdToGUIDCNamePairMap::get() return theInst.mnIdToGUIDCNamePairMap; } -// ---------------------------------------------------------------------------- + template< typename Type > void lclAppendHex( OUStringBuffer& orBuffer, Type nValue ) diff --git a/oox/source/ole/olestorage.cxx b/oox/source/ole/olestorage.cxx index d6d47f04c1f0..c7ce3aa7cf95 100644 --- a/oox/source/ole/olestorage.cxx +++ b/oox/source/ole/olestorage.cxx @@ -85,7 +85,7 @@ private: OUString maElementName; }; -// ---------------------------------------------------------------------------- + OleOutputStream::OleOutputStream( const Reference< XComponentContext >& rxContext, const Reference< XNameContainer >& rxStorage, const OUString& rElementName ) : @@ -214,7 +214,7 @@ OleStorage::~OleStorage() { } -// ---------------------------------------------------------------------------- + void OleStorage::initStorage( const Reference< XInputStream >& rxInStream ) { diff --git a/oox/source/ole/vbacontrol.cxx b/oox/source/ole/vbacontrol.cxx index 4ad463d16d01..19a87087caba 100644 --- a/oox/source/ole/vbacontrol.cxx +++ b/oox/source/ole/vbacontrol.cxx @@ -77,7 +77,7 @@ const sal_uInt32 VBA_SITE_DEFFLAGS = 0x00000033; const sal_uInt8 VBA_SITEINFO_COUNT = 0x80; const sal_uInt8 VBA_SITEINFO_MASK = 0x7F; -// ---------------------------------------------------------------------------- + /** Collects names of all controls in a user form or container control. Allows to generate unused names for dummy controls separating option groups. @@ -124,7 +124,7 @@ OUString VbaControlNamesSet::generateDummyName() return aCtrlName; } -// ---------------------------------------------------------------------------- + /** Functor that inserts the name of a control into a VbaControlNamesSet. */ struct VbaControlNameInserter @@ -135,7 +135,7 @@ public: inline void operator()( const VbaFormControl& rControl ) { mrCtrlNames.insertName( rControl ); } }; -// ---------------------------------------------------------------------------- + /** A dummy invisible form control (fixed label without text) that is used to separate two groups of option buttons. @@ -776,7 +776,7 @@ bool lclEatKeyword( OUString& rCodeLine, const OUString& rKeyword ) } // namespace -// ---------------------------------------------------------------------------- + VbaUserForm::VbaUserForm( const Reference< XComponentContext >& rxContext, const Reference< XModel >& rxDocModel, const GraphicHelper& rGraphicHelper, bool bDefaultColorBgr ) : diff --git a/oox/source/ole/vbaproject.cxx b/oox/source/ole/vbaproject.cxx index b58710d0efcc..2d881734d4de 100644 --- a/oox/source/ole/vbaproject.cxx +++ b/oox/source/ole/vbaproject.cxx @@ -81,7 +81,7 @@ bool lclReadConfigItem( const Reference< XInterface >& rxConfigAccess, const OUS } // namespace -// ---------------------------------------------------------------------------- + VbaFilterConfig::VbaFilterConfig( const Reference< XComponentContext >& rxContext, const OUString& rConfigCompName ) { diff --git a/oox/source/ppt/backgroundproperties.cxx b/oox/source/ppt/backgroundproperties.cxx index fac91bc7e034..dd1ba5ac3429 100644 --- a/oox/source/ppt/backgroundproperties.cxx +++ b/oox/source/ppt/backgroundproperties.cxx @@ -27,7 +27,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; namespace oox { namespace ppt { -// --------------------------------------------------------------------- + BackgroundPropertiesContext::BackgroundPropertiesContext( FragmentHandler2& rParent, ::oox::drawingml::FillProperties& rFillProperties ) : FragmentHandler2( rParent ) diff --git a/oox/source/ppt/customshowlistcontext.cxx b/oox/source/ppt/customshowlistcontext.cxx index eb7d255480d7..70ecf0cfa953 100644 --- a/oox/source/ppt/customshowlistcontext.cxx +++ b/oox/source/ppt/customshowlistcontext.cxx @@ -65,7 +65,7 @@ CustomShowContext::~CustomShowContext( ) return this; } -//--------------------------------------------------------------------------- + CustomShowListContext::CustomShowListContext( FragmentHandler2& rParent, std::vector< CustomShow >& rCustomShowList ) diff --git a/oox/source/ppt/timenode.cxx b/oox/source/ppt/timenode.cxx index c96d794a1fde..f0b5db7dd88c 100644 --- a/oox/source/ppt/timenode.cxx +++ b/oox/source/ppt/timenode.cxx @@ -110,7 +110,7 @@ namespace oox { namespace ppt { } // BEGIN CUT&PASTE from sd/source/filter/ppt/pptinanimations.hxx -// -------------------------------------------------------------------- + static void fixMainSequenceTiming( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode ) { try @@ -176,7 +176,7 @@ namespace oox { namespace ppt { } } -// -------------------------------------------------------------------- + static void fixInteractiveSequenceTiming( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode ) { diff --git a/oox/source/vml/vmlformatting.cxx b/oox/source/vml/vmlformatting.cxx index c42045191b1e..b1e77075a4bf 100644 --- a/oox/source/vml/vmlformatting.cxx +++ b/oox/source/vml/vmlformatting.cxx @@ -64,7 +64,7 @@ bool lclExtractDouble( double& orfValue, sal_Int32& ornEndPos, const OUString& r } // namespace -// ---------------------------------------------------------------------------- + bool ConversionHelper::separatePair( OUString& orValue1, OUString& orValue2, const OUString& rValue, sal_Unicode cSep ) diff --git a/oox/source/vml/vmlinputstream.cxx b/oox/source/vml/vmlinputstream.cxx index b8d86122ca67..573e976b1c40 100644 --- a/oox/source/vml/vmlinputstream.cxx +++ b/oox/source/vml/vmlinputstream.cxx @@ -77,7 +77,7 @@ inline void lclAppendToBuffer( OStringBuffer& rBuffer, const sal_Char* pcBeg, co rBuffer.append( pcBeg, static_cast< sal_Int32 >( pcEnd - pcBeg ) ); } -// ---------------------------------------------------------------------------- + void lclProcessAttribs( OStringBuffer& rBuffer, const sal_Char* pcBeg, const sal_Char* pcEnd ) { diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx index 17b8818a405c..1d50f40272f4 100644 --- a/oox/source/vml/vmlshape.cxx +++ b/oox/source/vml/vmlshape.cxx @@ -83,7 +83,7 @@ namespace { const sal_Int32 VML_SHAPETYPE_PICTUREFRAME = 75; const sal_Int32 VML_SHAPETYPE_HOSTCONTROL = 201; -// ---------------------------------------------------------------------------- + awt::Point lclGetAbsPoint( const awt::Point& rRelPoint, const awt::Rectangle& rShapeRect, const awt::Rectangle& rCoordSys ) { @@ -130,7 +130,7 @@ void ShapeTypeModel::assignUsed( const ShapeTypeModel& rSource ) moGraphicTitle.assignIfUsed( rSource.moGraphicTitle ); } -// ---------------------------------------------------------------------------- + ShapeType::ShapeType( Drawing& rDrawing ) : mrDrawing( rDrawing ) @@ -237,7 +237,7 @@ ClientData::ClientData() : { } -// ---------------------------------------------------------------------------- + ShapeModel::ShapeModel() { @@ -259,7 +259,7 @@ ClientData& ShapeModel::createClientData() return *mxClientData; } -// ---------------------------------------------------------------------------- + ShapeBase::ShapeBase( Drawing& rDrawing ) : ShapeType( rDrawing ) |