[Libreoffice-commits] .: connectivity/source unusedcode.easy

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Sun Oct 7 08:31:17 PDT 2012


 connectivity/source/drivers/mork/MColumnAlias.cxx       |   12 ----
 connectivity/source/drivers/mork/MColumnAlias.hxx       |    1 
 connectivity/source/drivers/mork/MNSProfileDiscover.cxx |   42 ----------------
 connectivity/source/drivers/mork/MNSProfileDiscover.hxx |    4 -
 unusedcode.easy                                         |    5 -
 5 files changed, 64 deletions(-)

New commits:
commit 378b578f9c33f35093c47090ff0271990346be93
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sun Oct 7 17:29:39 2012 +0200

    Remove unused mork methods
    
    Change-Id: I2d9c02145bf332ecfc0e2493bc697d61259c9d16

diff --git a/connectivity/source/drivers/mork/MColumnAlias.cxx b/connectivity/source/drivers/mork/MColumnAlias.cxx
index c833787..624b5ab 100644
--- a/connectivity/source/drivers/mork/MColumnAlias.cxx
+++ b/connectivity/source/drivers/mork/MColumnAlias.cxx
@@ -137,16 +137,4 @@ void OColumnAlias::initialize( const ::com::sun::star::uno::Reference< ::com::su
     return pos->second.programmaticAsciiName;
 }
 
-//------------------------------------------------------------------
-bool OColumnAlias::isColumnSearchable( const ::rtl::OUString _alias ) const
-{
-    ::rtl::OString sProgrammatic = getProgrammaticNameOrFallbackToUTF8Alias( _alias );
-
-    return  (   !sProgrammatic.equals( "HomeCountry" )
-            &&  !sProgrammatic.equals( "WorkCountry" )
-            );
-    // for those, we know that they're not searchable in the Mozilla/LDAP implementation.
-    // There might be more ...
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/mork/MColumnAlias.hxx b/connectivity/source/drivers/mork/MColumnAlias.hxx
index 3b713ae..45f6f78 100644
--- a/connectivity/source/drivers/mork/MColumnAlias.hxx
+++ b/connectivity/source/drivers/mork/MColumnAlias.hxx
@@ -67,7 +67,6 @@ namespace connectivity
             inline AliasMap::const_iterator begin() const { return m_aAliasMap.begin(); }
             inline AliasMap::const_iterator end() const { return m_aAliasMap.end(); }
 
-            bool isColumnSearchable( const ::rtl::OUString _alias ) const;
 
         private:
             void initialize( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB );
diff --git a/connectivity/source/drivers/mork/MNSProfileDiscover.cxx b/connectivity/source/drivers/mork/MNSProfileDiscover.cxx
index 014e17c..9c7521c 100644
--- a/connectivity/source/drivers/mork/MNSProfileDiscover.cxx
+++ b/connectivity/source/drivers/mork/MNSProfileDiscover.cxx
@@ -158,30 +158,6 @@ namespace connectivity
                 return m_Product.mProfileList[profileName]->getProfilePath();
         }
 
-        ::sal_Int32 ProfileAccess::getProfileCount( ::com::sun::star::mozilla::MozillaProductType product) throw (::com::sun::star::uno::RuntimeException)
-        {
-            sal_Int32 index=product;
-            ProductStruct &m_Product = m_ProductProfileList[index];
-            return static_cast< ::sal_Int32 >(m_Product.mProfileList.size());
-        }
-        ::sal_Int32 ProfileAccess::getProfileList( ::com::sun::star::mozilla::MozillaProductType product, ::com::sun::star::uno::Sequence< ::rtl::OUString >& list ) throw (::com::sun::star::uno::RuntimeException)
-        {
-            sal_Int32 index=product;
-            ProductStruct &m_Product = m_ProductProfileList[index];
-            list.realloc(static_cast<sal_Int32>(m_Product.mProfileList.size()));
-            sal_Int32 i=0;
-            for(ProfileList::iterator itor=m_Product.mProfileList.begin();
-                itor != m_Product.mProfileList.end();
-                ++itor)
-            {
-                ProfileStruct * aProfile = (*itor).second;
-                list[i] = aProfile->getProfileName();
-                i++;
-            }
-
-            return static_cast< ::sal_Int32 >(m_Product.mProfileList.size());
-        }
-
         ::rtl::OUString ProfileAccess::getDefaultProfile( ::com::sun::star::mozilla::MozillaProductType product ) throw (::com::sun::star::uno::RuntimeException)
         {
             sal_Int32 index=product;
@@ -199,24 +175,6 @@ namespace connectivity
             ProfileStruct * aProfile = (*m_Product.mProfileList.begin()).second;
             return aProfile->getProfileName();
         }
