resyncing to master

6 files changed, 0 insertions, 119 deletions

diff --git a/linguistic/inc/linguistic/misc.hxx b/linguistic/inc/linguistic/misc.hxx
index 4061701c1f66..7699735c971e 100644
--- a/linguistic/inc/linguistic/misc.hxx
+++ b/linguistic/inc/linguistic/misc.hxx
@@ -101,16 +101,6 @@ LocaleDataWrapper & GetLocaleDataWrapper( sal_Int16 nLang );
 
 rtl_TextEncoding GetTextEncoding( sal_Int16 nLanguage );
 
-inline ::rtl::OUString BS2OU(const ByteString &rText, rtl_TextEncoding nEnc)
-{
-    return ::rtl::OUString( rText.GetBuffer(), rText.Len(), nEnc );
-}
-
-inline ByteString OU2BS(const ::rtl::OUString &rText, rtl_TextEncoding nEnc)
-{
-    return ByteString( rText.getStr(), nEnc );
-}
-
 rtl::OUString StripTrailingChars( rtl::OUString &rTxt, sal_Unicode cChar );
 
 sal_Int32 LevDistance( const rtl::OUString &rTxt1, const rtl::OUString &rTxt2 );
diff --git a/linguistic/source/lngreg.cxx b/linguistic/source/lngreg.cxx
index 3ddf8f1ee046..34048e555c51 100644
--- a/linguistic/source/lngreg.cxx
+++ b/linguistic/source/lngreg.cxx
@@ -75,17 +75,9 @@ extern void * SAL_CALL GrammarCheckingIterator_getFactory
 );
 
 
-// definition of the two functions that are used to provide the services
-
 extern "C"
 {
 
-SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
-    const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
 SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
 {
diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx
index 14216f8f8174..0893c0719436 100644
--- a/linguistic/source/lngsvcmgr.cxx
+++ b/linguistic/source/lngsvcmgr.cxx
@@ -182,97 +182,6 @@ sal_Bool SvcInfo::HasLanguage( sal_Int16 nLanguage ) const
     return i < nCnt;
 }
 
-
-
-
-void LngSvcMgr::SetAvailableCfgServiceLists( LinguDispatcher &rDispatcher,
-        const SvcInfoArray &rAvailSvcs )
-{
-    // get list of nodenames to look at for their service list
-    const char *pEntryName = 0;
-    sal_Bool bHasLangSvcList = sal_True;
-    switch (rDispatcher.GetDspType())
-    {
-        case LinguDispatcher::DSP_SPELL     : pEntryName = "ServiceManager/SpellCheckerList";    break;
-        case LinguDispatcher::DSP_GRAMMAR   : pEntryName = "ServiceManager/GrammarCheckerList";
-                                              bHasLangSvcList = sal_False;
-                                              break;
-        case LinguDispatcher::DSP_HYPH      : pEntryName = "ServiceManager/HyphenatorList";
-                                              bHasLangSvcList = sal_False;
-                                              break;
-        case LinguDispatcher::DSP_THES      : pEntryName = "ServiceManager/ThesaurusList";  break;
-        default :
-            DBG_ASSERT( 0, "unexpected case" );
-    }
-    String  aNode( String::CreateFromAscii( pEntryName ) );
-    uno::Sequence < OUString > aNodeNames( /*aCfg.*/GetNodeNames( aNode ) );
-
-
-    sal_Int32 nLen = aNodeNames.getLength();
-    const OUString *pNodeNames = aNodeNames.getConstArray();
-    for (sal_Int32 i = 0;  i < nLen;  ++i)
-    {
-        uno::Sequence< OUString >   aSvcImplNames;
-
-        uno::Sequence< OUString >    aNames( 1 );
-        OUString *pNames = aNames.getArray();
-
-        OUString aPropName( aNode );
-        aPropName += OUString::valueOf( (sal_Unicode) '/' );
-        aPropName += pNodeNames[i];
-        pNames[0] = aPropName;
-
-        uno::Sequence< uno::Any > aValues = /*aCfg.*/GetProperties( aNames );
-        if (aValues.getLength())
-        {
-            // get list of configured service names for the
-            // current node (language)
-            const uno::Any &rValue = aValues.getConstArray()[0];
-            if (bHasLangSvcList)
-                aSvcImplNames = GetLangSvcList( rValue );
-            else
-                aSvcImplNames = GetLangSvc( rValue );
-
-            sal_Int32 nSvcs = aSvcImplNames.getLength();
-            if (nSvcs)
-            {
-                const OUString *pImplNames = aSvcImplNames.getConstArray();
-
-                LanguageType nLang = MsLangId::convertIsoStringToLanguage( pNodeNames[i] );
-
-                // build list of available services from those
-                sal_Int32 nCnt = 0;
-                uno::Sequence< OUString > aAvailSvcs( nSvcs );
-                OUString *pAvailSvcs = aAvailSvcs.getArray();
-                for (sal_Int32 k = 0;  k < nSvcs;  ++k)
-                {
-                    // check for availability of the service
-                    size_t nAvailSvcs = rAvailSvcs.size();
-                    for (size_t m = 0;  m < nAvailSvcs;  ++m)
-                    {
-                        const SvcInfo &rSvcInfo = rAvailSvcs[m];
-                        if (rSvcInfo.aSvcImplName == pImplNames[k]  &&
-                            rSvcInfo.HasLanguage( nLang ))
-                        {
-                            pAvailSvcs[ nCnt++ ] = rSvcInfo.aSvcImplName;
-                            break;
-                        }
-                    }
-                }
-
-                if (nCnt)
-                {
-                    aAvailSvcs.realloc( nCnt );
-                    rDispatcher.SetServiceList( CreateLocale( nLang ), aAvailSvcs );
-                }
-            }
-        }
-    }
-}
-
-
-
-
 class LngSvcMgrListenerHelper :
     public cppu::WeakImplHelper2
     <
diff --git a/linguistic/source/lngsvcmgr.hxx b/linguistic/source/lngsvcmgr.hxx
index 7054cf1b4455..635a85318364 100644
--- a/linguistic/source/lngsvcmgr.hxx
+++ b/linguistic/source/lngsvcmgr.hxx
@@ -136,9 +136,6 @@ class LngSvcMgr :
 
     sal_Bool    SaveCfgSvcs( const String &rServiceName );
 
-    void    SetAvailableCfgServiceLists( LinguDispatcher &rDispatcher,
-                    const SvcInfoArray &rAvailSvcs );
-
     // utl::ConfigItem (to allow for listening of changes of relevant properties)
     virtual void    Notify( const com::sun::star::uno::Sequence< rtl::OUString > &rPropertyNames );
     virtual void    Commit();
diff --git a/linguistic/workben/exports.dxp b/linguistic/workben/exports.dxp
index b0f85bf7bebf..86214860d555 100755
--- a/linguistic/workben/exports.dxp
+++ b/linguistic/workben/exports.dxp
@@ -1,3 +1,2 @@
 component_getFactory
-component_getImplementationEnvironment
 component_writeInfo
diff --git a/linguistic/workben/sreg.cxx b/linguistic/workben/sreg.cxx
index 85e218da1ef5..af9c20102244 100644
--- a/linguistic/workben/sreg.cxx
+++ b/linguistic/workben/sreg.cxx
@@ -59,12 +59,6 @@ sal_Bool SAL_CALL component_writeInfo(
     return SpellChecker_writeInfo( pServiceManager, pRegistryKey );
 }
 
-SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
-    const sal_Char ** ppEnvTypeName, uno_Environment ** ppEnv )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
 SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
 {