[Libreoffice-commits] core.git: 2 commits - configure.ac dbaccess/source
Tor Lillqvist
tml at collabora.com
Tue Apr 15 23:56:51 PDT 2014
configure.ac | 8 ++++++--
dbaccess/source/core/dataaccess/commanddefinition.cxx | 7 +++----
dbaccess/source/core/dataaccess/databasedocument.cxx | 7 ++++++-
dbaccess/source/core/dataaccess/datasource.cxx | 7 ++++++-
dbaccess/source/core/inc/services.hxx | 16 ++++++----------
dbaccess/source/filter/xml/dbloader2.cxx | 5 +++++
dbaccess/source/ui/browser/unodatbr.cxx | 12 ++++++------
7 files changed, 38 insertions(+), 24 deletions(-)
New commits:
commit 77be5e9064134fa0b559537433d57b6c0c646fa5
Author: Tor Lillqvist <tml at collabora.com>
Date: Wed Apr 16 09:56:08 2014 +0300
Update experimental hacks for using Clang from the NDK
Change-Id: Id8fd8ca3c53fe97caa00a2d1c80b73387a4be2bc
diff --git a/configure.ac b/configure.ac
index cbc7199..05a2931 100644
--- a/configure.ac
+++ b/configure.ac
@@ -223,7 +223,9 @@ AC_ARG_WITH(android-ndk-toolchain-version,
AS_HELP_STRING([--with-android-ndk-toolchain-version],
[Specify which toolchain version to use, of those present in the
Android NDK you are using. Mandatory if the NDK used has several
- toolchain versions for the host architecture you are building for.]), ,)
+ toolchain versions for the host architecture you are building for.
+ Possible values are 4.6, 4.8, clang3.3 and clang3.4. Only 4.8 has been
+ tested for real...]), ,)
AC_ARG_WITH(android-sdk,
AS_HELP_STRING([--with-android-sdk],
@@ -268,12 +270,14 @@ if test -n "$with_android_ndk"; then
ANDROID_BINUTILS_DIR=$ANDROID_NDK_HOME/toolchains/$android_platform_prefix-$with_android_ndk_toolchain_version
ANDROID_COMPILER_DIR=$ANDROID_BINUTILS_DIR
;;
- clang3.1|clang3.2)
+ clang3.3|clang3.4)
AC_MSG_WARN([Building with the Clang tool-chain is known to break in the bridges module, fix that please])
ANDROID_BINUTILS_DIR=$ANDROID_NDK_HOME/toolchains/$android_platform_prefix-4.6
ANDROID_COMPILER_DIR=$ANDROID_NDK_HOME/toolchains/llvm-${with_android_ndk_toolchain_version#clang}
ANDROID_USING_CLANG=true
;;
+ *)
+ AC_MSG_ERROR([Unrecognized value for the --with-android-ndk-toolchain-version option])
esac
if test ! -d $ANDROID_BINUTILS_DIR; then
commit e616c346d433dffd52fd483d8cfb3c4e5ec4169e
Author: Tor Lillqvist <tml at collabora.com>
Date: Wed Apr 16 09:51:47 2014 +0300
WaE: Unreferenced function definition [loplugin:unreffun]
Work around a slight confusion in the Clang plugin when used with Clang
3.2. Put these 'extern "C"' function definitions consistenly outside
namespaces, as they are declared in the header.
Change-Id: Iccee41dfe0776f382e677b109009a95fb806a12c
diff --git a/dbaccess/source/core/dataaccess/commanddefinition.cxx b/dbaccess/source/core/dataaccess/commanddefinition.cxx
index 8efc222..14a527e 100644
--- a/dbaccess/source/core/dataaccess/commanddefinition.cxx
+++ b/dbaccess/source/core/dataaccess/commanddefinition.cxx
@@ -38,15 +38,14 @@ using namespace ::osl;
using namespace ::comphelper;
using namespace ::cppu;
-namespace dbaccess
-{
-
// OCommandDefinition
extern "C" void SAL_CALL createRegistryInfo_OCommandDefinition()
{
- static ::dba::OAutoRegistration< OCommandDefinition > aAutoRegistration;
+ static ::dba::OAutoRegistration< ::dbaccess::OCommandDefinition > aAutoRegistration;
}
+namespace dbaccess
+{
void OCommandDefinition::registerProperties()
{
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx
index 9270176..6a181bb 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -146,13 +146,18 @@ bool ViewMonitor::onSetCurrentController( const Reference< XController >& _rxCon
return bLoadFinished;
}
+} // namespace dbaccess
+
// ODatabaseDocument
extern "C" void SAL_CALL createRegistryInfo_ODatabaseDocument()
{
- static ::dba::OAutoRegistration< ODatabaseDocument > aAutoRegistration;
+ static ::dba::OAutoRegistration< ::dbaccess::ODatabaseDocument > aAutoRegistration;
}
+namespace dbaccess
+{
+
ODatabaseDocument::ODatabaseDocument(const ::rtl::Reference<ODatabaseModelImpl>& _pImpl )
:ModelDependentComponent( _pImpl )
,ODatabaseDocument_OfficeDocument( getMutex() )
diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx
index 3d65363..c1b5ba5 100644
--- a/dbaccess/source/core/dataaccess/datasource.cxx
+++ b/dbaccess/source/core/dataaccess/datasource.cxx
@@ -475,13 +475,18 @@ namespace
};
}
+} // namespace dbaccess
+
// ODatabaseContext
extern "C" void SAL_CALL createRegistryInfo_ODatabaseSource()
{
- static ::dba::OAutoRegistration< ODatabaseSource > aAutoRegistration;
+ static ::dba::OAutoRegistration< ::dbaccess::ODatabaseSource > aAutoRegistration;
}
+namespace dbaccess
+{
+
ODatabaseSource::ODatabaseSource(const ::rtl::Reference<ODatabaseModelImpl>& _pImpl)
:ModelDependentComponent( _pImpl )
,ODatabaseSource_Base( getMutex() )
diff --git a/dbaccess/source/core/inc/services.hxx b/dbaccess/source/core/inc/services.hxx
index 41fcee7..46673bd 100644
--- a/dbaccess/source/core/inc/services.hxx
+++ b/dbaccess/source/core/inc/services.hxx
@@ -24,16 +24,12 @@
#include <sal/types.h>
-extern "C" {
-
-void SAL_CALL createRegistryInfo_DataAccessDescriptorFactory();
-void SAL_CALL createRegistryInfo_OCommandDefinition();
-void SAL_CALL createRegistryInfo_OComponentDefinition();
-void SAL_CALL createRegistryInfo_ODatabaseDocument();
-void SAL_CALL createRegistryInfo_ODatabaseSource();
-void SAL_CALL createRegistryInfo_ORowSet();
-
-}
+extern "C" void SAL_CALL createRegistryInfo_DataAccessDescriptorFactory();
+extern "C" void SAL_CALL createRegistryInfo_OCommandDefinition();
+extern "C" void SAL_CALL createRegistryInfo_OComponentDefinition();
+extern "C" void SAL_CALL createRegistryInfo_ODatabaseDocument();
+extern "C" void SAL_CALL createRegistryInfo_ODatabaseSource();
+extern "C" void SAL_CALL createRegistryInfo_ORowSet();
#endif
diff --git a/dbaccess/source/filter/xml/dbloader2.cxx b/dbaccess/source/filter/xml/dbloader2.cxx
index d91b392..9d1b95b 100644
--- a/dbaccess/source/filter/xml/dbloader2.cxx
+++ b/dbaccess/source/filter/xml/dbloader2.cxx
@@ -213,11 +213,16 @@ Sequence< OUString > DBTypeDetection::getSupportedServiceNames_Static(void) thro
return aSNS;
}
+} // namespace dbaxml
+
extern "C" void SAL_CALL createRegistryInfo_DBTypeDetection()
{
static ::dbaxml::OMultiInstanceAutoRegistration< ::dbaxml::DBTypeDetection > aAutoRegistration;
}
+namespace dbaxml
+{
+
class DBContentLoader : public ::cppu::WeakImplHelper2< XFrameLoader, XServiceInfo>
{
private:
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index a6887b7..9103d70 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -154,18 +154,18 @@ using namespace ::dbtools;
using namespace ::comphelper;
using namespace ::svx;
+// SbaTableQueryBrowser
+extern "C" void SAL_CALL createRegistryInfo_OBrowser()
+{
+ static ::dbaui::OMultiInstanceAutoRegistration< ::dbaui::SbaTableQueryBrowser > aAutoRegistration;
+}
+
namespace dbaui
{
namespace DatabaseObject = ::com::sun::star::sdb::application::DatabaseObject;
namespace DatabaseObjectContainer = ::com::sun::star::sdb::application::DatabaseObjectContainer;
-// SbaTableQueryBrowser
-extern "C" void SAL_CALL createRegistryInfo_OBrowser()
-{
- static OMultiInstanceAutoRegistration< SbaTableQueryBrowser > aAutoRegistration;
-}
-
void SafeAddPropertyListener(const Reference< XPropertySet > & xSet, const OUString& rPropName, XPropertyChangeListener* pListener)
{
Reference< XPropertySetInfo > xInfo = xSet->getPropertySetInfo();
More information about the Libreoffice-commits
mailing list