diff options
author | Noel Grandin <noel@peralex.com> | 2016-02-02 16:15:51 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2016-02-08 06:08:14 +0000 |
commit | b14224fe97b8a44232c9c1401d3a49771f46582e (patch) | |
tree | 8f9cf31cf4b51a0edbb43022499a6acd17d0945d /include | |
parent | c474e610e453d0f38f7cc6cb9559ad7e7b5d69ca (diff) |
loplugin:unusedmethods
using an idea from dtardon:
<dtardon> noelgrandin, hi. could you try to run the unusedmethods clang
plugin with "make build-nocheck"? that would catch functions that are
only used in tests. e.g., i just removed the whole o3tl::range class,
which has not been used in many years, but htere was a test for it...
<noelgrandin> dtardon, interesting idea! Sure, I can do that.
Change-Id: I5653953a426a2186a1e43017212d87ffce520387
Reviewed-on: https://gerrit.libreoffice.org/22041
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'include')
45 files changed, 1 insertions, 198 deletions
diff --git a/include/basic/sbxvar.hxx b/include/basic/sbxvar.hxx index 2f56372d9f3f..6dfd7e21a094 100644 --- a/include/basic/sbxvar.hxx +++ b/include/basic/sbxvar.hxx @@ -192,35 +192,15 @@ public: // TODO: Ensure error conditions (overflow, conversions) // are taken into consideration in Compute and Compare - inline bool operator ==( const SbxValue& ) const; - inline bool operator !=( const SbxValue& ) const; - inline bool operator <( const SbxValue& ) const; - inline bool operator >( const SbxValue& ) const; inline bool operator <=( const SbxValue& ) const; inline bool operator >=( const SbxValue& ) const; inline SbxValue& operator *=( const SbxValue& ); inline SbxValue& operator /=( const SbxValue& ); - inline SbxValue& operator %=( const SbxValue& ); inline SbxValue& operator +=( const SbxValue& ); inline SbxValue& operator -=( const SbxValue& ); - inline SbxValue& operator &=( const SbxValue& ); - inline SbxValue& operator |=( const SbxValue& ); - inline SbxValue& operator ^=( const SbxValue& ); }; -inline bool SbxValue::operator==( const SbxValue& r ) const -{ return Compare( SbxEQ, r ); } - -inline bool SbxValue::operator!=( const SbxValue& r ) const -{ return Compare( SbxNE, r ); } - -inline bool SbxValue::operator<( const SbxValue& r ) const -{ return Compare( SbxLT, r ); } - -inline bool SbxValue::operator>( const SbxValue& r ) const -{ return Compare( SbxGT, r ); } - inline bool SbxValue::operator<=( const SbxValue& r ) const { return Compare( SbxLE, r ); } @@ -233,24 +213,12 @@ inline SbxValue& SbxValue::operator*=( const SbxValue& r ) inline SbxValue& SbxValue::operator/=( const SbxValue& r ) { Compute( SbxDIV, r ); return *this; } -inline SbxValue& SbxValue::operator%=( const SbxValue& r ) -{ Compute( SbxMOD, r ); return *this; } - inline SbxValue& SbxValue::operator+=( const SbxValue& r ) { Compute( SbxPLUS, r ); return *this; } inline SbxValue& SbxValue::operator-=( const SbxValue& r ) { Compute( SbxMINUS, r ); return *this; } -inline SbxValue& SbxValue::operator&=( const SbxValue& r ) -{ Compute( SbxAND, r ); return *this; } - -inline SbxValue& SbxValue::operator|=( const SbxValue& r ) -{ Compute( SbxOR, r ); return *this; } - -inline SbxValue& SbxValue::operator^=( const SbxValue& r ) -{ Compute( SbxXOR, r ); return *this; } - class SbxArray; class SbxInfo; diff --git a/include/comphelper/property.hxx b/include/comphelper/property.hxx index 5bc46a888d99..bad79df7f692 100644 --- a/include/comphelper/property.hxx +++ b/include/comphelper/property.hxx @@ -40,28 +40,6 @@ namespace comphelper } }; - struct PropertyStringEqualFunctor : ::std::binary_function< css::beans::Property, OUString, bool > - { - - inline bool operator()( const css::beans::Property& lhs, const OUString& rhs ) const - { - return lhs.Name == rhs ; - } - - inline bool operator()( const OUString& lhs, const css::beans::Property& rhs ) const - { - return lhs == rhs.Name ; - } - }; - - struct PropertyEqualByName : public ::std::binary_function< css::beans::Property, css::beans::Property, bool > - { - bool operator() (const css::beans::Property& x, const css::beans::Property& y) const - { - return x.Name == y.Name ; - } - }; - /// remove the property with the given name from the given sequence COMPHELPER_DLLPUBLIC void RemoveProperty(css::uno::Sequence<css::beans::Property>& seqProps, const OUString& _rPropName); diff --git a/include/comphelper/stl_types.hxx b/include/comphelper/stl_types.hxx index f154937bd507..f38a9cf061a5 100644 --- a/include/comphelper/stl_types.hxx +++ b/include/comphelper/stl_types.hxx @@ -181,7 +181,6 @@ public: } Self & operator*() { return *this; } // so operator= works Self & operator++() { return *this; } - Self & operator++(int) { return *this; } private: OUStringBuffer & m_rBuffer; diff --git a/include/comphelper/string.hxx b/include/comphelper/string.hxx index 90b1e3e4384e..eb72beda89eb 100644 --- a/include/comphelper/string.hxx +++ b/include/comphelper/string.hxx @@ -38,16 +38,6 @@ // go into the stable URE API: namespace comphelper { namespace string { -/** Compare an OString to a single char - - @param rIn The input OString - @param c The character to compare againsg - - @return true if rIn has one char and its equal to c - */ -inline bool equals(const OString& rIn, sal_Char c) -{ return rIn.getLength() == 1 && rIn[0] == c; } - /** Compare an OUString to a single char @param rIn The input OUString @@ -399,15 +389,6 @@ COMPHELPER_DLLPUBLIC bool isdigitAsciiString(const OString &rString); */ COMPHELPER_DLLPUBLIC bool isdigitAsciiString(const OUString &rString); -/** Compare two strings containing software version numbers - - Inspired by the GNU strverscmp(), but there is no guarantee that the exact - same semantics are used, or that the semantics are stable between LibreOffice versions. - - @return -1, 0 or 1 -*/ -COMPHELPER_DLLPUBLIC int compareVersionStrings(const OUString& a, const OUString& b); - } } #endif diff --git a/include/connectivity/dbcharset.hxx b/include/connectivity/dbcharset.hxx index 66044f76d0ff..e93a59dd2acf 100644 --- a/include/connectivity/dbcharset.hxx +++ b/include/connectivity/dbcharset.hxx @@ -141,13 +141,9 @@ namespace dbtools /// prefix increment const CharsetIterator& operator++(); - /// postfix increment - const CharsetIterator operator++(int) { CharsetIterator hold(*this); ++*this; return hold; } /// prefix decrement const CharsetIterator& operator--(); - /// postfix decrement - const CharsetIterator operator--(int) { CharsetIterator hold(*this); --*this; return hold; } protected: CharsetIterator(const OCharsetMap* _pContainer, OCharsetMap::TextEncBag::const_iterator _aPos ); diff --git a/include/connectivity/dbexception.hxx b/include/connectivity/dbexception.hxx index 6e7cb972e16b..a67aa9d871f9 100644 --- a/include/connectivity/dbexception.hxx +++ b/include/connectivity/dbexception.hxx @@ -133,7 +133,6 @@ public: TYPE getType() const { return m_eType; } operator const css::sdbc::SQLException* () const; - operator const css::sdbc::SQLWarning* () const; operator const css::sdb::SQLContext* () const; const css::uno::Any& get() const { return m_aContent; } diff --git a/include/connectivity/sdbcx/VDescriptor.hxx b/include/connectivity/sdbcx/VDescriptor.hxx index fa9fa3190f3f..6aff71c61e5a 100644 --- a/include/connectivity/sdbcx/VDescriptor.hxx +++ b/include/connectivity/sdbcx/VDescriptor.hxx @@ -72,12 +72,6 @@ namespace connectivity virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception); - // compare - inline bool operator == ( const OUString & _rRH ) - { - return m_aCase(m_Name,_rRH); - } - // css::lang::XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override; static css::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId(); diff --git a/include/drawinglayer/geometry/viewinformation2d.hxx b/include/drawinglayer/geometry/viewinformation2d.hxx index 72e857c407a3..53fd5f47eb81 100644 --- a/include/drawinglayer/geometry/viewinformation2d.hxx +++ b/include/drawinglayer/geometry/viewinformation2d.hxx @@ -123,7 +123,6 @@ namespace drawinglayer /// compare operators bool operator==(const ViewInformation2D& rCandidate) const; - bool operator!=(const ViewInformation2D& rCandidate) const { return !operator==(rCandidate); } /// data access const basegfx::B2DHomMatrix& getObjectTransformation() const; diff --git a/include/drawinglayer/primitive2d/baseprimitive2d.hxx b/include/drawinglayer/primitive2d/baseprimitive2d.hxx index 6362793e78ac..79c2b13d6ecf 100644 --- a/include/drawinglayer/primitive2d/baseprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/baseprimitive2d.hxx @@ -173,7 +173,6 @@ namespace drawinglayer Overridden implementations are then based on this implementation */ virtual bool operator==( const BasePrimitive2D& rPrimitive ) const; - bool operator!=( const BasePrimitive2D& rPrimitive ) const { return !operator==(rPrimitive); } /// The default implementation will use getDecomposition results to create the range virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; @@ -290,9 +289,6 @@ namespace drawinglayer */ bool DRAWINGLAYER_DLLPUBLIC arePrimitive2DReferencesEqual(const Primitive2DReference& rA, const Primitive2DReference& rB); - /// compare two Primitive2DReferences for equality, uses arePrimitive2DReferencesEqual internally - bool DRAWINGLAYER_DLLPUBLIC arePrimitive2DSequencesEqual(const Primitive2DSequence& rA, const Primitive2DSequence& rB); - OUString DRAWINGLAYER_DLLPUBLIC idToString(sal_uInt32 nId); } // end of namespace primitive2d diff --git a/include/drawinglayer/primitive3d/baseprimitive3d.hxx b/include/drawinglayer/primitive3d/baseprimitive3d.hxx index d3eaf47f17b3..0f21afd91617 100644 --- a/include/drawinglayer/primitive3d/baseprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/baseprimitive3d.hxx @@ -64,7 +64,6 @@ namespace drawinglayer { namespace primitive3d { Primitive3DContainer( std::initializer_list<Primitive3DReference> init ) : vector(init) {} void append(const Primitive3DContainer& rSource); - void append(Primitive3DContainer&& rSource); Primitive3DContainer& operator=(const Primitive3DContainer& r) { vector::operator=(r); return *this; } Primitive3DContainer& operator=(const Primitive3DContainer&& r) { vector::operator=(r); return *this; } bool operator==(const Primitive3DContainer& rB) const; @@ -111,7 +110,6 @@ namespace drawinglayer Overridden implementation are then based on this implementation. */ virtual bool operator==( const BasePrimitive3D& rPrimitive ) const; - bool operator!=( const BasePrimitive3D& rPrimitive ) const { return !operator==(rPrimitive); } /** This method is for places where using the C++ implementation directly is possible. The subprocessing and range merging is more efficient when working directly on basegfx::B3DRange. The default implementation diff --git a/include/drawinglayer/texture/texture.hxx b/include/drawinglayer/texture/texture.hxx index 3f1d6d07adc0..ce9e34b23ab5 100644 --- a/include/drawinglayer/texture/texture.hxx +++ b/include/drawinglayer/texture/texture.hxx @@ -41,7 +41,6 @@ namespace drawinglayer // compare operator virtual bool operator==(const GeoTexSvx& rGeoTexSvx) const; - bool operator!=(const GeoTexSvx& rGeoTexSvx) const { return !operator==(rGeoTexSvx); } // virtual base methods virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const; diff --git a/include/editeng/Trie.hxx b/include/editeng/Trie.hxx index 302c6a622739..4cdcdc9d8f9d 100644 --- a/include/editeng/Trie.hxx +++ b/include/editeng/Trie.hxx @@ -32,7 +32,7 @@ public: void insert(const OUString& sInputString) const; void findSuggestions(const OUString& sWordPart, std::vector<OUString>& rSuggestionList) const; - void getAllEntries(std::vector<OUString>& entries); + size_t size() const; }; } diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx index 8ba5791443b8..92b277a9323d 100644 --- a/include/filter/msfilter/msdffimp.hxx +++ b/include/filter/msfilter/msdffimp.hxx @@ -753,8 +753,6 @@ struct SvxMSDffShapeOrder explicit SvxMSDffShapeOrder( sal_uLong nId ): nShapeId( nId ), nTxBxComp( 0 ), pFly( nullptr ), nHdFtSection( 0 ), pObj( nullptr ){} - bool operator==( const SvxMSDffShapeOrder& rEntry ) const - { return (nTxBxComp == rEntry.nTxBxComp); } bool operator<( const SvxMSDffShapeOrder& rEntry ) const { return (nTxBxComp < rEntry.nTxBxComp); } }; diff --git a/include/o3tl/lazy_update.hxx b/include/o3tl/lazy_update.hxx index c596e1315e14..951a9bb7bdc2 100644 --- a/include/o3tl/lazy_update.hxx +++ b/include/o3tl/lazy_update.hxx @@ -50,11 +50,6 @@ output( myValue.getOutValue() ); public: LazyUpdate(Func const & func): func_(func), input_(), dirty_(true) {} - template<typename T> void setInValue(T && in) { - dirty_ = true; - input_ = std::forward(in); - } - In const & getInValue() const { return input_; } Out const & getOutValue() const { return update(); } diff --git a/include/oox/helper/containerhelper.hxx b/include/oox/helper/containerhelper.hxx index 1c73eb7ec98d..626214674a27 100644 --- a/include/oox/helper/containerhelper.hxx +++ b/include/oox/helper/containerhelper.hxx @@ -49,7 +49,6 @@ struct ValueRange 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( const ValueRange& rRange ) const { return (mnFirst <= rRange.mnFirst) && (rRange.mnLast <= mnLast); } bool intersects( const ValueRange& rRange ) const { return (mnFirst <= rRange.mnLast) && (rRange.mnFirst <= mnLast); } }; diff --git a/include/sfx2/mnumgr.hxx b/include/sfx2/mnumgr.hxx index a1607b9bcfa6..5f51b064690e 100644 --- a/include/sfx2/mnumgr.hxx +++ b/include/sfx2/mnumgr.hxx @@ -78,7 +78,6 @@ public: void Execute( const Point& rPos, vcl::Window *pWindow ); void RemoveDisabledEntries(); - Menu* GetSVMenu(); }; #endif // INCLUDED_SFX2_MNUMGR_HXX diff --git a/include/sfx2/sidebar/Context.hxx b/include/sfx2/sidebar/Context.hxx index b9430baedfb3..945cf09cc1f1 100644 --- a/include/sfx2/sidebar/Context.hxx +++ b/include/sfx2/sidebar/Context.hxx @@ -52,7 +52,6 @@ public: */ sal_Int32 EvaluateMatch (const Context& rOther) const; - bool operator== (const Context& rOther) const; bool operator!= (const Context& rOther) const; }; diff --git a/include/sfx2/sidebar/EnumContext.hxx b/include/sfx2/sidebar/EnumContext.hxx index 080a81836013..dc29753aed92 100644 --- a/include/sfx2/sidebar/EnumContext.hxx +++ b/include/sfx2/sidebar/EnumContext.hxx @@ -130,7 +130,6 @@ public: Application GetApplication_DI() const; bool operator == (const EnumContext& rOther); - bool operator != (const EnumContext& rOther); /** When two contexts are matched against each other then application or context name may have the wildcard value 'any'. diff --git a/include/svl/nranges.hxx b/include/svl/nranges.hxx index def27ace1258..d80c3377681d 100644 --- a/include/svl/nranges.hxx +++ b/include/svl/nranges.hxx @@ -38,13 +38,9 @@ public: ~SfxUShortRanges() { delete [] _pRanges; } - bool operator == ( const SfxUShortRanges & ) const; - SfxUShortRanges& operator = ( const SfxUShortRanges & ); SfxUShortRanges& operator += ( const SfxUShortRanges & ); - SfxUShortRanges& operator -= ( const SfxUShortRanges & ); - SfxUShortRanges& operator /= ( const SfxUShortRanges & ); sal_uInt16 Count() const; bool IsEmpty() const diff --git a/include/svtools/HtmlWriter.hxx b/include/svtools/HtmlWriter.hxx index ca5139cb91d1..5aeee2f592f0 100644 --- a/include/svtools/HtmlWriter.hxx +++ b/include/svtools/HtmlWriter.hxx @@ -41,9 +41,6 @@ public: void end(); void flushStack(); - void flushStack(const OString& aElement); - - void write(const OString& aContent); void attribute(const OString& aAttribute, const char* aValue); void attribute(const OString& aAttribute, sal_Int32 aValue); diff --git a/include/svx/svdglue.hxx b/include/svx/svdglue.hxx index cd543f61fea6..2db77761b3ed 100644 --- a/include/svx/svdglue.hxx +++ b/include/svx/svdglue.hxx @@ -78,7 +78,6 @@ class SVX_DLLPUBLIC SdrGluePoint { 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; } const Point& GetPos() const { return aPos; } void SetPos(const Point& rNewPos) { aPos=rNewPos; } SdrEscapeDirection GetEscDir() const { return nEscDir; } diff --git a/include/svx/svdlayer.hxx b/include/svx/svdlayer.hxx index 48df21bf49fe..78b98e77983b 100644 --- a/include/svx/svdlayer.hxx +++ b/include/svx/svdlayer.hxx @@ -112,7 +112,6 @@ public: SdrLayerAdmin(const SdrLayerAdmin& rSrcLayerAdmin); ~SdrLayerAdmin(); const SdrLayerAdmin& operator=(const SdrLayerAdmin& rSrcLayerAdmin); - bool operator==(const SdrLayerAdmin& rCmpLayerAdmin) const; void SetParent(SdrLayerAdmin* pNewParent) { pParent=pNewParent; } void SetModel(SdrModel* pNewModel); void InsertLayer(SdrLayer* pLayer, sal_uInt16 nPos) diff --git a/include/svx/svdmark.hxx b/include/svx/svdmark.hxx index 2bcd84ece843..fc9702899b12 100644 --- a/include/svx/svdmark.hxx +++ b/include/svx/svdmark.hxx @@ -64,7 +64,6 @@ public: virtual void ObjectInDestruction(const SdrObject& rObject) override; SdrMark& operator=(const SdrMark& rMark); - bool operator==(const SdrMark& rMark) const; void SetMarkedSdrObj(SdrObject* pNewObj); SdrObject* GetMarkedSdrObj() const { return mpSelectedSdrObject;} diff --git a/include/svx/svdsob.hxx b/include/svx/svdsob.hxx index 976165b09da1..510087c1914a 100644 --- a/include/svx/svdsob.hxx +++ b/include/svx/svdsob.hxx @@ -41,11 +41,6 @@ public: memset(aData, bInitVal ? 0xFF : 0x00, sizeof(aData)); } - bool operator==(const SetOfByte& rCmpSet) const - { - return (memcmp(aData, rCmpSet.aData, sizeof(aData)) == 0); - } - bool operator!=(const SetOfByte& rCmpSet) const { return (memcmp(aData, rCmpSet.aData, sizeof(aData))!=0); @@ -87,7 +82,6 @@ public: bool IsEmpty() const; void operator&=(const SetOfByte& r2ndSet); - void operator|=(const SetOfByte& r2ndSet); // initialize this set with a uno sequence of sal_Int8 void PutValue(const css::uno::Any & rAny); diff --git a/include/tools/date.hxx b/include/tools/date.hxx index f450c7b7bf23..1dfb13098028 100644 --- a/include/tools/date.hxx +++ b/include/tools/date.hxx @@ -168,8 +168,6 @@ public: Date& operator -=( long nDays ); Date& operator ++(); Date& operator --(); - Date operator ++( int ); - Date operator --( int ); TOOLS_DLLPUBLIC friend Date operator +( const Date& rDate, long nDays ); TOOLS_DLLPUBLIC friend Date operator -( const Date& rDate, long nDays ); diff --git a/include/tools/inetmime.hxx b/include/tools/inetmime.hxx index 1bc2404025c1..3b737c889622 100644 --- a/include/tools/inetmime.hxx +++ b/include/tools/inetmime.hxx @@ -302,28 +302,6 @@ public: */ inline INetMIMEOutputSink & operator <<(const sal_Char * pOctets); - /** Write a sequence of octets. - - @param rOctets A OString, interpreted as a sequence of octets. - - @return This instance. - */ - INetMIMEOutputSink & operator <<(const OString& rOctets) - { - writeSequence(rOctets.getStr(), rOctets.getStr() + rOctets.getLength()); - return *this; - } - - /** Call a manipulator function. - - @param pManipulator A manipulator function. - - @return Whatever the manipulator function returns. - */ - INetMIMEOutputSink & - operator <<(INetMIMEOutputSink & (* pManipulator)(INetMIMEOutputSink &)) - { return pManipulator(*this); } - OString takeBuffer() { return m_aBuffer.makeStringAndClear(); diff --git a/include/tools/multisel.hxx b/include/tools/multisel.hxx index 633f50714d1a..1731b4925f6a 100644 --- a/include/tools/multisel.hxx +++ b/include/tools/multisel.hxx @@ -54,7 +54,6 @@ public: ~MultiSelection(); MultiSelection& operator= ( const MultiSelection& rOrig ); - bool operator== ( MultiSelection& rOrig ); void SelectAll( bool bSelect = true ); bool Select( long nIndex, bool bSelect = true ); diff --git a/include/tools/poly.hxx b/include/tools/poly.hxx index a956b200651a..e4a842107b08 100644 --- a/include/tools/poly.hxx +++ b/include/tools/poly.hxx @@ -161,8 +161,6 @@ public: tools::Polygon& operator=( const tools::Polygon& rPoly ); bool operator==( const tools::Polygon& rPoly ) const; - bool operator!=( const tools::Polygon& rPoly ) const - { return !(Polygon::operator==( rPoly )); } bool IsEqual( const tools::Polygon& rPoly ) const; // streaming a Polygon does ignore PolyFlags, so use the Write Or Read @@ -253,8 +251,6 @@ public: tools::PolyPolygon& operator=( const tools::PolyPolygon& rPolyPoly ); bool operator==( const tools::PolyPolygon& rPolyPoly ) const; - bool operator!=( const tools::PolyPolygon& rPolyPoly ) const - { return !(PolyPolygon::operator==( rPolyPoly )); } TOOLS_DLLPUBLIC friend SvStream& ReadPolyPolygon( SvStream& rIStream, tools::PolyPolygon& rPolyPoly ); TOOLS_DLLPUBLIC friend SvStream& WritePolyPolygon( SvStream& rOStream, const tools::PolyPolygon& rPolyPoly ); diff --git a/include/tools/stream.hxx b/include/tools/stream.hxx index 16b46fb72f90..aba3304ea83f 100644 --- a/include/tools/stream.hxx +++ b/include/tools/stream.hxx @@ -555,13 +555,6 @@ inline OString read_uInt8_lenPrefixed_uInt8s_ToOString(SvStream& rStrm) return read_uInt8s_ToOString(rStrm, nUnits); } -inline OString read_uInt32_lenPrefixed_uInt8s_ToOString(SvStream& rStrm) -{ - sal_uInt32 nUnits = 0; - rStrm.ReadUInt32( nUnits ); - return read_uInt8s_ToOString(rStrm, nUnits); -} - /// Attempt to read a pascal-style length (of type prefix) prefixed sequence of /// 8bit units to an OUString inline OUString read_uInt16_lenPrefixed_uInt8s_ToOUString(SvStream& rStrm, diff --git a/include/tools/svborder.hxx b/include/tools/svborder.hxx index e30853d702c1..c919d8cd76ca 100644 --- a/include/tools/svborder.hxx +++ b/include/tools/svborder.hxx @@ -67,14 +67,6 @@ public: Bottom() += rBorder.Bottom(); return *this; } - SvBorder & operator -= ( const SvBorder & rBorder ) - { - Left() -= rBorder.Left(); - Top() -= rBorder.Top(); - Right() -= rBorder.Right(); - Bottom() -= rBorder.Bottom(); - return *this; - } long & Top() { return nTop; } long & Right() { return nRight; } long & Bottom() { return nBottom; } @@ -86,7 +78,6 @@ public: }; TOOLS_DLLPUBLIC Rectangle & operator += ( Rectangle & rRect, const SvBorder & rBorder ); -TOOLS_DLLPUBLIC Rectangle & operator -= ( Rectangle & rRect, const SvBorder & rBorder ); #endif diff --git a/include/tools/urlobj.hxx b/include/tools/urlobj.hxx index cd5bf231d134..3985942857ea 100644 --- a/include/tools/urlobj.hxx +++ b/include/tools/urlobj.hxx @@ -189,8 +189,6 @@ public: inline bool operator !=(INetURLObject const & rObject) const { return !(*this == rObject); } - bool operator <(INetURLObject const & rObject) const; - // Strict Parsing: inline explicit INetURLObject( diff --git a/include/vcl/alpha.hxx b/include/vcl/alpha.hxx index 9b7e6b44a6a3..1bc67b2c415a 100644 --- a/include/vcl/alpha.hxx +++ b/include/vcl/alpha.hxx @@ -40,8 +40,6 @@ public: AlphaMask& operator=( const Bitmap& rBitmap ); AlphaMask& operator=( const AlphaMask& rAlphaMask ) { return static_cast<AlphaMask&>( Bitmap::operator=( rAlphaMask ) ); } bool operator!() const { return Bitmap::operator!(); } - bool operator==( const AlphaMask& rAlphaMask ) const { return Bitmap::operator==( rAlphaMask ); } - bool operator!=( const AlphaMask& rAlphaMask ) const { return Bitmap::operator!=( rAlphaMask ); } void SetPrefMapMode( const MapMode& rMapMode ) { Bitmap::SetPrefMapMode( rMapMode ); } diff --git a/include/vcl/animate.hxx b/include/vcl/animate.hxx index 9b3856aec6e8..74d57088bcc4 100644 --- a/include/vcl/animate.hxx +++ b/include/vcl/animate.hxx @@ -102,8 +102,6 @@ public: Animation& operator=( const Animation& rAnimation ); bool operator==( const Animation& rAnimation ) const; - bool operator!=( const Animation& rAnimation ) const - { return !(*this==rAnimation); } void Clear(); diff --git a/include/vcl/cursor.hxx b/include/vcl/cursor.hxx index 038e18f5b2c7..927f60cf5fc1 100644 --- a/include/vcl/cursor.hxx +++ b/include/vcl/cursor.hxx @@ -91,8 +91,6 @@ public: Cursor& operator=( const Cursor& rCursor ); bool operator==( const Cursor& rCursor ) const; - bool operator!=( const Cursor& rCursor ) const - { return !(Cursor::operator==( rCursor )); } private: void ImplRestore(); diff --git a/include/vcl/dibtools.hxx b/include/vcl/dibtools.hxx index c9e98c4c03b8..4c1daa3aab1b 100644 --- a/include/vcl/dibtools.hxx +++ b/include/vcl/dibtools.hxx @@ -67,7 +67,6 @@ bool VCL_DLLPUBLIC WriteDIBBitmapEx( const BitmapEx& rSource, SvStream& rOStm); -sal_uInt32 getDIBInfoHeaderSize(); sal_uInt32 getDIBV5HeaderSize(); #endif // INCLUDED_VCL_DIBTOOLS_HXX diff --git a/include/vcl/gdimtf.hxx b/include/vcl/gdimtf.hxx index 6875a5074ca4..88bc38df2d83 100644 --- a/include/vcl/gdimtf.hxx +++ b/include/vcl/gdimtf.hxx @@ -117,7 +117,6 @@ public: GDIMetaFile& operator=( const GDIMetaFile& rMtf ); bool operator==( const GDIMetaFile& rMtf ) const; - bool operator!=( const GDIMetaFile& rMtf ) const { return !( *this == rMtf ); } void Clear(); bool Mirror( BmpMirrorFlags nMirrorFlags ); diff --git a/include/vcl/hatch.hxx b/include/vcl/hatch.hxx index 935ea9ac6e06..9a81006085ae 100644 --- a/include/vcl/hatch.hxx +++ b/include/vcl/hatch.hxx @@ -66,7 +66,6 @@ public: Hatch& operator=( const Hatch& rHatch ); bool operator==( const Hatch& rHatch ) const; - bool operator!=( const Hatch& rHatch ) const { return !(Hatch::operator==( rHatch ) ); } HatchStyle GetStyle() const { return mpImplHatch->meStyle; } diff --git a/include/vcl/image.hxx b/include/vcl/image.hxx index e5c045feeccf..f63634f0086a 100644 --- a/include/vcl/image.hxx +++ b/include/vcl/image.hxx @@ -124,7 +124,6 @@ public: ImageList& operator=( const ImageList& rImageList ); bool operator==( const ImageList& rImageList ) const; - bool operator!=( const ImageList& rImageList ) const { return !(ImageList::operator==( rImageList )); } private: diff --git a/include/vcl/inputctx.hxx b/include/vcl/inputctx.hxx index d1f3f9ff3f5b..c2e0f172265e 100644 --- a/include/vcl/inputctx.hxx +++ b/include/vcl/inputctx.hxx @@ -68,8 +68,6 @@ public: InputContext& operator=( const InputContext& rInputContext ); bool operator==( const InputContext& rInputContext ) const; - bool operator!=( const InputContext& rInputContext ) const - { return !(InputContext::operator==( rInputContext )); } }; inline InputContext& InputContext::operator=( const InputContext& rInputContext ) diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx index 774fd40fdf45..e28fbd9f9060 100644 --- a/include/vcl/menu.hxx +++ b/include/vcl/menu.hxx @@ -447,9 +447,6 @@ public: /// Close the 'pStartedFrom' menu window. virtual void ClosePopup(Menu* pMenu) override; - /// Deactivate the MenuBarWindow. - void DeactivateMenuBar(VclPtr<vcl::Window>& xFocusId); - /// Forward the KeyInput call to the MenuBar. virtual void MenuBarKeyInput(const KeyEvent& rEvent) override; diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx index ded112ccc475..376fad492278 100644 --- a/include/vcl/print.hxx +++ b/include/vcl/print.hxx @@ -96,8 +96,6 @@ public: const OUString& GetComment() const { return maComment; } PrintQueueFlags GetStatus() const { return mnStatus; } sal_uInt32 GetJobs() const { return mnJobs; } - - bool operator==( const QueueInfo& rInfo ) const; }; diff --git a/include/vcl/settings.hxx b/include/vcl/settings.hxx index 46de94d538f9..c911c5d93d17 100644 --- a/include/vcl/settings.hxx +++ b/include/vcl/settings.hxx @@ -671,7 +671,6 @@ public: sal_uLong GetBalloonDelay() const; bool operator ==( const HelpSettings& rSet ) const; - bool operator !=( const HelpSettings& rSet ) const; }; @@ -729,7 +728,6 @@ public: AllSettingsFlags GetChangeFlags( const AllSettings& rSettings ) const; bool operator ==( const AllSettings& rSet ) const; - bool operator !=( const AllSettings& rSet ) const; static void LocaleSettingsChanged( sal_uInt32 nHint ); SvtSysLocale& GetSysLocale(); }; diff --git a/include/vcl/textrectinfo.hxx b/include/vcl/textrectinfo.hxx index 8b98e1a37c99..b5dcf561f132 100644 --- a/include/vcl/textrectinfo.hxx +++ b/include/vcl/textrectinfo.hxx @@ -41,8 +41,6 @@ public: { return ((mnMaxWidth == rInfo.mnMaxWidth) && (mnLineCount == rInfo.mnLineCount) && (mbEllipsis == rInfo.mbEllipsis)); } - bool operator !=( const TextRectInfo& rInfo ) const - { return !(TextRectInfo::operator==( rInfo )); } }; inline TextRectInfo::TextRectInfo() diff --git a/include/vcl/txtattr.hxx b/include/vcl/txtattr.hxx index 43a6adc9a65d..3dcb28fd4a4a 100644 --- a/include/vcl/txtattr.hxx +++ b/include/vcl/txtattr.hxx @@ -54,8 +54,6 @@ public: virtual TextAttrib* Clone() const = 0; virtual bool operator==( const TextAttrib& rAttr ) const = 0; - bool operator!=( const TextAttrib& rAttr ) const - { return !(*this == rAttr ); } }; diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index 59432a6cc520..5487745d36ab 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -637,13 +637,6 @@ private: SAL_DLLPRIVATE void ImplInitWindowData( WindowType nType ); - SAL_DLLPRIVATE void getFrameDev( const Point& rPt, const Point& rDevPt, const Size& rDevSize, - OutputDevice& rOutDev ); - - - SAL_DLLPRIVATE void drawFrameDev( const Point& rPt, const Point& rDevPt, const Size& rDevSize, - const OutputDevice& rOutDev, const vcl::Region& rRegion ); - SAL_DLLPRIVATE void ImplSetFrameParent( const vcl::Window* pParent ); SAL_DLLPRIVATE void ImplInsertWindow( vcl::Window* pParent ); |