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

[Libreoffice Gerrit user]

 extensions/source/activex/so_activex.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 6ad7a76d6f5c1f9a74464a263527764d5c3d4a30
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Mon Sep 24 10:43:00 2018 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Mon Sep 24 11:44:12 2018 +0200

    Looks like these functions can be static and not STDAPI
    
    ...as they appear to only be called from within this .cxx.  (And
    <https://msdn.microsoft.com/library/ms686631(vs.85).aspx> documents that STDAPI
    expands to a return type of HRESULT, among further decoration.)
    
    Change-Id: I4994e6e6f8fe0466f9aa9b4c9cf2c20bd718fa05
    Reviewed-on: https://gerrit.libreoffice.org/60925
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/extensions/source/activex/so_activex.cxx b/extensions/source/activex/so_activex.cxx
index e5df921505fb..fb3e324494c2 100644
--- a/extensions/source/activex/so_activex.cxx
+++ b/extensions/source/activex/so_activex.cxx
@@ -247,7 +247,7 @@ BOOL createKey( HKEY hkey,
 }
 
 STDAPI DllUnregisterServerNative( int nMode, BOOL bForAllUsers, BOOL bFor64Bit );
-HRESULT DllRegisterServerNative_Impl( int nMode, BOOL bForAllUsers, REGSAM nKeyAccess, const wchar_t* pProgramPath, const wchar_t* pLibName )
+static HRESULT DllRegisterServerNative_Impl( int nMode, BOOL bForAllUsers, REGSAM nKeyAccess, const wchar_t* pProgramPath, const wchar_t* pLibName )
 {
     BOOL aResult = FALSE;
 
@@ -427,7 +427,7 @@ HRESULT DeleteKeyTree( HKEY hkey, const char* pPath, REGSAM nKeyAccess )
     return REG_DELETE_KEY_A( hkey, pPath, nKeyAccess & ( KEY_WOW64_64KEY | KEY_WOW64_32KEY ) );
 }
 
-STDAPI DllUnregisterServerNative_Impl( int nMode, BOOL bForAllUsers, REGSAM nKeyAccess )
+static HRESULT DllUnregisterServerNative_Impl( int nMode, BOOL bForAllUsers, REGSAM nKeyAccess )
 {
     HKEY        hkey = nullptr;
     BOOL        fErr = FALSE;
@@ -543,7 +543,7 @@ const char* const aMSMimeType[] = { "application/msword",
 const int nForMSModes[] = { 1, 1, 2, 2, 4, 4, 4 };
 
 STDAPI DllUnregisterServerDoc( int nMode, BOOL bForAllUsers, BOOL bFor64Bit );
-STDAPI DllRegisterServerDoc_Impl( int nMode, BOOL bForAllUsers, REGSAM nKeyAccess )
+static HRESULT DllRegisterServerDoc_Impl( int nMode, BOOL bForAllUsers, REGSAM nKeyAccess )
 {
     BOOL aResult = TRUE;
 
@@ -645,7 +645,7 @@ STDAPI DllRegisterServerDoc( int nMode, BOOL bForAllUsers, BOOL bFor64Bit )
 
 // DllUnregisterServerDoc - Removes entries from the system registry
 
-STDAPI DllUnregisterServerDoc_Impl( int nMode, BOOL bForAllUsers, REGSAM nKeyAccess )
+static HRESULT DllUnregisterServerDoc_Impl( int nMode, BOOL bForAllUsers, REGSAM nKeyAccess )
 {
     HKEY        hkey = nullptr;
     BOOL        fErr = FALSE;