[Libreoffice-commits] core.git: chart2/source connectivity/source editeng/source filter/source formula/source hwpfilter/source idlc/inc idlc/source idl/inc include/formula include/sax include/svl include/svx sax/source svl/source

Noel Grandin noel at peralex.com
Wed Jan 20 00:14:22 PST 2016


 chart2/source/inc/EventListenerHelper.hxx               |   38 --------
 connectivity/source/drivers/firebird/ResultSet.hxx      |    5 -
 connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx |   12 --
 connectivity/source/inc/file/FResultSet.hxx             |    5 -
 connectivity/source/inc/java/sql/DriverPropertyInfo.hxx |    3 
 editeng/source/editeng/editobj.cxx                      |   20 ----
 editeng/source/editeng/editobj2.hxx                     |   12 --
 filter/source/svg/b2dellipse.cxx                        |    5 -
 filter/source/svg/b2dellipse.hxx                        |    3 
 formula/source/core/api/token.cxx                       |   54 ------------
 hwpfilter/source/list.hxx                               |   39 ---------
 hwpfilter/source/mzstring.cxx                           |   23 -----
 hwpfilter/source/mzstring.h                             |    3 
 idl/inc/bastype.hxx                                     |    6 -
 idl/inc/hash.hxx                                        |    2 
 idlc/inc/idlc/astexpression.hxx                         |    1 
 idlc/source/astexpression.cxx                           |   52 ------------
 include/formula/tokenarray.hxx                          |   14 ---
 include/sax/fastparser.hxx                              |    2 
 include/svl/itemset.hxx                                 |    1 
 include/svl/ownlist.hxx                                 |    1 
 include/svx/sdr/overlay/overlaymanager.hxx              |    2 
 sax/source/fastparser/fastparser.cxx                    |   29 ------
 svl/source/items/itemset.cxx                            |   18 ----
 svl/source/misc/ownlist.cxx                             |   68 ----------------
 25 files changed, 1 insertion(+), 417 deletions(-)

New commits:
commit 4ff5a5558472beee85eb1234dcc2aa2ed9000f6c
Author: Noel Grandin <noel at peralex.com>
Date:   Tue Jan 19 15:17:30 2016 +0200

    loplugin:unusedmethods
    
    Change-Id: Ib2dc804f55d1a96ae01f2cf31b7d55956040a72e
    Reviewed-on: https://gerrit.libreoffice.org/21603
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noelgrandin at gmail.com>

diff --git a/chart2/source/inc/EventListenerHelper.hxx b/chart2/source/inc/EventListenerHelper.hxx
index 6fe8b9f..7e190df 100644
--- a/chart2/source/inc/EventListenerHelper.hxx
+++ b/chart2/source/inc/EventListenerHelper.hxx
@@ -73,44 +73,6 @@ private:
     ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > m_xListener;
 };
 
-template< class Pair >
-struct addListenerToMappedElementFunctor : public ::std::unary_function< Pair, void >
-{
-    explicit addListenerToMappedElementFunctor( const ::com::sun::star::uno::Reference<
-                                                    ::com::sun::star::lang::XEventListener > & xListener ) :
-            m_xListener( xListener )
-    {}
-
-    void operator() ( const Pair & aPair )
-    {
-        ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >
-              xBroadcaster( aPair.second, ::com::sun::star::uno::UNO_QUERY );
-        if( xBroadcaster.is() && m_xListener.is())
-            xBroadcaster->addEventListener( m_xListener );
-    }
-private:
-    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > m_xListener;
-};
-
-template< class Pair >
-struct removeListenerFromMappedElementFunctor : public ::std::unary_function< Pair, void >
-{
-    explicit removeListenerFromMappedElementFunctor( const ::com::sun::star::uno::Reference<
-                                                         ::com::sun::star::lang::XEventListener > & xListener ) :
-            m_xListener( xListener )
-    {}
-
-    void operator() ( const Pair & aPair )
-    {
-        ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >
-              xBroadcaster( aPair.second, ::com::sun::star::uno::UNO_QUERY );
-        if( xBroadcaster.is() && m_xListener.is())
-            xBroadcaster->removeEventListener( m_xListener );
-    }
-private:
-    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > m_xListener;
-};
-
 } //  namespace impl
 
 template< class InterfaceRef >
