Author: hdu
Date: Mon Jan 6 11:40:46 2014
New Revision: 1555720
URL: http://svn.apache.org/r1555720
Log:
#i123964# fix symbol visibility mismatch in dbaccess filter/xml
Modified:
openoffice/trunk/main/dbaccess/source/filter/xml/makefile.mk
openoffice/trunk/main/dbaccess/source/filter/xml/xmlservices.cxx
Modified: openoffice/trunk/main/dbaccess/source/filter/xml/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/filter/xml/makefile.mk?rev=1555720&r1=1555719&r2=1555720&view=diff
==============================================================================
--- openoffice/trunk/main/dbaccess/source/filter/xml/makefile.mk (original)
+++ openoffice/trunk/main/dbaccess/source/filter/xml/makefile.mk Mon Jan 6
11:40:46 2014
@@ -31,6 +31,7 @@ ENABLE_EXCEPTIONS=TRUE
# --- Settings ----------------------------------
.INCLUDE : settings.mk
+.INCLUDE : $(PRJ)$/util$/makefile.pmk
# --- Files -------------------------------------
Modified: openoffice/trunk/main/dbaccess/source/filter/xml/xmlservices.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/filter/xml/xmlservices.cxx?rev=1555720&r1=1555719&r2=1555720&view=diff
==============================================================================
--- openoffice/trunk/main/dbaccess/source/filter/xml/xmlservices.cxx (original)
+++ openoffice/trunk/main/dbaccess/source/filter/xml/xmlservices.cxx Mon Jan 6
11:40:46 2014
@@ -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 createRegistryI
//---------------------------------------------------------------------------------------
-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_getIm
}
//---------------------------------------------------------------------------------------
-extern "C" void* SAL_CALL component_getFactory(
+extern "C" void* DBACCESS_DLLPUBLIC component_getFactory(
const sal_Char* pImplementationName,
void* pServiceManager,
void* /*pRegistryKey*/)