-        ::sal_Bool ProfileAccess::isProfileLocked( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException)
-        {
-            (void)product; /* avoid warning about unused parameter */
-            (void)profileName; /* avoid warning about unused parameter */
-            return sal_True;
-        }
-
-        ::sal_Bool ProfileAccess::getProfileExists( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException)
-        {
-            sal_Int32 index=product;
-            ProductStruct &m_Product = m_ProductProfileList[index];
-            if (!m_Product.mProfileList.size() || m_Product.mProfileList.find(profileName) == m_Product.mProfileList.end())
-            {
-                return sal_False;
-            }
-            else
-                return sal_True;
-        }
     }
 }
 
diff --git a/connectivity/source/drivers/mork/MNSProfileDiscover.hxx b/connectivity/source/drivers/mork/MNSProfileDiscover.hxx
index 1cb44cd..be95627 100644
--- a/connectivity/source/drivers/mork/MNSProfileDiscover.hxx
+++ b/connectivity/source/drivers/mork/MNSProfileDiscover.hxx
@@ -79,11 +79,7 @@ namespace connectivity
             virtual ~ProfileAccess();
             ProfileAccess();
             ::rtl::OUString getProfilePath( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException);
-            ::sal_Int32 getProfileCount( ::com::sun::star::mozilla::MozillaProductType product ) throw (::com::sun::star::uno::RuntimeException);
-            ::sal_Int32 getProfileList( ::com::sun::star::mozilla::MozillaProductType product, ::com::sun::star::uno::Sequence< ::rtl::OUString >& list ) throw (::com::sun::star::uno::RuntimeException);
             ::rtl::OUString getDefaultProfile( ::com::sun::star::mozilla::MozillaProductType product ) throw (::com::sun::star::uno::RuntimeException);
-            ::sal_Bool SAL_CALL isProfileLocked( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException);
-            ::sal_Bool SAL_CALL getProfileExists( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException);
         protected:
             ProductStruct m_ProductProfileList[4];
             sal_Int32 LoadProductsInfo();
diff --git a/unusedcode.easy b/unusedcode.easy
index 1dddeae..b836d67 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -70,11 +70,6 @@ comphelper::detail::ConfigurationWrapper::setLocalizedPropertyValue(boost::share
 connectivity::file::OStatement_Base::reset()
 connectivity::mork::MQueryHelper::next()
 connectivity::mork::MQueryHelperResultEntry::insert(rtl::OString const&, rtl::OUString&)
-connectivity::mork::OColumnAlias::isColumnSearchable(rtl::OUString) const
-connectivity::mork::ProfileAccess::getProfileCount(com::sun::star::mozilla::MozillaProductType)
-connectivity::mork::ProfileAccess::getProfileExists(com::sun::star::mozilla::MozillaProductType, rtl::OUString const&)
-connectivity::mork::ProfileAccess::getProfileList(com::sun::star::mozilla::MozillaProductType, com::sun::star::uno::Sequence<rtl::OUString>&)
-connectivity::mork::ProfileAccess::isProfileLocked(com::sun::star::mozilla::MozillaProductType, rtl::OUString const&)
 connectivity::mozab::MQueryHelper::next()
 connectivity::sdbcx::OGroup::OGroup(rtl::OUString const&, unsigned char)
 connectivity::sdbcx::OGroup::OGroup(unsigned char)


More information about the Libreoffice-commits mailing list