diff --git a/connectivity/source/drivers/firebird/ResultSet.hxx b/connectivity/source/drivers/firebird/ResultSet.hxx
index c60a0a8..dd9a897 100644
--- a/connectivity/source/drivers/firebird/ResultSet.hxx
+++ b/connectivity/source/drivers/firebird/ResultSet.hxx
@@ -128,11 +128,6 @@ namespace connectivity
                        isc_stmt_handle& aStatementHandle,
                        XSQLDA* aSqlda);
 
-            ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > operator *()
-            {
-                return ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >(*static_cast<OResultSet_BASE*>(this));
-            }
-
             // XInterface
             virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
                     const ::com::sun::star::uno::Type& rType)
diff --git a/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx b/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx
index 16d46f5..12e33af 100644
--- a/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx
+++ b/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx
@@ -48,18 +48,6 @@ jclass java_sql_DriverPropertyInfo::getMyClass() const
 }
 
 
-java_sql_DriverPropertyInfo::operator css::sdbc::DriverPropertyInfo()
-{
-    css::sdbc::DriverPropertyInfo aInfo;
-    aInfo.Name = name();
-    aInfo.Description = description();
-    aInfo.IsRequired = required();
-    aInfo.Value = value();
-    aInfo.Choices = choices();
-
-    return aInfo;
-}
-
 OUString java_sql_DriverPropertyInfo::name()
 {
     OUString aStr;
diff --git a/connectivity/source/inc/file/FResultSet.hxx b/connectivity/source/inc/file/FResultSet.hxx
index 0eaeedd..f773f66 100644
--- a/connectivity/source/inc/file/FResultSet.hxx
+++ b/connectivity/source/inc/file/FResultSet.hxx
@@ -163,11 +163,6 @@ namespace connectivity
             // a Constructor, that is needed for when Returning the Object is needed:
             OResultSet( OStatement_Base* pStmt,connectivity::OSQLParseTreeIterator& _aSQLIterator);
 
-            ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > operator *()
-            {
-                return ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >(*static_cast<OResultSet_BASE*>(this));
-            }
-
             // ::cppu::OComponentHelper
             virtual void SAL_CALL disposing() override;
             // XInterface
diff --git a/connectivity/source/inc/java/sql/DriverPropertyInfo.hxx b/connectivity/source/inc/java/sql/DriverPropertyInfo.hxx
index ae3bd12..3380ef5 100644
--- a/connectivity/source/inc/java/sql/DriverPropertyInfo.hxx
+++ b/connectivity/source/inc/java/sql/DriverPropertyInfo.hxx
@@ -39,13 +39,12 @@ namespace connectivity
         virtual ~java_sql_DriverPropertyInfo();
         // A ctor that is needed for returning the object
         java_sql_DriverPropertyInfo( JNIEnv * pEnv, jobject myObj ) : java_lang_Object( pEnv, myObj ){}
-                operator ::com::sun::star::sdbc::DriverPropertyInfo();
 
         OUString name();
         OUString description();
         OUString value();
         bool        required();
-                ::com::sun::star::uno::Sequence< OUString> choices();
+        ::com::sun::star::uno::Sequence< OUString> choices();
     };
 }
 
diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx
index f12c68e..8ab97df 100644
--- a/editeng/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -206,26 +206,6 @@ void ContentInfo::Dump() const
 }
 #endif
 
-bool ContentInfo::operator==( const ContentInfo& rCompare ) const
-{
-    if( (maText == rCompare.maText) &&
-            (aStyle == rCompare.aStyle ) &&
-            (aAttribs.size() == rCompare.aAttribs.size()) &&
-            (eFamily == rCompare.eFamily ) &&
-            (aParaAttribs == rCompare.aParaAttribs ) )
-    {
-        for (size_t i = 0, n = aAttribs.size(); i < n; ++i)
-        {
-            if (aAttribs[i] != rCompare.aAttribs[i])
-                return false;
-        }
-
-        return true;
-    }
-
-    return false;
-}
-
 EditTextObject::EditTextObject( SfxItemPool* pPool ) :
     mpImpl(new EditTextObjectImpl(this, pPool))
 {
diff --git a/editeng/source/editeng/editobj2.hxx b/editeng/source/editeng/editobj2.hxx
index aa8b248..6f9fae2 100644
--- a/editeng/source/editeng/editobj2.hxx
+++ b/editeng/source/editeng/editobj2.hxx
@@ -69,19 +69,8 @@ public:
 
     bool IsFeature() const;
     void SetItem(const SfxPoolItem& rNew);
-
-    inline bool operator==( const XEditAttribute& rCompare ) const;
 };
 
