[Libreoffice-commits] .: 2 commits - desktop/source linguistic/source
Caolán McNamara
caolan at kemper.freedesktop.org
Thu Jun 30 03:36:46 PDT 2011
desktop/source/app/app.cxx | 4 -
desktop/source/app/cmdlinehelp.cxx | 10 ----
linguistic/source/lngsvcmgr.cxx | 91 -------------------------------------
linguistic/source/lngsvcmgr.hxx | 3 -
4 files changed, 4 insertions(+), 104 deletions(-)
New commits:
commit b005b9c1a82bab4650b1976beb257620bd3f1059
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jun 30 10:53:27 2011 +0100
callcatcher: unused SetAvailableCfgServiceLists
diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx
index 2f17c98..2023232 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 54e5038..2df04c8 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();
commit 1e4e43f60c5ec0421e470ab0d528075d9c59dae0
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Jun 29 22:34:59 2011 +0100
build id isn't massively helpful here
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 8c86886..2d3950d 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1682,9 +1682,9 @@ int Desktop::Main()
#ifdef DBG_UTIL
//include version ID in non product builds
- ::rtl::OUString aDefault;
+ ::rtl::OUString aDefault(RTL_CONSTASCII_USTRINGPARAM("development"));
aTitle += DEFINE_CONST_UNICODE(" [");
- String aVerId( utl::Bootstrap::getBuildIdData( aDefault ));
+ String aVerId( utl::Bootstrap::getProductSource(aDefault));
aTitle += aVerId;
aTitle += ']';
#endif
diff --git a/desktop/source/app/cmdlinehelp.cxx b/desktop/source/app/cmdlinehelp.cxx
index 6a09755..04cd295 100644
--- a/desktop/source/app/cmdlinehelp.cxx
+++ b/desktop/source/app/cmdlinehelp.cxx
@@ -55,7 +55,7 @@ namespace desktop
// [OK]
const char *aCmdLineHelp_version =
- "%PRODUCTNAME %PRODUCTVERSION %PRODUCTEXTENSION %BUILDID\n"\
+ "%PRODUCTNAME %PRODUCTVERSION %PRODUCTEXTENSION\n"\
"\n";
const char *aCmdLineHelp_head =
"Usage: %CMDNAME [options] [documents...]\n"\
@@ -147,9 +147,6 @@ namespace desktop
String aHelpMessage_right(aCmdLineHelp_right, RTL_TEXTENCODING_ASCII_US);
String aHelpMessage_bottom(aCmdLineHelp_bottom, RTL_TEXTENCODING_ASCII_US);
ReplaceStringHookProc(aHelpMessage_version);
- ::rtl::OUString aDefault;
- String aVerId( ::utl::Bootstrap::getBuildIdData( aDefault ));
- aHelpMessage_version.SearchAndReplaceAscii( "%BUILDID", aVerId );
aHelpMessage_head.SearchAndReplaceAscii( "%CMDNAME", String( "soffice", RTL_TEXTENCODING_ASCII_US) );
#ifdef UNX
// on unix use console for output
@@ -184,11 +181,8 @@ namespace desktop
{
String aVersionMsg(aCmdLineHelp_version, RTL_TEXTENCODING_ASCII_US);
ReplaceStringHookProc(aVersionMsg);
- ::rtl::OUString aDefault;
- String aVerId = ::utl::Bootstrap::getBuildIdData(aDefault);
- aVersionMsg.SearchAndReplaceAscii("%BUILDID", aVerId);
#ifdef UNX
- fprintf(stdout, "%s", ByteString(aVersionMsg, RTL_TEXTENCODING_ASCII_US).GetBuffer());
+ fprintf(stdout, "%s", rtl::OUStringToOString(aVersionMsg, RTL_TEXTENCODING_ASCII_US).getStr());
#else
// Just re-use the help dialog for now.
CmdlineHelpDialog aDlg;
More information about the Libreoffice-commits
mailing list