[Libreoffice-commits] .: Branch 'feature/gbuild_merge' - shell/inc shell/source

[David Tardon]

 shell/inc/internal/shellcomdllapi.h                 |   19 +++++++++++++++++++
 shell/source/win32/shlxthandler/exports.dxp         |    4 ----
 shell/source/win32/shlxthandler/ooofilt/exports.dxp |    4 ----
 shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx |    9 +++++----
 shell/source/win32/shlxthandler/shlxthdl.cxx        |    9 +++++----
 5 files changed, 29 insertions(+), 16 deletions(-)

New commits:
commit e58b551534602de6e8f80f8ebdcdc0887c52f80e
Author: David Tardon <dtardon at redhat.com>
Date:   Sun May 27 11:48:57 2012 +0200

    export COM functions
    
    Change-Id: Ibc0fb44e1f57ad609216ae0a32c1d2f3a6f9e076

diff --git a/shell/inc/internal/shellcomdllapi.h b/shell/inc/internal/shellcomdllapi.h
new file mode 100644
index 0000000..d9a9e16
--- /dev/null
+++ b/shell/inc/internal/shellcomdllapi.h
@@ -0,0 +1,19 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * Copyright 2012 LibreOffice contributors.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#if !defined SHELL_INTERNAL_SHELLCOMDLLAPI_H_INCLUDED
+#define SHELL_INTERNAL_SHELLCOMDLLAPI_H_INCLUDED
+
+#include <sal/types.h>
+
+#define SHELL_COM_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
+
+#endif /* SHELL_INTERNAL_SHELLCOMDLLAPI_H_INCLUDED */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/win32/shlxthandler/exports.dxp b/shell/source/win32/shlxthandler/exports.dxp
deleted file mode 100755
index 953039c..0000000
--- a/shell/source/win32/shlxthandler/exports.dxp
+++ /dev/null
@@ -1,4 +0,0 @@
-DllRegisterServer PRIVATE
-DllUnregisterServer PRIVATE 
-DllGetClassObject PRIVATE 
-DllCanUnloadNow PRIVATE
\ No newline at end of file
diff --git a/shell/source/win32/shlxthandler/ooofilt/exports.dxp b/shell/source/win32/shlxthandler/ooofilt/exports.dxp
deleted file mode 100755
index 953039c..0000000
--- a/shell/source/win32/shlxthandler/ooofilt/exports.dxp
+++ /dev/null
@@ -1,4 +0,0 @@
-DllRegisterServer PRIVATE
-DllUnregisterServer PRIVATE 
-DllGetClassObject PRIVATE 
-DllCanUnloadNow PRIVATE
\ No newline at end of file
diff --git a/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx b/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
index 7d6b15d..ca5bbb7 100644
--- a/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
+++ b/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
@@ -40,6 +40,7 @@
 #include "internal/metainforeader.hxx"
 #include "internal/registry.hxx"
 #include "internal/fileextensions.hxx"
+#include "internal/shellcomdllapi.h"
 
 //--------------------------------------------------------------------------
 //  Include file    Purpose
@@ -901,7 +902,7 @@ extern "C" BOOL WINAPI DllMain(
 //              E_UNEXPECTED
 //                  Unsuccessful due to an unexpected condition
 //-------------------------------------------------------------------------
-extern "C" SCODE STDMETHODCALLTYPE DllGetClassObject(
+extern "C" SHELL_COM_DLLPUBLIC SCODE STDMETHODCALLTYPE DllGetClassObject(
     REFCLSID   cid,
     REFIID     iid,
     void **    ppvObj
@@ -941,7 +942,7 @@ extern "C" SCODE STDMETHODCALLTYPE DllGetClassObject(
 //              S_FALSE
 //                  DLL must remain loaded
 //--------------------------------------------------------------------------
-extern "C" SCODE STDMETHODCALLTYPE DllCanUnloadNow()
+extern "C" SHELL_COM_DLLPUBLIC SCODE STDMETHODCALLTYPE DllCanUnloadNow()
 {
     if ( 0 >= g_lInstances )
         return S_OK;
@@ -1252,14 +1253,14 @@ namespace /* private */
 
 } // namespace /* private */
 
-STDAPI DllRegisterServer()
+SHELL_COM_DLLPUBLIC STDAPI DllRegisterServer()
 {
     return S_OK;
 }
 
 //---------------------------
 
-STDAPI DllUnregisterServer()
+SHELL_COM_DLLPUBLIC STDAPI DllUnregisterServer()
 {
     return S_OK;
 }
diff --git a/shell/source/win32/shlxthandler/shlxthdl.cxx b/shell/source/win32/shlxthandler/shlxthdl.cxx
index 21257c7..6b020a6 100644
--- a/shell/source/win32/shlxthandler/shlxthdl.cxx
+++ b/shell/source/win32/shlxthandler/shlxthdl.cxx
@@ -28,6 +28,7 @@
 
 #include "internal/config.hxx"
 #include "internal/global.hxx"
+#include "internal/shellcomdllapi.h"
 #include "internal/shlxthdl.hxx"
 #include "classfactory.hxx"
 #include "internal/registry.hxx"
@@ -311,7 +312,7 @@ namespace /* private */
 // COM exports
 //---------------------
 
-extern "C" STDAPI DllRegisterServer()
+extern "C" SHELL_COM_DLLPUBLIC STDAPI DllRegisterServer()
 {
     TCHAR ModuleFileName[MAX_PATH];
 
@@ -349,7 +350,7 @@ extern "C" STDAPI DllRegisterServer()
     return hr;
 }
 
-extern "C" STDAPI DllUnregisterServer()
+extern "C" SHELL_COM_DLLPUBLIC STDAPI DllUnregisterServer()
 {
     HRESULT hr = S_OK;
 
@@ -379,7 +380,7 @@ extern "C" STDAPI DllUnregisterServer()
     return hr;
 }
 
-extern "C" STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void** ppv)
+extern "C" SHELL_COM_DLLPUBLIC STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void** ppv)
 {
     *ppv = 0;
 
@@ -409,7 +410,7 @@ extern "C" STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void** ppv)
     return S_OK;
 }
 
-extern "C" STDAPI DllCanUnloadNow(void)
+extern "C" SHELL_COM_DLLPUBLIC STDAPI DllCanUnloadNow(void)
 {
     if (CClassFactory::IsLocked() || g_DllRefCnt > 0)
         return S_FALSE;