-inline bool XEditAttribute::operator==( const XEditAttribute& rCompare ) const
-{
-    return  (nStart == rCompare.nStart) &&
-            (nEnd == rCompare.nEnd) &&
-            ( (pItem == rCompare.pItem) ||
-            ( pItem->Which() != rCompare.pItem->Which()) ||
-            (*pItem == *rCompare.pItem));
-}
-
 struct XParaPortion
 {
     long                nHeight;
@@ -157,7 +146,6 @@ public:
 
     const WrongList* GetWrongList() const;
     void SetWrongList( WrongList* p );
-    bool operator==( const ContentInfo& rCompare ) const;
 
     // #i102062#
     bool isWrongListEqual(const ContentInfo& rCompare) const;
diff --git a/filter/source/svg/b2dellipse.cxx b/filter/source/svg/b2dellipse.cxx
index 4e4e1f0..b476109 100644
--- a/filter/source/svg/b2dellipse.cxx
+++ b/filter/source/svg/b2dellipse.cxx
@@ -22,11 +22,6 @@ namespace basegfx
     {
     }
 
-    bool B2DEllipse::operator==(const B2DEllipse& rEllipse) const
-    {
-        return (maCenter == rEllipse.maCenter) && (maRadius == rEllipse.maRadius);
-    }
-
 } // end of namespace basegfx
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/svg/b2dellipse.hxx b/filter/source/svg/b2dellipse.hxx
index 45ad6f9..b37a5c3 100644
--- a/filter/source/svg/b2dellipse.hxx
+++ b/filter/source/svg/b2dellipse.hxx
@@ -40,9 +40,6 @@ namespace basegfx
         // assignment operator
         B2DEllipse& operator=(const B2DEllipse& rEllipse);
 
-        // compare operators
-        bool operator==(const B2DEllipse& rEllipse) const;
-
         // Coordinate interface
         basegfx::B2DPoint getB2DEllipseCenter() const { return maCenter; }
         basegfx::B2DTuple getB2DEllipseRadius() const { return maRadius; }
diff --git a/formula/source/core/api/token.cxx b/formula/source/core/api/token.cxx
index e868bbf..131cafa 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -901,60 +901,6 @@ FormulaToken* FormulaTokenArray::ReplaceToken( sal_uInt16 nOffset, FormulaToken*
     }
 }
 
-void FormulaTokenArray::RemoveToken( sal_uInt16 nOffset, sal_uInt16 nCount )
-{
-    if (nOffset < nLen)
-    {
-        SAL_WARN_IF( nOffset + nCount > nLen, "formula.core",
-                "FormulaTokenArray::RemoveToken - nOffset " << nOffset << " + nCount " << nCount << " > nLen " << nLen);
-        const sal_uInt16 nStop = ::std::min( static_cast<sal_uInt16>(nOffset + nCount), nLen);
-        nCount = nStop - nOffset;
-        for (sal_uInt16 j = nOffset; j < nStop; ++j)
-        {
-            FormulaToken* p = pCode[j];
-            if (p->GetRef() > 1)
-            {
-                for (sal_uInt16 i=0; i < nRPN; ++i)
-                {
-                    if (pRPN[i] == p)
-                    {
-                        // Shift remaining tokens in pRPN down.
-                        for (sal_uInt16 x=i+1; x < nRPN; ++x)
-                        {
-                            pRPN[x-1] = pRPN[x];
-                        }
-                        --nRPN;
-
-                        p->DecRef();
-                        if (p->GetRef() == 1)
-                            break;  // for
-                    }
-                }
-            }
-            p->DecRef();    // may be dead now
-        }
-
-        // Shift remaining tokens in pCode down.
-        for (sal_uInt16 x = nStop; x < nLen; ++x)
-        {
-            pCode[x-nCount] = pCode[x];
-        }
-        nLen -= nCount;
-
-        if (nIndex >= nOffset)
-        {
-            if (nIndex < nStop)
-                nIndex = nOffset + 1;
-            else
-                nIndex -= nStop - nOffset;
-        }
-    }
-    else
-    {
-        SAL_WARN("formula.core","FormulaTokenArray::RemoveToken - nOffset " << nOffset << " >= nLen " << nLen);
-    }
-}
-
 FormulaToken* FormulaTokenArray::Add( FormulaToken* t )
 {
     if( !pCode )
diff --git a/hwpfilter/source/list.hxx b/hwpfilter/source/list.hxx
index c4371d2..11dae5f 100644
--- a/hwpfilter/source/list.hxx
+++ b/hwpfilter/source/list.hxx
@@ -61,13 +61,6 @@ public:
     /// construct list with single element
     explicit LinkedListIterator( LinkedList<T>* pList = 0 );
     ~LinkedListIterator();
-
-    // bug-compatible with original LinkedList.h/cxx: Ignore parameter!
-    void operator++( int );   /// advance iterator by one step (ignore n !!!)
-    void operator--( int );   /// go one step backwards (ignore n !!!)
-    void operator++();        /// advance iterator by one step
-    void operator--();        /// go one step backwards
-
 };
 
 
