diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-09-02 14:28:28 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-09-02 15:35:31 +0200 |
commit | ed5e44054c4c5c0fd7d9555dba777df250b7f301 (patch) | |
tree | 412937bcb45329b37ead6f812455a7d0cb3a286a /include | |
parent | 221107a1853c93e69debb42b2106978379d5ae60 (diff) |
loplugin:constmethod in oox
Change-Id: Ie6c9c60288accf7096288aa67d091548e43687cd
Reviewed-on: https://gerrit.libreoffice.org/78397
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include')
-rw-r--r-- | include/oox/drawingml/shape.hxx | 18 | ||||
-rw-r--r-- | include/oox/drawingml/shapecontext.hxx | 2 | ||||
-rw-r--r-- | include/oox/export/chartexport.hxx | 2 | ||||
-rw-r--r-- | include/oox/export/drawingml.hxx | 8 | ||||
-rw-r--r-- | include/oox/export/vmlexport.hxx | 2 | ||||
-rw-r--r-- | include/oox/helper/grabbagstack.hxx | 4 | ||||
-rw-r--r-- | include/oox/ole/olehelper.hxx | 10 | ||||
-rw-r--r-- | include/oox/ole/vbacontrol.hxx | 4 | ||||
-rw-r--r-- | include/oox/ole/vbaexport.hxx | 6 | ||||
-rw-r--r-- | include/oox/ppt/comments.hxx | 10 | ||||
-rw-r--r-- | include/oox/ppt/pptshape.hxx | 2 | ||||
-rw-r--r-- | include/oox/ppt/slidefragmenthandler.hxx | 2 | ||||
-rw-r--r-- | include/oox/ppt/slidepersist.hxx | 4 |
13 files changed, 37 insertions, 37 deletions
diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx index d55e92ae5058..19b619251339 100644 --- a/include/oox/drawingml/shape.hxx +++ b/include/oox/drawingml/shape.hxx @@ -146,11 +146,11 @@ public: std::vector< ShapePtr >& getChildren() { return maChildren; } void setName( const OUString& rName ) { msName = rName; } - const OUString& getName( ) { return msName; } + const OUString& getName( ) const { return msName; } void setInternalName( const OUString& rInternalName ) { msInternalName = rInternalName; } const OUString& getInternalName() const { return msInternalName; } void setId( const OUString& rId ) { msId = rId; } - const OUString& getId() { return msId; } + const OUString& getId() const { return msId; } void setDescription( const OUString& rDescr ) { msDescription = rDescr; } void setHidden( bool bHidden ) { mbHidden = bHidden; } void setHiddenMasterShape( bool bHiddenMasterShape ) { mbHiddenMasterShape = bHiddenMasterShape; } @@ -169,7 +169,7 @@ public: void setTableType(); void setTextBody(const TextBodyPtr & pTextBody); - const TextBodyPtr& getTextBody() { return mpTextBody;} + const TextBodyPtr& getTextBody() const { return mpTextBody;} void setMasterTextListStyle( const TextListStylePtr& pMasterTextListStyle ); const TextListStylePtr& getMasterTextListStyle() const { return mpMasterTextListStyle; } @@ -192,26 +192,26 @@ public: void applyShapeReference( const Shape& rReferencedShape, bool bUseText = true ); const ::std::vector<OUString>& - getExtDrawings() { return maExtDrawings; } + getExtDrawings() const { return maExtDrawings; } void addExtDrawingRelId( const OUString &rRelId ) { maExtDrawings.push_back( rRelId ); } // Set font color only for extdrawings. void setFontRefColorForNodes(const Color& rColor) { maFontRefColorForNodes = rColor; } const Color& getFontRefColorForNodes() const { return maFontRefColorForNodes; } void setLockedCanvas(bool bLockedCanvas); - bool getLockedCanvas() { return mbLockedCanvas;} + bool getLockedCanvas() const { return mbLockedCanvas;} void setWps(bool bWps); - bool getWps() { return mbWps;} + bool getWps() const { return mbWps;} void setTextBox(bool bTextBox); const css::uno::Sequence<css::beans::PropertyValue> & - getDiagramDoms() { return maDiagramDoms; } + getDiagramDoms() const { return maDiagramDoms; } void setDiagramDoms(const css::uno::Sequence<css::beans::PropertyValue>& rDiagramDoms) { maDiagramDoms = rDiagramDoms; } void setDiagramData(const DiagramDataPtr& pDiagramData) { mpDiagramData = pDiagramData; } css::uno::Sequence< css::uno::Sequence< css::uno::Any > >resolveRelationshipsOfTypeFromOfficeDoc( core::XmlFilterBase& rFilter, const OUString& sFragment, const OUString& sType ); void setLinkedTxbxAttributes(const LinkedTxbxAttr& rhs){ maLinkedTxbxAttr = rhs; }; void setTxbxHasLinkedTxtBox( const bool rhs){ mbHasLinkedTxbx = rhs; }; - const LinkedTxbxAttr& getLinkedTxbxAttributes() { return maLinkedTxbxAttr; }; - bool isLinkedTxbx() { return mbHasLinkedTxbx; }; + const LinkedTxbxAttr& getLinkedTxbxAttributes() const { return maLinkedTxbxAttr; }; + bool isLinkedTxbx() const { return mbHasLinkedTxbx; }; void setZOrder(sal_Int32 nZOrder) { mnZOrder = nZOrder; } diff --git a/include/oox/drawingml/shapecontext.hxx b/include/oox/drawingml/shapecontext.hxx index b06ac38ed21d..15684323ca9f 100644 --- a/include/oox/drawingml/shapecontext.hxx +++ b/include/oox/drawingml/shapecontext.hxx @@ -38,7 +38,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override; - const ShapePtr& getShape() { return mpShapePtr;} + const ShapePtr& getShape() const { return mpShapePtr;} protected: diff --git a/include/oox/export/chartexport.hxx b/include/oox/export/chartexport.hxx index a07a624d2b97..e7474d75ac15 100644 --- a/include/oox/export/chartexport.hxx +++ b/include/oox/export/chartexport.hxx @@ -220,7 +220,7 @@ public: void SetURLTranslator(const std::shared_ptr<URLTransformer>& pTransformer); - const css::uno::Reference< css::frame::XModel >& getModel(){ return mxChartModel; } + const css::uno::Reference< css::frame::XModel >& getModel() const { return mxChartModel; } void WriteChartObj( const css::uno::Reference< css::drawing::XShape >& xShape, sal_Int32 nID, sal_Int32 nChartCount ); diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx index c11664bb2738..95c105ee6c4c 100644 --- a/include/oox/export/drawingml.hxx +++ b/include/oox/export/drawingml.hxx @@ -161,8 +161,8 @@ protected: void WriteStyleProperties( sal_Int32 nTokenId, const css::uno::Sequence< css::beans::PropertyValue >& aProperties ); - const char* GetComponentDir(); - const char* GetRelationCompPrefix(); + const char* GetComponentDir() const; + const char* GetRelationCompPrefix() const; static bool EqualGradients( css::awt::Gradient aGradient1, css::awt::Gradient aGradient2 ); @@ -170,9 +170,9 @@ public: DrawingML( ::sax_fastparser::FSHelperPtr pFS, ::oox::core::XmlFilterBase* pFB, DocumentType eDocumentType = DOCUMENT_PPTX, DMLTextExport* pTextExport = nullptr ) : meDocumentType( eDocumentType ), mpTextExport(pTextExport), mpFS( pFS ), mpFB( pFB ), mbIsBackgroundDark( false ) {} void SetFS( ::sax_fastparser::FSHelperPtr pFS ) { mpFS = pFS; } - const ::sax_fastparser::FSHelperPtr& GetFS() { return mpFS; } + const ::sax_fastparser::FSHelperPtr& GetFS() const { return mpFS; } ::oox::core::XmlFilterBase* GetFB() { return mpFB; } - DocumentType GetDocumentType() { return meDocumentType; } + DocumentType GetDocumentType() const { return meDocumentType; } /// The application-specific text exporter callback, if there is one. DMLTextExport* GetTextExport() { return mpTextExport; } diff --git a/include/oox/export/vmlexport.hxx b/include/oox/export/vmlexport.hxx index 7aa445cfddf9..83b5b91c0d41 100644 --- a/include/oox/export/vmlexport.hxx +++ b/include/oox/export/vmlexport.hxx @@ -127,7 +127,7 @@ public: virtual ~VMLExport() override; const ::sax_fastparser::FSHelperPtr& - GetFS() { return m_pSerializer; } + GetFS() const { return m_pSerializer; } void SetFS(const ::sax_fastparser::FSHelperPtr& pSerializer); diff --git a/include/oox/helper/grabbagstack.hxx b/include/oox/helper/grabbagstack.hxx index 4821978ac31a..de6802ecc1b5 100644 --- a/include/oox/helper/grabbagstack.hxx +++ b/include/oox/helper/grabbagstack.hxx @@ -42,7 +42,7 @@ public: GrabBagStack(const OUString& aElementName); ~GrabBagStack(); - const OUString& getCurrentName() { return mCurrentElement.maElementName;} + const OUString& getCurrentName() const { return mCurrentElement.maElementName;} css::beans::PropertyValue getRootProperty(); @@ -51,7 +51,7 @@ public: void pop(); void addInt32(const OUString& aElementName, sal_Int32 aIntValue); void addString(const OUString& aElementName, const OUString& aStringValue); - bool isStackEmpty(); + bool isStackEmpty() const; }; } // namespace oox diff --git a/include/oox/ole/olehelper.hxx b/include/oox/ole/olehelper.hxx index 4995db760547..389b2a874fbf 100644 --- a/include/oox/ole/olehelper.hxx +++ b/include/oox/ole/olehelper.hxx @@ -149,17 +149,17 @@ public: OleFormCtrlExportHelper( const css::uno::Reference< css::uno::XComponentContext >& rxCtx, const css::uno::Reference< css::frame::XModel >& xDocModel, const css::uno::Reference< css::awt::XControlModel >& xModel ); ~OleFormCtrlExportHelper(); - OUString getGUID() + OUString getGUID() const { OUString sResult; if ( maGUID.getLength() > 2 ) sResult = maGUID.copy(1, maGUID.getLength() - 2 ); return sResult; } - const OUString& getFullName() { return maFullName; } - const OUString& getTypeName() { return maTypeName; } - const OUString& getName() { return maName; } - bool isValid() { return mpModel != nullptr; } + const OUString& getFullName() const { return maFullName; } + const OUString& getTypeName() const { return maTypeName; } + const OUString& getName() const { return maName; } + bool isValid() const { return mpModel != nullptr; } void exportName( const css::uno::Reference< css::io::XOutputStream >& rxOut ); void exportCompObj( const css::uno::Reference< css::io::XOutputStream >& rxOut ); void exportControl( const css::uno::Reference< css::io::XOutputStream >& rxOut, const css::awt::Size& rSize, bool bAutoClose = false ); diff --git a/include/oox/ole/vbacontrol.hxx b/include/oox/ole/vbacontrol.hxx index b192c2d29ff8..911b14c324cb 100644 --- a/include/oox/ole/vbacontrol.hxx +++ b/include/oox/ole/vbacontrol.hxx @@ -86,8 +86,8 @@ public: const ControlConverter& rConv, ApiControlType eCtrlType, sal_Int32 nCtrlIndex ) const; - const OUString& getControlSource() { return maControlSource; } - const OUString& getRowSource() { return maRowSource; } + const OUString& getControlSource() const { return maControlSource; } + const OUString& getRowSource() const { return maRowSource; } private: OUString maName; ///< Name of the control. OUString maTag; ///< User defined tag. diff --git a/include/oox/ole/vbaexport.hxx b/include/oox/ole/vbaexport.hxx index 4951b341cd32..6194d7108126 100644 --- a/include/oox/ole/vbaexport.hxx +++ b/include/oox/ole/vbaexport.hxx @@ -39,12 +39,12 @@ public: private: css::uno::Reference<css::container::XNameContainer> - getBasicLibrary(); + getBasicLibrary() const; css::uno::Reference<css::script::XLibraryContainer> - getLibraryContainer(); + getLibraryContainer() const; - OUString getProjectName(); + OUString getProjectName() const; css::uno::Reference<css::frame::XModel> mxModel; }; diff --git a/include/oox/ppt/comments.hxx b/include/oox/ppt/comments.hxx index 65f719fff9f4..781820b7a0b5 100644 --- a/include/oox/ppt/comments.hxx +++ b/include/oox/ppt/comments.hxx @@ -80,19 +80,19 @@ class Comment { text = _text; } - const OUString& get_text() + const OUString& get_text() const { return text; } - const css::util::DateTime& getDateTime() + const css::util::DateTime& getDateTime() const { return aDateTime; } - sal_Int32 getIntX() + sal_Int32 getIntX() const { return x.toInt32(); } - sal_Int32 getIntY() + sal_Int32 getIntY() const { return y.toInt32(); } @@ -103,7 +103,7 @@ class CommentList { public: std::vector<Comment> cmLst; - int getSize () + int getSize () const { return static_cast<int>(cmLst.size()); } diff --git a/include/oox/ppt/pptshape.hxx b/include/oox/ppt/pptshape.hxx index b1ffc3f91ffa..fac28f7616c3 100644 --- a/include/oox/ppt/pptshape.hxx +++ b/include/oox/ppt/pptshape.hxx @@ -62,7 +62,7 @@ public: // addShape is creating and inserting the corresponding XShape. void addShape( oox::core::XmlFilterBase& rFilterBase, - SlidePersist& rPersist, + const SlidePersist& rPersist, const oox::drawingml::Theme* pTheme, const css::uno::Reference< css::drawing::XShapes >& rxShapes, basegfx::B2DHomMatrix& aTransformation, diff --git a/include/oox/ppt/slidefragmenthandler.hxx b/include/oox/ppt/slidefragmenthandler.hxx index 8e5791564e77..c6a193ffdbff 100644 --- a/include/oox/ppt/slidefragmenthandler.hxx +++ b/include/oox/ppt/slidefragmenthandler.hxx @@ -44,7 +44,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override; virtual void onCharacters( const OUString& rChars ) override; - const ::std::vector< OUString>& getCharVector() { return maCharVector; } + const ::std::vector< OUString>& getCharVector() const { return maCharVector; } protected: SlidePersistPtr mpSlidePersistPtr; diff --git a/include/oox/ppt/slidepersist.hxx b/include/oox/ppt/slidepersist.hxx index 5708775c25bd..8ef8515757bf 100644 --- a/include/oox/ppt/slidepersist.hxx +++ b/include/oox/ppt/slidepersist.hxx @@ -96,7 +96,7 @@ public: bool isNotesPage() const { return mbNotes; } void setLayoutValueToken( sal_Int32 nLayoutValueToken ) { mnLayoutValueToken = nLayoutValueToken; } - sal_Int16 getLayoutFromValueToken(); + sal_Int16 getLayoutFromValueToken() const; const oox::drawingml::TextListStylePtr& getDefaultTextStyle() const { return maDefaultTextStylePtr; } @@ -105,7 +105,7 @@ public: const oox::drawingml::TextListStylePtr& getNotesTextStyle() const { return maNotesTextStylePtr; } const oox::drawingml::TextListStylePtr& getOtherTextStyle() const { return maOtherTextStylePtr; } - const oox::drawingml::ShapePtr& getShapes() { return maShapesPtr; } + const oox::drawingml::ShapePtr& getShapes() const { return maShapesPtr; } void hideShapesAsMasterShapes(); ::std::vector< std::shared_ptr< TimeNode > >& getTimeNodeList() { return maTimeNodeList; } oox::ppt::HeaderFooter& getHeaderFooter(){ return maHeaderFooter; }; |