[Libreoffice-commits] core.git: 4 commits - include/tools sc/source tools/source unotools/source

[Noel Grandin]

 include/tools/ref.hxx                           |    3 ---
 sc/source/core/data/table3.cxx                  |    2 +-
 sc/source/filter/oox/formulaparser.cxx          |    8 --------
 tools/source/debug/debug.cxx                    |   13 +++----------
 unotools/source/config/configvaluecontainer.cxx |   10 ----------
 5 files changed, 4 insertions(+), 32 deletions(-)

New commits:
commit e3246e806cad5f9d2c05c3408adc3019da5a575d
Author: Noel Grandin <noel at peralex.com>
Date:   Mon Jul 14 12:55:03 2014 +0200

    loplugin:unreffun
    
    Change-Id: Ib64683372d89896e7fbac7ac9acb608c5470531c

diff --git a/sc/source/filter/oox/formulaparser.cxx b/sc/source/filter/oox/formulaparser.cxx
index 41331fb..1e63e9d 100644
--- a/sc/source/filter/oox/formulaparser.cxx
+++ b/sc/source/filter/oox/formulaparser.cxx
@@ -472,7 +472,6 @@ protected:
     size_t              appendWhiteSpaceTokens( const WhiteSpaceVec* pSpaces );
     size_t              insertWhiteSpaceTokens( const WhiteSpaceVec* pSpaces, size_t nIndexFromEnd );
 
-    size_t              getOperandSize( size_t nOpCountFromEnd, size_t nOpIndex ) const;
     void                pushOperandSize( size_t nSize );
     size_t              popOperandSize();
 
@@ -725,13 +724,6 @@ size_t FormulaParserImpl::insertWhiteSpaceTokens( const WhiteSpaceVec* pSpaces,
     return pSpaces ? pSpaces->size() : 0;
 }
 
-size_t FormulaParserImpl::getOperandSize( size_t nOpCountFromEnd, size_t nOpIndex ) const
-{
-    OSL_ENSURE( (nOpIndex < nOpCountFromEnd) && (nOpCountFromEnd <= maOperandSizeStack.size()),
-        "FormulaParserImpl::getOperandSize - invalid parameters" );
-    return maOperandSizeStack[ maOperandSizeStack.size() - nOpCountFromEnd + nOpIndex ];
-}
-
 void FormulaParserImpl::pushOperandSize( size_t nSize )
 {
     maOperandSizeStack.push_back( nSize );
commit 06a40a242fe1382a208cfb85857f371d0a6a5fa5
Author: Noel Grandin <noel at peralex.com>
Date:   Mon Jul 14 12:03:25 2014 +0200

    -Wunused-variable
    
    Change-Id: I3a22b16d2449a1cb2eba00164f8fca0fd022bd0a

diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 6306f6a..a842d82 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -800,7 +800,7 @@ void ScTable::SortReorderByRow(
                     pNew->CopyAllBroadcasters(*rCell.maCell.mpFormula);
                     pNew->GetCode()->AdjustReferenceOnMovedOrigin(aOldPos, aCellPos);
 
-                    sc::CellStoreType::iterator itBlk = rCellStore.push_back(pNew);
+                    rCellStore.push_back(pNew);
                 }
                 break;
                 default:
commit 34cabe837dbb78bf7531c4bab6f50c4764e64cf5
Author: Noel Grandin <noel at peralex.com>
Date:   Mon Jul 14 11:29:02 2014 +0200

    loplugin:unreffun
    
    Change-Id: Idc0f3ef53f48b2e77e4cecbcdbbc44a115c6ec2e

diff --git a/tools/source/debug/debug.cxx b/tools/source/debug/debug.cxx
index 4b0a37a..c956ac2 100644
--- a/tools/source/debug/debug.cxx
+++ b/tools/source/debug/debug.cxx
@@ -304,20 +304,12 @@ void* DbgFunc( sal_uInt16 nAction, void* pParam )
     }
 }
 
-#else
-
-void* DbgFunc( sal_uInt16, void* ) { return NULL; }
-
 #endif
 
+#if OSL_DEBUG_LEVEL > 0
 
 TOOLS_DLLPUBLIC void DbgUnhandledException(const css::uno::Any & caught, const char* currentFunction, const char* fileAndLineNo)
 {
-#if OSL_DEBUG_LEVEL == 0
-        (void) caught;
-        (void) currentFunction;
-        (void) fileAndLineNo;
-#else
         OString sMessage( "caught an exception!" );
         sMessage += "\nin function:";
         sMessage += currentFunction;
@@ -359,9 +351,10 @@ TOOLS_DLLPUBLIC void DbgUnhandledException(const css::uno::Any & caught, const c
         SAL_DETAIL_LOG_FORMAT(
             SAL_DETAIL_ENABLE_LOG_WARN, SAL_DETAIL_LOG_LEVEL_WARN,
             "legacy.osl", fileAndLineNo, "%s", sMessage.getStr());
-#endif
 }
 
+#endif
+
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unotools/source/config/configvaluecontainer.cxx b/unotools/source/config/configvaluecontainer.cxx
index 99a2e97..3c526e9 100644
--- a/unotools/source/config/configvaluecontainer.cxx
+++ b/unotools/source/config/configvaluecontainer.cxx
@@ -57,13 +57,10 @@ namespace utl
 
         void bind( void* _pLocation, const Type& _rType );
 
-        bool                    isBound( ) const        { return ( ltUnbound != eLocationType ) && ( NULL != pLocation ); }
         const OUString&  getPath( ) const        { return sRelativePath; }
         LocationType            getLocType( ) const     { return eLocationType; }
         void*                   getLocation( ) const    { return pLocation; }
         const Type&             getDataType( ) const    { return aDataType; }
-
-        bool operator == ( const NodeValueAccessor& rhs ) const;
     };
 
     NodeValueAccessor::NodeValueAccessor( const OUString& _rNodePath )
@@ -73,13 +70,6 @@ namespace utl
     {
     }
 
-    bool NodeValueAccessor::operator == ( const NodeValueAccessor& rhs ) const
-    {
-        return  (   sRelativePath   ==  rhs.sRelativePath   )
-            &&  (   eLocationType   ==  rhs.eLocationType   )
-            &&  (   pLocation       ==  rhs.pLocation       );
-    }
-
     void NodeValueAccessor::bind( void* _pLocation, const Type& _rType )
     {
         DBG_ASSERT( !isBound(), "NodeValueAccessor::bind: already bound!" );
commit 09a90c2ff5d39c3ae61b4041c3b39d3da0c640c1
Author: Noel Grandin <noel at peralex.com>
Date:   Thu Jul 10 13:37:10 2014 +0200

    remove unused SvRefBase constructor
    
    Change-Id: I81991231a2cc0b0c9d8289db8435ef8286f1c2bb

diff --git a/include/tools/ref.hxx b/include/tools/ref.hxx
index a6782f0..4d9bc86 100644
--- a/include/tools/ref.hxx
+++ b/include/tools/ref.hxx
@@ -155,9 +155,6 @@ public:
                     SvRefBase()
                     { nRefCount = SV_NO_DELETE_REFCOUNT; }
 
-                    SvRefBase( const SvRefBase & /* rObj */ )
-                    { nRefCount = SV_NO_DELETE_REFCOUNT; }
-
     SvRefBase &     operator = ( const SvRefBase & )
                     { return *this; }