@@ -111,38 +104,6 @@ LinkedListIterator<T>::~LinkedListIterator()
 {
 }
 
-template<class T>
-void LinkedListIterator<T>::operator++( int )
-{
-    ASSERT( mpList != nullptr );
-
-    // bug-compatible with LinkedList.cxx: ignore parameter!
-    mnPosition ++;
-}
-
-template<class T>
-void LinkedListIterator<T>::operator--( int )
-{
-    ASSERT( mpList != nullptr );
-
-    // bug-compatible with LinkedList.cxx: ignore parameter!
-    mnPosition --;
-}
-
-template<class T>
-void LinkedListIterator<T>::operator++()
-{
-    ASSERT( mpList != nullptr );
-    mnPosition ++;
-}
-
-template<class T>
-void LinkedListIterator<T>::operator--()
-{
-    ASSERT( mpList != nullptr );
-    mnPosition --;
-}
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/hwpfilter/source/mzstring.cxx b/hwpfilter/source/mzstring.cxx
index b9a31ba..31ca947 100644
--- a/hwpfilter/source/mzstring.cxx
+++ b/hwpfilter/source/mzstring.cxx
@@ -167,29 +167,6 @@ int MzString::rfind(char ch, int pos)
 }
 
 
-// += operator
-
-MzString &MzString::operator += (char ch)
-{
-    append(&ch, 1);
-    return *this;
-}
-
-
-MzString &MzString::operator += (const char *str)
-{
-    append(str);
-    return *this;
-}
-
-
-MzString &MzString::operator += (MzString const &s)
-{
-    append(s);
-    return *this;
-}
-
-
 // << operator
 MzString &MzString::operator << (const char *str)
 {
diff --git a/hwpfilter/source/mzstring.h b/hwpfilter/source/mzstring.h
index 5a5d606..1de0906 100644
--- a/hwpfilter/source/mzstring.h
+++ b/hwpfilter/source/mzstring.h
@@ -99,9 +99,6 @@ class MzString
         MzString  &operator = (const char *s);
 
 // Appending
-        MzString  &operator += (char);
-        MzString  &operator += (const char *);
-        MzString  &operator += (MzString const &);
 
         MzString  &operator << (const char *);
         MzString  &operator << (char);
diff --git a/idl/inc/bastype.hxx b/idl/inc/bastype.hxx
index f31121a..de0d8aa 100644
--- a/idl/inc/bastype.hxx
+++ b/idl/inc/bastype.hxx
@@ -134,12 +134,6 @@ class SvVersion
     sal_uInt16  nMinorVersion;
 public:
                 SvVersion() : nMajorVersion( 1 ), nMinorVersion( 0 ) {}
-    bool        operator == ( const SvVersion & r )
-                {
-                    return (r.nMajorVersion == nMajorVersion)
-                             && (r.nMinorVersion == nMinorVersion);
-                }
-
     bool        ReadSvIdl( SvTokenStream & rInStm );
 };
 
