[Libreoffice-commits] core.git: include/oox offapi/com oox/source sax/qa

[Matúš Kukan]

 include/oox/core/fasttokenhandler.hxx             |    2 --
 offapi/com/sun/star/xml/sax/XFastTokenHandler.idl |   14 --------------
 oox/source/core/fasttokenhandler.cxx              |   11 -----------
 oox/source/crypto/DocumentDecryption.cxx          |   10 ----------
 sax/qa/cppunit/parser.cxx                         |   12 ------------
 5 files changed, 49 deletions(-)

New commits:
commit 879bfcbf84fc7b73b5475d3f02e98184a2065dc5
Author: Matúš Kukan <matus.kukan at collabora.com>
Date:   Fri Sep 19 10:49:33 2014 +0200

    Remove unused XFastTokenHandler functions
    
    Change-Id: I0d8072f1194aa837932dcffd6dc6a3761bbdc74e

diff --git a/include/oox/core/fasttokenhandler.hxx b/include/oox/core/fasttokenhandler.hxx
index 23d2076..baf0472 100644
--- a/include/oox/core/fasttokenhandler.hxx
+++ b/include/oox/core/fasttokenhandler.hxx
@@ -51,8 +51,6 @@ public:
     virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     // XFastTokenHandler
-    virtual sal_Int32 SAL_CALL getToken( const OUString& rIdentifier ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual OUString SAL_CALL getIdentifier( sal_Int32 nToken ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
     virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getUTF8Identifier( sal_Int32 nToken ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
     virtual sal_Int32 SAL_CALL getTokenFromUTF8( const ::com::sun::star::uno::Sequence< sal_Int8 >& Identifier ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
diff --git a/offapi/com/sun/star/xml/sax/XFastTokenHandler.idl b/offapi/com/sun/star/xml/sax/XFastTokenHandler.idl
index 5223392..4daec30 100644
--- a/offapi/com/sun/star/xml/sax/XFastTokenHandler.idl
+++ b/offapi/com/sun/star/xml/sax/XFastTokenHandler.idl
@@ -38,20 +38,6 @@ module com {  module sun {  module star {  module xml {  module sax {
 interface XFastTokenHandler: com::sun::star::uno::XInterface
 {
 
-    /** returns a integer token for the given string identifier.
-
-        @returns
-            a unique integer token for the given String or FastToken::DONTKNOW
-            if the identifier is not known to this instance.
-    */
-    long getToken( [in] string Identifier );
-
-
-    /** returns a string identifier for the given integer token.
-    */
-    string getIdentifier( [in] long Token );
-
-
     /** returns a integer token for the given string
 
         @param Identifier
diff --git a/oox/source/core/fasttokenhandler.cxx b/oox/source/core/fasttokenhandler.cxx
index 91fb38a..3fe24ef 100644
--- a/oox/source/core/fasttokenhandler.cxx
+++ b/oox/source/core/fasttokenhandler.cxx
@@ -73,17 +73,6 @@ Sequence< OUString > SAL_CALL FastTokenHandler::getSupportedServiceNames() throw
     return FastTokenHandler_getSupportedServiceNames();
 }
 
-// XFastTokenHandler
-sal_Int32 FastTokenHandler::getToken( const OUString& rIdentifier ) throw( RuntimeException, std::exception )
-{
-    return mrTokenMap.getTokenFromUnicode( rIdentifier );
-}
-
-OUString FastTokenHandler::getIdentifier( sal_Int32 nToken ) throw( RuntimeException, std::exception )
-{
-    return mrTokenMap.getUnicodeTokenName( nToken );
-}
-
 Sequence< sal_Int8 > FastTokenHandler::getUTF8Identifier( sal_Int32 nToken ) throw( RuntimeException, std::exception )
 {
     return mrTokenMap.getUtf8TokenName( nToken );
diff --git a/oox/source/crypto/DocumentDecryption.cxx b/oox/source/crypto/DocumentDecryption.cxx
index d792f6b..50a8868 100644
--- a/oox/source/crypto/DocumentDecryption.cxx
+++ b/oox/source/crypto/DocumentDecryption.cxx
@@ -47,21 +47,11 @@ vector<sal_uInt8> convertToVector(Sequence<sal_Int8>& input)
 class AgileTokenHandler : public cppu::WeakImplHelper1< XFastTokenHandler >
 {
 public:
-    virtual sal_Int32 SAL_CALL getToken( const OUString& /*nIdentifier*/ ) throw (RuntimeException, std::exception) SAL_OVERRIDE
-    {
-        return FastToken::DONTKNOW;
-    }
-
     virtual sal_Int32 SAL_CALL getTokenFromUTF8( const Sequence< sal_Int8 >& /*nIdentifier*/ ) throw (RuntimeException, std::exception) SAL_OVERRIDE
     {
         return FastToken::DONTKNOW;
     }
 
-    virtual OUString SAL_CALL getIdentifier( sal_Int32 /*nToken*/ ) throw (RuntimeException, std::exception) SAL_OVERRIDE
-    {
-        return OUString();
-    }
-
     virtual Sequence<sal_Int8> SAL_CALL getUTF8Identifier(sal_Int32 /*nToken*/) throw (RuntimeException, std::exception) SAL_OVERRIDE
     {
         return Sequence<sal_Int8>();
diff --git a/sax/qa/cppunit/parser.cxx b/sax/qa/cppunit/parser.cxx
index 5674b11..5669d0f 100644
--- a/sax/qa/cppunit/parser.cxx
+++ b/sax/qa/cppunit/parser.cxx
@@ -29,18 +29,6 @@ public:
              DummyTokenHandler() {}
     virtual ~DummyTokenHandler() {}
 
-    virtual sal_Int32 SAL_CALL getToken( const OUString& )
-        throw (uno::RuntimeException, std::exception) SAL_OVERRIDE
-    {
-        CPPUNIT_ASSERT_MESSAGE( "getToken: unexpected call", false );
-        return FastToken::DONTKNOW;
-    }
-    virtual OUString SAL_CALL getIdentifier( sal_Int32 )
-        throw (uno::RuntimeException, std::exception) SAL_OVERRIDE
-    {
-        CPPUNIT_ASSERT_MESSAGE( "getIdentifier: unexpected call", false );
-        return OUString();
-    }
     virtual sal_Int32 SAL_CALL getTokenFromUTF8( const uno::Sequence<sal_Int8>& )
         throw (uno::RuntimeException, std::exception) SAL_OVERRIDE
     {