diff options
author | Noel Grandin <noel@peralex.com> | 2016-01-13 10:58:54 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2016-01-13 12:16:23 +0200 |
commit | 139c2e8cbde7e176d184c46583d1b78ef851515a (patch) | |
tree | 1df9c43c20ceaf4a461d9291e7359ddfde129adb /include | |
parent | 6cbf151fa91ce50f7b1582c6e502a4474ba54b8e (diff) |
loplugin:unusedmethods unused return value in include/svx
Change-Id: I9a5e937905fd71ecbbf9cb215ff6cc2b7defc6f3
Diffstat (limited to 'include')
27 files changed, 47 insertions, 79 deletions
diff --git a/include/svx/AccessibleShape.hxx b/include/svx/AccessibleShape.hxx index 822be7eda382..a3abffbd37cc 100644 --- a/include/svx/AccessibleShape.hxx +++ b/include/svx/AccessibleShape.hxx @@ -161,14 +161,6 @@ public: */ virtual void Init(); - /** Compare two accessible shapes using object identity - @param rShape - This is the second operand. - @return - Returns true if both shapes are the same object. - */ - bool operator== (const AccessibleShape& rShape); - /** Set the specified state. If the state is <const>FOCUSED</const> then, additionally to the inherited functionality, the focus listeners registered with the XAccessibleComponent diff --git a/include/svx/EnhancedCustomShape2d.hxx b/include/svx/EnhancedCustomShape2d.hxx index 667ad5c18c73..c85f88856552 100644 --- a/include/svx/EnhancedCustomShape2d.hxx +++ b/include/svx/EnhancedCustomShape2d.hxx @@ -132,7 +132,7 @@ class SVX_DLLPUBLIC EnhancedCustomShape2d : public SfxItemSet SAL_DLLPRIVATE Color GetColorData( const Color& rFillColor, sal_uInt32 nIndex, double dBrightness ) const; SAL_DLLPRIVATE void AdaptObjColor(SdrPathObj& rObj, const SfxItemSet& rCustomShapeSet, sal_uInt32& nColorIndex, sal_uInt32 nColorCount); - SAL_DLLPRIVATE bool GetParameter( double& rParameterReturnValue, const css::drawing::EnhancedCustomShapeParameter&, + SAL_DLLPRIVATE void GetParameter( double& rParameterReturnValue, const css::drawing::EnhancedCustomShapeParameter&, const bool bReplaceGeoWidth, const bool bReplaceGeoHeight ) const; SAL_DLLPRIVATE Point GetPoint( const css::drawing::EnhancedCustomShapeParameterPair&, const bool bScale = true, const bool bReplaceGeoSize = false ) const; @@ -141,7 +141,7 @@ class SVX_DLLPUBLIC EnhancedCustomShape2d : public SfxItemSet bool bLineGeometryNeededOnly, bool bSortFilledObjectsToBack, sal_Int32 nIndex ); SAL_DLLPRIVATE SdrObject* CreatePathObj( bool bLineGeometryNeededOnly ); - SAL_DLLPRIVATE const sal_Int32* ApplyShapeAttributes( const SdrCustomShapeGeometryItem& rItem ); + SAL_DLLPRIVATE void ApplyShapeAttributes( const SdrCustomShapeGeometryItem& rItem ); SAL_DLLPRIVATE void SetPathSize( sal_Int32 nIndex = 0 ); diff --git a/include/svx/ShapeTypeHandler.hxx b/include/svx/ShapeTypeHandler.hxx index 85573017690d..796fe88c52e2 100644 --- a/include/svx/ShapeTypeHandler.hxx +++ b/include/svx/ShapeTypeHandler.hxx @@ -131,11 +131,8 @@ public: Number of new shape types. @param aDescriptorList Array of new shape type descriptors. - @return - The returned flag indicates whether the specified shape - descriptors have been successfully added. */ - bool AddShapeTypeList (int nDescriptorCount, + void AddShapeTypeList (int nDescriptorCount, ShapeTypeDescriptor aDescriptorList[]); /// get the accessible base name for an object diff --git a/include/svx/fmsrcimp.hxx b/include/svx/fmsrcimp.hxx index 74305a99a721..6e5ed194d0ff 100644 --- a/include/svx/fmsrcimp.hxx +++ b/include/svx/fmsrcimp.hxx @@ -89,7 +89,7 @@ class SAL_WARN_UNUSED FmRecordCountListener : public ::cppu::WeakImplHelper1< cs // attribute access public: - Link<sal_Int32,void> SetPropChangeHandler(const Link<sal_Int32,void>& lnk); + void SetPropChangeHandler(const Link<sal_Int32,void>& lnk); // methods public: @@ -338,7 +338,7 @@ public: /** only valid, if not an (asynchronous) search is running, the next search will then be executed on top of the new iterator with the new parameter */ - bool SwitchToContext(const css::uno::Reference< css::sdbc::XResultSet >& xCursor, const OUString& strVisibleFields, const InterfaceArray& arrFields, + void SwitchToContext(const css::uno::Reference< css::sdbc::XResultSet >& xCursor, const OUString& strVisibleFields, const InterfaceArray& arrFields, sal_Int32 nFieldIndex); protected: diff --git a/include/svx/fmtools.hxx b/include/svx/fmtools.hxx index 3c970a0d50e7..6e9069407f41 100644 --- a/include/svx/fmtools.hxx +++ b/include/svx/fmtools.hxx @@ -116,14 +116,11 @@ public: bool is() const { return m_xMoveOperations.is(); } bool Is() const { return m_xMoveOperations.is(); } - CursorWrapper* operator ->() { return this; } operator const css::uno::Reference< css::uno::XInterface>& () const{ return m_xGeneric; } // 'Conversions' const CursorWrapper& operator=(const css::uno::Reference< css::sdbc::XRowSet>& xCursor); operator const css::uno::Reference< css::sdbc::XResultSet>& () const { return m_xMoveOperations; } - operator const css::uno::Reference< css::sdbcx::XRowLocate>& () const { return m_xBookmarkOperations; } - operator const css::uno::Reference< css::sdbcx::XColumnsSupplier>& () const { return m_xColumnsSupplier; } const css::uno::Reference< css::beans::XPropertySet >& getPropertySet() const { return m_xPropertyAccess; } diff --git a/include/svx/gallery1.hxx b/include/svx/gallery1.hxx index dc5d0a9fd479..5879e201edbd 100644 --- a/include/svx/gallery1.hxx +++ b/include/svx/gallery1.hxx @@ -134,7 +134,7 @@ public: SAL_DLLPRIVATE OUString GetThemeName( sal_uIntPtr nThemeId ) const; bool CreateTheme( const OUString& rThemeName ); - SAL_DLLPRIVATE bool RenameTheme( const OUString& rOldName, const OUString& rNewName ); + SAL_DLLPRIVATE void RenameTheme( const OUString& rOldName, const OUString& rNewName ); bool RemoveTheme( const OUString& rThemeName ); GalleryTheme* AcquireTheme( const OUString& rThemeName, SfxListener& rListener ); diff --git a/include/svx/langbox.hxx b/include/svx/langbox.hxx index cfc1e181c1d7..f88ca532d7b3 100644 --- a/include/svx/langbox.hxx +++ b/include/svx/langbox.hxx @@ -69,9 +69,9 @@ public: bool bCheckSpellAvail = false ); sal_Int32 InsertLanguage( const LanguageType eLangType, sal_Int32 nPos = LISTBOX_APPEND ); - sal_Int32 InsertDefaultLanguage( sal_Int16 nType, sal_Int32 nPos = LISTBOX_APPEND ); - sal_Int32 InsertSystemLanguage( sal_Int32 nPos = LISTBOX_APPEND ); - sal_Int32 InsertLanguage( const LanguageType eLangType, + void InsertDefaultLanguage( sal_Int16 nType, sal_Int32 nPos = LISTBOX_APPEND ); + void InsertSystemLanguage( sal_Int32 nPos = LISTBOX_APPEND ); + void InsertLanguage( const LanguageType eLangType, bool bCheckEntry, sal_Int32 nPos = LISTBOX_APPEND ); void RemoveLanguage( const LanguageType eLangType ); void SelectLanguage( const LanguageType eLangType, bool bSelect = true ); diff --git a/include/svx/nbdtmg.hxx b/include/svx/nbdtmg.hxx index f8251d7d719f..55059bc56776 100644 --- a/include/svx/nbdtmg.hxx +++ b/include/svx/nbdtmg.hxx @@ -217,8 +217,8 @@ class SVX_DLLPUBLIC NBOTypeMgrBase virtual ~NBOTypeMgrBase() {} virtual void Init()=0; virtual sal_uInt16 GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 mLevel,sal_uInt16 nFromIndex=0)=0; - virtual bool RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel=(sal_uInt16)0xFFFF)=0; - virtual bool ApplyNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel=(sal_uInt16)0xFFFF, bool isDefault=false,bool isResetSize=false)=0; + virtual void RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel=(sal_uInt16)0xFFFF)=0; + virtual void ApplyNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel=(sal_uInt16)0xFFFF, bool isDefault=false,bool isResetSize=false)=0; virtual OUString GetDescription(sal_uInt16 nIndex,bool isDefault=false)=0; virtual bool IsCustomized(sal_uInt16 nIndex)=0; static sal_uInt16 IsSingleLevel(sal_uInt16 nCurLevel); @@ -249,8 +249,8 @@ class SVX_DLLPUBLIC BulletsTypeMgr: public NBOTypeMgrBase virtual ~BulletsTypeMgr() {} virtual void Init() override; virtual sal_uInt16 GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 mLevel,sal_uInt16 nFromIndex=0) override; - virtual bool RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel=(sal_uInt16)0xFFFF) override; - virtual bool ApplyNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel=(sal_uInt16)0xFFFF,bool isDefault=false,bool isResetSize=false) override; + virtual void RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel=(sal_uInt16)0xFFFF) override; + virtual void ApplyNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel=(sal_uInt16)0xFFFF,bool isDefault=false,bool isResetSize=false) override; virtual OUString GetDescription(sal_uInt16 nIndex,bool isDefault=false) override; virtual bool IsCustomized(sal_uInt16 nIndex) override; static sal_Unicode GetBulChar(sal_uInt16 nIndex); @@ -271,8 +271,8 @@ class SVX_DLLPUBLIC GraphyicBulletsTypeMgr: public NBOTypeMgrBase virtual ~GraphyicBulletsTypeMgr(); virtual void Init() override; virtual sal_uInt16 GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 mLevel,sal_uInt16 nFromIndex=0) override; - virtual bool RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel=(sal_uInt16)0xFFFF) override; - virtual bool ApplyNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel=(sal_uInt16)0xFFFF,bool isDefault=false,bool isResetSize=false) override; + virtual void RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel=(sal_uInt16)0xFFFF) override; + virtual void ApplyNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel=(sal_uInt16)0xFFFF,bool isDefault=false,bool isResetSize=false) override; virtual OUString GetDescription(sal_uInt16 nIndex,bool isDefault=false) override; virtual bool IsCustomized(sal_uInt16 nIndex) override; OUString GetGrfName(sal_uInt16 nIndex); @@ -292,8 +292,8 @@ class SVX_DLLPUBLIC MixBulletsTypeMgr: public NBOTypeMgrBase virtual ~MixBulletsTypeMgr() {} virtual void Init() override; virtual sal_uInt16 GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 mLevel,sal_uInt16 nFromIndex=0) override; - virtual bool RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel=(sal_uInt16)0xFFFF) override; - virtual bool ApplyNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel=(sal_uInt16)0xFFFF,bool isDefault=false,bool isResetSize=false) override; + virtual void RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel=(sal_uInt16)0xFFFF) override; + virtual void ApplyNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel=(sal_uInt16)0xFFFF,bool isDefault=false,bool isResetSize=false) override; virtual OUString GetDescription(sal_uInt16 nIndex,bool isDefault=false) override; virtual bool IsCustomized(sal_uInt16 nIndex) override; static MixBulletsTypeMgr& GetInstance(); @@ -310,8 +310,8 @@ class SVX_DLLPUBLIC NumberingTypeMgr: public NBOTypeMgrBase virtual ~NumberingTypeMgr(); virtual void Init() override; virtual sal_uInt16 GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 mLevel,sal_uInt16 nFromIndex=0) override; - virtual bool RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel=(sal_uInt16)0xFFFF) override; - virtual bool ApplyNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel=(sal_uInt16)0xFFFF,bool isDefault=false,bool isResetSize=false) override; + virtual void RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel=(sal_uInt16)0xFFFF) override; + virtual void ApplyNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel=(sal_uInt16)0xFFFF,bool isDefault=false,bool isResetSize=false) override; virtual OUString GetDescription(sal_uInt16 nIndex,bool isDefault=false) override; virtual bool IsCustomized(sal_uInt16 nIndex) override; static NumberingTypeMgr& GetInstance(); @@ -328,8 +328,8 @@ class SVX_DLLPUBLIC OutlineTypeMgr: public NBOTypeMgrBase virtual ~OutlineTypeMgr() {} virtual void Init() override; virtual sal_uInt16 GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 mLevel,sal_uInt16 nFromIndex=0) override; - virtual bool RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel=(sal_uInt16)0xFFFF) override; - virtual bool ApplyNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel=(sal_uInt16)0xFFFF,bool isDefault=false,bool isResetSize=false) override; + virtual void RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel=(sal_uInt16)0xFFFF) override; + virtual void ApplyNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel=(sal_uInt16)0xFFFF,bool isDefault=false,bool isResetSize=false) override; virtual OUString GetDescription(sal_uInt16 nIndex,bool isDefault=false) override; virtual bool IsCustomized(sal_uInt16 nIndex) override; static OutlineTypeMgr& GetInstance(); diff --git a/include/svx/sdr/table/tablecontroller.hxx b/include/svx/sdr/table/tablecontroller.hxx index d1a87a24dc74..b8cf893c772c 100644 --- a/include/svx/sdr/table/tablecontroller.hxx +++ b/include/svx/sdr/table/tablecontroller.hxx @@ -135,7 +135,7 @@ private: SVX_DLLPRIVATE void MergeRange( sal_Int32 nFirstCol, sal_Int32 nFirstRow, sal_Int32 nLastCol, sal_Int32 nLastRow ); SVX_DLLPRIVATE void EditCell( const CellPos& rPos, vcl::Window* pWindow, const css::awt::MouseEvent* pMouseEvent = nullptr, sal_uInt16 nAction = 0 ); - SVX_DLLPRIVATE bool StopTextEdit(); + SVX_DLLPRIVATE void StopTextEdit(); SVX_DLLPRIVATE sal_uInt16 getKeyboardAction( const KeyEvent& rKEvt, vcl::Window* pWindow ); SVX_DLLPRIVATE bool executeAction( sal_uInt16 nAction, bool bSelect, vcl::Window* pWindow ); diff --git a/include/svx/sdrmasterpagedescriptor.hxx b/include/svx/sdrmasterpagedescriptor.hxx index a13cea3e5aac..2469e078f85b 100644 --- a/include/svx/sdrmasterpagedescriptor.hxx +++ b/include/svx/sdrmasterpagedescriptor.hxx @@ -74,10 +74,6 @@ namespace sdr const SetOfByte& GetVisibleLayers() const { return maVisibleLayers; } void SetVisibleLayers(const SetOfByte& rNew); - // operators - bool operator==(const MasterPageDescriptor& rCandidate) const; - bool operator!=(const MasterPageDescriptor& rCandidate) const; - const SdrPageProperties* getCorrectSdrPageProperties() const; }; } // end of namespace sdr diff --git a/include/svx/svdedtv.hxx b/include/svx/svdedtv.hxx index 3da98ac09106..104d9a161622 100644 --- a/include/svx/svdedtv.hxx +++ b/include/svx/svdedtv.hxx @@ -194,9 +194,9 @@ public: void AddUndoActions( std::vector< SdrUndoAction* >& ); // Layermanagement with Undo. - SdrLayer* InsertNewLayer(const OUString& rName, sal_uInt16 nPos=0xFFFF); + void InsertNewLayer(const OUString& rName, sal_uInt16 nPos=0xFFFF); // Delete a layer including all objects contained - void DeleteLayer(const OUString& rName); + void DeleteLayer(const OUString& rName); // Marked objects which are outside a page // are assigned to an other page; at the moment without undo!!! diff --git a/include/svx/svdedxv.hxx b/include/svx/svdedxv.hxx index 5fccc68595fe..63b91527ef87 100644 --- a/include/svx/svdedxv.hxx +++ b/include/svx/svdedxv.hxx @@ -247,7 +247,7 @@ public: // Has only effect, if the document has draw-objects with macrofunctionality (SdrObject::HasMacro()==sal_True). bool IsMacroMode() const { return bMacroMode; } bool BegMacroObj(const Point& rPnt, short nTol, SdrObject* pObj, SdrPageView* pPV, vcl::Window* pWin); - bool BegMacroObj(const Point& rPnt, SdrObject* pObj, SdrPageView* pPV, vcl::Window* pWin) { return BegMacroObj(rPnt,-2,pObj,pPV,pWin); } + void BegMacroObj(const Point& rPnt, SdrObject* pObj, SdrPageView* pPV, vcl::Window* pWin) { BegMacroObj(rPnt,-2,pObj,pPV,pWin); } void MovMacroObj(const Point& rPnt); void BrkMacroObj(); bool EndMacroObj(); @@ -265,7 +265,7 @@ public: static bool SupportsFormatPaintbrush( sal_uInt32 nObjectInventor, sal_uInt16 nObjectIdentifier ); /** returns a format paint brush set from the current selection */ - bool TakeFormatPaintBrush( std::shared_ptr< SfxItemSet >& rFormatSet ); + void TakeFormatPaintBrush( std::shared_ptr< SfxItemSet >& rFormatSet ); /** applies a format paint brush set from the current selection. if bNoCharacterFormats is true, no character attributes are changed. diff --git a/include/svx/svdetc.hxx b/include/svx/svdetc.hxx index 0cc1798979ca..17f3f3d89d2f 100644 --- a/include/svx/svdetc.hxx +++ b/include/svx/svdetc.hxx @@ -149,13 +149,13 @@ public: void Init( sal_uIntPtr _nSumActionCount, sal_uIntPtr _nObjCount ); - bool SetNextObject(); + void SetNextObject(); void SetActionCount( sal_uIntPtr _nActionCount ); void SetInsertCount( sal_uIntPtr _nInsertCount ); bool ReportActions( sal_uIntPtr nActionCount ); - bool ReportInserts( sal_uIntPtr nInsertCount ); + void ReportInserts( sal_uIntPtr nInsertCount ); sal_uIntPtr GetSumCurAction() const { return nSumCurAction; }; sal_uIntPtr GetObjCount() const { return nObjCount; }; @@ -167,7 +167,7 @@ public: sal_uIntPtr GetInsertCount() const { return nInsertCount; }; sal_uIntPtr GetCurInsert() const { return nCurInsert; }; - bool ReportRescales( sal_uIntPtr nRescaleCount ); + void ReportRescales( sal_uIntPtr nRescaleCount ); }; diff --git a/include/svx/svdglue.hxx b/include/svx/svdglue.hxx index c880eab46c33..cd543f61fea6 100644 --- a/include/svx/svdglue.hxx +++ b/include/svx/svdglue.hxx @@ -79,7 +79,6 @@ public: SdrGluePoint(): nEscDir(SdrEscapeDirection::SMART),nId(0),nAlign(SdrAlign::NONE),bNoPercent(false),bReallyAbsolute(false),bUserDefined(true) {} SdrGluePoint(const Point& rNewPos, bool bNewPercent=true, SdrAlign nNewAlign = SdrAlign::HORZ_CENTER): aPos(rNewPos),nEscDir(SdrEscapeDirection::SMART),nId(0),nAlign(nNewAlign),bNoPercent(!bNewPercent),bReallyAbsolute(false),bUserDefined(true) {} bool operator==(const SdrGluePoint& rCmpGP) const { return aPos==rCmpGP.aPos && nEscDir==rCmpGP.nEscDir && nId==rCmpGP.nId && nAlign==rCmpGP.nAlign && bNoPercent==rCmpGP.bNoPercent && bReallyAbsolute==rCmpGP.bReallyAbsolute && bUserDefined==rCmpGP.bUserDefined; } - bool operator!=(const SdrGluePoint& rCmpGP) const { return !operator==(rCmpGP); } const Point& GetPos() const { return aPos; } void SetPos(const Point& rNewPos) { aPos=rNewPos; } SdrEscapeDirection GetEscDir() const { return nEscDir; } diff --git a/include/svx/svdhdl.hxx b/include/svx/svdhdl.hxx index 50b9d7e9ad50..3b9fcf454240 100644 --- a/include/svx/svdhdl.hxx +++ b/include/svx/svdhdl.hxx @@ -445,8 +445,6 @@ protected: private: SVX_DLLPRIVATE SdrHdlList(const SdrHdlList&): aList() {} SVX_DLLPRIVATE void operator=(const SdrHdlList&) {} - SVX_DLLPRIVATE bool operator==(const SdrHdlList&) const { return false; } - SVX_DLLPRIVATE bool operator!=(const SdrHdlList&) const { return false; } public: explicit SdrHdlList(SdrMarkView* pV); diff --git a/include/svx/svdlayer.hxx b/include/svx/svdlayer.hxx index d412c13cbadf..48df21bf49fe 100644 --- a/include/svx/svdlayer.hxx +++ b/include/svx/svdlayer.hxx @@ -70,7 +70,6 @@ class SVX_DLLPUBLIC SdrLayer public: bool operator==(const SdrLayer& rCmpLayer) const; - bool operator!=(const SdrLayer& rCmpLayer) const { return !operator==(rCmpLayer); } void SetName(const OUString& rNewName); const OUString& GetName() const { return maName; } @@ -114,7 +113,6 @@ public: ~SdrLayerAdmin(); const SdrLayerAdmin& operator=(const SdrLayerAdmin& rSrcLayerAdmin); bool operator==(const SdrLayerAdmin& rCmpLayerAdmin) const; - bool operator!=(const SdrLayerAdmin& rCmpLayerAdmin) const { return !operator==(rCmpLayerAdmin); } void SetParent(SdrLayerAdmin* pNewParent) { pParent=pNewParent; } void SetModel(SdrModel* pNewModel); void InsertLayer(SdrLayer* pLayer, sal_uInt16 nPos) @@ -135,7 +133,7 @@ public: SdrLayer* NewLayer(const OUString& rName, sal_uInt16 nPos=0xFFFF); // New layer, name is retrieved from the resource - SdrLayer* NewStandardLayer(sal_uInt16 nPos=0xFFFF); + void NewStandardLayer(sal_uInt16 nPos=0xFFFF); // Iterate over all layers sal_uInt16 GetLayerCount() const { return sal_uInt16(aLayer.size()); } diff --git a/include/svx/svdmark.hxx b/include/svx/svdmark.hxx index ff8510b8cfa2..2bcd84ece843 100644 --- a/include/svx/svdmark.hxx +++ b/include/svx/svdmark.hxx @@ -65,10 +65,6 @@ public: SdrMark& operator=(const SdrMark& rMark); bool operator==(const SdrMark& rMark) const; - bool operator!=(const SdrMark& rMark) const - { - return !(operator==(rMark)); - } void SetMarkedSdrObj(SdrObject* pNewObj); SdrObject* GetMarkedSdrObj() const { return mpSelectedSdrObject;} @@ -170,7 +166,6 @@ protected: bool mbSorted; private: - SVX_DLLPRIVATE bool operator==(const SdrMarkList& rCmpMarkList) const; SVX_DLLPRIVATE void ImpForceSort(); private: diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx index 4a246d90de13..86956c3a148f 100644 --- a/include/svx/svdmodel.hxx +++ b/include/svx/svdmodel.hxx @@ -517,9 +517,9 @@ public: bool HasUndoActions() const; bool HasRedoActions() const; - bool Undo(); - bool Redo(); - bool Repeat(SfxRepeatTarget&); + void Undo(); + void Redo(); + void Repeat(SfxRepeatTarget&); // The application can set a handler here which collects the UndoActions einsammelt. // The handler has the following signature: diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx index 5e8d87bf1346..df25580e01d2 100644 --- a/include/svx/svdmrkv.hxx +++ b/include/svx/svdmrkv.hxx @@ -252,7 +252,7 @@ public: OUString GetDescriptionOfMarkedObjects() const { return GetMarkedObjectList().GetMarkDescription(); } OUString GetDescriptionOfMarkedPoints() const { return GetMarkedObjectList().GetPointMarkDescription(); } OUString GetDescriptionOfMarkedGluePoints() const { return GetMarkedObjectList().GetGluePointMarkDescription(); } - bool GetBoundRectFromMarkedObjects(SdrPageView* pPageView, Rectangle& rRect) const { return GetMarkedObjectList().TakeBoundRect(pPageView, rRect); } + void GetBoundRectFromMarkedObjects(SdrPageView* pPageView, Rectangle& rRect) const { GetMarkedObjectList().TakeBoundRect(pPageView, rRect); } bool GetSnapRectFromMarkedObjects(SdrPageView* pPageView, Rectangle& rRect) const { return GetMarkedObjectList().TakeSnapRect(pPageView, rRect); } // Get a list of all those links which are connected to marked nodes, @@ -303,7 +303,7 @@ public: // Mark all objects within a rectangular area // Just objects are marked which are inclosed completely - bool MarkObj(const Rectangle& rRect, bool bUnmark=false); + void MarkObj(const Rectangle& rRect, bool bUnmark=false); void MarkObj(SdrObject* pObj, SdrPageView* pPV, bool bUnmark=false, bool bImpNoSetMarkHdl=false); void MarkAllObj(SdrPageView* pPV=nullptr); // pPage=NULL => all displayed pages void UnmarkAllObj(SdrPageView* pPV=nullptr); // pPage=NULL => all displayed pages @@ -333,7 +333,7 @@ public: bool MarkPointHelper(SdrHdl* pHdl, SdrMark* pMark, bool bUnmark); // Mark all points within this rectangular alle Punkte (View coordinates) - bool MarkPoints(const Rectangle& rRect, bool bUnmark=false) { return MarkPoints(&rRect,bUnmark); } + void MarkPoints(const Rectangle& rRect, bool bUnmark=false) { MarkPoints(&rRect,bUnmark); } bool UnmarkPoint(SdrHdl& rHdl) { return MarkPoint(rHdl,true); } bool IsPointMarked(const SdrHdl& rHdl) const { ForceUndirtyMrkPnt(); return rHdl.IsSelected(); } bool MarkAllPoints() { return MarkPoints(nullptr,false); } @@ -384,7 +384,7 @@ public: // Pick: Supported options for nOptions are SEARCH_NEXT, SEARCH_BACKWARD bool PickGluePoint(const Point& rPnt, SdrObject*& rpObj, sal_uInt16& rnId, SdrPageView*& rpPV, SdrSearchOptions nOptions=SdrSearchOptions::NONE) const; bool MarkGluePoint(const SdrObject* pObj, sal_uInt16 nId, const SdrPageView* pPV, bool bUnmark=false); - bool UnmarkGluePoint(const SdrObject* pObj, sal_uInt16 nId, const SdrPageView* pPV) { return MarkGluePoint(pObj,nId,pPV,true); } + void UnmarkGluePoint(const SdrObject* pObj, sal_uInt16 nId, const SdrPageView* pPV) { MarkGluePoint(pObj,nId,pPV,true); } bool IsGluePointMarked(const SdrObject* pObj, sal_uInt16 nId) const; // Get the Hdl (handle) of a marked GluePoint. Non-marked @@ -408,7 +408,7 @@ public: // bool BegMarkGluePoints(const Point& rPnt, OutputDevice* pOut); bool BegMarkGluePoints(const Point& rPnt, bool bUnmark = false); void MovMarkGluePoints(const Point& rPnt); - bool EndMarkGluePoints(); + void EndMarkGluePoints(); void BrkMarkGluePoints(); bool IsMarkGluePoints() const { return (nullptr != mpMarkGluePointsOverlay); } @@ -437,7 +437,7 @@ public: // objects may not be processed in the meantime (until the next // LeaveGroup()). With markings which overlaps pages, every page is processed // separately. The method returns sal_True, if at least one group was entered. - bool EnterMarkedGroup(); + void EnterMarkedGroup(); // Is set by DragView automatically when finishing a Crook-Drag. void SetLastCrookCenter(const Point& rPt) { maLastCrookCenter=rPt; } diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx index 5d83a8d136f8..b75a37ca3ad9 100644 --- a/include/svx/svdobj.hxx +++ b/include/svx/svdobj.hxx @@ -522,7 +522,7 @@ public: // Tooling for painting a single object to a OutputDevice. This will be needed as long // as not all painting is changed to use DrawContact objects. - bool SingleObjectPainter(OutputDevice& rOut) const; + void SingleObjectPainter(OutputDevice& rOut) const; bool LineGeometryUsageIsNecessary() const; // Returns a copy of the object. Every inherited class must reimplement this (in class Foo diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx index c2e1435b419f..5b9abe59418d 100644 --- a/include/svx/svdotext.hxx +++ b/include/svx/svdotext.hxx @@ -312,7 +312,7 @@ protected: virtual SdrObjGeoData* NewGeoData() const override; virtual void SaveGeoData(SdrObjGeoData& rGeo) const override; virtual void RestGeoData(const SdrObjGeoData& rGeo) override; - bool NbcSetEckenradius(long nRad); + void NbcSetEckenradius(long nRad); // #115391# new method for SdrObjCustomShape and SdrTextObj to correctly handle and set // SdrTextMinFrameWidthItem and SdrTextMinFrameHeightItem based on all settings, necessities diff --git a/include/svx/svdpagv.hxx b/include/svx/svdpagv.hxx index beaf794336d5..7db356586020 100644 --- a/include/svx/svdpagv.hxx +++ b/include/svx/svdpagv.hxx @@ -114,7 +114,7 @@ public: const SdrPageWindow* FindPatchedPageWindow( const OutputDevice& rOutDev ) const; private: - SVX_DLLPRIVATE SdrPageWindow& CreateNewPageWindowEntry(SdrPaintWindow& rPaintWindow); + SVX_DLLPRIVATE void CreateNewPageWindowEntry(SdrPaintWindow& rPaintWindow); void ImpInvalidateHelpLineArea(sal_uInt16 nNum) const; diff --git a/include/svx/svdsnpv.hxx b/include/svx/svdsnpv.hxx index 37e2755984c0..61d14f6fc922 100644 --- a/include/svx/svdsnpv.hxx +++ b/include/svx/svdsnpv.hxx @@ -182,9 +182,9 @@ public: bool IsMoveSnapOnlyTopLeft() const { return bMoveSnapOnlyTopLeft; } // #114409#-1 Migrate PageOrigin - bool BegSetPageOrg(const Point& rPnt); + void BegSetPageOrg(const Point& rPnt); void MovSetPageOrg(const Point& rPnt); - bool EndSetPageOrg(); + void EndSetPageOrg(); void BrkSetPageOrg(); bool IsSetPageOrg() const { return (nullptr != mpPageOriginOverlay); } @@ -195,7 +195,7 @@ public: // Move of an available auxiliary line. Use nHelpLineNum and pPV from PickHelpLine. bool BegDragHelpLine(sal_uInt16 nHelpLineNum, SdrPageView* pPV); // interactive insertion of a new auxiliary line - bool BegDragHelpLine(const Point& rPnt, SdrHelpLineKind eNewKind); + void BegDragHelpLine(const Point& rPnt, SdrHelpLineKind eNewKind); Pointer GetDraggedHelpLinePointer() const; // change the type of auxiliary line while dragging diff --git a/include/svx/unoshape.hxx b/include/svx/unoshape.hxx index 5dd4f10832c3..be0b4b5b3195 100644 --- a/include/svx/unoshape.hxx +++ b/include/svx/unoshape.hxx @@ -580,7 +580,7 @@ public: bool createObject( const SvGlobalName &aClassName ); - bool createLink( const OUString& aLinkURL ); + void createLink( const OUString& aLinkURL ); // XInterface virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; diff --git a/include/svx/xbitmap.hxx b/include/svx/xbitmap.hxx index 606339bf020e..7f514d190250 100644 --- a/include/svx/xbitmap.hxx +++ b/include/svx/xbitmap.hxx @@ -45,7 +45,6 @@ public: ~XOBitmap(); XOBitmap& operator=( const XOBitmap& rXOBitmap ); - bool operator==( const XOBitmap& rXOBitmap ) const; void Bitmap2Array(); void Array2Bitmap(); diff --git a/include/svx/xmleohlp.hxx b/include/svx/xmleohlp.hxx index 2879548be6e8..cc496a347bd8 100644 --- a/include/svx/xmleohlp.hxx +++ b/include/svx/xmleohlp.hxx @@ -84,7 +84,7 @@ private: SVX_DLLPRIVATE css::uno::Reference < css::embed::XStorage > ImplGetContainerStorage( const OUString& rStorageName ); - SVX_DLLPRIVATE bool ImplReadObject( + SVX_DLLPRIVATE void ImplReadObject( const OUString& rContainerStorageName, OUString& rObjName, const SvGlobalName *pClassId, diff --git a/include/svx/xpoly.hxx b/include/svx/xpoly.hxx index 9d96d40a5cec..6dfb0af507b5 100644 --- a/include/svx/xpoly.hxx +++ b/include/svx/xpoly.hxx @@ -88,7 +88,6 @@ public: Point& operator[]( sal_uInt16 nPos ); XPolygon& operator=( const XPolygon& rXPoly ); bool operator==( const XPolygon& rXPoly ) const; - bool operator!=( const XPolygon& rXPoly ) const; XPolyFlags GetFlags( sal_uInt16 nPos ) const; void SetFlags( sal_uInt16 nPos, XPolyFlags eFlags ); @@ -150,8 +149,6 @@ public: XPolygon& operator[]( sal_uInt16 nPos ); XPolyPolygon& operator=( const XPolyPolygon& rXPolyPoly ); - bool operator==( const XPolyPolygon& rXPolyPoly ) const; - bool operator!=( const XPolyPolygon& rXPolyPoly ) const; // transformations void Distort(const Rectangle& rRefRect, const XPolygon& rDistortedRect); |