diff --git a/idl/inc/hash.hxx b/idl/inc/hash.hxx
index 39fdf76..70a5d6a 100644
--- a/idl/inc/hash.hxx
+++ b/idl/inc/hash.hxx
@@ -77,8 +77,6 @@ public:
     void            SetValue( sal_uLong n ) { nValue = n; }
     sal_uLong       GetValue() const { return nValue; }
 
-    bool            operator == ( const SvStringHashEntry & rRef )
-                    { return nHashId == rRef.nHashId; }
     SvStringHashEntry & operator = ( const SvStringHashEntry & rRef )
         { SvRefBase::operator=( rRef );
           aName   = rRef.aName;
diff --git a/idlc/inc/idlc/astexpression.hxx b/idlc/inc/idlc/astexpression.hxx
index 83fa6d7..4e51e8b 100644
--- a/idlc/inc/idlc/astexpression.hxx
+++ b/idlc/inc/idlc/astexpression.hxx
@@ -115,7 +115,6 @@ public:
     void evaluate();
 
     // Compare to AstExpressions
-    bool operator==(AstExpression *pExpr);
     bool compare(AstExpression *pExpr);
 
     OString toString();
diff --git a/idlc/source/astexpression.cxx b/idlc/source/astexpression.cxx
index cb5a044..2ffd67f 100644
--- a/idlc/source/astexpression.cxx
+++ b/idlc/source/astexpression.cxx
@@ -758,58 +758,6 @@ bool AstExpression::coerce(ExprType t)
     return m_exprValue != nullptr;
 }
 
-bool AstExpression::operator==(AstExpression *pExpr)
-{
-    bool bRet = false;
-    if (m_combOperator != pExpr->getCombOperator())
-        return bRet;
-    evaluate();
-    pExpr->evaluate();
-    if (m_exprValue == nullptr || pExpr->getExprValue() == nullptr)
-        return bRet;
-    if (m_exprValue->et != pExpr->getExprValue()->et)
-        return bRet;
-    switch (m_exprValue->et)
-    {
-        case ET_short:
-            bRet = m_exprValue->u.sval == pExpr->getExprValue()->u.sval;
-            break;
-        case ET_ushort:
-            bRet = m_exprValue->u.usval == pExpr->getExprValue()->u.usval;
-            break;
-        case ET_long:
-            bRet = m_exprValue->u.lval == pExpr->getExprValue()->u.lval;
-            break;
-        case ET_ulong:
-            bRet = m_exprValue->u.ulval == pExpr->getExprValue()->u.ulval;
-            break;
-        case ET_hyper:
-            bRet = m_exprValue->u.hval == pExpr->getExprValue()->u.hval;
-            break;
-        case ET_uhyper:
-            bRet = m_exprValue->u.uhval == pExpr->getExprValue()->u.uhval;
-            break;
-        case ET_float:
-            bRet = m_exprValue->u.fval == pExpr->getExprValue()->u.fval;
-            break;
-        case ET_double:
-            bRet = m_exprValue->u.dval == pExpr->getExprValue()->u.dval;
-            break;
-        case ET_byte:
-            bRet = m_exprValue->u.byval == pExpr->getExprValue()->u.byval;
-            break;
-        case ET_boolean:
-            bRet = m_exprValue->u.lval == pExpr->getExprValue()->u.lval;
-            break;
-        default:
-            OSL_ASSERT(false);
-            bRet = false;
-            break;
-    }
-
-    return bRet;
-}
-
 bool AstExpression::compare(AstExpression *pExpr)
 {
     bool bRet = false;
diff --git a/include/formula/tokenarray.hxx b/include/formula/tokenarray.hxx
index d88f884..7960591 100644
--- a/include/formula/tokenarray.hxx
+++ b/include/formula/tokenarray.hxx
@@ -148,20 +148,6 @@ protected:
      */
     FormulaToken*           ReplaceToken( sal_uInt16 nOffset, FormulaToken*, ReplaceMode eMode );
 
-    /** Remove a sequence of tokens from pCode array, and pRPN array if the
-        tokens are referenced there.
-
-        This' nLen and nRPN are adapted, as is nIndex if it points behind
-        nOffset. If nIndex points into the to be removed range
-        (nOffset < nIndex < nOffset+nCount) it is set to nOffset+1.
-
-        @param  nOffset
-                Start offset into pCode.
-        @param  nCount
-                Count of tokens to remove.
-     */
-    void                    RemoveToken( sal_uInt16 nOffset, sal_uInt16 nCount );
-
     inline  void            SetCombinedBitsRecalcMode( ScRecalcMode nBits )
                                 { nMode |= (nBits & ~RECALCMODE_EMASK); }
     inline  ScRecalcMode    GetCombinedBitsRecalcMode() const
diff --git a/include/sax/fastparser.hxx b/include/sax/fastparser.hxx
index d730917..206cae8 100644
--- a/include/sax/fastparser.hxx
+++ b/include/sax/fastparser.hxx
@@ -67,8 +67,6 @@ public:
     virtual OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException, std::exception) override;
     virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
     virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException, std::exception) override;
