diff options
| author | Thorsten Behrens <tbehrens@suse.com> | 2013-09-11 15:14:30 +0200 |
|---|---|---|
| committer | Thorsten Behrens <tbehrens@suse.com> | 2013-09-11 18:20:37 +0200 |
| commit | 3af7e5c320c55e67367ce824944de58672cc772f (patch) | |
| tree | e4b1947cdd4c13e5d6a9189cc2a4e9c35f3b353f /include/oox | |
| parent | f34fe6ed9f5a63745821770fd925776c54c8b905 (diff) | |
Exorcise some cargo-cultness in oox.
- the inline keyword on class methods that have their body defined
right there in the class definition is redundant
- the explicit keyword on nullary ctors is pointless, there is no
implicit conversion happening anyway with those
Change-Id: Ie9f44c7948f932ce3a8af871bf73743112d94d03
Diffstat (limited to 'include/oox')
43 files changed, 455 insertions, 457 deletions
diff --git a/include/oox/core/contexthandler2.hxx b/include/oox/core/contexthandler2.hxx index 03e4f1bf1785..82e27b89b6dd 100644 --- a/include/oox/core/contexthandler2.hxx +++ b/include/oox/core/contexthandler2.hxx @@ -144,12 +144,12 @@ public: /** Returns true, if nElement contains the identifier of the currently processed element. */ - inline bool isCurrentElement( sal_Int32 nElement ) const + bool isCurrentElement( sal_Int32 nElement ) const { return getCurrentElement() == nElement; } /** Returns true, if either nElement1 or nElement2 contain the identifier of the currently processed element. */ - inline bool isCurrentElement( sal_Int32 nElement1, sal_Int32 nElement2 ) const + bool isCurrentElement( sal_Int32 nElement1, sal_Int32 nElement2 ) const { return isCurrentElement( nElement1 ) || isCurrentElement( nElement2 ); } /** Returns the identifier of the specified parent element. */ @@ -157,7 +157,7 @@ public: /** Returns true, if nElement contains the identifier of the specified parent element. */ - inline sal_Int32 isParentElement( sal_Int32 nElement, sal_Int32 nCountBack = 1 ) const + sal_Int32 isParentElement( sal_Int32 nElement, sal_Int32 nCountBack = 1 ) const { return getParentElement( nCountBack ) == nElement; } /** Returns true, if the element currently processed is the root element of diff --git a/include/oox/core/fragmenthandler.hxx b/include/oox/core/fragmenthandler.hxx index 236e212e6e32..5c3ad7600cf2 100644 --- a/include/oox/core/fragmenthandler.hxx +++ b/include/oox/core/fragmenthandler.hxx @@ -83,7 +83,7 @@ public: virtual ~FragmentHandler(); /** Returns the com.sun.star.xml.sax.XFastContextHandler interface of this context. */ - inline ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > + ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > getFastContextHandler() { return static_cast< ContextHandler* >( this ); } // com.sun.star.xml.sax.XFastDocumentHandler interface -------------------- diff --git a/include/oox/core/recordparser.hxx b/include/oox/core/recordparser.hxx index bd8942771050..f1a6817be68f 100644 --- a/include/oox/core/recordparser.hxx +++ b/include/oox/core/recordparser.hxx @@ -47,7 +47,7 @@ struct RecordInputSource class RecordParser { public: - explicit RecordParser(); + RecordParser(); virtual ~RecordParser(); void setFragmentHandler( const ::rtl::Reference< FragmentHandler >& rxHandler ); @@ -57,7 +57,7 @@ public: ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException ); - inline const RecordInputSource& getInputSource() const { return maSource; } + const RecordInputSource& getInputSource() const { return maSource; } private: /** Returns a RecordInfo struct that contains the passed record identifier diff --git a/include/oox/core/relations.hxx b/include/oox/core/relations.hxx index b78d0d3056eb..c3f10aea55df 100644 --- a/include/oox/core/relations.hxx +++ b/include/oox/core/relations.hxx @@ -54,7 +54,7 @@ struct Relation OUString maTarget; bool mbExternal; - inline explicit Relation() : mbExternal( false ) {} + Relation() : mbExternal( false ) {} }; // ============================================================================ @@ -68,7 +68,7 @@ public: explicit Relations( const OUString& rFragmentPath ); /** Returns the path of the fragment this relations collection is related to. */ - inline const OUString& getFragmentPath() const { return maFragmentPath; } + const OUString& getFragmentPath() const { return maFragmentPath; } /** Returns the relation with the passed relation identifier. */ const Relation* getRelationFromRelId( const OUString& rId ) const; diff --git a/include/oox/core/xmlfilterbase.hxx b/include/oox/core/xmlfilterbase.hxx index e9b9fab558cd..7414e71c2228 100644 --- a/include/oox/core/xmlfilterbase.hxx +++ b/include/oox/core/xmlfilterbase.hxx @@ -213,9 +213,9 @@ public: @return newly created ID. */ - inline sal_Int32 GetUniqueId() { return mnMaxDocId++; } - inline OString GetUniqueIdOString() { return OString::number( mnMaxDocId++ ); } - inline OUString GetUniqueIdOUString() { return OUString::number( mnMaxDocId++ ); } + sal_Int32 GetUniqueId() { return mnMaxDocId++; } + OString GetUniqueIdOString() { return OString::number( mnMaxDocId++ ); } + OUString GetUniqueIdOUString() { return OUString::number( mnMaxDocId++ ); } /** Write the document properties into into the current OPC package. diff --git a/include/oox/drawingml/chart/chartcontextbase.hxx b/include/oox/drawingml/chart/chartcontextbase.hxx index 218e7bf4406e..a244ad7dba6b 100644 --- a/include/oox/drawingml/chart/chartcontextbase.hxx +++ b/include/oox/drawingml/chart/chartcontextbase.hxx @@ -34,7 +34,7 @@ template< typename ModelType > class ContextBase : public ::oox::core::ContextHandler2 { public: - inline explicit ContextBase( ::oox::core::ContextHandler2Helper& rParent, ModelType& rModel ) : + explicit ContextBase( ::oox::core::ContextHandler2Helper& rParent, ModelType& rModel ) : ::oox::core::ContextHandler2( rParent ), mrModel( rModel ) {} virtual ~ContextBase() {} diff --git a/include/oox/drawingml/chart/chartdrawingfragment.hxx b/include/oox/drawingml/chart/chartdrawingfragment.hxx index 43d27f586514..48ca9f234eec 100644 --- a/include/oox/drawingml/chart/chartdrawingfragment.hxx +++ b/include/oox/drawingml/chart/chartdrawingfragment.hxx @@ -35,8 +35,8 @@ struct AnchorPosModel double mfX; /// X coordinate relative to chart object (0.0 to 1.0). double mfY; /// Y coordinate relative to chart object (0.0 to 1.0). - inline explicit AnchorPosModel() : mfX( -1.0 ), mfY( -1.0 ) {} - inline bool isValid() const { return (0.0 <= mfX) && (mfX <= 1.0) && (0.0 <= mfY) && (mfY <= 1.0); } + AnchorPosModel() : mfX( -1.0 ), mfY( -1.0 ) {} + bool isValid() const { return (0.0 <= mfX) && (mfX <= 1.0) && (0.0 <= mfY) && (mfY <= 1.0); } }; // ---------------------------------------------------------------------------- @@ -44,8 +44,8 @@ struct AnchorPosModel /** Absolute shape size in a chart object (in EMUs). */ struct AnchorSizeModel : public EmuSize { - inline explicit AnchorSizeModel() : EmuSize( -1, -1 ) {} - inline bool isValid() const { return (Width >= 0) && (Height >= 0); } + AnchorSizeModel() : EmuSize( -1, -1 ) {} + bool isValid() const { return (Width >= 0) && (Height >= 0); } }; // ============================================================================ diff --git a/include/oox/drawingml/chart/converterbase.hxx b/include/oox/drawingml/chart/converterbase.hxx index dea77dec1325..5641389ad98c 100644 --- a/include/oox/drawingml/chart/converterbase.hxx +++ b/include/oox/drawingml/chart/converterbase.hxx @@ -106,10 +106,10 @@ template< typename ModelType > class ConverterBase : public ConverterRoot { public: - inline const ModelType& getModel() const { return mrModel; } + const ModelType& getModel() const { return mrModel; } protected: - inline explicit ConverterBase( const ConverterRoot& rParent, ModelType& rModel ) : + explicit ConverterBase( const ConverterRoot& rParent, ModelType& rModel ) : ConverterRoot( rParent ), mrModel( rModel ) {} virtual ~ConverterBase() {} diff --git a/include/oox/drawingml/chart/modelbase.hxx b/include/oox/drawingml/chart/modelbase.hxx index 985221ec394b..89e8837e8f9e 100644 --- a/include/oox/drawingml/chart/modelbase.hxx +++ b/include/oox/drawingml/chart/modelbase.hxx @@ -36,19 +36,19 @@ template< typename ModelType > class ModelRef : public ::boost::shared_ptr< ModelType > { public: - inline explicit ModelRef() {} - inline ModelRef( const ::boost::shared_ptr< ModelType >& rxModel ) : ::boost::shared_ptr< ModelType >( rxModel ) {} - inline ~ModelRef() {} + ModelRef() {} + ModelRef( const ::boost::shared_ptr< ModelType >& rxModel ) : ::boost::shared_ptr< ModelType >( rxModel ) {} + ~ModelRef() {} - inline bool is() const { return this->get() != 0; } + bool is() const { return this->get() != 0; } - inline ModelType& create() { this->reset( new ModelType ); return **this; } + ModelType& create() { this->reset( new ModelType ); return **this; } template< typename Param1Type > - inline ModelType& create( const Param1Type& rParam1 ) { this->reset( new ModelType( rParam1 ) ); return **this; } + ModelType& create( const Param1Type& rParam1 ) { this->reset( new ModelType( rParam1 ) ); return **this; } - inline ModelType& getOrCreate() { if( !*this ) this->reset( new ModelType ); return **this; } + ModelType& getOrCreate() { if( !*this ) this->reset( new ModelType ); return **this; } template< typename Param1Type > - inline ModelType& getOrCreate( const Param1Type& rParam1 ) { if( !*this ) this->reset( new ModelType( rParam1 ) ); return **this; } + ModelType& getOrCreate( const Param1Type& rParam1 ) { if( !*this ) this->reset( new ModelType( rParam1 ) ); return **this; } }; // ============================================================================ @@ -60,15 +60,15 @@ public: typedef typename RefVector< ModelType >::value_type value_type; typedef typename RefVector< ModelType >::size_type size_type; - inline explicit ModelVector() {} - inline ~ModelVector() {} + ModelVector() {} + ~ModelVector() {} - inline ModelType& create() { return append( new ModelType ); } + ModelType& create() { return append( new ModelType ); } template< typename Param1Type > - inline ModelType& create( const Param1Type& rParam1 ) { return append( new ModelType( rParam1 ) ); } + ModelType& create( const Param1Type& rParam1 ) { return append( new ModelType( rParam1 ) ); } private: - inline ModelType& append( ModelType* pModel ) { this->push_back( value_type( pModel ) ); return *pModel; } + ModelType& append( ModelType* pModel ) { this->push_back( value_type( pModel ) ); return *pModel; } }; // ============================================================================ @@ -81,15 +81,15 @@ public: typedef typename RefMap< KeyType, ModelType >::mapped_type mapped_type; typedef typename RefMap< KeyType, ModelType >::value_type value_type; - inline explicit ModelMap() {} - inline ~ModelMap() {} + ModelMap() {} + ~ModelMap() {} - inline ModelType& create( KeyType eKey ) { return insert( eKey, new ModelType ); } + ModelType& create( KeyType eKey ) { return insert( eKey, new ModelType ); } template< typename Param1Type > - inline ModelType& create( KeyType eKey, const Param1Type& rParam1 ) { return insert( eKey, new ModelType( rParam1 ) ); } + ModelType& create( KeyType eKey, const Param1Type& rParam1 ) { return insert( eKey, new ModelType( rParam1 ) ); } private: - inline ModelType& insert( KeyType eKey, ModelType* pModel ) { (*this)[ eKey ].reset( pModel ); return *pModel; } + ModelType& insert( KeyType eKey, ModelType* pModel ) { (*this)[ eKey ].reset( pModel ); return *pModel; } }; // ============================================================================ @@ -99,7 +99,7 @@ struct NumberFormat OUString maFormatCode; /// Number format code. bool mbSourceLinked; /// True = number format linked to source data. - explicit NumberFormat(); + NumberFormat(); void setAttributes( const AttributeList& rAttribs ); }; @@ -119,7 +119,7 @@ struct LayoutModel sal_Int32 mnTarget; /// Layout target for plot area. bool mbAutoLayout; /// True = automatic positioning. - explicit LayoutModel(); + LayoutModel(); ~LayoutModel(); }; diff --git a/include/oox/drawingml/chart/plotareaconverter.hxx b/include/oox/drawingml/chart/plotareaconverter.hxx index 6796ffbd6a1c..7dd58ab807a7 100644 --- a/include/oox/drawingml/chart/plotareaconverter.hxx +++ b/include/oox/drawingml/chart/plotareaconverter.hxx @@ -79,11 +79,11 @@ public: void convertPositionFromModel(); /** Returns the automatic chart title if the chart contains only one series. */ - inline const OUString& getAutomaticTitle() const { return maAutoTitle; } + const OUString& getAutomaticTitle() const { return maAutoTitle; } /** Returns true, if the chart is three-dimensional. */ - inline bool is3dChart() const { return mb3dChart; } + bool is3dChart() const { return mb3dChart; } /** Returns true, if chart type supports wall and floor format in 3D mode. */ - inline bool isWall3dChart() const { return mbWall3dChart; } + bool isWall3dChart() const { return mbWall3dChart; } private: OUString maAutoTitle; diff --git a/include/oox/drawingml/chart/typegroupconverter.hxx b/include/oox/drawingml/chart/typegroupconverter.hxx index dfce05065c18..16afc572279c 100644 --- a/include/oox/drawingml/chart/typegroupconverter.hxx +++ b/include/oox/drawingml/chart/typegroupconverter.hxx @@ -128,7 +128,7 @@ public: virtual ~TypeGroupConverter(); /** Returns the type info struct that describes this chart type group. */ - inline const TypeGroupInfo& getTypeInfo() const { return maTypeInfo; } + const TypeGroupInfo& getTypeInfo() const { return maTypeInfo; } /** Returns true, if the series in this chart type group are stacked on each other (no percentage). */ bool isStacked() const; diff --git a/include/oox/drawingml/color.hxx b/include/oox/drawingml/color.hxx index b58f0b8ae5b3..220e8411e1e9 100644 --- a/include/oox/drawingml/color.hxx +++ b/include/oox/drawingml/color.hxx @@ -75,7 +75,7 @@ public: void clearTransparence(); /** Overwrites this color with the passed color, if it is used. */ - inline void assignIfUsed( const Color& rColor ) { if( rColor.isUsed() ) *this = rColor; } + void assignIfUsed( const Color& rColor ) { if( rColor.isUsed() ) *this = rColor; } /** Returns true, if the color is initialized. */ bool isUsed() const { return meMode != COLOR_UNUSED; } diff --git a/include/oox/drawingml/drawingmltypes.hxx b/include/oox/drawingml/drawingmltypes.hxx index 9e011f302ae2..5ceac48ed2bb 100644 --- a/include/oox/drawingml/drawingmltypes.hxx +++ b/include/oox/drawingml/drawingmltypes.hxx @@ -162,8 +162,8 @@ struct EmuPoint sal_Int64 X; sal_Int64 Y; - inline explicit EmuPoint() : X( 0 ), Y( 0 ) {} - inline explicit EmuPoint( sal_Int64 nX, sal_Int64 nY ) : X( nX ), Y( nY ) {} + EmuPoint() : X( 0 ), Y( 0 ) {} + explicit EmuPoint( sal_Int64 nX, sal_Int64 nY ) : X( nX ), Y( nY ) {} }; // ============================================================================ @@ -174,8 +174,8 @@ struct EmuSize sal_Int64 Width; sal_Int64 Height; - inline explicit EmuSize() : Width( 0 ), Height( 0 ) {} - inline explicit EmuSize( sal_Int64 nWidth, sal_Int64 nHeight ) : Width( nWidth ), Height( nHeight ) {} + EmuSize() : Width( 0 ), Height( 0 ) {} + explicit EmuSize( sal_Int64 nWidth, sal_Int64 nHeight ) : Width( nWidth ), Height( nHeight ) {} }; // ============================================================================ @@ -183,12 +183,12 @@ struct EmuSize /** A structure for a rectangle with 64-bit interger components. */ struct EmuRectangle : public EmuPoint, public EmuSize { - inline explicit EmuRectangle() {} - inline explicit EmuRectangle( const EmuPoint& rPos, const EmuSize& rSize ) : EmuPoint( rPos ), EmuSize( rSize ) {} - inline explicit EmuRectangle( sal_Int64 nX, sal_Int64 nY, sal_Int64 nWidth, sal_Int64 nHeight ) : EmuPoint( nX, nY ), EmuSize( nWidth, nHeight ) {} + EmuRectangle() {} + explicit EmuRectangle( const EmuPoint& rPos, const EmuSize& rSize ) : EmuPoint( rPos ), EmuSize( rSize ) {} + explicit EmuRectangle( sal_Int64 nX, sal_Int64 nY, sal_Int64 nWidth, sal_Int64 nHeight ) : EmuPoint( nX, nY ), EmuSize( nWidth, nHeight ) {} - inline void setPos( const EmuPoint& rPos ) { static_cast< EmuPoint& >( *this ) = rPos; } - inline void setSize( const EmuSize& rSize ) { static_cast< EmuSize& >( *this ) = rSize; } + void setPos( const EmuPoint& rPos ) { static_cast< EmuPoint& >( *this ) = rPos; } + void setSize( const EmuSize& rSize ) { static_cast< EmuSize& >( *this ) = rSize; } }; // ============================================================================ diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx index 8573968af549..dbe17c149267 100644 --- a/include/oox/drawingml/shape.hxx +++ b/include/oox/drawingml/shape.hxx @@ -62,7 +62,7 @@ struct ChartShapeInfo OUString maFragmentPath; ///< Path to related XML stream, e.g. for charts. bool mbEmbedShapes; ///< True = load chart shapes into chart, false = load into parent drawpage. - inline explicit ChartShapeInfo( bool bEmbedShapes ) : mbEmbedShapes( bEmbedShapes ) {} + explicit ChartShapeInfo( bool bEmbedShapes ) : mbEmbedShapes( bEmbedShapes ) {} }; // ============================================================================ @@ -81,14 +81,14 @@ public: PropertyMap& getShapeProperties(){ return maShapeProperties; } - inline LineProperties& getLineProperties() { return *mpLinePropertiesPtr; } - inline const LineProperties& getLineProperties() const { return *mpLinePropertiesPtr; } + LineProperties& getLineProperties() { return *mpLinePropertiesPtr; } + const LineProperties& getLineProperties() const { return *mpLinePropertiesPtr; } - inline FillProperties& getFillProperties() { return *mpFillPropertiesPtr; } - inline const FillProperties& getFillProperties() const { return *mpFillPropertiesPtr; } + FillProperties& getFillProperties() { return *mpFillPropertiesPtr; } + const FillProperties& getFillProperties() const { return *mpFillPropertiesPtr; } - inline GraphicProperties& getGraphicProperties() { return *mpGraphicPropertiesPtr; } - inline const GraphicProperties& getGraphicProperties() const { return *mpGraphicPropertiesPtr; } + GraphicProperties& getGraphicProperties() { return *mpGraphicPropertiesPtr; } + const GraphicProperties& getGraphicProperties() const { return *mpGraphicPropertiesPtr; } CustomShapePropertiesPtr getCustomShapeProperties(){ return mpCustomShapePropertiesPtr; } @@ -97,7 +97,7 @@ public: table::TablePropertiesPtr getTableProperties(); - inline EffectProperties& getEffectProperties() { return *mpEffectPropertiesPtr; } + EffectProperties& getEffectProperties() { return *mpEffectPropertiesPtr; } void setChildPosition( com::sun::star::awt::Point nPosition ){ maChPosition = nPosition; } void setChildSize( com::sun::star::awt::Size aSize ){ maChSize = aSize; } @@ -139,8 +139,8 @@ public: void setMasterTextListStyle( const TextListStylePtr& pMasterTextListStyle ); TextListStylePtr getMasterTextListStyle() const { return mpMasterTextListStyle; } - inline ShapeStyleRefMap& getShapeStyleRefs() { return maShapeStyleRefs; } - inline const ShapeStyleRefMap& getShapeStyleRefs() const { return maShapeStyleRefs; } + ShapeStyleRefMap& getShapeStyleRefs() { return maShapeStyleRefs; } + const ShapeStyleRefMap& getShapeStyleRefs() const { return maShapeStyleRefs; } const ShapeStyleRef* getShapeStyleRef( sal_Int32 nRefType ) const; // addShape is creating and inserting the corresponding XShape. diff --git a/include/oox/drawingml/shapepropertymap.hxx b/include/oox/drawingml/shapepropertymap.hxx index 80187524b922..c0c8e723b63d 100644 --- a/include/oox/drawingml/shapepropertymap.hxx +++ b/include/oox/drawingml/shapepropertymap.hxx @@ -85,8 +85,8 @@ struct OOX_DLLPUBLIC ShapePropertyInfo bool bNamedFillGradient, bool bNamedFillBitmapUrl ); - inline bool has( ShapePropertyId ePropId ) const { return mpnPropertyIds[ ePropId ] >= 0; } - inline sal_Int32 operator[]( ShapePropertyId ePropId ) const { return mpnPropertyIds[ ePropId ]; } + bool has( ShapePropertyId ePropId ) const { return mpnPropertyIds[ ePropId ] >= 0; } + sal_Int32 operator[]( ShapePropertyId ePropId ) const { return mpnPropertyIds[ ePropId ]; } }; // ============================================================================ @@ -110,7 +110,7 @@ public: /** Sets the specified shape property to the passed value. */ template< typename Type > - inline bool setProperty( ShapePropertyId ePropId, const Type& rValue ) + bool setProperty( ShapePropertyId ePropId, const Type& rValue ) { return setAnyProperty( ePropId, ::com::sun::star::uno::Any( rValue ) ); } using PropertyMap::setAnyProperty; diff --git a/include/oox/drawingml/textbody.hxx b/include/oox/drawingml/textbody.hxx index 2d77cf277df6..0c79fd9e5a7c 100644 --- a/include/oox/drawingml/textbody.hxx +++ b/include/oox/drawingml/textbody.hxx @@ -43,14 +43,14 @@ public: TextBody( TextBodyPtr pBody ); ~TextBody(); - inline const TextParagraphVector& getParagraphs() const { return maParagraphs; } + const TextParagraphVector& getParagraphs() const { return maParagraphs; } TextParagraph& addParagraph(); - inline const TextListStyle& getTextListStyle() const { return maTextListStyle; } - inline TextListStyle& getTextListStyle() { return maTextListStyle; } + const TextListStyle& getTextListStyle() const { return maTextListStyle; } + TextListStyle& getTextListStyle() { return maTextListStyle; } - inline const TextBodyProperties& getTextProperties() const { return maTextProperties; } - inline TextBodyProperties& getTextProperties() { return maTextProperties; } + const TextBodyProperties& getTextProperties() const { return maTextProperties; } + TextBodyProperties& getTextProperties() { return maTextProperties; } /** insert the text body at the text cursor */ void insertAt( diff --git a/include/oox/drawingml/textfield.hxx b/include/oox/drawingml/textfield.hxx index df98b0302560..0dbfdea2fb31 100644 --- a/include/oox/drawingml/textfield.hxx +++ b/include/oox/drawingml/textfield.hxx @@ -35,11 +35,11 @@ class TextField public: TextField(); - inline TextParagraphProperties& getTextParagraphProperties() { return maTextParagraphProperties; } - inline const TextParagraphProperties& getTextParagraphProperties() const { return maTextParagraphProperties; } + TextParagraphProperties& getTextParagraphProperties() { return maTextParagraphProperties; } + const TextParagraphProperties& getTextParagraphProperties() const { return maTextParagraphProperties; } - inline void setType( const OUString& sType ) { msType = sType; } - inline void setUuid( const OUString & sUuid ) { msUuid = sUuid; } + void setType( const OUString& sType ) { msType = sType; } + void setUuid( const OUString & sUuid ) { msUuid = sUuid; } virtual sal_Int32 insertAt( const ::oox::core::XmlFilterBase& rFilterBase, diff --git a/include/oox/drawingml/textliststyle.hxx b/include/oox/drawingml/textliststyle.hxx index 851c506af17e..c8a1f1b625be 100644 --- a/include/oox/drawingml/textliststyle.hxx +++ b/include/oox/drawingml/textliststyle.hxx @@ -36,11 +36,11 @@ public: void apply( const TextListStyle& rTextListStyle ); - inline const TextParagraphPropertiesVector& getListStyle() const { return maListStyle; }; - inline TextParagraphPropertiesVector& getListStyle() { return maListStyle; }; + const TextParagraphPropertiesVector& getListStyle() const { return maListStyle; }; + TextParagraphPropertiesVector& getListStyle() { return maListStyle; }; - inline const TextParagraphPropertiesVector& getAggregationListStyle() const { return maAggregationListStyle; }; - inline TextParagraphPropertiesVector& getAggregationListStyle() { return maAggregationListStyle; }; + const TextParagraphPropertiesVector& getAggregationListStyle() const { return maAggregationListStyle; }; + TextParagraphPropertiesVector& getAggregationListStyle() { return maAggregationListStyle; }; #if defined(DBG_UTIL) && OSL_DEBUG_LEVEL > 1 void dump() const; diff --git a/include/oox/drawingml/textparagraph.hxx b/include/oox/drawingml/textparagraph.hxx index 37c53268b001..190cb60290e9 100644 --- a/include/oox/drawingml/textparagraph.hxx +++ b/include/oox/drawingml/textparagraph.hxx @@ -38,17 +38,15 @@ public: TextParagraph(); ~TextParagraph(); - inline TextRunVector& getRuns() { return maRuns; } - inline const TextRunVector& getRuns() const { return maRuns; } - inline void addRun( const TextRunPtr & pRun ) { maRuns.push_back( pRun ); } + TextRunVector& getRuns() { return maRuns; } + const TextRunVector& getRuns() const { return maRuns; } + void addRun( const TextRunPtr & pRun ) { maRuns.push_back( pRun ); } - inline TextParagraphProperties& getProperties() { return maProperties; } - inline const TextParagraphProperties& getProperties() const { return maProperties; } + TextParagraphProperties& getProperties() { return maProperties; } + const TextParagraphProperties& getProperties() const { return maProperties; } - inline TextCharacterProperties& getEndProperties() { return maEndProperties; } - inline const TextCharacterProperties& getEndProperties() const { return maEndProperties; } - - //inline void setProperties( TextParagraphPropertiesPtr pProps ) { mpProperties = pProps; } + TextCharacterProperties& getEndProperties() { return maEndProperties; } + const TextCharacterProperties& getEndProperties() const { return maEndProperties; } void insertAt( const ::oox::core::XmlFilterBase& rFilterBase, diff --git a/include/oox/drawingml/textrun.hxx b/include/oox/drawingml/textrun.hxx index 0e215bf68973..94a2c0201709 100644 --- a/include/oox/drawingml/textrun.hxx +++ b/include/oox/drawingml/textrun.hxx @@ -33,13 +33,13 @@ public: TextRun(); virtual ~TextRun(); - inline OUString& getText() { return msText; } - inline const OUString& getText() const { return msText; } + OUString& getText() { return msText; } + const OUString& getText() const { return msText; } - inline TextCharacterProperties& getTextCharacterProperties() { return maTextCharacterProperties; } - inline const TextCharacterProperties& getTextCharacterProperties() const { return maTextCharacterProperties; } + TextCharacterProperties& getTextCharacterProperties() { return maTextCharacterProperties; } + const TextCharacterProperties& getTextCharacterProperties() const { return maTextCharacterProperties; } - inline void setLineBreak() { mbIsLineBreak = true; } + void setLineBreak() { mbIsLineBreak = true; } virtual sal_Int32 insertAt( const ::oox::core::XmlFilterBase& rFilterBase, diff --git a/include/oox/drawingml/theme.hxx b/include/oox/drawingml/theme.hxx index f167c43a4fd4..a95cb8282ca7 100644 --- a/include/oox/drawingml/theme.hxx +++ b/include/oox/drawingml/theme.hxx @@ -45,46 +45,46 @@ typedef RefMap< sal_Int32, TextCharacterProperties > FontScheme; class OOX_DLLPUBLIC Theme { public: - explicit Theme(); + Theme(); ~Theme(); - inline void setStyleName( const OUString& rStyleName ) { maStyleName = rStyleName; } - inline const OUString& getStyleName() const { return maStyleName; } + void setStyleName( const OUString& rStyleName ) { maStyleName = rStyleName; } + const OUString& getStyleName() const { return maStyleName; } - inline ClrScheme& getClrScheme() { return maClrScheme; } - inline const ClrScheme& getClrScheme() const { return maClrScheme; } + ClrScheme& getClrScheme() { return maClrScheme; } + const ClrScheme& getClrScheme() const { return maClrScheme; } - inline FillStyleList& getFillStyleList() { return maFillStyleList; } - inline const FillStyleList& getFillStyleList() const { return maFillStyleList; } - inline FillStyleList& getBgFillStyleList() { return maBgFillStyleList; } - inline const FillStyleList& getBgFillStyleList() const { return maBgFillStyleList; } + FillStyleList& getFillStyleList() { return maFillStyleList; } + const FillStyleList& getFillStyleList() const { return maFillStyleList; } + FillStyleList& getBgFillStyleList() { return maBgFillStyleList; } + const FillStyleList& getBgFillStyleList() const { return maBgFillStyleList; } /** Returns the fill properties of the passed one-based themed style index. */ const FillProperties* getFillStyle( sal_Int32 nIndex ) const; - inline LineStyleList& getLineStyleList() { return maLineStyleList; } - inline const LineStyleList& getLineStyleList() const { return maLineStyleList; } + LineStyleList& getLineStyleList() { return maLineStyleList; } + const LineStyleList& getLineStyleList() const { return maLineStyleList; } /** Returns the line properties of the passed one-based themed style index. */ const LineProperties* getLineStyle( sal_Int32 nIndex ) const; - inline EffectStyleList& getEffectStyleList() { return maEffectStyleList; } - inline const EffectStyleList& getEffectStyleList() const { return maEffectStyleList; } + EffectStyleList& getEffectStyleList() { return maEffectStyleList; } + const EffectStyleList& getEffectStyleList() const { return maEffectStyleList; } const EffectProperties* getEffectStyle( sal_Int32 nIndex ) const; - inline FontScheme& getFontScheme() { return maFontScheme; } - inline const FontScheme& getFontScheme() const { return maFontScheme; } + FontScheme& getFontScheme() { return maFontScheme; } + const FontScheme& getFontScheme() const { return maFontScheme; } /** Returns theme font properties by scheme type (major/minor). */ const TextCharacterProperties* getFontStyle( sal_Int32 nSchemeType ) const; /** Returns theme font by placeholder name, e.g. the major latin theme font for the font name '+mj-lt'. */ const TextFont* resolveFont( const OUString& rName ) const; - inline Shape& getSpDef() { return maSpDef; } - inline const Shape& getSpDef() const { return maSpDef; } + Shape& getSpDef() { return maSpDef; } + const Shape& getSpDef() const { return maSpDef; } - inline Shape& getLnDef() { return maLnDef; } - inline const Shape& getLnDef() const { return maLnDef; } + Shape& getLnDef() { return maLnDef; } + const Shape& getLnDef() const { return maLnDef; } - inline Shape& getTxDef() { return maTxDef; } - inline const Shape& getTxDef() const { return maTxDef; } + Shape& getTxDef() { return maTxDef; } + const Shape& getTxDef() const { return maTxDef; } void setFragment( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::dom::XDocument>& xRef ) { mxFragment=xRef; } diff --git a/include/oox/dump/dffdumper.hxx b/include/oox/dump/dffdumper.hxx index d041dcc0be66..21edb23fea70 100644 --- a/include/oox/dump/dffdumper.hxx +++ b/include/oox/dump/dffdumper.hxx @@ -32,12 +32,12 @@ namespace dump { class DffStreamObject : public SequenceRecordObjectBase { public: - inline sal_uInt16 getVer() const { return mnInstVer & 0x000F; } - inline sal_uInt16 getInst() const { return (mnInstVer & 0xFFF0) >> 4; } - inline bool isContainer() const { return getVer() == 15; } + sal_uInt16 getVer() const { return mnInstVer & 0x000F; } + sal_uInt16 getInst() const { return (mnInstVer & 0xFFF0) >> 4; } + bool isContainer() const { return getVer() == 15; } protected: - inline explicit DffStreamObject() {} + DffStreamObject() {} using SequenceRecordObjectBase::construct; diff --git a/include/oox/dump/dumperbase.hxx b/include/oox/dump/dumperbase.hxx index 043bb73ecfa8..6219ec9892f4 100644 --- a/include/oox/dump/dumperbase.hxx +++ b/include/oox/dump/dumperbase.hxx @@ -142,16 +142,16 @@ public: class BinaryInputStreamRef : public ::oox::BinaryInputStreamRef { public: - inline BinaryInputStreamRef() {} + BinaryInputStreamRef() {} - inline /*implicit*/ BinaryInputStreamRef( BinaryInputStream* pInStrm ) : + /*implicit*/ BinaryInputStreamRef( BinaryInputStream* pInStrm ) : ::oox::BinaryInputStreamRef( pInStrm ) {} - inline /*implicit*/ BinaryInputStreamRef( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxInStrm ) : + /*implicit*/ BinaryInputStreamRef( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxInStrm ) : ::oox::BinaryInputStreamRef( new BinaryXInputStream( rxInStrm, true ) ) {} template< typename StreamType > - inline /*implicit*/ BinaryInputStreamRef( const ::boost::shared_ptr< StreamType >& rxInStrm ) : + /*implicit*/ BinaryInputStreamRef( const ::boost::shared_ptr< StreamType >& rxInStrm ) : ::oox::BinaryInputStreamRef( rxInStrm ) {} }; @@ -256,8 +256,8 @@ struct Address { sal_Int32 mnCol; sal_Int32 mnRow; - inline explicit Address() : mnCol( 0 ), mnRow( 0 ) {} - inline explicit Address( sal_Int32 nCol, sal_Int32 nRow ) : mnCol( nCol ), mnRow( nRow ) {} + Address() : mnCol( 0 ), mnRow( 0 ) {} + explicit Address( sal_Int32 nCol, sal_Int32 nRow ) : mnCol( nCol ), mnRow( nRow ) {} }; // ---------------------------------------------------------------------------- @@ -266,7 +266,7 @@ struct Range { Address maFirst; Address maLast; - inline explicit Range() {} + Range() {} }; // ---------------------------------------------------------------------------- @@ -279,7 +279,7 @@ struct TokenAddress : public Address { bool mbRelCol; bool mbRelRow; - inline explicit TokenAddress() : mbRelCol( false ), mbRelRow( false ) {} + TokenAddress() : mbRelCol( false ), mbRelRow( false ) {} }; // ---------------------------------------------------------------------------- @@ -288,7 +288,7 @@ struct TokenRange { TokenAddress maFirst; TokenAddress maLast; - inline explicit TokenRange() {} + TokenRange() {} }; // ============================================================================ @@ -432,13 +432,13 @@ void StringHelper::appendValue( OUStringBuffer& rStr, Type nData, FormatType eFm class String : public OUString { public: - inline String() {} - inline /*implicit*/ String( const OUString& rStr ) : OUString( rStr ) {} - inline /*implicit*/ String( const sal_Char* pcStr ) : OUString( OUString::createFromAscii( pcStr ? pcStr : "" ) ) {} - inline /*implicit*/ String( sal_Unicode cChar ) : OUString( cChar ) {} + String() {} + /*implicit*/ String( const OUString& rStr ) : OUString( rStr ) {} + /*implicit*/ String( const sal_Char* pcStr ) : OUString( OUString::createFromAscii( pcStr ? pcStr : "" ) ) {} + /*implicit*/ String( sal_Unicode cChar ) : OUString( cChar ) {} - inline bool has() const { return getLength() > 0; } - inline OUString operator()( const sal_Char* pcDefault ) const { if( has() ) return *this; return String( pcDefault ); } + bool has() const { return getLength() > 0; } + OUString operator()( const sal_Char* pcDefault ) const { if( has() ) return *this; return String( pcDefault ); } }; static const String EMPTY_STRING; @@ -503,11 +503,11 @@ class Base public: virtual ~Base(); - inline bool isValid() const { return implIsValid(); } - inline static bool isValid( const BaseRef& rxBase ) { return rxBase.get() && rxBase->isValid(); } + bool isValid() const { return implIsValid(); } + static bool isValid( const BaseRef& rxBase ) { return rxBase.get() && rxBase->isValid(); } protected: - inline explicit Base() {} + Base() {} virtual bool implIsValid() const = 0; }; @@ -522,7 +522,7 @@ public: void readConfigBlock( TextInputStream& rStrm ); protected: - inline explicit ConfigItemBase() {} + ConfigItemBase() {} virtual void implProcessConfigItemStr( TextInputStream& rStrm, @@ -584,25 +584,25 @@ public: /** Returns true, if the map contains an entry for the passed key. */ template< typename Type > - inline bool hasName( Type nKey ) const + bool hasName( Type nKey ) const { return maMap.count( static_cast< sal_Int64 >( nKey ) ) != 0; } /** Returns the name for the passed key. */ template< typename Type > - inline OUString getName( const Config& rCfg, Type nKey ) const + OUString getName( const Config& rCfg, Type nKey ) const { return implGetName( rCfg, static_cast< sal_Int64 >( nKey ) ); } /** Returns a display name for the passed double value. */ - inline OUString getName( const Config& rCfg, double fValue ) const + OUString getName( const Config& rCfg, double fValue ) const { return implGetNameDbl( rCfg, fValue ); } /** Returns a map iterator pointing to the first contained name. */ - inline const_iterator begin() const { return maMap.begin(); } + const_iterator begin() const { return maMap.begin(); } /** Returns a map iterator pointing one past the last contained name. */ - inline const_iterator end() const { return maMap.end(); } + const_iterator end() const { return maMap.end(); } protected: - inline explicit NameListBase( const SharedConfigData& rCfgData ) : mrCfgData( rCfgData ) {} + explicit NameListBase( const SharedConfigData& rCfgData ) : mrCfgData( rCfgData ) {} virtual bool implIsValid() const; @@ -649,9 +649,9 @@ public: explicit ConstList( const SharedConfigData& rCfgData ); /** Sets a default name for unknown keys. */ - inline void setDefaultName( const String& rDefName ) { maDefName = rDefName; } + void setDefaultName( const String& rDefName ) { maDefName = rDefName; } /** Enables or disables automatic quotation of returned names. */ - inline void setQuoteNames( bool bQuoteNames ) { mbQuoteNames = bQuoteNames; } + void setQuoteNames( bool bQuoteNames ) { mbQuoteNames = bQuoteNames; } protected: virtual void implProcessConfigItemStr( @@ -669,7 +669,7 @@ protected: virtual void implIncludeList( const NameListBase& rList ); private: - OUString maDefName; + OUString maDefName; bool mbQuoteNames; }; @@ -705,9 +705,9 @@ public: explicit FlagsList( const SharedConfigData& rCfgData ); /** Returns the flags to be ignored on output. */ - inline sal_Int64 getIgnoreFlags() const { return mnIgnore; } + sal_Int64 getIgnoreFlags() const { return mnIgnore; } /** Sets flags to be ignored on output. */ - inline void setIgnoreFlags( sal_Int64 nIgnore ) { mnIgnore = nIgnore; } + void setIgnoreFlags( sal_Int64 nIgnore ) { mnIgnore = nIgnore; } protected: virtual void implProcessConfigItemStr( @@ -748,14 +748,14 @@ private: { sal_Int64 mnKey; Int64Pair maFilter; - inline explicit ExtItemFormatKey( sal_Int64 nKey ) : mnKey( nKey ), maFilter( 0, 0 ) {} + explicit ExtItemFormatKey( sal_Int64 nKey ) : mnKey( nKey ), maFilter( 0, 0 ) {} bool operator<( const ExtItemFormatKey& rRight ) const; }; struct ExtItemFormat : public ItemFormat { bool mbShiftValue; - inline explicit ExtItemFormat() : mbShiftValue( true ) {} + ExtItemFormat() : mbShiftValue( true ) {} }; typedef ::std::map< ExtItemFormatKey, ExtItemFormat > ExtItemFormatMap; ExtItemFormatMap maFmtMap; @@ -768,8 +768,8 @@ class UnitConverter : public NameListBase public: explicit UnitConverter( const SharedConfigData& rCfgData ); - inline void setUnitName( const String& rUnitName ) { maUnitName = rUnitName; } - inline void setFactor( double fFactor ) { mfFactor = fFactor; } + void setUnitName( const String& rUnitName ) { maUnitName = rUnitName; } + void setFactor( double fFactor ) { mfFactor = fFactor; } protected: /** Sets the name for the passed key. */ @@ -791,13 +791,13 @@ private: class NameListWrapper { public: - inline NameListWrapper() {} - inline /*implicit*/ NameListWrapper( const OUString& rListName ) : maName( rListName ) {} - inline /*implicit*/ NameListWrapper( const sal_Char* pcListName ) : maName( pcListName ) {} - inline /*implicit*/ NameListWrapper( const NameListRef& rxList ) : mxList( rxList ) {} + NameListWrapper() {} + /*implicit*/ NameListWrapper( const OUString& rListName ) : maName( rListName ) {} + /*implicit*/ NameListWrapper( const sal_Char* pcListName ) : maName( pcListName ) {} + /*implicit*/ NameListWrapper( const NameListRef& rxList ) : mxList( rxList ) {} - inline bool isEmpty() const { return !mxList && !maName.has(); } - NameListRef getNameList( const Config& rCfg ) const; + bool isEmpty() const { return !mxList && !maName.has(); } + NameListRef getNameList( const Config& rCfg ) const; private: String maName; @@ -811,10 +811,10 @@ static const NameListWrapper NO_LIST; class ItemFormatMap : public ::std::map< sal_Int64, ItemFormat > { public: - inline explicit ItemFormatMap() {} - inline explicit ItemFormatMap( const NameListRef& rxNameList ) { insertFormats( rxNameList ); } + ItemFormatMap() {} + explicit ItemFormatMap( const NameListRef& rxNameList ) { insertFormats( rxNameList ); } - void insertFormats( const NameListRef& rxNameList ); + void insertFormats( const NameListRef& rxNameList ); }; // ============================================================================ @@ -831,9 +831,9 @@ public: virtual ~SharedConfigData(); - inline const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& getContext() const { return mxContext; } - inline const StorageRef& getRootStorage() const { return mxRootStrg; } - inline const OUString& getSysFileName() const { return maSysFileName; } + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& getContext() const { return mxContext; } + const StorageRef& getRootStorage() const { return mxRootStrg; } + const OUString& getSysFileName() const { return maSysFileName; } void setOption( const OUString& rKey, const OUString& rData ); const OUString* getOption( const OUString& rKey ) const; @@ -844,7 +844,7 @@ public: void eraseNameList( const OUString& rListName ); NameListRef getNameList( const OUString& rListName ) const; - inline bool isPasswordCancelled() const { return mbPwCancelled; } + bool isPasswordCancelled() const { return mbPwCancelled; } protected: virtual bool implIsValid() const; @@ -915,9 +915,9 @@ public: virtual ~Config(); - inline const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& getContext() const { return mxCfgData->getContext(); } - inline const StorageRef& getRootStorage() const { return mxCfgData->getRootStorage(); } - inline const OUString& getSysFileName() const { return mxCfgData->getSysFileName(); } + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& getContext() const { return mxCfgData->getContext(); } + const StorageRef& getRootStorage() const { return mxCfgData->getRootStorage(); } + const OUString& getSysFileName() const { return mxCfgData->getSysFileName(); } const OUString& getStringOption( const String& rKey, const OUString& rDefault ) const; bool getBoolOption( const String& rKey, bool bDefault ) const; @@ -942,7 +942,7 @@ public: bool isPasswordCancelled() const; protected: - inline explicit Config() {} + Config() {} void construct( const Config& rParent ); void construct( const sal_Char* pcEnvVar, @@ -1009,7 +1009,7 @@ public: void newLine(); void emptyLine( size_t nCount = 1 ); - inline OUStringBuffer& getLine() { return maLine; } + OUStringBuffer& getLine() { return maLine; } void incIndent(); void decIndent(); @@ -1026,7 +1026,7 @@ public: void startItem( const String& rItemName ); void contItem(); void endItem(); - inline const OUString& getLastItemValue() const { return maLastItem; } + const OUString& getLastItemValue() const { return maLastItem; } void startMultiItems(); void endMultiItems(); @@ -1041,25 +1041,25 @@ public: void writeDateTime( const ::com::sun::star::util::DateTime& rDateTime ); template< typename Type > - inline void writeDec( Type nData, sal_Int32 nWidth = 0, sal_Unicode cFill = ' ' ) + void writeDec( Type nData, sal_Int32 nWidth = 0, sal_Unicode cFill = ' ' ) { StringHelper::appendDec( maLine, nData, nWidth, cFill ); } template< typename Type > - inline void writeHex( Type nData, bool bPrefix = true ) + void writeHex( Type nData, bool bPrefix = true ) { StringHelper::appendHex( maLine, nData, bPrefix ); } template< typename Type > - inline void writeShortHex( Type nData, bool bPrefix = true ) + void writeShortHex( Type nData, bool bPrefix = true ) { StringHelper::appendShortHex( maLine, nData, bPrefix ); } template< typename Type > - inline void writeBin( Type nData, bool bDots = true ) + void writeBin( Type nData, bool bDots = true ) { StringHelper::appendBin( maLine, nData, bDots ); } template< typename Type > - inline void writeFix( Type nData, sal_Int32 nWidth = 0 ) + void writeFix( Type nData, sal_Int32 nWidth = 0 ) { StringHelper::appendFix( maLine, nData, nWidth ); } template< typename Type > - inline void writeValue( Type nData, FormatType eFmtType ) + void writeValue( Type nData, FormatType eFmtType ) { StringHelper::appendValue( maLine, nData, eFmtType ); } template< typename Type > - inline void writeName( const Config& rCfg, Type nData, const NameListWrapper& rListWrp ) + void writeName( const Config& rCfg, Type nData, const NameListWrapper& rListWrp ) { writeString( rCfg.getName( rListWrp, nData ) ); } // ------------------------------------------------------------------------ @@ -1091,8 +1091,8 @@ typedef ::boost::shared_ptr< Output > OutputRef; class IndentGuard { public: - inline explicit IndentGuard( const OutputRef& rxOut ) : mrOut( *rxOut ) { mrOut.incIndent(); } - inline ~IndentGuard() { mrOut.decIndent(); } + explicit IndentGuard( const OutputRef& rxOut ) : mrOut( *rxOut ) { mrOut.incIndent(); } + ~IndentGuard() { mrOut.decIndent(); } private: IndentGuard( const IndentGuard& ); IndentGuard& operator=( const IndentGuard& ); @@ -1105,18 +1105,18 @@ private: class TableGuard { public: - inline explicit TableGuard( const OutputRef& rxOut, sal_Int32 nW1 ) : + explicit TableGuard( const OutputRef& rxOut, sal_Int32 nW1 ) : mrOut( *rxOut ) { mrOut.startTable( nW1 ); } - inline explicit TableGuard( const OutputRef& rxOut, sal_Int32 nW1, sal_Int32 nW2 ) : + explicit TableGuard( const OutputRef& rxOut, sal_Int32 nW1, sal_Int32 nW2 ) : mrOut( *rxOut ) { mrOut.startTable( nW1, nW2 ); } - inline explicit TableGuard( const OutputRef& rxOut, sal_Int32 nW1, sal_Int32 nW2, sal_Int32 nW3, sal_Int32 nW4 ) : + explicit TableGuard( const OutputRef& rxOut, sal_Int32 nW1, sal_Int32 nW2, sal_Int32 nW3, sal_Int32 nW4 ) : mrOut( *rxOut ) { mrOut.startTable( nW1, nW2, nW3, nW4 ); } - inline explicit TableGuard( const OutputRef& rxOut, size_t nColCount, + explicit TableGuard( const OutputRef& rxOut, size_t nColCount, const sal_Int32* pnColWidths ) : mrOut( *rxOut ) { mrOut.startTable( nColCount, pnColWidths ); } - inline ~TableGuard() { mrOut.endTable(); } - inline void tab() { mrOut.tab(); } - inline void tab( size_t nCol ) { mrOut.tab( nCol ); } + ~TableGuard() { mrOut.endTable(); } + void tab() { mrOut.tab(); } + void tab( size_t nCol ) { mrOut.tab( nCol ); } private: TableGuard( const TableGuard& ); TableGuard& operator=( const TableGuard& ); @@ -1129,10 +1129,10 @@ private: class ItemGuard { public: - inline explicit ItemGuard( const OutputRef& rxOut, const String& rName = EMPTY_STRING ) : - mrOut( *rxOut ) { mrOut.startItem( rName ); } - inline ~ItemGuard() { mrOut.endItem(); } - inline void cont() { mrOut.contItem(); } + explicit ItemGuard( const OutputRef& rxOut, const String& rName = EMPTY_STRING ) : + mrOut( *rxOut ) { mrOut.startItem( rName ); } + ~ItemGuard() { mrOut.endItem(); } + void cont() { mrOut.contItem(); } private: ItemGuard( const ItemGuard& ); ItemGuard& operator=( const ItemGuard& ); @@ -1145,8 +1145,8 @@ private: class MultiItemsGuard { public: - inline explicit MultiItemsGuard( const OutputRef& rxOut ) : mrOut( *rxOut ) { mrOut.startMultiItems(); } - inline ~MultiItemsGuard() { mrOut.endMultiItems(); } + explicit MultiItemsGuard( const OutputRef& rxOut ) : mrOut( *rxOut ) { mrOut.startMultiItems(); } + ~MultiItemsGuard() { mrOut.endMultiItems(); } private: MultiItemsGuard( const MultiItemsGuard& ); MultiItemsGuard& operator=( const MultiItemsGuard& ); @@ -1185,14 +1185,14 @@ class ObjectBase : public Base public: virtual ~ObjectBase(); - inline const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& getContext() const { return mxConfig->getContext(); } void dump(); // ------------------------------------------------------------------------ protected: - inline explicit ObjectBase() {} + ObjectBase() {} void construct( const ConfigRef& rxConfig ); void construct( const ObjectBase& rParent ); @@ -1202,7 +1202,7 @@ protected: // ------------------------------------------------------------------------ - inline Config& cfg() const { return *mxConfig; } + Config& cfg() const { return *mxConfig; } private: ConfigRef mxConfig; @@ -1216,7 +1216,7 @@ typedef ::boost::shared_ptr< ObjectBase > ObjectRef; class StorageObjectBase : public ObjectBase { protected: - inline explicit StorageObjectBase() {} + StorageObjectBase() {} protected: using ObjectBase::construct; @@ -1272,7 +1272,7 @@ private: OUString maName; bool mbStorage; - inline explicit PreferredItem( const OUString rName, bool bStorage ) : + explicit PreferredItem( const OUString rName, bool bStorage ) : maName( rName ), mbStorage( bStorage ) {} }; typedef ::std::vector< PreferredItem > PreferredItemVector; @@ -1294,7 +1294,7 @@ public: // ------------------------------------------------------------------------ protected: - inline explicit OutputObjectBase() {} + OutputObjectBase() {} using ObjectBase::construct; void construct( const ObjectBase& rParent, const OUString& rSysFileName ); @@ -1464,7 +1464,7 @@ public: // ------------------------------------------------------------------------ protected: - inline explicit InputObjectBase() {} + InputObjectBase() {} using OutputObjectBase::construct; void construct( const ObjectBase& rParent, const BinaryInputStreamRef& rxStrm, const OUString& rSysFileName ); @@ -1489,8 +1489,8 @@ protected: void dumpRemainingStream(); void dumpArray( const String& rName, sal_Int32 nBytes, sal_Unicode cSep = OOX_DUMP_LISTSEP ); - inline void dumpUnused( sal_Int32 nBytes ) { dumpArray( OOX_DUMP_UNUSED, nBytes ); } - inline void dumpUnknown( sal_Int32 nBytes ) { dumpArray( OOX_DUMP_UNKNOWN, nBytes ); } + void dumpUnused( sal_Int32 nBytes ) { dumpArray( OOX_DUMP_UNUSED, nBytes ); } + void dumpUnknown( sal_Int32 nBytes ) { dumpArray( OOX_DUMP_UNKNOWN, nBytes ); } sal_Unicode dumpUnicode( const String& rName ); @@ -1689,7 +1689,7 @@ protected: class TextStreamObjectBase : public InputObjectBase { protected: - inline TextStreamObjectBase() {} + TextStreamObjectBase() {} using InputObjectBase::construct; void construct( @@ -1755,7 +1755,7 @@ protected: class RecordObjectBase : public InputObjectBase { protected: - inline explicit RecordObjectBase() {} + RecordObjectBase() {} using InputObjectBase::construct; void construct( @@ -1766,13 +1766,13 @@ protected: const String& rRecNames, const String& rSimpleRecs = EMPTY_STRING ); - inline sal_Int64 getRecPos() const { return mnRecPos; } - inline sal_Int64 getRecId() const { return mnRecId; } - inline sal_Int64 getRecSize() const { return mnRecSize; } - inline NameListRef getRecNames() const { return maRecNames.getNameList( cfg() ); } + sal_Int64 getRecPos() const { return mnRecPos; } + sal_Int64 getRecId() const { return mnRecId; } + sal_Int64 getRecSize() const { return mnRecSize; } + NameListRef getRecNames() const { return maRecNames.getNameList( cfg() ); } - inline void setBinaryOnlyMode( bool bBinaryOnly ) { mbBinaryOnly = bBinaryOnly; } - inline bool isBinaryOnlyMode() const { return mbBinaryOnly; } + void setBinaryOnlyMode( bool bBinaryOnly ) { mbBinaryOnly = bBinaryOnly; } + bool isBinaryOnlyMode() const { return mbBinaryOnly; } virtual bool implIsValid() const; virtual void implDump(); @@ -1805,9 +1805,9 @@ private: class SequenceRecordObjectBase : public RecordObjectBase { protected: - inline explicit SequenceRecordObjectBase() : mxRecData( new StreamDataSequence ) {} + SequenceRecordObjectBase() : mxRecData( new StreamDataSequence ) {} - inline StreamDataSequence& getRecordDataSequence() { return *mxRecData; } + StreamDataSequence& getRecordDataSequence() { return *mxRecData; } using RecordObjectBase::construct; void construct( @@ -1840,7 +1840,7 @@ public: bool isImportCancelled() const; protected: - inline explicit DumperBase() {} + DumperBase() {} using ObjectBase::construct; void construct( const ConfigRef& rxConfig ); diff --git a/include/oox/dump/oledumper.hxx b/include/oox/dump/oledumper.hxx index b58500ef8f3c..223c58d27b7b 100644 --- a/include/oox/dump/oledumper.hxx +++ b/include/oox/dump/oledumper.hxx @@ -38,7 +38,7 @@ namespace dump { class OleInputObjectBase : public InputObjectBase { protected: - inline explicit OleInputObjectBase() {} + OleInputObjectBase() {} OUString dumpAnsiString32( const String& rName ); OUString dumpUniString32( const String& rName ); @@ -144,7 +144,7 @@ public: explicit OleStorageObject( const ObjectBase& rParent, const StorageRef& rxStrg, const OUString& rSysPath ); protected: - inline explicit OleStorageObject() {} + OleStorageObject() {} using StorageObjectBase::construct; void construct( const ObjectBase& rParent, const StorageRef& rxStrg, const OUString& rSysPath ); @@ -290,7 +290,7 @@ protected: class AxPropertyObjectBase : public OleInputObjectBase { protected: - inline explicit AxPropertyObjectBase() {} + AxPropertyObjectBase() {} using OleInputObjectBase::construct; void construct( @@ -324,19 +324,19 @@ protected: template< typename Type > Type dumpHexProperty( Type nDefault, const NameListWrapper& rListWrp = NO_LIST ); - inline bool dumpBoolProperty() { return startNextProperty(); } - inline sal_Int32 dumpHmmProperty() { return dumpDecProperty< sal_Int32 >( 0, "CONV-HMM-TO-CM" ); } - inline sal_uInt8 dumpMousePtrProperty() { return dumpDecProperty< sal_uInt8 >( 0, "OLE-MOUSEPTR" ); } + bool dumpBoolProperty() { return startNextProperty(); } + sal_Int32 dumpHmmProperty() { return dumpDecProperty< sal_Int32 >( 0, "CONV-HMM-TO-CM" ); } + sal_uInt8 dumpMousePtrProperty() { return dumpDecProperty< sal_uInt8 >( 0, "OLE-MOUSEPTR" ); } template< typename Type > - inline Type dumpBorderStyleProperty( Type nDefault ) { return dumpDecProperty< Type >( nDefault, "AX-BORDERSTYLE" ); } + Type dumpBorderStyleProperty( Type nDefault ) { return dumpDecProperty< Type >( nDefault, "AX-BORDERSTYLE" ); } template< typename Type > - inline Type dumpSpecialEffectProperty( Type nDefault ) { return dumpDecProperty< Type >( nDefault, "AX-SPECIALEFFECT" ); } - inline sal_uInt32 dumpEnabledProperty() { return dumpDecProperty< sal_uInt32 >( 1, "AX-ENABLED" ); } - inline sal_Int32 dumpOrientationProperty() { return dumpDecProperty< sal_Int32 >( -1, "AX-ORIENTATION" ); } - inline sal_Int32 dumpDelayProperty() { return dumpDecProperty< sal_Int32 >( 50, "AX-CONV-MS" ); } - inline sal_uInt32 dumpImagePosProperty() { return dumpHexProperty< sal_uInt32 >( 0x00070001, "AX-IMAGEPOS" ); } - inline sal_uInt8 dumpImageSizeModeProperty() { return dumpDecProperty< sal_uInt8 >( 0, "AX-IMAGESIZEMODE" ); } - inline sal_uInt8 dumpImageAlignProperty() { return dumpDecProperty< sal_uInt8 >( 2, "AX-IMAGEALIGN" ); } + Type dumpSpecialEffectProperty( Type nDefault ) { return dumpDecProperty< Type >( nDefault, "AX-SPECIALEFFECT" ); } + sal_uInt32 dumpEnabledProperty() { return dumpDecProperty< sal_uInt32 >( 1, "AX-ENABLED" ); } + sal_Int32 dumpOrientationProperty() { return dumpDecProperty< sal_Int32 >( -1, "AX-ORIENTATION" ); } + sal_Int32 dumpDelayProperty() { return dumpDecProperty< sal_Int32 >( 50, "AX-CONV-MS" ); } + sal_uInt32 dumpImagePosProperty() { return dumpHexProperty< sal_uInt32 >( 0x00070001, "AX-IMAGEPOS" ); } + sal_uInt8 dumpImageSizeModeProperty() { return dumpDecProperty< sal_uInt8 >( 0, "AX-IMAGESIZEMODE" ); } + sal_uInt8 dumpImageAlignProperty() { return dumpDecProperty< sal_uInt8 >( 2, "AX-IMAGEALIGN" ); } sal_uInt32 dumpFlagsProperty( sal_uInt32 nDefault, const sal_Char* pcNameList = "AX-FLAGS" ); sal_uInt32 dumpColorProperty( sal_uInt32 nDefault ); @@ -357,7 +357,7 @@ private: void constructAxPropObj( const String& rPropNameList, bool b64BitPropFlags ); void dumpVersion(); - OUString dumpString( const String& rName, sal_uInt32 nSize, bool bArray ); + OUString dumpString( const String& rName, sal_uInt32 nSize, bool bArray ); void dumpShortProperties(); void dumpLargeProperties(); @@ -370,7 +370,7 @@ private: OUString maItemName; sal_uInt32 mnDataSize; OUString* mpItemValue; - inline explicit LargeProperty( LargePropertyType ePropType, const String& rItemName, sal_uInt32 nDataSize, OUString* pItemValue = 0 ) : + explicit LargeProperty( LargePropertyType ePropType, const String& rItemName, sal_uInt32 nDataSize, OUString* pItemValue = 0 ) : mePropType( ePropType ), maItemName( rItemName ), mnDataSize( nDataSize ), mpItemValue( pItemValue ) {} }; typedef ::std::vector< LargeProperty > LargePropertyVector; @@ -379,7 +379,7 @@ private: { OUString maItemName; sal_uInt16 mnData; - inline explicit StreamProperty( const String& rItemName, sal_uInt16 nData ) : + explicit StreamProperty( const String& rItemName, sal_uInt16 nData ) : maItemName( rItemName ), mnData( nData ) {} }; typedef ::std::vector< StreamProperty > StreamPropertyVector; @@ -575,7 +575,7 @@ struct VbaFormSiteInfo sal_uInt32 mnLength; bool mbInStream; - inline explicit VbaFormSiteInfo() : mnId( 0 ), mnLength( 0 ), mbInStream( false ) {} + VbaFormSiteInfo() : mnId( 0 ), mnLength( 0 ), mbInStream( false ) {} }; typedef ::std::vector< VbaFormSiteInfo > VbaFormSiteInfoVector; @@ -754,7 +754,7 @@ struct VbaSharedData StreamOffsetMap maStrmOffsets; rtl_TextEncoding meTextEnc; - explicit VbaSharedData(); + VbaSharedData(); bool isModuleStream( const OUString& rStrmName ) const; sal_Int32 getStreamOffset( const OUString& rStrmName ) const; diff --git a/include/oox/helper/attributelist.hxx b/include/oox/helper/attributelist.hxx index 55f41cf0a3b3..0555ed487376 100644 --- a/include/oox/helper/attributelist.hxx +++ b/include/oox/helper/attributelist.hxx @@ -75,7 +75,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& rxAttribs ); /** Returns the wrapped com.sun.star.xml.sax.XFastAttributeList object. */ - inline ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList > + ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList > getFastAttributeList() const { return mxAttribs; } /** Returns true, if the specified attribute is present. */ diff --git a/include/oox/helper/binaryinputstream.hxx b/include/oox/helper/binaryinputstream.hxx index 64d85357c2e8..45371673026e 100644 --- a/include/oox/helper/binaryinputstream.hxx +++ b/include/oox/helper/binaryinputstream.hxx @@ -84,22 +84,22 @@ public: All data types supported by the ByteOrderConverter class can be used. */ template< typename Type > - inline Type readValue() { Type nValue; readValue( nValue ); return nValue; } + Type readValue() { Type nValue; readValue( nValue ); return nValue; } /** Stream operator for all data types supported by the readValue() function. */ template< typename Type > - inline BinaryInputStream& operator>>( Type& ornValue ) { readValue( ornValue ); return *this; } - - inline sal_Int8 readInt8() { return readValue< sal_Int8 >(); } - inline sal_uInt8 readuInt8() { return readValue< sal_uInt8 >(); } - inline sal_Int16 readInt16() { return readValue< sal_Int16 >(); } - inline sal_uInt16 readuInt16() { return readValue< sal_uInt16 >(); } - inline sal_Int32 readInt32() { return readValue< sal_Int32 >(); } - inline sal_uInt32 readuInt32() { return readValue< sal_uInt32 >(); } - inline sal_Int64 readInt64() { return readValue< sal_Int64 >(); } - inline sal_uInt64 readuInt64() { return readValue< sal_uInt64 >(); } - inline float readFloat() { return readValue< float >(); } - inline double readDouble() { return readValue< double >(); } + BinaryInputStream& operator>>( Type& ornValue ) { readValue( ornValue ); return *this; } + + sal_Int8 readInt8() { return readValue< sal_Int8 >(); } + sal_uInt8 readuInt8() { return readValue< sal_uInt8 >(); } + sal_Int16 readInt16() { return readValue< sal_Int16 >(); } + sal_uInt16 readuInt16() { return readValue< sal_uInt16 >(); } + sal_Int32 readInt32() { return readValue< sal_Int32 >(); } + sal_uInt32 readuInt32() { return readValue< sal_uInt32 >(); } + sal_Int64 readInt64() { return readValue< sal_Int64 >(); } + sal_uInt64 readuInt64() { return readValue< sal_uInt64 >(); } + float readFloat() { return readValue< float >(); } + double readDouble() { return readValue< double >(); } /** Reads a (preallocated!) C array of values from the stream. @@ -218,7 +218,7 @@ public: protected: /** This dummy default c'tor will never call the c'tor of the virtual base class BinaryStreamBase as this class cannot be instanciated directly. */ - inline explicit BinaryInputStream() : BinaryStreamBase( false ) {} + BinaryInputStream() : BinaryStreamBase( false ) {} }; typedef ::boost::shared_ptr< BinaryInputStream > BinaryInputStreamRef; @@ -309,7 +309,7 @@ public: /** Stream operator for all data types supported by the readValue() function. */ template< typename Type > - inline BinaryXInputStream& operator>>( Type& ornValue ) { readValue( ornValue ); return *this; } + BinaryXInputStream& operator>>( Type& ornValue ) { readValue( ornValue ); return *this; } private: StreamDataSequence maBuffer; ///< Data buffer used in readMemory() function. @@ -350,11 +350,11 @@ public: /** Stream operator for all data types supported by the readValue() function. */ template< typename Type > - inline SequenceInputStream& operator>>( Type& ornValue ) { readValue( ornValue ); return *this; } + SequenceInputStream& operator>>( Type& ornValue ) { readValue( ornValue ); return *this; } private: /** Returns the number of bytes available in the sequence for the passed byte count. */ - inline sal_Int32 getMaxBytes( sal_Int32 nBytes ) const + sal_Int32 getMaxBytes( sal_Int32 nBytes ) const { return getLimitedValue< sal_Int32, sal_Int32 >( nBytes, 0, mpData->getLength() - mnPos ); } }; @@ -415,11 +415,11 @@ public: /** Stream operator for all data types supported by the readValue() function. */ template< typename Type > - inline RelativeInputStream& operator>>( Type& ornValue ) { readValue( ornValue ); return *this; } + RelativeInputStream& operator>>( Type& ornValue ) { readValue( ornValue ); return *this; } private: /** Returns the number of bytes available in the sequence for the passed byte count. */ - inline sal_Int32 getMaxBytes( sal_Int32 nBytes ) const + sal_Int32 getMaxBytes( sal_Int32 nBytes ) const { return getLimitedValue< sal_Int32, sal_Int64 >( nBytes, 0, mnSize - mnRelPos ); } private: diff --git a/include/oox/helper/binaryoutputstream.hxx b/include/oox/helper/binaryoutputstream.hxx index 56d806577731..e4e41119ba46 100644 --- a/include/oox/helper/binaryoutputstream.hxx +++ b/include/oox/helper/binaryoutputstream.hxx @@ -66,7 +66,7 @@ public: /** Stream operator for all data types supported by the writeValue() function. */ template< typename Type > - inline BinaryOutputStream& operator<<( Type nValue ) { writeValue( nValue ); return *this; } + BinaryOutputStream& operator<<( Type nValue ) { writeValue( nValue ); return *this; } void writeCompressedUnicodeArray( const OUString& rString, bool bCompressed, bool bAllowNulChars = false ); @@ -77,7 +77,7 @@ public: protected: /** This dummy default c'tor will never call the c'tor of the virtual base class BinaryStreamBase as this class cannot be instanciated directly. */ - inline explicit BinaryOutputStream() : BinaryStreamBase( false ) {} + BinaryOutputStream() : BinaryStreamBase( false ) {} }; template< typename Type > @@ -136,10 +136,10 @@ public: /** Stream operator for all data types supported by the writeValue() function. */ template< typename Type > - inline BinaryXOutputStream& operator<<( Type nValue ) { writeValue( nValue ); return *this; } + BinaryXOutputStream& operator<<( Type nValue ) { writeValue( nValue ); return *this; } /** Returns the XOutputStream interface of the wrapped output stream. */ - inline ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > + ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > getXOutputStream() const { return mxOutStrm; } private: @@ -177,7 +177,7 @@ public: /** Stream operator for all data types supported by the writeValue() function. */ template< typename Type > - inline SequenceOutputStream& operator<<( Type nValue ) { writeValue( nValue ); return *this; } + SequenceOutputStream& operator<<( Type nValue ) { writeValue( nValue ); return *this; } }; // ============================================================================ diff --git a/include/oox/helper/binarystreambase.hxx b/include/oox/helper/binarystreambase.hxx index d9ab979de019..7ece97a1fc08 100644 --- a/include/oox/helper/binarystreambase.hxx +++ b/include/oox/helper/binarystreambase.hxx @@ -76,12 +76,12 @@ public: Implementations may still implement size() and tell() even if the stream is not seekable. */ - inline bool isSeekable() const { return mbSeekable; } + bool isSeekable() const { return mbSeekable; } /** Returns true, if the stream position is invalid (EOF). This flag turns true *after* the first attempt to seek/read beyond the stream end. */ - inline bool isEof() const { return mbEof; } + bool isEof() const { return mbEof; } /** Returns the size of the remaining data available in the stream, if stream supports size() and tell(), otherwise -1. @@ -90,11 +90,11 @@ public: /** Seeks the stream to the beginning, if stream is seekable. */ - inline void seekToStart() { seek( 0 ); } + void seekToStart() { seek( 0 ); } /** Seeks the stream to the end, if stream is seekable. */ - inline void seekToEnd() { seek( size() ); } + void seekToEnd() { seek( size() ); } /** Seeks the stream forward to a position that is a multiple of the passed block size, if stream is seekable. @@ -108,7 +108,7 @@ public: void alignToBlock( sal_Int32 nBlockSize, sal_Int64 nAnchorPos = 0 ); protected: - inline explicit BinaryStreamBase( bool bSeekable ) : mbEof( false ), mbSeekable( bSeekable ) {} + explicit BinaryStreamBase( bool bSeekable ) : mbEof( false ), mbSeekable( bSeekable ) {} private: BinaryStreamBase( const BinaryStreamBase& ); diff --git a/include/oox/helper/containerhelper.hxx b/include/oox/helper/containerhelper.hxx index f3b27f05b1e2..fdb6ec99e287 100644 --- a/include/oox/helper/containerhelper.hxx +++ b/include/oox/helper/containerhelper.hxx @@ -45,14 +45,14 @@ struct ValueRange sal_Int32 mnFirst; sal_Int32 mnLast; - inline explicit ValueRange( sal_Int32 nValue = 0 ) : mnFirst( nValue ), mnLast( nValue ) {} - inline explicit ValueRange( sal_Int32 nFirst, sal_Int32 nLast ) : mnFirst( nFirst ), mnLast( nLast ) {} - - inline bool operator==( const ValueRange& rRange ) const { return (mnFirst == rRange.mnFirst) && (mnLast == rRange.mnLast); } - inline bool operator!=( const ValueRange& rRange ) const { return !(*this == rRange); } - inline bool contains( sal_Int32 nValue ) const { return (mnFirst <= nValue) && (nValue <= mnLast); } - inline bool contains( const ValueRange& rRange ) const { return (mnFirst <= rRange.mnFirst) && (rRange.mnLast <= mnLast); } - inline bool intersects( const ValueRange& rRange ) const { return (mnFirst <= rRange.mnLast) && (rRange.mnFirst <= mnLast); } + explicit ValueRange( sal_Int32 nValue = 0 ) : mnFirst( nValue ), mnLast( nValue ) {} + explicit ValueRange( sal_Int32 nFirst, sal_Int32 nLast ) : mnFirst( nFirst ), mnLast( nLast ) {} + + bool operator==( const ValueRange& rRange ) const { return (mnFirst == rRange.mnFirst) && (mnLast == rRange.mnLast); } + bool operator!=( const ValueRange& rRange ) const { return !(*this == rRange); } + bool contains( sal_Int32 nValue ) const { return (mnFirst <= nValue) && (nValue <= mnLast); } + bool contains( const ValueRange& rRange ) const { return (mnFirst <= rRange.mnFirst) && (rRange.mnLast <= mnLast); } + bool intersects( const ValueRange& rRange ) const { return (mnFirst <= rRange.mnLast) && (rRange.mnFirst <= mnLast); } }; // ---------------------------------------------------------------------------- @@ -67,15 +67,15 @@ typedef ::std::vector< ValueRange > ValueRangeVector; class OOX_DLLPUBLIC ValueRangeSet { public: - inline explicit ValueRangeSet() {} + ValueRangeSet() {} /** Inserts the passed value into the range list. */ - inline void insert( sal_Int32 nValue ) { insert( ValueRange( nValue ) ); } + void insert( sal_Int32 nValue ) { insert( ValueRange( nValue ) ); } /** Inserts the passed value range into the range list. */ void insert( const ValueRange& rRange ); /** Returns the ordered list of all value ranges. */ - inline const ValueRangeVector& getRanges() const { return maRanges; } + const ValueRangeVector& getRanges() const { return maRanges; } private: ValueRangeVector maRanges; @@ -101,49 +101,49 @@ public: typedef typename container_type::iterator iterator; typedef typename container_type::const_iterator const_iterator; - inline explicit Matrix() : mnWidth( 0 ) {} - inline explicit Matrix( size_type nWidth, size_type nHeight ) { this->resize( nWidth, nHeight ); } - inline explicit Matrix( size_type nWidth, size_type nHeight, const_reference rData ) { this->resize( nWidth, nHeight, rData ); } - - inline size_type capacity() const { return maData.capacity(); } - inline bool empty() const { return maData.empty(); } - inline size_type size() const { return maData.size(); } - inline size_type width() const { return mnWidth; } - inline size_type height() const { return this->empty() ? 0 : (this->size() / this->width()); } - inline bool has( size_type nX, size_type nY ) const { return (nX < this->width()) && (nY < this->height()); } - - inline void reserve( size_type nWidth, size_type nHeight ) { maData.reserve( nWidth * nHeight ); } - inline void clear() { this->resize( 0, 0 ); } - inline void resize( size_type nWidth, size_type nHeight ) { mnWidth = nWidth; maData.resize( nWidth * nHeight ); } - inline void resize( size_type nWidth, size_type nHeight, const_reference rData ) { mnWidth = nWidth; maData.resize( nWidth * nHeight, rData ); } - - inline iterator at( size_type nX, size_type nY ) { return maData.begin() + mnWidth * nY + nX; } - inline const_iterator at( size_type nX, size_type nY ) const { return maData.begin() + mnWidth * nY + nX; } - - inline reference operator()( size_type nX, size_type nY ) { return *this->at( nX, nY ); } - inline const_reference operator()( size_type nX, size_type nY ) const { return *this->at( nX, nY ); } - - inline iterator begin() { return maData.begin(); } - inline const_iterator begin() const { return maData.begin(); } - inline iterator end() { return maData.end(); } - inline const_iterator end() const { return maData.end(); } - - inline reference front() { return maData.front(); } - inline const_reference front() const { return maData.front(); } - inline reference back() { return maData.back(); } - inline const_reference back() const { return maData.back(); } - - inline iterator row_begin( size_type nY ) { return this->at( 0, nY ); } - inline const_iterator row_begin( size_type nY ) const { return this->at( 0, nY ); } - inline iterator row_end( size_type nY ) { return this->at( mnWidth, nY ); } - inline const_iterator row_end( size_type nY ) const { return this->at( mnWidth, nY ); } - - inline reference row_front( size_type nY ) { return (*this)( 0, nY ); } - inline const_reference row_front( size_type nY ) const { return (*this)( 0, nY ); } - inline reference row_back( size_type nY ) { return (*this)( mnWidth - 1, nY ); } - inline const_reference row_back( size_type nY ) const { return (*this)( mnWidth - 1, nY ); } - - inline void swap( Matrix& rMatrix ) { maData.swap( rMatrix.maData ); } + Matrix() : mnWidth( 0 ) {} + explicit Matrix( size_type nWidth, size_type nHeight ) { this->resize( nWidth, nHeight ); } + explicit Matrix( size_type nWidth, size_type nHeight, const_reference rData ) { this->resize( nWidth, nHeight, rData ); } + + size_type capacity() const { return maData.capacity(); } + bool empty() const { return maData.empty(); } + size_type size() const { return maData.size(); } + size_type width() const { return mnWidth; } + size_type height() const { return this->empty() ? 0 : (this->size() / this->width()); } + bool has( size_type nX, size_type nY ) const { return (nX < this->width()) && (nY < this->height()); } + + void reserve( size_type nWidth, size_type nHeight ) { maData.reserve( nWidth * nHeight ); } + void clear() { this->resize( 0, 0 ); } + void resize( size_type nWidth, size_type nHeight ) { mnWidth = nWidth; maData.resize( nWidth * nHeight ); } + void resize( size_type nWidth, size_type nHeight, const_reference rData ) { mnWidth = nWidth; maData.resize( nWidth * nHeight, rData ); } + + iterator at( size_type nX, size_type nY ) { return maData.begin() + mnWidth * nY + nX; } + const_iterator at( size_type nX, size_type nY ) const { return maData.begin() + mnWidth * nY + nX; } + + reference operator()( size_type nX, size_type nY ) { return *this->at( nX, nY ); } + const_reference operator()( size_type nX, size_type nY ) const { return *this->at( nX, nY ); } + + iterator begin() { return maData.begin(); } + const_iterator begin() const { return maData.begin(); } + iterator end() { return maData.end(); } + const_iterator end() const { return maData.end(); } + + reference front() { return maData.front(); } + const_reference front() const { return maData.front(); } + reference back() { return maData.back(); } + const_reference back() const { return maData.back(); } + + iterator row_begin( size_type nY ) { return this->at( 0, nY ); } + const_iterator row_begin( size_type nY ) const { return this->at( 0, nY ); } + iterator row_end( size_type nY ) { return this->at( mnWidth, nY ); } + const_iterator row_end( size_type nY ) const { return this->at( mnWidth, nY ); } + + reference row_front( size_type nY ) { return (*this)( 0, nY ); } + const_reference row_front( size_type nY ) const { return (*this)( 0, nY ); } + reference row_back( size_type nY ) { return (*this)( mnWidth - 1, nY ); } + const_reference row_back( size_type nY ) const { return (*this)( mnWidth - 1, nY ); } + + void swap( Matrix& rMatrix ) { maData.swap( rMatrix.maData ); } private: container_type maData; diff --git a/include/oox/helper/helper.hxx b/include/oox/helper/helper.hxx index 1b85ac3e750f..f86b3d3e8cb2 100644 --- a/include/oox/helper/helper.hxx +++ b/include/oox/helper/helper.hxx @@ -191,27 +191,27 @@ template< typename Type > class OptValue { public: - inline explicit OptValue() : maValue(), mbHasValue( false ) {} - inline explicit OptValue( const Type& rValue ) : maValue( rValue ), mbHasValue( true ) {} - inline explicit OptValue( bool bHasValue, const Type& rValue ) : maValue( rValue ), mbHasValue( bHasValue ) {} + OptValue() : maValue(), mbHasValue( false ) {} + explicit OptValue( const Type& rValue ) : maValue( rValue ), mbHasValue( true ) {} + explicit OptValue( bool bHasValue, const Type& rValue ) : maValue( rValue ), mbHasValue( bHasValue ) {} - inline bool has() const { return mbHasValue; } - inline bool operator!() const { return !mbHasValue; } - inline bool differsFrom( const Type& rValue ) const { return mbHasValue && (maValue != rValue); } + bool has() const { return mbHasValue; } + bool operator!() const { return !mbHasValue; } + bool differsFrom( const Type& rValue ) const { return mbHasValue && (maValue != rValue); } - inline const Type& get() const { return maValue; } - inline const Type& get( const Type& rDefValue ) const { return mbHasValue ? maValue : rDefValue; } + const Type& get() const { return maValue; } + const Type& get( const Type& rDefValue ) const { return mbHasValue ? maValue : rDefValue; } - inline void reset() { mbHasValue = false; } - inline void set( const Type& rValue ) { maValue = rValue; mbHasValue = true; } - inline Type& use() { mbHasValue = true; return maValue; } + void reset() { mbHasValue = false; } + void set( const Type& rValue ) { maValue = rValue; mbHasValue = true; } + Type& use() { mbHasValue = true; return maValue; } - inline OptValue& operator=( const Type& rValue ) { set( rValue ); return *this; } - inline bool operator==( const OptValue& rValue ) const { - return ( ( mbHasValue == false && rValue.mbHasValue == false ) || - ( mbHasValue == rValue.mbHasValue && maValue == rValue.maValue ) ); - } - inline void assignIfUsed( const OptValue& rValue ) { if( rValue.mbHasValue ) set( rValue.maValue ); } + OptValue& operator=( const Type& rValue ) { set( rValue ); return *this; } + bool operator==( const OptValue& rValue ) const { + return ( ( mbHasValue == false && rValue.mbHasValue == false ) || + ( mbHasValue == rValue.mbHasValue && maValue == rValue.maValue ) ); + } + void assignIfUsed( const OptValue& rValue ) { if( rValue.mbHasValue ) set( rValue.maValue ); } private: Type maValue; @@ -234,29 +234,29 @@ class ByteOrderConverter { public: #ifdef OSL_BIGENDIAN - inline static void convertLittleEndian( sal_Int8& ) {} // present for usage in templates - inline static void convertLittleEndian( sal_uInt8& ) {} // present for usage in templates - inline static void convertLittleEndian( sal_Int16& rnValue ) { swap2( reinterpret_cast< sal_uInt8* >( &rnValue ) ); } - inline static void convertLittleEndian( sal_uInt16& rnValue ) { swap2( reinterpret_cast< sal_uInt8* >( &rnValue ) ); } - inline static void convertLittleEndian( sal_Int32& rnValue ) { swap4( reinterpret_cast< sal_uInt8* >( &rnValue ) ); } - inline static void convertLittleEndian( sal_uInt32& rnValue ) { swap4( reinterpret_cast< sal_uInt8* >( &rnValue ) ); } - inline static void convertLittleEndian( sal_Int64& rnValue ) { swap8( reinterpret_cast< sal_uInt8* >( &rnValue ) ); } - inline static void convertLittleEndian( sal_uInt64& rnValue ) { swap8( reinterpret_cast< sal_uInt8* >( &rnValue ) ); } - inline static void convertLittleEndian( float& rfValue ) { swap4( reinterpret_cast< sal_uInt8* >( &rfValue ) ); } - inline static void convertLittleEndian( double& rfValue ) { swap8( reinterpret_cast< sal_uInt8* >( &rfValue ) ); } + static void convertLittleEndian( sal_Int8& ) {} // present for usage in templates + static void convertLittleEndian( sal_uInt8& ) {} // present for usage in templates + static void convertLittleEndian( sal_Int16& rnValue ) { swap2( reinterpret_cast< sal_uInt8* >( &rnValue ) ); } + static void convertLittleEndian( sal_uInt16& rnValue ) { swap2( reinterpret_cast< sal_uInt8* >( &rnValue ) ); } + static void convertLittleEndian( sal_Int32& rnValue ) { swap4( reinterpret_cast< sal_uInt8* >( &rnValue ) ); } + static void convertLittleEndian( sal_uInt32& rnValue ) { swap4( reinterpret_cast< sal_uInt8* >( &rnValue ) ); } + static void convertLittleEndian( sal_Int64& rnValue ) { swap8( reinterpret_cast< sal_uInt8* >( &rnValue ) ); } + static void convertLittleEndian( sal_uInt64& rnValue ) { swap8( reinterpret_cast< sal_uInt8* >( &rnValue ) ); } + static void convertLittleEndian( float& rfValue ) { swap4( reinterpret_cast< sal_uInt8* >( &rfValue ) ); } + static void convertLittleEndian( double& rfValue ) { swap8( reinterpret_cast< sal_uInt8* >( &rfValue ) ); } template< typename Type > inline static void convertLittleEndianArray( Type* pnArray, size_t nElemCount ); - inline static void convertLittleEndianArray( sal_Int8*, size_t ) {} - inline static void convertLittleEndianArray( sal_uInt8*, size_t ) {} + static void convertLittleEndianArray( sal_Int8*, size_t ) {} + static void convertLittleEndianArray( sal_uInt8*, size_t ) {} #else template< typename Type > - inline static void convertLittleEndian( Type& ) {} + static void convertLittleEndian( Type& ) {} template< typename Type > - inline static void convertLittleEndianArray( Type*, size_t ) {} + static void convertLittleEndianArray( Type*, size_t ) {} #endif diff --git a/include/oox/helper/propertymap.hxx b/include/oox/helper/propertymap.hxx index d03d891d93b5..24fbff581c87 100644 --- a/include/oox/helper/propertymap.hxx +++ b/include/oox/helper/propertymap.hxx @@ -51,28 +51,28 @@ typedef ::std::map< sal_Int32, ::com::sun::star::uno::Any > PropertyMapBase; class OOX_DLLPUBLIC PropertyMap : public PropertyMapBase { public: - explicit PropertyMap(); + PropertyMap(); /** Returns the name of the passed property identifier. */ static const OUString& getPropertyName( sal_Int32 nPropId ); /** Returns true, if the map contains a property with the passed identifier. */ - inline bool hasProperty( sal_Int32 nPropId ) const + bool hasProperty( sal_Int32 nPropId ) const { return find( nPropId ) != end(); } /** Sets the specified property to the passed value. Does nothing, if the identifier is invalid. */ - inline bool setAnyProperty( sal_Int32 nPropId, const ::com::sun::star::uno::Any& rValue ) + bool setAnyProperty( sal_Int32 nPropId, const ::com::sun::star::uno::Any& rValue ) { if( nPropId < 0 ) return false; (*this)[ nPropId ] = rValue; return true; } /** Sets the specified property to the passed value. Does nothing, if the identifier is invalid. */ template< typename Type > - inline bool setProperty( sal_Int32 nPropId, const Type& rValue ) + bool setProperty( sal_Int32 nPropId, const Type& rValue ) { if( nPropId < 0 ) return false; (*this)[ nPropId ] <<= rValue; return true; } /** Inserts all properties contained in the passed property map. */ - inline void assignUsed( const PropertyMap& rPropMap ) + void assignUsed( const PropertyMap& rPropMap ) { insert( rPropMap.begin(), rPropMap.end() ); } /** Inserts all properties contained in the passed property map */ diff --git a/include/oox/helper/propertyset.hxx b/include/oox/helper/propertyset.hxx index 2c97b29677fa..f4aa0b42eeec 100644 --- a/include/oox/helper/propertyset.hxx +++ b/include/oox/helper/propertyset.hxx @@ -49,30 +49,30 @@ class PropertyMap; class OOX_DLLPUBLIC PropertySet { public: - inline explicit PropertySet() {} + PropertySet() {} /** Constructs a property set wrapper with the passed UNO property set. */ - inline explicit PropertySet( + explicit PropertySet( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rxPropSet ) { set( rxPropSet ); } /** Constructs a property set wrapper after querying the XPropertySet interface. */ template< typename Type > - inline explicit PropertySet( const Type& rObject ) { set( rObject ); } + explicit PropertySet( const Type& rObject ) { set( rObject ); } /** Sets the passed UNO property set and releases the old UNO property set. */ void set( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rxPropSet ); /** Queries the passed object (interface or any) for an XPropertySet and releases the old UNO property set. */ template< typename Type > - inline void set( const Type& rObject ) + void set( const Type& rObject ) { set( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >( rObject, ::com::sun::star::uno::UNO_QUERY ) ); } /** Returns true, if the contained XPropertySet interface is valid. */ - inline bool is() const { return mxPropSet.is(); } + bool is() const { return mxPropSet.is(); } /** Returns the contained XPropertySet interface. */ - inline ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getXPropertySet() const { return mxPropSet; } /** Returns true, if the specified property is supported by the property set. */ @@ -87,12 +87,12 @@ public: /** Gets the specified property from the property set. @return true, if the passed variable could be filled with the property value. */ template< typename Type > - inline bool getProperty( Type& orValue, sal_Int32 nPropId ) const + bool getProperty( Type& orValue, sal_Int32 nPropId ) const { return getAnyProperty( nPropId ) >>= orValue; } /** Gets the specified boolean property from the property set. @return true = property contains true; false = property contains false or error occurred. */ - inline bool getBoolProperty( sal_Int32 nPropId ) const + bool getBoolProperty( sal_Int32 nPropId ) const { bool bValue = false; return getProperty( bValue, nPropId ) && bValue; } // Set properties --------------------------------------------------------- @@ -101,7 +101,7 @@ public: /** Puts the passed value into the property set. */ template< typename Type > - inline bool setProperty( sal_Int32 nPropId, const Type& rValue ) + bool setProperty( sal_Int32 nPropId, const Type& rValue ) { return setAnyProperty( nPropId, ::com::sun::star::uno::Any( rValue ) ); } /** Puts the passed properties into the property set. Tries to use the XMultiPropertySet interface. diff --git a/include/oox/helper/refmap.hxx b/include/oox/helper/refmap.hxx index c980039442b1..251f4eccb5f8 100644 --- a/include/oox/helper/refmap.hxx +++ b/include/oox/helper/refmap.hxx @@ -49,7 +49,7 @@ public: public: /** Returns true, if the object associated to the passed key exists. Returns false, if the key exists but points to an empty reference. */ - inline bool has( key_type nKey ) const + bool has( key_type nKey ) const { const mapped_type* pxRef = getRef( nKey ); return pxRef && pxRef->get(); @@ -57,7 +57,7 @@ public: /** Returns a reference to the object associated to the passed key, or an empty reference on error. */ - inline mapped_type get( key_type nKey ) const + mapped_type get( key_type nKey ) const { if( const mapped_type* pxRef = getRef( nKey ) ) return *pxRef; return mapped_type(); @@ -66,7 +66,7 @@ public: /** Calls the passed functor for every contained object, automatically skips all elements that are empty references. */ template< typename FunctorType > - inline void forEach( const FunctorType& rFunctor ) const + void forEach( const FunctorType& rFunctor ) const { ::std::for_each( this->begin(), this->end(), ForEachFunctor< FunctorType >( rFunctor ) ); } @@ -74,7 +74,7 @@ public: /** Calls the passed member function of ObjType on every contained object, automatically skips all elements that are empty references. */ template< typename FuncType > - inline void forEachMem( FuncType pFunc ) const + void forEachMem( FuncType pFunc ) const { forEach( ::boost::bind( pFunc, _1 ) ); } @@ -82,7 +82,7 @@ public: /** Calls the passed member function of ObjType on every contained object, automatically skips all elements that are empty references. */ template< typename FuncType, typename ParamType > - inline void forEachMem( FuncType pFunc, ParamType aParam ) const + void forEachMem( FuncType pFunc, ParamType aParam ) const { forEach( ::boost::bind( pFunc, _1, aParam ) ); } @@ -90,7 +90,7 @@ public: /** Calls the passed member function of ObjType on every contained object, automatically skips all elements that are empty references. */ template< typename FuncType, typename ParamType1, typename ParamType2 > - inline void forEachMem( FuncType pFunc, ParamType1 aParam1, ParamType2 aParam2 ) const + void forEachMem( FuncType pFunc, ParamType1 aParam1, ParamType2 aParam2 ) const { forEach( ::boost::bind( pFunc, _1, aParam1, aParam2 ) ); } @@ -98,7 +98,7 @@ public: /** Calls the passed member function of ObjType on every contained object, automatically skips all elements that are empty references. */ template< typename FuncType, typename ParamType1, typename ParamType2, typename ParamType3 > - inline void forEachMem( FuncType pFunc, ParamType1 aParam1, ParamType2 aParam2, ParamType3 aParam3 ) const + void forEachMem( FuncType pFunc, ParamType1 aParam1, ParamType2 aParam2, ParamType3 aParam3 ) const { forEach( ::boost::bind( pFunc, _1, aParam1, aParam2, aParam3 ) ); } @@ -106,7 +106,7 @@ public: /** Calls the passed member function of ObjType on every contained object, automatically skips all elements that are empty references. */ template< typename FuncType, typename ParamType1, typename ParamType2, typename ParamType3, typename ParamType4 > - inline void forEachMem( FuncType pFunc, ParamType1 aParam1, ParamType2 aParam2, ParamType3 aParam3, ParamType4 aParam4 ) const + void forEachMem( FuncType pFunc, ParamType1 aParam1, ParamType2 aParam2, ParamType3 aParam3, ParamType4 aParam4 ) const { forEach( ::boost::bind( pFunc, _1, aParam1, aParam2, aParam3, aParam4 ) ); } @@ -115,7 +115,7 @@ public: /** Calls the passed functor for every contained object. Passes the key as first argument and the object reference as second argument to rFunctor. */ template< typename FunctorType > - inline void forEachWithKey( const FunctorType& rFunctor ) const + void forEachWithKey( const FunctorType& rFunctor ) const { ::std::for_each( this->begin(), this->end(), ForEachFunctorWithKey< FunctorType >( rFunctor ) ); } @@ -123,7 +123,7 @@ public: /** Calls the passed member function of ObjType on every contained object. Passes the object key as argument to the member function. */ template< typename FuncType > - inline void forEachMemWithKey( FuncType pFunc ) const + void forEachMemWithKey( FuncType pFunc ) const { forEachWithKey( ::boost::bind( pFunc, _2, _1 ) ); } @@ -131,7 +131,7 @@ public: /** Calls the passed member function of ObjType on every contained object. Passes the object key as first argument to the member function. */ template< typename FuncType, typename ParamType > - inline void forEachMemWithKey( FuncType pFunc, ParamType aParam ) const + void forEachMemWithKey( FuncType pFunc, ParamType aParam ) const { forEachWithKey( ::boost::bind( pFunc, _2, _1, aParam ) ); } @@ -139,7 +139,7 @@ public: /** Calls the passed member function of ObjType on every contained object. Passes the object key as first argument to the member function. */ template< typename FuncType, typename ParamType1, typename ParamType2 > - inline void forEachMemWithKey( FuncType pFunc, ParamType1 aParam1, ParamType2 aParam2 ) const + void forEachMemWithKey( FuncType pFunc, ParamType1 aParam1, ParamType2 aParam2 ) const { forEachWithKey( ::boost::bind( pFunc, _2, _1, aParam1, aParam2 ) ); } @@ -147,7 +147,7 @@ public: /** Calls the passed member function of ObjType on every contained object. Passes the object key as first argument to the member function. */ template< typename FuncType, typename ParamType1, typename ParamType2, typename ParamType3 > - inline void forEachMemWithKey( FuncType pFunc, ParamType1 aParam1, ParamType2 aParam2, ParamType3 aParam3 ) const + void forEachMemWithKey( FuncType pFunc, ParamType1 aParam1, ParamType2 aParam2, ParamType3 aParam3 ) const { forEachWithKey( ::boost::bind( pFunc, _2, _1, aParam1, aParam2, aParam3 ) ); } @@ -157,19 +157,19 @@ private: struct ForEachFunctor { FunctorType maFunctor; - inline explicit ForEachFunctor( const FunctorType& rFunctor ) : maFunctor( rFunctor ) {} - inline void operator()( const value_type& rValue ) { if( rValue.second.get() ) maFunctor( *rValue.second ); } + explicit ForEachFunctor( const FunctorType& rFunctor ) : maFunctor( rFunctor ) {} + void operator()( const value_type& rValue ) { if( rValue.second.get() ) maFunctor( *rValue.second ); } }; template< typename FunctorType > struct ForEachFunctorWithKey { FunctorType maFunctor; - inline explicit ForEachFunctorWithKey( const FunctorType& rFunctor ) : maFunctor( rFunctor ) {} - inline void operator()( const value_type& rValue ) { if( rValue.second.get() ) maFunctor( rValue.first, *rValue.second ); } + explicit ForEachFunctorWithKey( const FunctorType& rFunctor ) : maFunctor( rFunctor ) {} + void operator()( const value_type& rValue ) { if( rValue.second.get() ) maFunctor( rValue.first, *rValue.second ); } }; - inline const mapped_type* getRef( key_type nKey ) const + const mapped_type* getRef( key_type nKey ) const { typename container_type::const_iterator aIt = this->find( nKey ); return (aIt == this->end()) ? 0 : &aIt->second; diff --git a/include/oox/helper/refvector.hxx b/include/oox/helper/refvector.hxx index c0602b571c23..c0c5ad22d374 100644 --- a/include/oox/helper/refvector.hxx +++ b/include/oox/helper/refvector.hxx @@ -47,14 +47,14 @@ public: public: /** Returns true, if the object with the passed index exists. Returns false, if the vector element exists but is an empty reference. */ - inline bool has( sal_Int32 nIndex ) const + bool has( sal_Int32 nIndex ) const { const value_type* pxRef = getRef( nIndex ); return pxRef && pxRef->get(); } /** Returns a reference to the object with the passed index, or 0 on error. */ - inline value_type get( sal_Int32 nIndex ) const + value_type get( sal_Int32 nIndex ) const { if( const value_type* pxRef = getRef( nIndex ) ) return *pxRef; return value_type(); @@ -62,12 +62,12 @@ public: /** Returns the index of the last element, or -1, if the vector is empty. Does *not* check whether the last element is an empty reference. */ - inline sal_Int32 getLastIndex() const { return static_cast< sal_Int32 >( this->size() ) - 1; } + sal_Int32 getLastIndex() const { return static_cast< sal_Int32 >( this->size() ) - 1; } /** Calls the passed functor for every contained object, automatically skips all elements that are empty references. */ template< typename FunctorType > - inline void forEach( FunctorType aFunctor ) const + void forEach( FunctorType aFunctor ) const { ::std::for_each( this->begin(), this->end(), ForEachFunctor< FunctorType >( aFunctor ) ); } @@ -75,7 +75,7 @@ public: /** Calls the passed member function of ObjType on every contained object, automatically skips all elements that are empty references. */ template< typename FuncType > - inline void forEachMem( FuncType pFunc ) const + void forEachMem( FuncType pFunc ) const { forEach( ::boost::bind( pFunc, _1 ) ); } @@ -83,7 +83,7 @@ public: /** Calls the passed member function of ObjType on every contained object, automatically skips all elements that are empty references. */ template< typename FuncType, typename ParamType > - inline void forEachMem( FuncType pFunc, ParamType aParam ) const + void forEachMem( FuncType pFunc, ParamType aParam ) const { forEach( ::boost::bind( pFunc, _1, aParam ) ); } @@ -91,7 +91,7 @@ public: /** Calls the passed member function of ObjType on every contained object, automatically skips all elements that are empty references. */ template< typename FuncType, typename ParamType1, typename ParamType2 > - inline void forEachMem( FuncType pFunc, ParamType1 aParam1, ParamType2 aParam2 ) const + void forEachMem( FuncType pFunc, ParamType1 aParam1, ParamType2 aParam2 ) const { forEach( ::boost::bind( pFunc, _1, aParam1, aParam2 ) ); } @@ -99,7 +99,7 @@ public: /** Calls the passed member function of ObjType on every contained object, automatically skips all elements that are empty references. */ template< typename FuncType, typename ParamType1, typename ParamType2, typename ParamType3 > - inline void forEachMem( FuncType pFunc, ParamType1 aParam1, ParamType2 aParam2, ParamType3 aParam3 ) const + void forEachMem( FuncType pFunc, ParamType1 aParam1, ParamType2 aParam2, ParamType3 aParam3 ) const { forEach( ::boost::bind( pFunc, _1, aParam1, aParam2, aParam3 ) ); } @@ -107,7 +107,7 @@ public: /** Calls the passed functor for every contained object. Passes the index as first argument and the object reference as second argument to rFunctor. */ template< typename FunctorType > - inline void forEachWithIndex( const FunctorType& rFunctor ) const + void forEachWithIndex( const FunctorType& rFunctor ) const { ::std::for_each( this->begin(), this->end(), ForEachFunctorWithIndex< FunctorType >( rFunctor ) ); } @@ -115,7 +115,7 @@ public: /** Calls the passed member function of ObjType on every contained object. Passes the vector index to the member function. */ template< typename FuncType > - inline void forEachMemWithIndex( FuncType pFunc ) const + void forEachMemWithIndex( FuncType pFunc ) const { forEachWithIndex( ::boost::bind( pFunc, _2, _1 ) ); } @@ -123,7 +123,7 @@ public: /** Calls the passed member function of ObjType on every contained object. Passes the vector index as first argument to the member function. */ template< typename FuncType, typename ParamType > - inline void forEachMemWithIndex( FuncType pFunc, ParamType aParam ) const + void forEachMemWithIndex( FuncType pFunc, ParamType aParam ) const { forEachWithIndex( ::boost::bind( pFunc, _2, _1, aParam ) ); } @@ -131,7 +131,7 @@ public: /** Calls the passed member function of ObjType on every contained object. Passes the vector index as first argument to the member function. */ template< typename FuncType, typename ParamType1, typename ParamType2 > - inline void forEachMemWithIndex( FuncType pFunc, ParamType1 aParam1, ParamType2 aParam2 ) const + void forEachMemWithIndex( FuncType pFunc, ParamType1 aParam1, ParamType2 aParam2 ) const { forEachWithIndex( ::boost::bind( pFunc, _2, _1, aParam1, aParam2 ) ); } @@ -139,7 +139,7 @@ public: /** Calls the passed member function of ObjType on every contained object. Passes the vector index as first argument to the member function. */ template< typename FuncType, typename ParamType1, typename ParamType2, typename ParamType3 > - inline void forEachMemWithIndex( FuncType pFunc, ParamType1 aParam1, ParamType2 aParam2, ParamType3 aParam3 ) const + void forEachMemWithIndex( FuncType pFunc, ParamType1 aParam1, ParamType2 aParam2, ParamType3 aParam3 ) const { forEachWithIndex( ::boost::bind( pFunc, _2, _1, aParam1, aParam2, aParam3 ) ); } @@ -147,7 +147,7 @@ public: /** Searches for an element by using the passed functor that takes a constant reference of the object type (const ObjType&). */ template< typename FunctorType > - inline value_type findIf( const FunctorType& rFunctor ) const + value_type findIf( const FunctorType& rFunctor ) const { typename container_type::const_iterator aIt = ::std::find_if( this->begin(), this->end(), FindFunctor< FunctorType >( rFunctor ) ); return (aIt == this->end()) ? value_type() : *aIt; @@ -158,8 +158,8 @@ private: struct ForEachFunctor { FunctorType maFunctor; - inline explicit ForEachFunctor( const FunctorType& rFunctor ) : maFunctor( rFunctor ) {} - inline void operator()( const value_type& rxValue ) { if( rxValue.get() ) maFunctor( *rxValue ); } + explicit ForEachFunctor( const FunctorType& rFunctor ) : maFunctor( rFunctor ) {} + void operator()( const value_type& rxValue ) { if( rxValue.get() ) maFunctor( *rxValue ); } }; template< typename FunctorType > @@ -167,19 +167,19 @@ private: { FunctorType maFunctor; sal_Int32 mnIndex; - inline explicit ForEachFunctorWithIndex( const FunctorType& rFunctor ) : maFunctor( rFunctor ), mnIndex( 0 ) {} - inline void operator()( const value_type& rxValue ) { if( rxValue.get() ) maFunctor( mnIndex, *rxValue ); ++mnIndex; } + explicit ForEachFunctorWithIndex( const FunctorType& rFunctor ) : maFunctor( rFunctor ), mnIndex( 0 ) {} + void operator()( const value_type& rxValue ) { if( rxValue.get() ) maFunctor( mnIndex, *rxValue ); ++mnIndex; } }; template< typename FunctorType > struct FindFunctor { FunctorType maFunctor; - inline explicit FindFunctor( const FunctorType& rFunctor ) : maFunctor( rFunctor ) {} - inline bool operator()( const value_type& rxValue ) { return rxValue.get() && maFunctor( *rxValue ); } + explicit FindFunctor( const FunctorType& rFunctor ) : maFunctor( rFunctor ) {} + bool operator()( const value_type& rxValue ) { return rxValue.get() && maFunctor( *rxValue ); } }; - inline const value_type* getRef( sal_Int32 nIndex ) const + const value_type* getRef( sal_Int32 nIndex ) const { return ((0 <= nIndex) && (static_cast< size_type >( nIndex ) < this->size())) ? &(*this)[ static_cast< size_type >( nIndex ) ] : 0; diff --git a/include/oox/ole/axbinaryreader.hxx b/include/oox/ole/axbinaryreader.hxx index b6a937d14c4c..42be3661d2f3 100644 --- a/include/oox/ole/axbinaryreader.hxx +++ b/include/oox/ole/axbinaryreader.hxx @@ -70,10 +70,10 @@ public: /** Aligns the stream according to the passed type and reads a value. */ template< typename Type > - inline Type readAligned() { align( sizeof( Type ) ); return readValue< Type >(); } + Type readAligned() { align( sizeof( Type ) ); return readValue< Type >(); } /** Aligns the stream according to the passed type and skips the size of the type. */ template< typename Type > - inline void skipAligned() { align( sizeof( Type ) ); skip( sizeof( Type ) ); } + void skipAligned() { align( sizeof( Type ) ); skip( sizeof( Type ) ); } private: BinaryInputStream* mpInStrm; ///< The wrapped input stream. @@ -101,7 +101,7 @@ public: /** Reads the next integer property value from the stream, if the respective flag in the property mask is set. */ template< typename StreamType, typename DataType > - inline void readIntProperty( DataType& ornValue ) + void readIntProperty( DataType& ornValue ) { if( startNextProperty() ) ornValue = maInStrm.readAligned< StreamType >(); } /** Reads the next boolean property value from the stream, if the respective flag in the property mask is set. */ @@ -128,31 +128,31 @@ public: /** Skips the next integer property value in the stream, if the respective flag in the property mask is set. */ template< typename StreamType > - inline void skipIntProperty() { if( startNextProperty() ) maInStrm.skipAligned< StreamType >(); } + void skipIntProperty() { if( startNextProperty() ) maInStrm.skipAligned< StreamType >(); } /** Skips the next boolean property value in the stream, if the respective flag in the property mask is set. */ - inline void skipBoolProperty() { startNextProperty(); } + void skipBoolProperty() { startNextProperty(); } /** Skips the next pair property in the stream, if the respective flag in the property mask is set. */ void skipPairProperty() { readPairProperty( maDummyPairData ); } /** Skips the next string property in the stream, if the respective flag in the property mask is set. */ - inline void skipStringProperty() { readStringProperty( maDummyString ); } + void skipStringProperty() { readStringProperty( maDummyString ); } /** Skips the next ArrayString property in the stream, if the respective flag in the property mask is set. */ - inline void skipArrayStringProperty() { readArrayStringProperty( maDummyArrayString ); } + void skipArrayStringProperty() { readArrayStringProperty( maDummyArrayString ); } /** Skips the next GUID property in the stream, if the respective flag in the property mask is set. */ - inline void skipGuidProperty() { readGuidProperty( maDummyString ); } + void skipGuidProperty() { readGuidProperty( maDummyString ); } /** Skips the next font property in the stream, if the respective flag in the property mask is set. */ - inline void skipFontProperty() { readFontProperty( maDummyFontData ); } + void skipFontProperty() { readFontProperty( maDummyFontData ); } /** Skips the next picture property in the stream, if the respective flag in the property mask is set. */ - inline void skipPictureProperty() { readPictureProperty( maDummyPicData ); } + void skipPictureProperty() { readPictureProperty( maDummyPicData ); } /** Has to be called for undefined properties. If the respective flag in the mask is set, the property import cannot be finished successfully. */ - inline void skipUndefinedProperty() { ensureValid( !startNextProperty() ); } + void skipUndefinedProperty() { ensureValid( !startNextProperty() ); } /** Final processing, reads contents of all complex properties. */ bool finalizeImport(); @@ -174,7 +174,7 @@ private: { AxPairData& mrPairData; - inline explicit PairProperty( AxPairData& rPairData ) : + explicit PairProperty( AxPairData& rPairData ) : mrPairData( rPairData ) {} virtual bool readProperty( AxAlignedInputStream& rInStrm ); }; @@ -185,7 +185,7 @@ private: OUString& mrValue; sal_uInt32 mnSize; - inline explicit StringProperty( OUString& rValue, sal_uInt32 nSize ) : + explicit StringProperty( OUString& rValue, sal_uInt32 nSize ) : mrValue( rValue ), mnSize( nSize ) {} virtual bool readProperty( AxAlignedInputStream& rInStrm ); }; @@ -195,7 +195,7 @@ private: { AxArrayString& mrArray; sal_uInt32 mnSize; - inline explicit ArrayStringProperty( AxArrayString& rArray, sal_uInt32 nSize ) : + explicit ArrayStringProperty( AxArrayString& rArray, sal_uInt32 nSize ) : mrArray( rArray ), mnSize( nSize ) {} virtual bool readProperty( AxAlignedInputStream& rInStrm ); }; @@ -205,7 +205,7 @@ private: { OUString& mrGuid; - inline explicit GuidProperty( OUString& rGuid ) : + explicit GuidProperty( OUString& rGuid ) : mrGuid( rGuid ) {} virtual bool readProperty( AxAlignedInputStream& rInStrm ); }; @@ -215,7 +215,7 @@ private: { AxFontData& mrFontData; - inline explicit FontProperty( AxFontData& rFontData ) : + explicit FontProperty( AxFontData& rFontData ) : mrFontData( rFontData ) {} virtual bool readProperty( AxAlignedInputStream& rInStrm ); }; @@ -225,7 +225,7 @@ private: { StreamDataSequence& mrPicData; - inline explicit PictureProperty( StreamDataSequence& rPicData ) : + explicit PictureProperty( StreamDataSequence& rPicData ) : mrPicData( rPicData ) {} virtual bool readProperty( AxAlignedInputStream& rInStrm ); }; diff --git a/include/oox/ole/axbinarywriter.hxx b/include/oox/ole/axbinarywriter.hxx index 14c8aef09cf5..97f740fd8dc8 100644 --- a/include/oox/ole/axbinarywriter.hxx +++ b/include/oox/ole/axbinarywriter.hxx @@ -57,10 +57,10 @@ public: void pad( sal_Int32 nBytes, size_t nAtomSize = 1); /** Aligns the stream according to the passed type and reads a value. */ template< typename Type > - inline void writeAligned( Type nVal ) { align( sizeof( Type ) ); writeValue( nVal ); } + void writeAligned( Type nVal ) { align( sizeof( Type ) ); writeValue( nVal ); } /** Aligns the stream according to the passed type and skips the size of the type. */ template< typename Type > - inline void padAligned() { align( sizeof( Type ) ); pad( sizeof( Type ) ); } + void padAligned() { align( sizeof( Type ) ); pad( sizeof( Type ) ); } private: BinaryOutputStream* mpOutStrm; ///< The wrapped input stream. @@ -87,7 +87,7 @@ public: /** Write an integer property value to the stream, the respective flag in the property mask is set. */ template< typename StreamType, typename DataType > - inline void writeIntProperty( DataType& ornValue ) + void writeIntProperty( DataType& ornValue ) { if( startNextProperty() ) maOutStrm.writeAligned< StreamType >( ornValue ); } /** Write a boolean property value to the stream, the respective flag in the property mask is set. */ @@ -101,7 +101,7 @@ public: /** Skips the next property clears the respective flag in the property mask. */ - inline void skipProperty() { startNextProperty( true ); } + void skipProperty() { startNextProperty( true ); } /** Final processing, write contents of all complex properties, writes record size */ bool finalizeExport(); @@ -123,7 +123,7 @@ private: { AxPairData& mrPairData; - inline explicit PairProperty( AxPairData& rPairData ) : + explicit PairProperty( AxPairData& rPairData ) : mrPairData( rPairData ) {} virtual bool writeProperty( AxAlignedOutputStream& rOutStrm ); }; @@ -134,7 +134,7 @@ private: OUString& mrValue; sal_uInt32 mnSize; - inline explicit StringProperty( OUString& rValue, sal_uInt32 nSize ) : + explicit StringProperty( OUString& rValue, sal_uInt32 nSize ) : mrValue( rValue ), mnSize( nSize ) {} virtual bool writeProperty( AxAlignedOutputStream& rOutStrm ); }; @@ -144,7 +144,7 @@ private: { StreamDataSequence& mrPicData; - inline explicit PictureProperty( StreamDataSequence& rPicData ) : + explicit PictureProperty( StreamDataSequence& rPicData ) : mrPicData( rPicData ) {} virtual bool writeProperty( AxAlignedOutputStream& rOutStrm ); }; diff --git a/include/oox/ole/axcontrol.hxx b/include/oox/ole/axcontrol.hxx index d2bf3e571bce..7f657b11c77a 100644 --- a/include/oox/ole/axcontrol.hxx +++ b/include/oox/ole/axcontrol.hxx @@ -354,9 +354,9 @@ public: virtual ~ControlModelBase(); /** Sets this control model to AWT model mode. */ - inline void setAwtModelMode() { mbAwtModel = true; } + void setAwtModelMode() { mbAwtModel = true; } /** Sets this control model to form component mode. */ - inline void setFormComponentMode() { mbAwtModel = false; } + void setFormComponentMode() { mbAwtModel = false; } /** Returns the UNO service name used to construct the AWT control model, or the control form component. */ @@ -505,7 +505,7 @@ public: virtual void convertFromProperties( PropertySet& rPropSet, const ControlConverter& rConv ); /** Returns the font height in points. */ - inline sal_Int16 getFontHeight() const { return maFontData.getHeightPoints(); } + sal_Int16 getFontHeight() const { return maFontData.getHeightPoints(); } public: // direct access needed for legacy VML drawing controls AxFontData maFontData; ///< The font settings. @@ -692,7 +692,7 @@ public: explicit AxOptionButtonModel(); /** Returns the group name used to goup several option buttons gogether. */ - inline const OUString& getGroupName() const { return maGroupName; } + const OUString& getGroupName() const { return maGroupName; } virtual ApiControlType getControlType() const; virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const; @@ -945,11 +945,11 @@ public: ControlModelBase* createModelFromGuid( const OUString& rClassId ); /** Returns true, if the internal control model exists. */ - inline bool hasModel() const { return mxModel.get() != 0; } + bool hasModel() const { return mxModel.get() != 0; } /** Returns read-only access to the internal control model. */ - inline const ControlModelBase* getModel() const { return mxModel.get(); } + const ControlModelBase* getModel() const { return mxModel.get(); } /** Returns read/write access to the internal control model. */ - inline ControlModelBase* getModel() { return mxModel.get(); } + ControlModelBase* getModel() { return mxModel.get(); } /** Returns the UNO service name needed to construct the control model. */ OUString getServiceName() const; @@ -1006,7 +1006,7 @@ public: convertAndInsert( const EmbeddedControl& rControl, sal_Int32& rnCtrlIndex ); /** Returns the XIndexContainer interface of the UNO control form, if existing. */ - inline ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > + ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > getXForm() const { return mxFormIC; } private: diff --git a/include/oox/ole/vbacontrol.hxx b/include/oox/ole/vbacontrol.hxx index e31ee4312f29..89e30badcfb4 100644 --- a/include/oox/ole/vbacontrol.hxx +++ b/include/oox/ole/vbacontrol.hxx @@ -51,11 +51,11 @@ public: void moveRelative( const AxPairData& rDistance ); /** Returns the programmatical name of the control. */ - inline const OUString& getName() const { return maName; } + const OUString& getName() const { return maName; } /** Returns the position of the control in its parent. */ - inline const AxPairData& getPosition() const { return maPos; } + const AxPairData& getPosition() const { return maPos; } /** Returns the unique identifier of this control. */ - inline sal_Int32 getId() const { return mnId; } + sal_Int32 getId() const { return mnId; } /** Returns true, if this control is a container control. */ bool isContainer() const; /** Returns the length of the stream data for stream based controls. */ @@ -63,7 +63,7 @@ public: /** Returns the name of the substorage for the container control data. */ OUString getSubStorageName() const; /** Returns the tab index of the control. */ - inline sal_Int16 getTabIndex() const { return mnTabIndex; } + sal_Int16 getTabIndex() const { return mnTabIndex; } /** Tries to create the control model according to the site model. */ ControlModelRef createControlModel( const AxClassTable& rClassTable ) const; @@ -73,8 +73,8 @@ public: const ControlConverter& rConv, ApiControlType eCtrlType, sal_Int32 nCtrlIndex ) const; - inline ::rtl::OUString getControlSource() { return maControlSource; } - inline ::rtl::OUString getRowSource() { return maRowSource; } + ::rtl::OUString getControlSource() { return maControlSource; } + ::rtl::OUString getRowSource() { return maRowSource; } protected: OUString maName; ///< Name of the control. OUString maTag; ///< User defined tag. diff --git a/include/oox/ole/vbamodule.hxx b/include/oox/ole/vbamodule.hxx index 70dcd3913b9a..9c0cfd0a1812 100644 --- a/include/oox/ole/vbamodule.hxx +++ b/include/oox/ole/vbamodule.hxx @@ -51,14 +51,14 @@ public: bool bExecutable ); /** Returns the module type (com.sun.star.script.ModuleType constant). */ - inline sal_Int32 getType() const { return mnType; } + sal_Int32 getType() const { return mnType; } /** Sets the passed module type. */ - inline void setType( sal_Int32 nType ) { mnType = nType; } + void setType( sal_Int32 nType ) { mnType = nType; } /** Returns the name of the module. */ - inline const OUString& getName() const { return maName; } + const OUString& getName() const { return maName; } /** Returns the stream name of the module. */ - inline const OUString& getStreamName() const { return maStreamName; } + const OUString& getStreamName() const { return maStreamName; } /** Imports all records for this module until the MODULEEND record. */ void importDirRecords( BinaryInputStream& rDirStrm ); diff --git a/include/oox/vml/vmldrawing.hxx b/include/oox/vml/vmldrawing.hxx index ad7790962366..8d35e2521849 100644 --- a/include/oox/vml/vmldrawing.hxx +++ b/include/oox/vml/vmldrawing.hxx @@ -102,13 +102,13 @@ public: virtual ~Drawing(); /** Returns the filter object that imports/exports this VML drawing. */ - inline ::oox::core::XmlFilterBase& getFilter() const { return mrFilter; } + ::oox::core::XmlFilterBase& getFilter() const { return mrFilter; } /** Returns the application type containing the drawing. */ - inline DrawingType getType() const { return meType; } + DrawingType getType() const { return meType; } /** Returns read/write access to the container of shapes and templates. */ - inline ShapeContainer& getShapes() { return *mxShapes; } + ShapeContainer& getShapes() { return *mxShapes; } /** Returns read access to the container of shapes and templates. */ - inline const ShapeContainer& getShapes() const { return *mxShapes; } + const ShapeContainer& getShapes() const { return *mxShapes; } /** Returns the form object used to process ActiveX form controls. */ ::oox::ole::EmbeddedForm& getControlForm() const; diff --git a/include/oox/vml/vmlshape.hxx b/include/oox/vml/vmlshape.hxx index 6ef480541cd3..345210b07bad 100644 --- a/include/oox/vml/vmlshape.hxx +++ b/include/oox/vml/vmlshape.hxx @@ -118,12 +118,12 @@ public: virtual ~ShapeType(); /** Returns read/write access to the shape template model structure. */ - inline ShapeTypeModel& getTypeModel() { return maTypeModel; } + ShapeTypeModel& getTypeModel() { return maTypeModel; } /** Returns read access to the shape template model structure. */ - inline const ShapeTypeModel& getTypeModel() const { return maTypeModel; } + const ShapeTypeModel& getTypeModel() const { return maTypeModel; } /** Returns the shape identifier (which is unique through the containing drawing). */ - inline const OUString& getShapeId() const { return maTypeModel.maShapeId; } + const OUString& getShapeId() const { return maTypeModel.maShapeId; } /** Returns the application defined shape type. */ sal_Int32 getShapeType() const; /** Returns the fragment path to the embedded graphic used by this shape. */ @@ -222,14 +222,14 @@ class OOX_DLLPUBLIC ShapeBase : public ShapeType { public: /** Returns read/write access to the shape model structure. */ - inline ShapeModel& getShapeModel() { return maShapeModel; } + ShapeModel& getShapeModel() { return maShapeModel; } /** Returns read access to the shape model structure. */ - inline const ShapeModel& getShapeModel() const { return maShapeModel; } + const ShapeModel& getShapeModel() const { return maShapeModel; } /** Returns read access to the shape textbox. */ - inline const TextBox* getTextBox() const { return maShapeModel.mxTextBox.get(); } + const TextBox* getTextBox() const { return maShapeModel.mxTextBox.get(); } /** Returns read access to the shape client data structure. */ - inline const ClientData* getClientData() const { return maShapeModel.mxClientData.get(); } + const ClientData* getClientData() const { return maShapeModel.mxClientData.get(); } /** Final processing after import of the drawing fragment. */ virtual void finalizeFragmentImport(); @@ -411,9 +411,9 @@ public: virtual ~GroupShape(); /** Returns read/write access to the container of child shapes and templates. */ - inline ShapeContainer& getChildren() { return *mxChildren; } + ShapeContainer& getChildren() { return *mxChildren; } /** Returns read access to the container of child shapes and templates. */ - inline const ShapeContainer& getChildren() const { return *mxChildren; } + const ShapeContainer& getChildren() const { return *mxChildren; } /** Final processing after import of the drawing fragment. */ virtual void finalizeFragmentImport(); diff --git a/include/oox/vml/vmlshapecontainer.hxx b/include/oox/vml/vmlshapecontainer.hxx index 5e6a2c2a9d75..315cbf8e9665 100644 --- a/include/oox/vml/vmlshapecontainer.hxx +++ b/include/oox/vml/vmlshapecontainer.hxx @@ -54,7 +54,7 @@ public: ~ShapeContainer(); /** Returns the drawing this shape container is part of. */ - inline Drawing& getDrawing() { return mrDrawing; } + Drawing& getDrawing() { return mrDrawing; } /** Creates and returns a new shape template object. */ ShapeType& createShapeType(); @@ -66,7 +66,7 @@ public: void finalizeFragmentImport(); /** Returns true, if this container does not contain any shapes. */ - inline bool empty() const { return maShapes.empty(); } + bool empty() const { return maShapes.empty(); } /** Returns the shape template with the passed identifier. @param bDeep True = searches in all group shapes too. */ diff --git a/include/oox/vml/vmltextbox.hxx b/include/oox/vml/vmltextbox.hxx index d31bb3b1f269..88e6ecbca872 100644 --- a/include/oox/vml/vmltextbox.hxx +++ b/include/oox/vml/vmltextbox.hxx @@ -83,7 +83,7 @@ public: void appendPortion( const TextParagraphModel& rParagraph, const TextFontModel& rFont, const OUString& rText ); /** Returns the current number of text portions. */ - inline size_t getPortionCount() const { return maPortions.size(); } + size_t getPortionCount() const { return maPortions.size(); } /** Returns the font settings of the first text portion. */ const TextFontModel* getFirstFont() const; /** Returns the entire text of all text portions. */ |