[Libreoffice-commits] core.git: extensions/CppunitTest_extensions_test_update.mk extensions/source

[Stephan Bergmann]

 extensions/CppunitTest_extensions_test_update.mk |    5 ++++-
 extensions/source/update/check/updatecheck.hxx   |    4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit fd6d9b9dc3726841ea26bae487b46119265eb358
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Jun 30 14:16:50 2014 +0200

    Allow CppunitTest_extensions_test_update direct access to UpdateCheck class
    
    Change-Id: Ifa1dafe838e0e9c5bfa4525eaa744d4851551fc8

diff --git a/extensions/CppunitTest_extensions_test_update.mk b/extensions/CppunitTest_extensions_test_update.mk
index 80309ec..9ea0865 100644
--- a/extensions/CppunitTest_extensions_test_update.mk
+++ b/extensions/CppunitTest_extensions_test_update.mk
@@ -18,7 +18,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,extensions_test_update, \
 $(eval $(call gb_CppunitTest_use_external,extensions_test_update,boost_headers))
 
 $(eval $(call gb_CppunitTest_use_libraries,extensions_test_update, \
-	updchk \
 	cppu \
 	cppuhelper \
 	sal \
@@ -27,6 +26,10 @@ $(eval $(call gb_CppunitTest_use_libraries,extensions_test_update, \
 	$(gb_UWINAPI) \
 ))
 
+$(eval $(call gb_CppunitTest_use_library_objects,extensions_test_update, \
+	updchk \
+))
+
 ifeq ($(OS),WNT)
 $(eval $(call gb_CppunitTest_use_system_win32_libs,extensions_test_update,\
 	shell32 \
diff --git a/extensions/source/update/check/updatecheck.hxx b/extensions/source/update/check/updatecheck.hxx
index ddf6179..ac971db 100644
--- a/extensions/source/update/check/updatecheck.hxx
+++ b/extensions/source/update/check/updatecheck.hxx
@@ -58,7 +58,7 @@ class UpdateCheck :
     public salhelper::ReferenceObject,
     public rtl::StaticWithInit< rtl::Reference< UpdateCheck >, UpdateCheckInitData >
 {
-    SAL_DLLPUBLIC_EXPORT UpdateCheck();
+    UpdateCheck();
 
     virtual ~UpdateCheck();
 
@@ -106,7 +106,7 @@ public:
     void cancelDownload();
 
     // Returns the XInteractionHandler of the UpdateHandler instance if present (and visible)
-    SAL_DLLPUBLIC_EXPORT com::sun::star::uno::Reference< com::sun::star::task::XInteractionHandler > getInteractionHandler() const;
+    com::sun::star::uno::Reference< com::sun::star::task::XInteractionHandler > getInteractionHandler() const;
 
     // UpdateCheckConfigListener
     virtual void autoCheckStatusChanged(bool enabled) SAL_OVERRIDE;