-
-    bool hasNamespaceURL( const OUString& rPrefix ) const;
 };
 
 }
diff --git a/include/svl/itemset.hxx b/include/svl/itemset.hxx
index 16122ce..6607ad5 100644
--- a/include/svl/itemset.hxx
+++ b/include/svl/itemset.hxx
@@ -120,7 +120,6 @@ public:
     sal_uInt16                  ClearItem( sal_uInt16 nWhich = 0);
     void                        ClearInvalidItems( bool bHardDefault = false );
     void                        InvalidateAllItems(); // HACK(via nWhich = 0) ???
-    void                        InvalidateDefaultItems();
 
     inline void                 SetParent( const SfxItemSet* pNew );
 
diff --git a/include/svl/ownlist.hxx b/include/svl/ownlist.hxx
index 460c4a3..1a47f1a 100644
--- a/include/svl/ownlist.hxx
+++ b/include/svl/ownlist.hxx
@@ -63,7 +63,6 @@ private:
 
 public:
     void           Append( const OUString & rCommand, const OUString & rArg );
-    void           AppendCommands( const OUString & rCmd, sal_Int32 * pEaten );
 
     void FillFromSequence( const css::uno::Sequence < css::beans::PropertyValue >& );
     void FillSequence( css::uno::Sequence < css::beans::PropertyValue >& );
diff --git a/include/svx/sdr/overlay/overlaymanager.hxx b/include/svx/sdr/overlay/overlaymanager.hxx
index 09c8505..08a0f30 100644
--- a/include/svx/sdr/overlay/overlaymanager.hxx
+++ b/include/svx/sdr/overlay/overlaymanager.hxx
@@ -109,8 +109,6 @@ namespace sdr
 
             // get the OutputDevice
             OutputDevice& getOutputDevice() const { return mrOutputDevice; }
-            // Get the draw model.
-            const SdrModel* getModel() const { return mpModel; }
 
             // add and remove OverlayObjects
             void add(OverlayObject& rOverlayObject);
diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx
index 514c156..d670489 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -228,12 +228,9 @@ public:
     void pushEntity( const Entity& rEntity );
     void popEntity();
     Entity& getEntity()             { return *mpTop; }
-    const Entity& getEntity() const { return *mpTop; }
     void parse();
     void produce( bool bForceFlush = false );
 
-    bool hasNamespaceURL( const OUString& rPrefix ) const;
-
 private:
     bool consume(EventList *);
     void deleteUsedEvents();
@@ -909,27 +906,6 @@ void FastSaxParserImpl::produce( bool bForceFlush )
     }
 }
 
-bool FastSaxParserImpl::hasNamespaceURL( const OUString& rPrefix ) const
-{
-    if (maEntities.empty())
-        return false;
-
-    const Entity& rEntity = getEntity();
-
-    if (rEntity.maNamespaceCount.empty())
-        return false;
-
-    OString aPrefix = OUStringToOString(rPrefix, RTL_TEXTENCODING_UTF8);
-    sal_uInt32 nNamespace = rEntity.maNamespaceCount.top();
-    while (nNamespace--)
-    {
-        if (rEntity.maNamespaceDefines[nNamespace]->maPrefix == aPrefix)
-            return true;
-    }
-
-    return false;
-}
-
 bool FastSaxParserImpl::consume(EventList *pEventList)
 {
     Entity& rEntity = getEntity();
@@ -1357,11 +1333,6 @@ uno::Sequence<OUString> FastSaxParser::getSupportedServiceNames()
     return seq;
 }
 
