diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-07-21 18:51:11 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-07-21 18:51:11 +0200 |
| commit | 200bc6c582d6cf2365001f27928c1e3d1f9c9845 (patch) | |
| tree | 0f27abe75bc3603341aef715372676aee8d86835 /configmgr | |
| parent | 01ea92166c12fe080575f8faba4162779fb46c28 (diff) | |
| parent | 1b465fcc0f5f699308c6ee5113dde6b82842c3dd (diff) | |
resyncing to master
Diffstat (limited to 'configmgr')
| -rw-r--r-- | configmgr/prj/build.lst | 2 | ||||
| -rwxr-xr-x | configmgr/qa/unit/data.xcd | 5 | ||||
| -rw-r--r-- | configmgr/source/services.cxx | 6 |
3 files changed, 1 insertions, 12 deletions
diff --git a/configmgr/prj/build.lst b/configmgr/prj/build.lst index caf964964554..962e2bc648ff 100644 --- a/configmgr/prj/build.lst +++ b/configmgr/prj/build.lst @@ -1,4 +1,4 @@ -cg configmgr : BOOST:boost LIBXSLT:libxslt comphelper cppu cppuhelper offuh sal salhelper stlport xmlreader NULL +cg configmgr : BOOST:boost LIBXSLT:libxslt comphelper cppu cppuhelper offapi sal salhelper stlport xmlreader NULL cg configmgr\inc nmake - all cg_inc NULL cg configmgr\source nmake - all cg_source cg_inc NULL # migrated to gbuild diff --git a/configmgr/qa/unit/data.xcd b/configmgr/qa/unit/data.xcd index 97e0aed31989..cd1cdd3a63d0 100755 --- a/configmgr/qa/unit/data.xcd +++ b/configmgr/qa/unit/data.xcd @@ -3578,11 +3578,6 @@ <value>1</value> </prop> </node> - <node oor:name=".uno:OnlineRegistrationDlg" oor:op="replace"> - <prop oor:name="Label" oor:type="xs:string"> - <value xml:lang="x-no-translate"></value><value xml:lang="en-US">~Registration...</value> - </prop> - </node> <node oor:name=".uno:GoToStartSel" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="x-no-translate"></value><value xml:lang="en-US">Select to File Begin</value> diff --git a/configmgr/source/services.cxx b/configmgr/source/services.cxx index ce4b9d49eb38..5f70c6ed708a 100644 --- a/configmgr/source/services.cxx +++ b/configmgr/source/services.cxx @@ -83,10 +83,4 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( pImplName, pServiceManager, pRegistryKey, services); } -extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - char const ** ppEnvTypeName, uno_Environment **) -{ - *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |