[Libreoffice-commits] core.git: Branch 'aoo/trunk' - dbaccess/source

[Herbert Dürr]

 dbaccess/source/filter/xml/makefile.mk     |    1 +
 dbaccess/source/filter/xml/xmlservices.cxx |   11 +++--------
 2 files changed, 4 insertions(+), 8 deletions(-)

New commits:
commit 631b6b53afe97f22405f5239e7d13422622f980b
Author: Herbert Dürr <hdu at apache.org>
Date:   Mon Jan 6 11:40:46 2014 +0000

    #i123964# fix symbol visibility mismatch in dbaccess filter/xml

diff --git a/dbaccess/source/filter/xml/makefile.mk b/dbaccess/source/filter/xml/makefile.mk
index 2563211..a28cfd5 100644
--- a/dbaccess/source/filter/xml/makefile.mk
+++ b/dbaccess/source/filter/xml/makefile.mk
@@ -31,6 +31,7 @@ ENABLE_EXCEPTIONS=TRUE
 # --- Settings ----------------------------------
 
 .INCLUDE :  	settings.mk
+.INCLUDE : $(PRJ)$/util$/makefile.pmk
 
 # --- Files -------------------------------------
 
diff --git a/dbaccess/source/filter/xml/xmlservices.cxx b/dbaccess/source/filter/xml/xmlservices.cxx
index 9edd503..8165fb4 100644
--- a/dbaccess/source/filter/xml/xmlservices.cxx
+++ b/dbaccess/source/filter/xml/xmlservices.cxx
@@ -24,15 +24,10 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_dbaccess.hxx"
 
-#ifndef _CPPUHELPER_FACTORY_HXX_
 #include <cppuhelper/factory.hxx>
-#endif
-#ifndef _OSL_DIAGNOSE_H_
 #include <osl/diagnose.h>
-#endif
-#ifndef _FLT_REGHELPER_HXX_
 #include "flt_reghelper.hxx"
-#endif
+#include "dbaccessdllapi.h"
 
 /********************************************************************************************/
 
@@ -70,7 +65,7 @@ extern "C" void SAL_CALL createRegistryInfo_dbaxml()
 
 //---------------------------------------------------------------------------------------
 
-extern "C" void SAL_CALL component_getImplementationEnvironment(
+extern "C" void DBACCESS_DLLPUBLIC component_getImplementationEnvironment(
                 const sal_Char  **ppEnvTypeName,
                 uno_Environment **
             )
@@ -80,7 +75,7 @@ extern "C" void SAL_CALL component_getImplementationEnvironment(
 }
 
 //---------------------------------------------------------------------------------------
-extern "C" void* SAL_CALL component_getFactory(
+extern "C" void* DBACCESS_DLLPUBLIC component_getFactory(
                     const sal_Char* pImplementationName,
                     void* pServiceManager,
                     void* /*pRegistryKey*/)