-bool FastSaxParser::hasNamespaceURL( const OUString& rPrefix ) const
-{
-    return mpImpl->hasNamespaceURL(rPrefix);
-}
-
 } // namespace sax_fastparser
 
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
diff --git a/svl/source/items/itemset.cxx b/svl/source/items/itemset.cxx
index 09c5004..809cfa5 100644
--- a/svl/source/items/itemset.cxx
+++ b/svl/source/items/itemset.cxx
@@ -350,24 +350,6 @@ void SfxItemSet::ClearInvalidItems( bool bHardDefault )
         }
 }
 
-void SfxItemSet::InvalidateDefaultItems()
-{
-    sal_uInt16* pPtr = m_pWhichRanges;
-    SfxItemArray ppFnd = m_pItems;
-
-    while( *pPtr )
-    {
-        for ( sal_uInt16 nWhich = *pPtr; nWhich <= *(pPtr+1); ++nWhich, ++ppFnd )
-            if (*ppFnd && *ppFnd != reinterpret_cast<SfxPoolItem *>(-1)
-                && **ppFnd == m_pPool->GetDefaultItem(nWhich))
-            {
-                m_pPool->Remove( **ppFnd );
-                *ppFnd = reinterpret_cast<SfxPoolItem*>(-1);
-            }
-        pPtr += 2;
-    }
-}
-
 void SfxItemSet::InvalidateAllItems()
 {
     assert( !m_nCount && "There are still Items set" );
diff --git a/svl/source/misc/ownlist.cxx b/svl/source/misc/ownlist.cxx
index b06cfc9..11449fb 100644
--- a/svl/source/misc/ownlist.cxx
+++ b/svl/source/misc/ownlist.cxx
@@ -25,74 +25,6 @@
 using namespace com::sun::star;
 
 
-static OUString parseString(const OUString & rCmd, sal_Int32 * pIndex)
-{
-    OUString result;
-
-    if(rCmd[*pIndex] == '\"') {
-        (*pIndex) ++;
-
-        sal_Int32 begin = *pIndex;
-
-        while(*pIndex < rCmd.getLength() && rCmd[(*pIndex) ++] != '\"') ;
-
-        result = rCmd.copy(begin, *pIndex - begin - 1);
-    }
-
-    return result;
-}
-
-static OUString parseWord(const OUString & rCmd, sal_Int32 * pIndex)
-{
-    sal_Int32 begin = *pIndex;
-
-    while(*pIndex < rCmd.getLength()
-          && !isspace(sal::static_int_cast<int>(rCmd[*pIndex]))
-          && rCmd[*pIndex] != '=')
-        (*pIndex) ++;
-
-    return rCmd.copy(begin, *pIndex - begin);
-}
-
-static void eatSpace(const OUString & rCmd, sal_Int32 * pIndex)
-{
-    while(*pIndex < rCmd.getLength() && isspace(sal::static_int_cast<int>(rCmd[*pIndex])))
-        (*pIndex) ++;
-}
-
-/**
- * Text is parsed and the single commands are added to the list.
- *
-*/
-void SvCommandList::AppendCommands
-(
- const OUString & rCmd,    /* This text is translated to commands */
- sal_Int32 * pEaten        /* Count of chars that have been read */
-)
-{
-    sal_Int32 index = 0;
-    while(index < rCmd.getLength())
-    {
-
-        eatSpace(rCmd, &index);
-        OUString name = (rCmd[index] == '\"') ? parseString(rCmd, &index) : parseWord(rCmd, &index);
-
-        eatSpace(rCmd, &index);
-        OUString value;
-        if(index < rCmd.getLength() && rCmd[index] == '=')
-        {
-            index ++;
-
-            eatSpace(rCmd, &index);
-            value = (rCmd[index] == '\"') ? parseString(rCmd, &index) : parseWord(rCmd, &index);
-        }
-
-        aCommandList.push_back( SvCommand(name, value));
-    }
-
-    *pEaten = index;
-}
-
 /**
  * An object of the type SvCommand is created and the list is
  * attached.


More information about the Libreoffice-commits mailing list