[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - 3 commits - desktop/test mysqlc/source odk/examples odk/settings sc/source
Tor Lillqvist
tml at collabora.com
Tue Dec 17 04:09:59 PST 2013
desktop/test/deployment/active/active_native.cxx | 7 +++++++
desktop/test/deployment/passive/passive_native.cxx | 7 +++++++
mysqlc/source/mysqlc_services.cxx | 7 +++++++
odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/component.cxx | 8 ++++++++
odk/examples/DevelopersGuide/Components/CppComponent/service2_impl.cxx | 7 +++++++
odk/examples/DevelopersGuide/Database/DriverSkeleton/SServices.cxx | 7 +++++++
odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/fdcomp.cxx | 7 +++++++
odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx | 7 +++++++
odk/examples/DevelopersGuide/examples.html | 4 ++--
odk/examples/cpp/complextoolbarcontrols/ListenerHelper.h | 9 +++------
odk/examples/cpp/complextoolbarcontrols/exports.cxx | 7 +++++++
odk/examples/cpp/counter/counter.cxx | 8 ++++++++
odk/examples/cpp/custompanel/ctp_services.cxx | 8 ++++++++
odk/examples/cpp/remoteclient/remoteclient.cxx | 8 ++++++++
odk/settings/component.uno.def | 1 +
sc/source/core/tool/formulagroup.cxx | 2 ++
16 files changed, 96 insertions(+), 8 deletions(-)
New commits:
commit deb46c8ad376896d191ad96791ae1eebc2ffa3b7
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue Nov 26 10:08:11 2013 +0200
WaE: unused parameter 'bForceEvaluation'
Change-Id: I402ccfa2e24240347985d9fda7adf4e2c01712fd
(cherry picked from commit b9b8e26aa0ff86b131c9da84f33ee3ce397104d6)
diff --git a/sc/source/core/tool/formulagroup.cxx b/sc/source/core/tool/formulagroup.cxx
index 9f386e1..3909bca 100644
--- a/sc/source/core/tool/formulagroup.cxx
+++ b/sc/source/core/tool/formulagroup.cxx
@@ -651,6 +651,8 @@ bool FormulaGroupInterpreter::switchOpenCLDevice(const OUString& rDeviceId, bool
return bSuccess;
#endif
}
+#else
+ (void) bForceEvaluation;
#endif
return false;
}
commit fbfab3614df6ba2a547d872191bf21a511307f0a
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Dec 17 10:53:29 2013 +0100
Keep using component_getImplementationEnvironment in extensions
...instead of relying on the implicit CPPU_CURRENT_LANGUAGE_BINDING_NAME
convention. Keeping that convention an implementation detail makes it easier to
do improvements in the future. (Theoretically, the bundled extension in mysqlc
could be considered internal code and not adapted, but just be safe.)
(cherry picked from commit fa2a7c1c95f78d20ed572091e12700fd4d852835)
Conflicts:
desktop/test/deployment/active/active_native.cxx
Change-Id: Iae41a6e072dabc2bf7c1481ba6cfed61680edf37
diff --git a/desktop/test/deployment/active/active_native.cxx b/desktop/test/deployment/active/active_native.cxx
index 2242c6b..b11d4de 100644
--- a/desktop/test/deployment/active/active_native.cxx
+++ b/desktop/test/deployment/active/active_native.cxx
@@ -252,6 +252,13 @@ 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;
+}
+
extern "C" sal_Bool SAL_CALL component_writeInfo(
void * pServiceManager, void * pRegistryKey)
{
diff --git a/desktop/test/deployment/passive/passive_native.cxx b/desktop/test/deployment/passive/passive_native.cxx
index 93af8ab..8714690 100644
--- a/desktop/test/deployment/passive/passive_native.cxx
+++ b/desktop/test/deployment/passive/passive_native.cxx
@@ -249,4 +249,11 @@ 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: */
diff --git a/mysqlc/source/mysqlc_services.cxx b/mysqlc/source/mysqlc_services.cxx
index af1cabe..0ffe9cd 100644
--- a/mysqlc/source/mysqlc_services.cxx
+++ b/mysqlc/source/mysqlc_services.cxx
@@ -22,6 +22,7 @@
#include <cppuhelper/factory.hxx>
#include <osl/diagnose.h>
#include <rtl/ustrbuf.hxx>
+#include <uno/lbnames.h>
using namespace connectivity::mysqlc;
using ::com::sun::star::uno::Reference;
@@ -102,6 +103,12 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
};
/* }}} */
+extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL
+component_getImplementationEnvironment(
+ char const ** ppEnvTypeName, uno_Environment **)
+{
+ *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
+}
/*
* Local variables:
diff --git a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/component.cxx b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/component.cxx
index 0e516e3..5456af8 100644
--- a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/component.cxx
+++ b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/component.cxx
@@ -35,6 +35,7 @@
#include <stdio.h>
#include <rtl/ustring.hxx>
+#include <uno/lbnames.h>
#include <cppuhelper/queryinterface.hxx>
#include <cppuhelper/factory.hxx>
// generated c++ interfaces
@@ -85,4 +86,11 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(const sal_C
return pRet;
}
+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: */
diff --git a/odk/examples/DevelopersGuide/Components/CppComponent/service2_impl.cxx b/odk/examples/DevelopersGuide/Components/CppComponent/service2_impl.cxx
index c9ed065..abb288e 100644
--- a/odk/examples/DevelopersGuide/Components/CppComponent/service2_impl.cxx
+++ b/odk/examples/DevelopersGuide/Components/CppComponent/service2_impl.cxx
@@ -36,6 +36,7 @@
#include <cppuhelper/implbase3.hxx>
#include <cppuhelper/factory.hxx>
#include <cppuhelper/implementationentry.hxx>
+#include <uno/lbnames.h>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
@@ -204,6 +205,12 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
implName, xMgr, xRegistry, ::my_sc_impl::s_component_entries );
}
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
+ char const ** ppEnvTypeName, uno_Environment **)
+{
+ *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
+}
+
}
diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SServices.cxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SServices.cxx
index 9e8fa4c..4873522 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SServices.cxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SServices.cxx
@@ -37,6 +37,7 @@
#include "SDriver.hxx"
#include <cppuhelper/factory.hxx>
#include <osl/diagnose.h>
+#include <uno/lbnames.h>
using namespace connectivity::skeleton;
using ::rtl::OUString;
@@ -143,5 +144,11 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
return pRet;
};
+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: */
diff --git a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/fdcomp.cxx b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/fdcomp.cxx
index e6b7885..9d234e9 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/fdcomp.cxx
+++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/fdcomp.cxx
@@ -37,6 +37,7 @@
#include <osl/mutex.hxx>
#include <osl/thread.h>
+#include <uno/lbnames.h>
#include <cppuhelper/factory.hxx>
#include <com/sun/star/lang/XSingleComponentFactory.hpp>
@@ -72,6 +73,12 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
return pRet;
}
+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: */
diff --git a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx
index 321bcf0..dfb9f6b 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx
+++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx
@@ -38,6 +38,7 @@
#include <cppuhelper/implbase2.hxx>
#include <cppuhelper/implbase3.hxx>
#include <cppuhelper/implbase.hxx>
+#include <uno/lbnames.h>
#include <com/sun/star/lang/XComponent.hpp>
@@ -339,6 +340,12 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
return pRet;
}
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
+ char const ** ppEnvTypeName, uno_Environment **)
+{
+ *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
+}
+
} // extern "C"
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/odk/examples/DevelopersGuide/examples.html b/odk/examples/DevelopersGuide/examples.html
index 4061d02..6a9a750 100644
--- a/odk/examples/DevelopersGuide/examples.html
+++ b/odk/examples/DevelopersGuide/examples.html
@@ -572,7 +572,7 @@ the c++ ProtocolHandler example.</td>
href="./Components/Addons/ProtocolHandlerAddon_cpp/component.cxx"
title="link to Components/Addons/ProtocolHandlerAddon_cpp/component.cxx">component.cxx</a></td>
<td class="cell80">Implements the administrative
-component functions (component_writeInfo, component_getFactory).</td>
+component functions (component_writeInfo, component_getFactory, component_getImplementationEnvironment).</td>
</tr>
<tr>
<td class="cell20"><a
@@ -899,7 +899,7 @@ the filter detection example.</td>
href="./OfficeDev/FilterDevelopment/FlatXmlFilterDetection/fdcomp.cxx"
title="link to OfficeDev/FilterDevelopment/FlatXmlFilterDetection/fdcomp.cxx">fdcomp.cxx</a></td>
<td class="cell80">Implements the administrative
-component functions (component_writeInfo, component_getFactory).</td>
+component functions (component_writeInfo, component_getFactory, component_getImplementationEnvironment).</td>
</tr>
<tr>
<td class="cell20"><a
diff --git a/odk/examples/cpp/complextoolbarcontrols/exports.cxx b/odk/examples/cpp/complextoolbarcontrols/exports.cxx
index 09ab4ce..35a4f39 100644
--- a/odk/examples/cpp/complextoolbarcontrols/exports.cxx
+++ b/odk/examples/cpp/complextoolbarcontrols/exports.cxx
@@ -18,6 +18,7 @@
*/
#include <cppuhelper/factory.hxx>
+#include <uno/lbnames.h>
#include "MyProtocolHandler.h"
#include "MyListener.h"
@@ -56,6 +57,12 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(const sal_Char* pImplNa
return xFactory.get();
}
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
+ char const ** ppEnvTypeName, uno_Environment **)
+{
+ *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
+}
+
} // extern C
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/odk/examples/cpp/counter/counter.cxx b/odk/examples/cpp/counter/counter.cxx
index c539d66..9fc6326 100644
--- a/odk/examples/cpp/counter/counter.cxx
+++ b/odk/examples/cpp/counter/counter.cxx
@@ -46,6 +46,7 @@
#include <stdio.h>
#include <rtl/ustring.hxx>
+#include <uno/lbnames.h>
#include <cppuhelper/queryinterface.hxx>
#include <cppuhelper/factory.hxx>
#include <cppuhelper/supportsservice.hxx>
@@ -181,4 +182,11 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(const sal_C
return pRet;
}
+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: */
diff --git a/odk/examples/cpp/custompanel/ctp_services.cxx b/odk/examples/cpp/custompanel/ctp_services.cxx
index c096a7b..a8f5702 100644
--- a/odk/examples/cpp/custompanel/ctp_services.cxx
+++ b/odk/examples/cpp/custompanel/ctp_services.cxx
@@ -20,6 +20,7 @@
#include "ctp_factory.hxx"
#include <cppuhelper/implementationentry.hxx>
+#include <uno/lbnames.h>
//......................................................................................................................
namespace sd { namespace colortoolpanel
@@ -52,6 +53,13 @@ extern "C"
{
return ::cppu::component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , ::sd::colortoolpanel::s_aServiceEntries );
}
+
+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: */
diff --git a/odk/examples/cpp/remoteclient/remoteclient.cxx b/odk/examples/cpp/remoteclient/remoteclient.cxx
index 2b7c4b3..373efae 100644
--- a/odk/examples/cpp/remoteclient/remoteclient.cxx
+++ b/odk/examples/cpp/remoteclient/remoteclient.cxx
@@ -35,6 +35,7 @@
#include <stdio.h>
#include <osl/mutex.hxx>
+#include <uno/lbnames.h>
#include <cppuhelper/factory.hxx>
#include <com/sun/star/uno/XNamingService.hpp>
@@ -245,6 +246,13 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
return pRet;
}
+
+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: */
diff --git a/odk/settings/component.uno.def b/odk/settings/component.uno.def
index 0c35f9a..1ca480a 100644
--- a/odk/settings/component.uno.def
+++ b/odk/settings/component.uno.def
@@ -1,2 +1,3 @@
EXPORTS
component_getFactory
+component_getImplementationEnvironment
commit aae97c958d7bf5fcadb3872a77fc2f11399d10ad
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Dec 17 10:52:48 2013 +0100
Do not use Boost in SDK examples
Change-Id: I8b2af447fe3ee29261e538a53b4624ff8b6c4d1e
(cherry picked from commit ca4065680a402e3d0ff43e41744b24a9c980b2ef)
diff --git a/odk/examples/cpp/complextoolbarcontrols/ListenerHelper.h b/odk/examples/cpp/complextoolbarcontrols/ListenerHelper.h
index a1e633e..0fe4bd0 100644
--- a/odk/examples/cpp/complextoolbarcontrols/ListenerHelper.h
+++ b/odk/examples/cpp/complextoolbarcontrols/ListenerHelper.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <map>
#include <vector>
-#include <boost/unordered_map.hpp>
#include <com/sun/star/frame/XFrame.hpp>
#include <com/sun/star/frame/XStatusListener.hpp>
@@ -29,14 +29,11 @@
typedef std::vector < com::sun::star::uno::Reference < com::sun::star::frame::XStatusListener > > StatusListeners;
-typedef boost::unordered_map < ::rtl::OUString,
- StatusListeners,
- rtl::OUStringHash,
- std::equal_to< rtl::OUString > > ListenerMap;
+typedef std::map < ::rtl::OUString, StatusListeners > ListenerMap;
// For every frame there is *one* Dispatch object for all possible commands
// this struct contains an array of listeners for every supported command
-// these arrays are accessed by a boost::unordered_map (with the command string as index)
+// these arrays are accessed by a std::map (with the command string as index)
struct ListenerItem
{
ListenerMap aContainer;
More information about the Libreoffice-commits
mailing list