[Libreoffice-commits] .: unotools/inc unotools/source unusedcode.easy

Matus Kukan mkukan at kemper.freedesktop.org
Sun Aug 21 10:12:39 PDT 2011


 unotools/inc/unotools/collatorwrapper.hxx |   15 --------
 unotools/source/i18n/collatorwrapper.cxx  |   55 ------------------------------
 unusedcode.easy                           |    3 -
 3 files changed, 73 deletions(-)

New commits:
commit 36703ca1de68cd62782d0d425123521a5bc6732b
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Sun Aug 21 19:09:04 2011 +0200

    unusedcode: CollatorWrapper

diff --git a/unotools/inc/unotools/collatorwrapper.hxx b/unotools/inc/unotools/collatorwrapper.hxx
index 3b90c84..f703639 100644
--- a/unotools/inc/unotools/collatorwrapper.hxx
+++ b/unotools/inc/unotools/collatorwrapper.hxx
@@ -56,11 +56,6 @@ class UNOTOOLS_DLLPUBLIC CollatorWrapper
 
         ~CollatorWrapper();
 
-        sal_Int32
-        compareSubstring (
-                const ::rtl::OUString& s1, sal_Int32 off1, sal_Int32 len1,
-                const ::rtl::OUString& s2, sal_Int32 off2, sal_Int32 len2) const;
-
            sal_Int32
         compareString (
                 const ::rtl::OUString& s1, const ::rtl::OUString& s2) const;
@@ -69,10 +64,6 @@ class UNOTOOLS_DLLPUBLIC CollatorWrapper
         listCollatorAlgorithms (
                 const ::com::sun::star::lang::Locale& rLocale) const;
 
-        ::com::sun::star::uno::Sequence< sal_Int32 >
-        listCollatorOptions (
-                const ::rtl::OUString& rAlgorithm) const;
-
         sal_Int32
         loadDefaultCollator (
                 const ::com::sun::star::lang::Locale& rLocale, sal_Int32 nOption);
@@ -82,12 +73,6 @@ class UNOTOOLS_DLLPUBLIC CollatorWrapper
                 const ::rtl::OUString& rAlgorithm,
                 const ::com::sun::star::lang::Locale& rLocale, sal_Int32 nOption);
 
-        void
-        loadCollatorAlgorithmWithEndUserOption (
-                const ::rtl::OUString& rAlgorithm,
-                const ::com::sun::star::lang::Locale& rLocale,
-                const ::com::sun::star::uno::Sequence< sal_Int32 >& rOption);
-
     protected:
 
         CollatorWrapper();
diff --git a/unotools/source/i18n/collatorwrapper.cxx b/unotools/source/i18n/collatorwrapper.cxx
index e872b82..2e7b981 100644
--- a/unotools/source/i18n/collatorwrapper.cxx
+++ b/unotools/source/i18n/collatorwrapper.cxx
@@ -50,26 +50,6 @@ CollatorWrapper::~CollatorWrapper()
 }
 
 sal_Int32
-CollatorWrapper::compareSubstring (
-        const ::rtl::OUString& s1, sal_Int32 off1, sal_Int32 len1,
-        const ::rtl::OUString& s2, sal_Int32 off2, sal_Int32 len2) const
-{
-    try
-    {
-        if (mxInternationalCollator.is())
-            return mxInternationalCollator->compareSubstring (
-                                                        s1, off1, len1, s2, off2, len2);
-    }
-    catch (uno::RuntimeException& rRuntimeException)
-    {
-        (void)rRuntimeException;
-        DBG_ERRORFILE ("CollatorWrapper: compareSubstring failed");
-    }
-
-    return 0;
-}
-
-sal_Int32
 CollatorWrapper::compareString (const ::rtl::OUString& s1, const ::rtl::OUString& s2) const
 {
     try
@@ -103,23 +83,6 @@ CollatorWrapper::listCollatorAlgorithms (const lang::Locale& rLocale) const
     return uno::Sequence< ::rtl::OUString > ();
 }
 
-uno::Sequence< sal_Int32 >
-CollatorWrapper::listCollatorOptions (const ::rtl::OUString& rAlgorithm) const
-{
-    try
-    {
-        if (mxInternationalCollator.is())
-            return mxInternationalCollator->listCollatorOptions (rAlgorithm);
-    }
-    catch (uno::RuntimeException& rRuntimeException)
-    {
-        (void)rRuntimeException;
-        DBG_ERRORFILE ("CollatorWrapper: listCollatorOptions failed");
-    }
-
-    return uno::Sequence< sal_Int32 > ();
-}
-
 sal_Int32
 CollatorWrapper::loadDefaultCollator (const lang::Locale& rLocale, sal_Int32 nOptions)
 {
@@ -157,22 +120,4 @@ CollatorWrapper::loadCollatorAlgorithm (const ::rtl::OUString& rAlgorithm,
 
 }
 
-void
-CollatorWrapper::loadCollatorAlgorithmWithEndUserOption (
-        const ::rtl::OUString& rAlgorithm,
-        const lang::Locale& rLocale, const uno::Sequence< sal_Int32 >& rOption)
-{
-    try
-    {
-        if (mxInternationalCollator.is())
-            mxInternationalCollator->loadCollatorAlgorithmWithEndUserOption (
-                                                        rAlgorithm, rLocale, rOption);
-    }
-    catch (uno::RuntimeException& rRuntimeException)
-    {
-        (void)rRuntimeException;
-        DBG_ERRORFILE ("CollatorWrapper: loadCollatorAlgorithmWithEndUserOption failed");
-    }
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unusedcode.easy b/unusedcode.easy
index 731b528..80497d4 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -84,9 +84,6 @@ CharPosArray::Replace(int const&, unsigned short)
 CharPosArray::Replace(int const*, unsigned short, unsigned short)
 CharPosArray::_ForEach(unsigned short, unsigned short, unsigned char (*)(int const&, void*), void*)
 CloneList::Count() const
-CollatorWrapper::compareSubstring(rtl::OUString const&, int, int, rtl::OUString const&, int, int) const
-CollatorWrapper::listCollatorOptions(rtl::OUString const&) const
-CollatorWrapper::loadCollatorAlgorithmWithEndUserOption(rtl::OUString const&, com::sun::star::lang::Locale const&, com::sun::star::uno::Sequence<int> const&)
 Color::IncreaseContrast(unsigned char)
 CommandExtTextInputData::CommandExtTextInputData()
 CommunicationLinkList::DeleteAndDestroy(unsigned short, unsigned short)


More information about the Libreoffice-commits mailing list