sal/qa/inc/stringhelper.hxx | 4 ---- sc/inc/address.hxx | 10 ---------- sc/inc/cellvalue.hxx | 2 -- sc/inc/chartarr.hxx | 2 -- sc/inc/pivot.hxx | 1 - sc/source/core/data/cellvalue.cxx | 9 --------- sc/source/core/data/pivot2.cxx | 20 -------------------- sc/source/core/tool/chartarr.cxx | 6 ------ sc/source/ui/inc/docsh.hxx | 1 - svx/inc/xpolyimp.hxx | 2 -- sw/inc/IMark.hxx | 24 ++++++++++++++++++++++++ 11 files changed, 24 insertions(+), 57 deletions(-)
New commits: commit a06eefdec89537ec1d939a5d001fd0d6f3eb9793 Author: Noel Grandin <[email protected]> Date: Tue Jan 19 13:21:37 2016 +0200 place it safe with MSVC 2008 build revert a couple of pieces of commit 5fe99ea3ee7b33a80f1419f2a4c9c1ea56dd00ee "loplugin:unusedmethods in sw" Change-Id: If1eb9c7f01dcdea7ef7059165470357d5186ff93 diff --git a/sw/inc/IMark.hxx b/sw/inc/IMark.hxx index 0a8860e..5f891b8 100644 --- a/sw/inc/IMark.hxx +++ b/sw/inc/IMark.hxx @@ -137,6 +137,18 @@ namespace sw { namespace mark { return pMark->StartsAfter(rPos); } +#ifdef DBG_UTIL + bool operator()(std::shared_ptr<sw::mark::IMark> const& pMark, + SwPosition const& rPos) + { + return pMark->StartsBefore(rPos); + } + bool operator()(std::shared_ptr<sw::mark::IMark> const& pMark1, + std::shared_ptr<sw::mark::IMark> const& pMark2) + { + return (*pMark1) < (*pMark2); + } +#endif }; // MSVC 2008 with _DEBUG calls this with parameters in wrong order @@ -148,6 +160,18 @@ namespace sw { namespace mark { return pMark->StartsBefore(rPos); } +#ifdef DBG_UTIL + bool operator()(SwPosition const& rPos, + std::shared_ptr<sw::mark::IMark> const& pMark) + { + return pMark->StartsAfter(rPos); + } + bool operator()(std::shared_ptr<sw::mark::IMark> const& pMark1, + std::shared_ptr<sw::mark::IMark> const& pMark2) + { + return (*pMark1) < (*pMark2); + } +#endif }; OUString ExpandFieldmark(IFieldmark* pBM); commit c0b199b3c69ace999db6e688466b2bbd9ad7c389 Author: Noel Grandin <[email protected]> Date: Tue Jan 19 13:10:56 2016 +0200 loplugin:unusedmethods in sc/ Change-Id: I2c24d06d9fad26c65fa13cdcaa2c3f908971106c diff --git a/sal/qa/inc/stringhelper.hxx b/sal/qa/inc/stringhelper.hxx index cb7a0ab..e7a0328 100644 --- a/sal/qa/inc/stringhelper.hxx +++ b/sal/qa/inc/stringhelper.hxx @@ -27,10 +27,6 @@ inline void operator <<= (rtl::OString& _rAsciiString, rtl::OUString const & _rU { _rAsciiString = rtl::OUStringToOString(_rUnicodeString,RTL_TEXTENCODING_ASCII_US); } -inline void operator <<= (rtl::OUString& _rUnicodeString, rtl::OString const & _rAsciiString ) -{ - _rUnicodeString = rtl::OStringToOUString(_rAsciiString, RTL_TEXTENCODING_ASCII_US); -} #endif diff --git a/sc/inc/address.hxx b/sc/inc/address.hxx index 3aa0ba1..9853a40 100644 --- a/sc/inc/address.hxx +++ b/sc/inc/address.hxx @@ -709,7 +709,6 @@ public: return aRange[n]; } inline bool operator==( const ScRangePair& ) const; - inline bool operator!=( const ScRangePair& ) const; }; inline ScRangePair& ScRangePair::operator= ( const ScRangePair& rRange ) @@ -725,11 +724,6 @@ inline bool ScRangePair::operator==( const ScRangePair& rRange ) const (aRange[1] == rRange.aRange[1]); } -inline bool ScRangePair::operator!=( const ScRangePair& rRange ) const -{ - return !operator==( rRange ); -} - // ScRefAddress class ScRefAddress { @@ -809,10 +803,6 @@ public: } inline bool operator == ( const ScRefAddress& r ) const; - inline bool operator != ( const ScRefAddress& r ) const - { - return !(operator==(r)); - } OUString GetRefString( ScDocument* pDocument, SCTAB nActTab, const ScAddress::Details& rDetails = ScAddress::detailsOOOa1) const; diff --git a/sc/inc/cellvalue.hxx b/sc/inc/cellvalue.hxx index 7ac6a87..6dcbc8f 100644 --- a/sc/inc/cellvalue.hxx +++ b/sc/inc/cellvalue.hxx @@ -155,8 +155,6 @@ struct SC_DLLPUBLIC ScRefCellValue bool equalsWithoutFormat( const ScRefCellValue& r ) const; ScRefCellValue& operator= ( const ScRefCellValue& r ); - - void swap( ScRefCellValue& r ); }; #endif diff --git a/sc/inc/chartarr.hxx b/sc/inc/chartarr.hxx index 0e2c255..d91e492 100644 --- a/sc/inc/chartarr.hxx +++ b/sc/inc/chartarr.hxx @@ -84,8 +84,6 @@ public: bool HasRowHeaders() const { return aPositioner.HasRowHeaders(); } const OUString& GetName() const { return aName; } - bool operator==(const ScChartArray& rCmp) const; - ScMemChart* CreateMemChart(); }; diff --git a/sc/inc/pivot.hxx b/sc/inc/pivot.hxx index a3583a7..f0dd99b 100644 --- a/sc/inc/pivot.hxx +++ b/sc/inc/pivot.hxx @@ -124,7 +124,6 @@ struct ScPivotField ScPivotField( const ScPivotField& r ); long getOriginalDim() const; - bool operator==( const ScPivotField& r ) const; }; typedef std::vector< ScPivotField > ScPivotFieldVector; diff --git a/sc/source/core/data/cellvalue.cxx b/sc/source/core/data/cellvalue.cxx index f0fe714..5da5e08 100644 --- a/sc/source/core/data/cellvalue.cxx +++ b/sc/source/core/data/cellvalue.cxx @@ -601,13 +601,4 @@ ScRefCellValue& ScRefCellValue::operator= ( const ScRefCellValue& r ) return *this; } -void ScRefCellValue::swap( ScRefCellValue& r ) -{ - std::swap(meType, r.meType); - - // double is 8 bytes, whereas a pointer may be 4 or 8 bytes depending on - // the platform. Swap by double values. - std::swap(mfValue, r.mfValue); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/data/pivot2.cxx b/sc/source/core/data/pivot2.cxx index 801afbe..6720473 100644 --- a/sc/source/core/data/pivot2.cxx +++ b/sc/source/core/data/pivot2.cxx @@ -47,18 +47,6 @@ using std::endl; using css::sheet::DataPilotFieldReference; using std::vector; -namespace -{ - -bool equals(const DataPilotFieldReference& left, const DataPilotFieldReference& right) -{ - return (left.ReferenceType == right.ReferenceType) - && (left.ReferenceField == right.ReferenceField) - && (left.ReferenceItemType == right.ReferenceItemType) - && (left.ReferenceItemName == right.ReferenceItemName); -} - -} // namespace // ScDPName @@ -127,14 +115,6 @@ long ScPivotField::getOriginalDim() const return mnOriginalDim >= 0 ? mnOriginalDim : static_cast<long>(nCol); } -bool ScPivotField::operator==( const ScPivotField& r ) const -{ - return (nCol == r.nCol) - && (mnOriginalDim == r.mnOriginalDim) - && (nFuncMask == r.nFuncMask) - && equals(maFieldRef, r.maFieldRef); -} - // ScPivotParam ScPivotParam::ScPivotParam() : diff --git a/sc/source/core/tool/chartarr.cxx b/sc/source/core/tool/chartarr.cxx index 5438895..7805379 100644 --- a/sc/source/core/tool/chartarr.cxx +++ b/sc/source/core/tool/chartarr.cxx @@ -84,12 +84,6 @@ ScChartArray::ScChartArray( const ScChartArray& rArr ) : ScChartArray::~ScChartArray() {} -bool ScChartArray::operator==(const ScChartArray& rCmp) const -{ - return aPositioner == rCmp.aPositioner - && aName == rCmp.aName; -} - ScMemChart* ScChartArray::CreateMemChart() { ScRangeListRef aRangeListRef(GetRangeList()); diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx index e50e238..827d123 100644 --- a/sc/source/ui/inc/docsh.hxx +++ b/sc/source/ui/inc/docsh.hxx @@ -227,7 +227,6 @@ public: ScDocument& GetDocument() { return aDocument; } ScDocFunc& GetDocFunc() { return *pDocFunc; } - void SetDocFunc( ScDocFunc *pDF ) { pDocFunc = pDF; } SfxPrinter* GetPrinter( bool bCreateIfNotExist = true ); sal_uInt16 SetPrinter( SfxPrinter* pNewPrinter, SfxPrinterChangeFlags nDiffFlags = SFX_PRINTER_ALL ); diff --git a/svx/inc/xpolyimp.hxx b/svx/inc/xpolyimp.hxx index aa0cf76..a72981b 100644 --- a/svx/inc/xpolyimp.hxx +++ b/svx/inc/xpolyimp.hxx @@ -42,7 +42,6 @@ public: ~ImpXPolygon(); bool operator==(const ImpXPolygon& rImpXPoly) const; - bool operator!=(const ImpXPolygon& rImpXPoly) const { return !operator==(rImpXPoly); } void CheckPointDelete() { @@ -71,7 +70,6 @@ public: ~ImpXPolyPolygon(); bool operator==(const ImpXPolyPolygon& rImpXPolyPoly) const; - bool operator!=(const ImpXPolyPolygon& rImpXPolyPoly) const { return !operator==(rImpXPolyPoly); } }; _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
