You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by da...@apache.org on 2018/03/24 00:50:48 UTC

svn commit: r1827620 - in /openoffice/trunk/main/store: inc/store/store.h source/store.cxx

Author: damjan
Date: Sat Mar 24 00:50:48 2018
New Revision: 1827620

URL: http://svn.apache.org/viewvc?rev=1827620&view=rev
Log:
Export the right main/store symbols.

Patch by: me


Modified:
    openoffice/trunk/main/store/inc/store/store.h
    openoffice/trunk/main/store/source/store.cxx

Modified: openoffice/trunk/main/store/inc/store/store.h
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/store/inc/store/store.h?rev=1827620&r1=1827619&r2=1827620&view=diff
==============================================================================
--- openoffice/trunk/main/store/inc/store/store.h (original)
+++ openoffice/trunk/main/store/inc/store/store.h Sat Mar 24 00:50:48 2018
@@ -25,6 +25,7 @@
 #define _STORE_STORE_H_ "$Revision$"
 
 #include <store/types.h>
+#include <store/dllapi.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -39,7 +40,7 @@ typedef void* storeHandle;
     @param  Handle [in] the Handle.
     @return store_E_None upon success
  */
-storeError SAL_CALL store_acquireHandle (
+STORE_DLLPUBLIC storeError SAL_CALL store_acquireHandle (
 	storeHandle Handle
 ) SAL_THROW_EXTERN_C();
 
@@ -49,7 +50,7 @@ storeError SAL_CALL store_acquireHandle
     @return store_E_None          upon success,
             store_E_InvalidHandle otherwise.
  */
-storeError SAL_CALL store_releaseHandle (
+STORE_DLLPUBLIC storeError SAL_CALL store_releaseHandle (
 	storeHandle Handle
 ) SAL_THROW_EXTERN_C();
 
@@ -66,7 +67,7 @@ typedef void* storeFileHandle;
     @param  phFile [out] the File Handle.
     @return store_E_None upon success
  */
-storeError SAL_CALL store_createMemoryFile (
+STORE_DLLPUBLIC storeError SAL_CALL store_createMemoryFile (
 	sal_uInt16       nPageSize,
 	storeFileHandle *phFile
 ) SAL_THROW_EXTERN_C();
@@ -84,7 +85,7 @@ storeError SAL_CALL store_createMemoryFi
 	@param  phFile [out] the File Handle.
     @return store_E_None upon success
  */
-storeError SAL_CALL store_openFile (
+STORE_DLLPUBLIC storeError SAL_CALL store_openFile (
 	rtl_uString     *pFilename,
 	storeAccessMode  eAccessMode,
 	sal_uInt16       nPageSize,
@@ -97,7 +98,7 @@ storeError SAL_CALL store_openFile (
     @return store_E_None upon     success,
             store_E_InvalidHandle otherwise.
  */
-storeError SAL_CALL store_closeFile (
+STORE_DLLPUBLIC storeError SAL_CALL store_closeFile (
 	storeFileHandle hFile
 ) SAL_THROW_EXTERN_C();
 
@@ -106,7 +107,7 @@ storeError SAL_CALL store_closeFile (
     @param  hFile [in] the File Handle.
     @return store_E_None upon success
  */
-storeError SAL_CALL store_flushFile (
+STORE_DLLPUBLIC storeError SAL_CALL store_flushFile (
 	storeFileHandle hFile
 ) SAL_THROW_EXTERN_C();
 
@@ -116,7 +117,7 @@ storeError SAL_CALL store_flushFile (
     @param  pnRefCount [out] number of open directories and streams.
     @return store_E_None upon success
  */
-storeError SAL_CALL store_getFileRefererCount (
+STORE_DLLPUBLIC storeError SAL_CALL store_getFileRefererCount (
 	storeFileHandle  hFile,
 	sal_uInt32      *pnRefCount
 ) SAL_THROW_EXTERN_C();
@@ -127,7 +128,7 @@ storeError SAL_CALL store_getFileReferer
     @param  pnSize [out] the file size in bytes.
     @return store_E_None upon success
  */
-storeError SAL_CALL store_getFileSize (
+STORE_DLLPUBLIC storeError SAL_CALL store_getFileSize (
 	storeFileHandle  hFile,
 	sal_uInt32      *pnSize
 ) SAL_THROW_EXTERN_C();
@@ -140,7 +141,7 @@ storeError SAL_CALL store_getFileSize (
     @param  pDstFilename [in] created with store_AccessCreate.
     @return store_E_None upon success
  */
-storeError SAL_CALL store_rebuildFile (
+STORE_DLLPUBLIC storeError SAL_CALL store_rebuildFile (
 	rtl_uString *pSrcFilename,
 	rtl_uString *pDstFilename
 ) SAL_THROW_EXTERN_C();
@@ -162,7 +163,7 @@ typedef void* storeDirectoryHandle;
     @param  phDirectory [out] the Directory Handle.
     @return store_E_None upon success
  */
-storeError SAL_CALL store_openDirectory (
+STORE_DLLPUBLIC storeError SAL_CALL store_openDirectory (
 	storeFileHandle       hFile,
 	rtl_uString          *pPath,
 	rtl_uString          *pName,
@@ -176,7 +177,7 @@ storeError SAL_CALL store_openDirectory
     @return store_E_None          upon success,
             store_E_InvalidHandle otherwise.
  */
-storeError SAL_CALL store_closeDirectory (
+STORE_DLLPUBLIC storeError SAL_CALL store_closeDirectory (
 	storeDirectoryHandle hDirectory
 ) SAL_THROW_EXTERN_C();
 
@@ -187,7 +188,7 @@ storeError SAL_CALL store_closeDirectory
     @return store_E_None       upon success,
             store_E_NoMoreFile upon end of iteration.
  */
-storeError SAL_CALL store_findFirst (
+STORE_DLLPUBLIC storeError SAL_CALL store_findFirst (
 	storeDirectoryHandle  hDirectory,
 	storeFindData        *pFindData
 ) SAL_THROW_EXTERN_C();
@@ -199,7 +200,7 @@ storeError SAL_CALL store_findFirst (
     @return store_E_None       upon success,
             store_E_NoMoreFile upon end of iteration.
  */
-storeError SAL_CALL store_findNext (
+STORE_DLLPUBLIC storeError SAL_CALL store_findNext (
 	storeDirectoryHandle  hDirectory,
 	storeFindData        *pFindData
 ) SAL_THROW_EXTERN_C();
@@ -221,7 +222,7 @@ typedef void* storeStreamHandle;
     @param  phStrm [out] the Stream Handle.
     @return store_E_None upon success
  */
-storeError SAL_CALL store_openStream (
+STORE_DLLPUBLIC storeError SAL_CALL store_openStream (
 	storeFileHandle    hFile,
 	rtl_uString       *pPath,
 	rtl_uString       *pName,
@@ -235,7 +236,7 @@ storeError SAL_CALL store_openStream (
     @return store_E_None          upon success,
             store_E_InvalidHandle otherwise.
  */
-storeError SAL_CALL store_closeStream (
+STORE_DLLPUBLIC storeError SAL_CALL store_closeStream (
 	storeStreamHandle hStrm
 ) SAL_THROW_EXTERN_C();
 
@@ -248,7 +249,7 @@ storeError SAL_CALL store_closeStream (
     @param  pnDone [out] the number of bytes actually read.
     @return store_E_None upon success
  */
-storeError SAL_CALL store_readStream (
+STORE_DLLPUBLIC storeError SAL_CALL store_readStream (
 	storeStreamHandle  hStrm,
 	sal_uInt32         nOffset,
 	void              *pBuffer,
@@ -265,7 +266,7 @@ storeError SAL_CALL store_readStream (
     @param  pnDone [out] the number of bytes actually written.
     @return store_E_None upon success
  */
-storeError SAL_CALL store_writeStream (
+STORE_DLLPUBLIC storeError SAL_CALL store_writeStream (
 	storeStreamHandle  hStrm,
 	sal_uInt32         nOffset,
 	const void        *pBuffer,
@@ -278,7 +279,7 @@ storeError SAL_CALL store_writeStream (
     @param  hStrm [in] the Stream Handle.
     @return store_E_None upon success
  */
-storeError SAL_CALL store_flushStream (
+STORE_DLLPUBLIC storeError SAL_CALL store_flushStream (
 	storeStreamHandle hStrm
 ) SAL_THROW_EXTERN_C();
 
@@ -288,7 +289,7 @@ storeError SAL_CALL store_flushStream (
     @param  pnSize [out] the stream size in bytes.
     @return store_E_None upon success
  */
-storeError SAL_CALL store_getStreamSize (
+STORE_DLLPUBLIC storeError SAL_CALL store_getStreamSize (
 	storeStreamHandle  hStrm,
 	sal_uInt32        *pnSize
 ) SAL_THROW_EXTERN_C();
@@ -299,7 +300,7 @@ storeError SAL_CALL store_getStreamSize
     @param  nSize [in] the new stream size in bytes.
     @return store_E_None upon success
  */
-storeError SAL_CALL store_setStreamSize (
+STORE_DLLPUBLIC storeError SAL_CALL store_setStreamSize (
 	storeStreamHandle hStrm,
 	sal_uInt32        nSize
 ) SAL_THROW_EXTERN_C();
@@ -315,7 +316,7 @@ storeError SAL_CALL store_setStreamSize
     @param  pnAttrib [out] the resulting attributes, may be NULL.
     @return store_E_None upon success
  */
-storeError SAL_CALL store_attrib (
+STORE_DLLPUBLIC storeError SAL_CALL store_attrib (
 	storeFileHandle hFile,
 	rtl_uString    *pPath,
 	rtl_uString    *pName,
@@ -337,7 +338,7 @@ storeError SAL_CALL store_attrib (
     @param  pDstName [in] the Destination name
     @return store_E_None upon success
  */
-storeError SAL_CALL store_link (
+STORE_DLLPUBLIC storeError SAL_CALL store_link (
 	storeFileHandle hFile,
 	rtl_uString *pSrcPath, rtl_uString *pSrcName,
 	rtl_uString *pDstPath, rtl_uString *pDstName
@@ -356,7 +357,7 @@ storeError SAL_CALL store_link (
     @param  pDstName [in] the Destination name
     @return store_E_None upon success
  */
-storeError SAL_CALL store_symlink (
+STORE_DLLPUBLIC storeError SAL_CALL store_symlink (
 	storeFileHandle hFile,
 	rtl_uString *pSrcPath, rtl_uString *pSrcName,
 	rtl_uString *pDstPath, rtl_uString *pDstName
@@ -371,7 +372,7 @@ storeError SAL_CALL store_symlink (
     @param  pDstName [in] the Destination name
     @return store_E_None upon success
  */
-storeError SAL_CALL store_rename (
+STORE_DLLPUBLIC storeError SAL_CALL store_rename (
 	storeFileHandle hFile,
 	rtl_uString *pSrcPath, rtl_uString *pSrcName,
 	rtl_uString *pDstPath, rtl_uString *pDstName
@@ -384,7 +385,7 @@ storeError SAL_CALL store_rename (
     @param  pName [in] the entry name
     @return store_E_None upon success
  */
-storeError SAL_CALL store_remove (
+STORE_DLLPUBLIC storeError SAL_CALL store_remove (
 	storeFileHandle hFile,
 	rtl_uString    *pPath,
 	rtl_uString    *pName

Modified: openoffice/trunk/main/store/source/store.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/store/source/store.cxx?rev=1827620&r1=1827619&r2=1827620&view=diff
==============================================================================
--- openoffice/trunk/main/store/source/store.cxx (original)
+++ openoffice/trunk/main/store/source/store.cxx Sat Mar 24 00:50:48 2018
@@ -75,7 +75,7 @@ using namespace store;
 /*
  * store_acquireHandle.
  */
-STORE_DLLPUBLIC storeError SAL_CALL store_acquireHandle (
+storeError SAL_CALL store_acquireHandle (
 	storeHandle Handle
 ) SAL_THROW_EXTERN_C()
 {
@@ -90,7 +90,7 @@ STORE_DLLPUBLIC storeError SAL_CALL stor
 /*
  * store_releaseHandle.
  */
-STORE_DLLPUBLIC storeError SAL_CALL store_releaseHandle (
+storeError SAL_CALL store_releaseHandle (
 	storeHandle Handle
 ) SAL_THROW_EXTERN_C()
 {
@@ -110,7 +110,7 @@ STORE_DLLPUBLIC storeError SAL_CALL stor
 /*
  * store_createMemoryFile.
  */
-STORE_DLLPUBLIC storeError SAL_CALL store_createMemoryFile (
+storeError SAL_CALL store_createMemoryFile (
 	sal_uInt16       nPageSize,
 	storeFileHandle *phFile
 ) SAL_THROW_EXTERN_C()
@@ -144,7 +144,7 @@ STORE_DLLPUBLIC storeError SAL_CALL stor
 /*
  * store_openFile.
  */
-STORE_DLLPUBLIC storeError SAL_CALL store_openFile (
+storeError SAL_CALL store_openFile (
 	rtl_uString     *pFilename,
 	storeAccessMode  eAccessMode,
 	sal_uInt16       nPageSize,
@@ -182,7 +182,7 @@ STORE_DLLPUBLIC storeError SAL_CALL stor
 /*
  * store_closeFile.
  */
-STORE_DLLPUBLIC storeError SAL_CALL store_closeFile (
+storeError SAL_CALL store_closeFile (
 	storeFileHandle Handle
 ) SAL_THROW_EXTERN_C()
 {
@@ -199,7 +199,7 @@ STORE_DLLPUBLIC storeError SAL_CALL stor
 /*
  * store_flushFile.
  */
-STORE_DLLPUBLIC storeError SAL_CALL store_flushFile (
+storeError SAL_CALL store_flushFile (
 	storeFileHandle Handle
 ) SAL_THROW_EXTERN_C()
 {
@@ -214,7 +214,7 @@ STORE_DLLPUBLIC storeError SAL_CALL stor
 /*
  * store_getFileRefererCount.
  */
-STORE_DLLPUBLIC storeError SAL_CALL store_getFileRefererCount (
+storeError SAL_CALL store_getFileRefererCount (
 	storeFileHandle  Handle,
 	sal_uInt32      *pnRefCount
 ) SAL_THROW_EXTERN_C()
@@ -234,7 +234,7 @@ STORE_DLLPUBLIC storeError SAL_CALL stor
 /*
  * store_getFileSize.
  */
-STORE_DLLPUBLIC storeError SAL_CALL store_getFileSize (
+storeError SAL_CALL store_getFileSize (
 	storeFileHandle  Handle,
 	sal_uInt32      *pnSize
 ) SAL_THROW_EXTERN_C()
@@ -253,7 +253,7 @@ STORE_DLLPUBLIC storeError SAL_CALL stor
 /*
  * store_rebuildFile.
  */
-STORE_DLLPUBLIC storeError SAL_CALL store_rebuildFile (
+storeError SAL_CALL store_rebuildFile (
 	rtl_uString *pSrcFilename,
 	rtl_uString *pDstFilename
 ) SAL_THROW_EXTERN_C()
@@ -290,7 +290,7 @@ STORE_DLLPUBLIC storeError SAL_CALL stor
 /*
  * store_openDirectory.
  */
-STORE_DLLPUBLIC storeError SAL_CALL store_openDirectory (
+storeError SAL_CALL store_openDirectory (
 	storeFileHandle       hFile,
 	rtl_uString          *pPath,
 	rtl_uString          *pName,
@@ -330,7 +330,7 @@ STORE_DLLPUBLIC storeError SAL_CALL stor
 /*
  * store_closeDirectory.
  */
-STORE_DLLPUBLIC storeError SAL_CALL store_closeDirectory (
+storeError SAL_CALL store_closeDirectory (
 	storeDirectoryHandle Handle
 ) SAL_THROW_EXTERN_C()
 {
@@ -346,7 +346,7 @@ STORE_DLLPUBLIC storeError SAL_CALL stor
 /*
  * store_findFirst.
  */
-STORE_DLLPUBLIC storeError SAL_CALL store_findFirst (
+storeError SAL_CALL store_findFirst (
 	storeDirectoryHandle  Handle,
 	storeFindData        *pFindData
 ) SAL_THROW_EXTERN_C()
@@ -370,7 +370,7 @@ STORE_DLLPUBLIC storeError SAL_CALL stor
 /*
  * store_findNext.
  */
-STORE_DLLPUBLIC storeError SAL_CALL store_findNext (
+storeError SAL_CALL store_findNext (
 	storeDirectoryHandle  Handle,
 	storeFindData        *pFindData
 ) SAL_THROW_EXTERN_C()
@@ -400,7 +400,7 @@ STORE_DLLPUBLIC storeError SAL_CALL stor
 /*
  * store_openStream
  */
-STORE_DLLPUBLIC storeError SAL_CALL store_openStream (
+storeError SAL_CALL store_openStream (
 	storeFileHandle    hFile,
 	rtl_uString       *pPath,
 	rtl_uString       *pName,
@@ -440,7 +440,7 @@ STORE_DLLPUBLIC storeError SAL_CALL stor
 /*
  * store_closeStream.
  */
-STORE_DLLPUBLIC storeError SAL_CALL store_closeStream (
+storeError SAL_CALL store_closeStream (
 	storeStreamHandle Handle
 ) SAL_THROW_EXTERN_C()
 {
@@ -456,7 +456,7 @@ STORE_DLLPUBLIC storeError SAL_CALL stor
 /*
  * store_readStream.
  */
-STORE_DLLPUBLIC storeError SAL_CALL store_readStream (
+storeError SAL_CALL store_readStream (
 	storeStreamHandle  Handle,
 	sal_uInt32         nOffset,
 	void              *pBuffer,
@@ -478,7 +478,7 @@ STORE_DLLPUBLIC storeError SAL_CALL stor
 /*
  * store_writeStream.
  */
-STORE_DLLPUBLIC storeError SAL_CALL store_writeStream (
+storeError SAL_CALL store_writeStream (
 	storeStreamHandle  Handle,
 	sal_uInt32         nOffset,
 	const void        *pBuffer,
@@ -500,7 +500,7 @@ STORE_DLLPUBLIC storeError SAL_CALL stor
 /*
  * store_flushStream.
  */
-STORE_DLLPUBLIC storeError SAL_CALL store_flushStream (
+storeError SAL_CALL store_flushStream (
 	storeStreamHandle Handle
 ) SAL_THROW_EXTERN_C()
 {
@@ -515,7 +515,7 @@ STORE_DLLPUBLIC storeError SAL_CALL stor
 /*
  * store_getStreamSize.
  */
-STORE_DLLPUBLIC storeError SAL_CALL store_getStreamSize (
+storeError SAL_CALL store_getStreamSize (
 	storeStreamHandle  Handle,
 	sal_uInt32        *pnSize
 ) SAL_THROW_EXTERN_C()
@@ -534,7 +534,7 @@ STORE_DLLPUBLIC storeError SAL_CALL stor
 /*
  * store_setStreamSize.
  */
-STORE_DLLPUBLIC storeError SAL_CALL store_setStreamSize (
+storeError SAL_CALL store_setStreamSize (
 	storeStreamHandle Handle,
 	sal_uInt32        nSize
 ) SAL_THROW_EXTERN_C()
@@ -555,7 +555,7 @@ STORE_DLLPUBLIC storeError SAL_CALL stor
 /*
  * store_attrib.
  */
-STORE_DLLPUBLIC storeError SAL_CALL store_attrib (
+storeError SAL_CALL store_attrib (
 	storeFileHandle Handle,
 	rtl_uString    *pPath,
 	rtl_uString    *pName,
@@ -596,7 +596,7 @@ STORE_DLLPUBLIC storeError SAL_CALL stor
 /*
  * store_link.
  */
-STORE_DLLPUBLIC storeError SAL_CALL store_link (
+storeError SAL_CALL store_link (
 	storeFileHandle Handle,
 	rtl_uString *pSrcPath, rtl_uString *pSrcName,
 	rtl_uString *pDstPath, rtl_uString *pDstName
@@ -646,7 +646,7 @@ STORE_DLLPUBLIC storeError SAL_CALL stor
 /*
  * store_symlink.
  */
-STORE_DLLPUBLIC storeError SAL_CALL store_symlink (
+storeError SAL_CALL store_symlink (
 	storeFileHandle Handle,
 	rtl_uString *pSrcPath, rtl_uString *pSrcName,
 	rtl_uString *pDstPath, rtl_uString *pDstName
@@ -689,7 +689,7 @@ STORE_DLLPUBLIC storeError SAL_CALL stor
 /*
  * store_rename.
  */
-STORE_DLLPUBLIC storeError SAL_CALL store_rename (
+storeError SAL_CALL store_rename (
 	storeFileHandle Handle,
 	rtl_uString *pSrcPath, rtl_uString *pSrcName,
 	rtl_uString *pDstPath, rtl_uString *pDstName
@@ -732,7 +732,7 @@ STORE_DLLPUBLIC storeError SAL_CALL stor
 /*
  * store_remove.
  */
-STORE_DLLPUBLIC storeError SAL_CALL store_remove (
+storeError SAL_CALL store_remove (
 	storeFileHandle Handle,
 	rtl_uString    *pPath,
 	rtl_uString    *pName