GNOME.org
 

ooo-build r13267 - in trunk: . patches/dev300

Author: brosenk
Date: Thu Jul 17 10:11:23 2008
New Revision: 13267
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13267&view=rev

Log:
Fix patch application after other patches touching the same code got added


Modified:
   trunk/ChangeLog
   trunk/patches/dev300/testing-more-optimizations-ark.diff

Modified: trunk/patches/dev300/testing-more-optimizations-ark.diff
==============================================================================
--- trunk/patches/dev300/testing-more-optimizations-ark.diff	(original)
+++ trunk/patches/dev300/testing-more-optimizations-ark.diff	Thu Jul 17 10:11:23 2008
@@ -1,5 +1,5 @@
---- ./icu/makefile.mk.optimize~	2008-04-11 09:26:50.000000000 +0200
-+++ ./icu/makefile.mk	2008-07-07 20:13:22.894846909 +0200
+--- ./icu/makefile.mk.arkopts~	2008-04-11 09:26:27.000000000 +0200
++++ ./icu/makefile.mk	2008-07-17 11:52:18.870043577 +0200
 @@ -82,8 +82,8 @@ CC:=gcc $(EXTRA_CFLAGS)
  icu_LDFLAGS+=-Wl,-z,noexecstack
  .ENDIF
@@ -11,14 +11,17 @@
  
  # until someone introduces SOLARIS 64-bit builds
  .IF "$(OS)"=="SOLARIS"
---- ./registry/inc/registry/registry.h.optimize~	2008-04-11 12:45:33.000000000 +0200
-+++ ./registry/inc/registry/registry.h	2008-07-07 20:12:51.808846525 +0200
-@@ -50,4 +50,4 @@ extern "C" {
+--- ./registry/inc/registry/registry.h.arkopts~	2008-07-17 11:49:18.777288611 +0200
++++ ./registry/inc/registry/registry.h	2008-07-17 11:54:21.532038669 +0200
+@@ -50,7 +50,7 @@ extern "C" {
                       reg_closeKey. If the function fails, phNewKey is NULL.
  	@return	REG_NO_ERROR if succeeds else an error code. 
  */
 -RegError REGISTRY_CALLTYPE reg_createKey(RegKeyHandle hKey, 
 +RegError REGISTRY_CALLTYPE SAL_DLLPUBLIC_EXPORT reg_createKey(RegKeyHandle hKey, 
+ 										 rtl_uString* keyName, 
+ 										 RegKeyHandle* phNewKey);
+ 
 @@ -65,7 +65,7 @@ RegError REGISTRY_CALLTYPE reg_createKey
                       reg_closeKey. If the function fails, phNewKey is NULL.
  	@return	REG_NO_ERROR if succeeds else an error code. 
@@ -241,7 +244,7 @@
  */
 -RegError REGISTRY_CALLTYPE reg_createRegistry(rtl_uString* registryName, 
 +RegError REGISTRY_CALLTYPE SAL_DLLPUBLIC_EXPORT reg_createRegistry(rtl_uString* registryName, 
- 							 				  RegHandle* phRegistry);
+ 							 				  RegHandle* phRegistry, bool bInternal = false);
  
  
 @@ -419,7 +419,7 @@ RegError REGISTRY_CALLTYPE reg_createReg
@@ -307,8 +310,8 @@
  
  #ifdef __cplusplus
  }
---- ./registry/inc/registry/writer.h.optimize~	2008-04-11 12:47:02.000000000 +0200
-+++ ./registry/inc/registry/writer.h	2008-07-07 20:12:51.805848099 +0200
+--- ./registry/inc/registry/writer.h.arkopts~	2008-04-11 12:46:39.000000000 +0200
++++ ./registry/inc/registry/writer.h	2008-07-17 11:52:18.919326086 +0200
 @@ -79,7 +79,7 @@ void * SAL_CALL typereg_writer_create(
      rtl_uString const * fileName, RTTypeClass typeClass, sal_Bool published,
      rtl_uString const * typeName, sal_uInt16 superTypeCount,
@@ -390,8 +393,8 @@
  
  #ifdef __cplusplus
  }
---- ./salhelper/inc/salhelper/dynload.hxx.optimize~	2008-04-11 13:21:48.000000000 +0200
-+++ ./salhelper/inc/salhelper/dynload.hxx	2008-07-07 20:12:51.809847002 +0200
+--- ./salhelper/inc/salhelper/dynload.hxx.arkopts~	2008-04-11 13:21:25.000000000 +0200
++++ ./salhelper/inc/salhelper/dynload.hxx	2008-07-17 11:52:18.919326086 +0200
 @@ -40,7 +40,7 @@ namespace salhelper
  
  /** The ORealDynamicLoader is an implementation helper class for the template loader ODynamicLoader.
@@ -401,9 +404,9 @@
  {
  public:
      /** initializes the loader, loads the library and call the initialization fucntion.
---- ./sal/inc/osl/file.h.optimize~	2008-07-07 19:57:38.318847517 +0200
-+++ ./sal/inc/osl/file.h	2008-07-07 20:12:51.791847717 +0200
-@@ -175,7 +175,7 @@ typedef void *oslDirectoryItem;
+--- ./sal/inc/osl/file.h.arkopts~	2008-04-15 16:25:23.000000000 +0200
++++ ./sal/inc/osl/file.h	2008-07-17 11:52:19.021268860 +0200
+@@ -174,7 +174,7 @@ typedef void *oslDirectoryItem;
  	@see osl_closeDirectory()
  */
  
@@ -412,7 +415,7 @@
  
  
  /**	Retrieve the next item of a previously opened directory. 
-@@ -209,7 +209,7 @@ oslFileError SAL_CALL osl_openDirectory(
+@@ -208,7 +208,7 @@ oslFileError SAL_CALL osl_openDirectory(
  	@see osl_getFileStatus()
  */
  
@@ -421,7 +424,7 @@
  	oslDirectory Directory,
  	oslDirectoryItem *pItem,
  	sal_uInt32	 uHint
-@@ -231,7 +231,7 @@ oslFileError SAL_CALL osl_getNextDirecto
+@@ -230,7 +230,7 @@ oslFileError SAL_CALL osl_getNextDirecto
  	@see osl_openDirectory()
  */
  
@@ -430,7 +433,7 @@
  
  
  /**	Retrieve a single directory item. 
-@@ -270,7 +270,7 @@ oslFileError SAL_CALL osl_closeDirectory
+@@ -269,7 +269,7 @@ oslFileError SAL_CALL osl_closeDirectory
  	@see osl_getNextDirectoryItem()
  */
  
@@ -439,7 +442,7 @@
  	rtl_uString *pustrFileURL, 
  	oslDirectoryItem *pItem
  	);
-@@ -293,7 +293,7 @@ oslFileError SAL_CALL osl_getDirectoryIt
+@@ -292,7 +292,7 @@ oslFileError SAL_CALL osl_getDirectoryIt
      @see osl_releaseDirectoryItem()
  */
  
@@ -448,7 +451,7 @@
  
  
  /**	Decrease the refcount of a directory item handle. 
-@@ -315,7 +315,7 @@ oslFileError SAL_CALL osl_acquireDirecto
+@@ -314,7 +314,7 @@ oslFileError SAL_CALL osl_acquireDirecto
  	@see osl_acquireDirectoryItem()
  */
  
@@ -457,7 +460,7 @@
  
  /* File types */
  
-@@ -438,7 +438,7 @@ struct _oslFileStatus {
+@@ -437,7 +437,7 @@ struct _oslFileStatus {
  	@see oslFileStatus
  */
  
@@ -466,7 +469,7 @@
  
  
  typedef void *oslVolumeDeviceHandle;
-@@ -460,7 +460,7 @@ typedef void *oslVolumeDeviceHandle;
+@@ -459,7 +459,7 @@ typedef void *oslVolumeDeviceHandle;
      @see osl_getVolumeInformation()
  */
  
@@ -475,7 +478,7 @@
  
  
  /** Automount a volume device.
-@@ -479,7 +479,7 @@ oslFileError SAL_CALL osl_unmountVolumeD
+@@ -478,7 +478,7 @@ oslFileError SAL_CALL osl_unmountVolumeD
      @see osl_getVolumeInformation()
  */
  
@@ -484,7 +487,7 @@
  
  
  /** Release a volume device handle.
-@@ -500,7 +500,7 @@ oslFileError SAL_CALL osl_automountVolum
+@@ -499,7 +499,7 @@ oslFileError SAL_CALL osl_automountVolum
      @see osl_getVolumeInformation()    
  */
  
@@ -493,7 +496,7 @@
  
  /** Acquire a volume device handle.
  
-@@ -520,7 +520,7 @@ oslFileError SAL_CALL osl_releaseVolumeD
+@@ -519,7 +519,7 @@ oslFileError SAL_CALL osl_releaseVolumeD
      @see osl_getVolumeInformation()
  */
  
@@ -502,7 +505,7 @@
  
  
  /** Get the full qualified URL where a device is mounted to.
-@@ -551,7 +551,7 @@ oslFileError SAL_CALL osl_acquireVolumeD
+@@ -550,7 +550,7 @@ oslFileError SAL_CALL osl_acquireVolumeD
  	@see	osl_unmountVolumeDevice()
  */
  
@@ -511,7 +514,7 @@
  
  /* Volume attributes */
  
-@@ -646,7 +646,7 @@ struct _oslVolumeInfo {
+@@ -645,7 +645,7 @@ struct _oslVolumeInfo {
  	@see	oslVolumeInfo
  */	
  
@@ -520,7 +523,7 @@
      rtl_uString *pustrDirectoryURL, 
      oslVolumeInfo *pInfo, 
      sal_uInt32 uFieldMask );
-@@ -709,7 +709,7 @@ typedef	void *oslFileHandle;
+@@ -708,7 +708,7 @@ typedef	void *oslFileHandle;
  	@see osl_getFileSize()
  */
  
@@ -529,7 +532,7 @@
  
  #define osl_Pos_Absolut 1
  #define osl_Pos_Current 2
-@@ -735,7 +735,7 @@ oslFileError SAL_CALL osl_openFile( rtl_
+@@ -734,7 +734,7 @@ oslFileError SAL_CALL osl_openFile( rtl_
  	@see	osl_getFilePos()
  */
  
@@ -538,7 +541,7 @@
  
  
  /**	Retrieve the current position of the internal pointer of an open file.
-@@ -757,7 +757,7 @@ oslFileError SAL_CALL osl_setFilePos( os
+@@ -756,7 +756,7 @@ oslFileError SAL_CALL osl_setFilePos( os
  	@see osl_writeFile()
  */
  
@@ -547,7 +550,7 @@
  
  
  /**	Set the file size of an open file. 
-@@ -782,7 +782,7 @@ oslFileError SAL_CALL osl_getFilePos( os
+@@ -781,7 +781,7 @@ oslFileError SAL_CALL osl_getFilePos( os
  	@see osl_getFileSize()
  */
  
@@ -556,7 +559,7 @@
  
  
  /**	Get the file size of an open file. 
-@@ -806,7 +806,7 @@ oslFileError SAL_CALL osl_setFileSize( o
+@@ -805,7 +805,7 @@ oslFileError SAL_CALL osl_setFileSize( o
  	@see osl_getFileStatus()
  */
  
@@ -565,7 +568,7 @@
  
  
  /**	Read a number of bytes from a file. 
-@@ -844,7 +844,7 @@ oslFileError SAL_CALL osl_getFileSize( o
+@@ -843,7 +843,7 @@ oslFileError SAL_CALL osl_getFileSize( o
  	@see osl_setFilePos()
  */
  
@@ -574,7 +577,7 @@
  
  
  /**	Test if the end of a file is reached.
-@@ -872,7 +872,7 @@ oslFileError SAL_CALL osl_readFile( oslF
+@@ -871,7 +871,7 @@ oslFileError SAL_CALL osl_readFile( oslF
  	@see osl_setFilePos()
  */
  
@@ -583,7 +586,7 @@
  
  
  /** Write a number of bytes to a file. 
-@@ -912,7 +912,7 @@ oslFileError SAL_CALL osl_isEndOfFile( o
+@@ -911,7 +911,7 @@ oslFileError SAL_CALL osl_isEndOfFile( o
  	@see osl_setFilePos()
  */
  
@@ -592,7 +595,7 @@
  
  
  /** Read a line from a file. 
-@@ -942,7 +942,7 @@ oslFileError SAL_CALL osl_writeFile( osl
+@@ -941,7 +941,7 @@ oslFileError SAL_CALL osl_writeFile( osl
  	@see osl_setFilePos()
  */
  
@@ -601,7 +604,7 @@
  
  /** Synchronize the memory representation of a file with that on the physical medium.
  
-@@ -978,7 +978,7 @@ oslFileError SAL_CALL osl_readLine( oslF
+@@ -977,7 +977,7 @@ oslFileError SAL_CALL osl_readLine( oslF
        @see osl_openFile()
        @see osl_writeFile()      
  */
@@ -610,7 +613,7 @@
  
  /**	Close an open file.
  
-@@ -997,7 +997,7 @@ oslFileError SAL_CALL osl_syncFile(oslFi
+@@ -996,7 +996,7 @@ oslFileError SAL_CALL osl_syncFile(oslFi
  	@see osl_openFile()
  */
  
@@ -619,7 +622,7 @@
  
  	
  /**	Create a directory.
-@@ -1027,7 +1027,7 @@ oslFileError SAL_CALL osl_closeFile( osl
+@@ -1026,7 +1026,7 @@ oslFileError SAL_CALL osl_closeFile( osl
  	@see osl_removeDirectory()
  */
  
@@ -628,7 +631,7 @@
  
  
  /**	Remove an empty directory.
-@@ -1058,7 +1058,7 @@ oslFileError SAL_CALL osl_createDirector
+@@ -1057,7 +1057,7 @@ oslFileError SAL_CALL osl_createDirector
  	@see osl_createDirectory()
  */
  	
@@ -637,7 +640,7 @@
  
  /** Function pointer representing a function that will be called by osl_createDirectoryPath
      if a directory has been created.
-@@ -1136,7 +1136,7 @@ typedef void (SAL_CALL *oslDirectoryCrea
+@@ -1135,7 +1135,7 @@ typedef void (SAL_CALL *oslDirectoryCrea
  	@see oslFileError
  	@see osl_createDirectory
  */
@@ -646,7 +649,7 @@
      rtl_uString* aDirectoryUrl, 
      oslDirectoryCreationCallbackFunc aDirectoryCreationCallbackFunc, 
      void* pData);
-@@ -1169,7 +1169,7 @@ oslFileError SAL_CALL osl_createDirector
+@@ -1168,7 +1168,7 @@ oslFileError SAL_CALL osl_createDirector
  	@see osl_openFile()
  */
  
@@ -655,7 +658,7 @@
  
  
  /** Copy a file to a new destination. 
-@@ -1198,7 +1198,7 @@ oslFileError SAL_CALL osl_removeFile( rt
+@@ -1197,7 +1197,7 @@ oslFileError SAL_CALL osl_removeFile( rt
  	@see	osl_removeFile()
  */
  
@@ -664,7 +667,7 @@
  
  
  /** Move a file or directory to a new destination or renames it. 
-@@ -1225,7 +1225,7 @@ oslFileError SAL_CALL osl_copyFile( rtl_
+@@ -1224,7 +1224,7 @@ oslFileError SAL_CALL osl_copyFile( rtl_
  	@see osl_copyFile()
  */
  
@@ -673,7 +676,7 @@
  
  
  /**	Determine a valid unused canonical name for a requested name. 
-@@ -1249,7 +1249,7 @@ oslFileError SAL_CALL osl_moveFile( rtl_
+@@ -1248,7 +1248,7 @@ oslFileError SAL_CALL osl_moveFile( rtl_
  	@see osl_getFileStatus()
  */
  
@@ -682,7 +685,7 @@
  
  
  /**	Convert a path relative to a given directory into an full qualified file URL.
-@@ -1287,7 +1287,7 @@ oslFileError SAL_CALL osl_getCanonicalNa
+@@ -1286,7 +1286,7 @@ oslFileError SAL_CALL osl_getCanonicalNa
  	@see	osl_getFileStatus()
  */
  
@@ -691,7 +694,7 @@
      rtl_uString* pustrBaseDirectoryURL, 
      rtl_uString *pustrRelativeFileURL, 
      rtl_uString **ppustrAbsoluteFileURL );
-@@ -1308,7 +1308,7 @@ oslFileError SAL_CALL osl_getAbsoluteFil
+@@ -1307,7 +1307,7 @@ oslFileError SAL_CALL osl_getAbsoluteFil
  	@see osl_getSystemPathFromFileURL()
  */
  
@@ -700,7 +703,7 @@
  
  
  /**	Searche a full qualified system path or a file URL.
-@@ -1339,7 +1339,7 @@ oslFileError SAL_CALL osl_getFileURLFrom
+@@ -1338,7 +1338,7 @@ oslFileError SAL_CALL osl_getFileURLFrom
  	@see osl_getSystemPathFromFileURL()
  */
  
@@ -709,7 +712,7 @@
  
  
  /**	Convert a file URL into a system dependend path.
-@@ -1357,7 +1357,7 @@ oslFileError SAL_CALL osl_searchFileURL(
+@@ -1356,7 +1356,7 @@ oslFileError SAL_CALL osl_searchFileURL(
  	@see osl_getFileURLFromSystemPath()
  */
  
@@ -718,7 +721,7 @@
  
  
  /** Function pointer representing the function called back from osl_abbreviateSystemPath
-@@ -1396,7 +1396,7 @@ typedef sal_uInt32 (SAL_CALL *oslCalcTex
+@@ -1395,7 +1395,7 @@ typedef sal_uInt32 (SAL_CALL *oslCalcTex
  	@see	oslCalcTextWidthFunc
  */
  
@@ -727,7 +730,7 @@
      rtl_uString *ustrSystemPath, 
      rtl_uString **pustrCompacted, 
      sal_uInt32 uMaxWidth, 
-@@ -1418,7 +1418,7 @@ oslFileError SAL_CALL osl_abbreviateSyst
+@@ -1417,7 +1417,7 @@ oslFileError SAL_CALL osl_abbreviateSyst
  	@see osl_getFileStatus()
  */
  
@@ -736,7 +739,7 @@
  
  
  /**	Set the file time.
-@@ -1443,7 +1443,7 @@ oslFileError SAL_CALL osl_setFileAttribu
+@@ -1442,7 +1442,7 @@ oslFileError SAL_CALL osl_setFileAttribu
  	@see osl_getFileStatus()
  */
  
@@ -745,7 +748,7 @@
      rtl_uString *pustrFileURL,	
      const TimeValue *aCreationTime,
  	const TimeValue *aLastAccessTime,
-@@ -1460,7 +1460,7 @@ oslFileError SAL_CALL osl_setFileTime( 
+@@ -1459,7 +1459,7 @@ oslFileError SAL_CALL osl_setFileTime( 
  	osl_File_E_NOENT no such file or directory not found
  */
  
@@ -754,7 +757,7 @@
  
  
  /** Creates a temporary file in the directory provided by the caller or the
-@@ -1515,7 +1515,7 @@ oslFileError SAL_CALL osl_getTempDirURL(
+@@ -1514,7 +1514,7 @@ oslFileError SAL_CALL osl_getTempDirURL(
  	@see    osl_getTempDirURL()	
  */
  
@@ -763,14 +766,14 @@
      rtl_uString*   pustrDirectoryURL, 
      oslFileHandle* pHandle, 
      rtl_uString**  ppustrTempFileURL);
-@@ -1525,5 +1525,3 @@ oslFileError SAL_CALL osl_createTempFile
+@@ -1524,5 +1524,3 @@ oslFileError SAL_CALL osl_createTempFile
  #endif
  
  #endif	/* _OSL_FILE_H_ */
 -
 -
---- ./sal/inc/osl/process.h.optimize~	2008-04-10 12:31:27.000000000 +0200
-+++ ./sal/inc/osl/process.h	2008-07-07 20:12:51.795846689 +0200
+--- ./sal/inc/osl/process.h.arkopts~	2008-04-10 12:31:04.000000000 +0200
++++ ./sal/inc/osl/process.h	2008-07-17 11:52:19.072043379 +0200
 @@ -180,7 +180,7 @@ typedef void* oslProcess;
  	@see osl_freeProcessHandle
  	@see osl_loginUser
@@ -916,8 +919,8 @@
  
  #ifdef __cplusplus
  }
---- ./sal/inc/rtl/unload.h.optimize~	2008-04-10 12:43:59.000000000 +0200
-+++ ./sal/inc/rtl/unload.h	2008-07-07 20:12:51.796847095 +0200
+--- ./sal/inc/rtl/unload.h.arkopts~	2008-04-10 12:43:36.000000000 +0200
++++ ./sal/inc/rtl/unload.h	2008-07-17 11:52:19.072043379 +0200
 @@ -166,7 +166,7 @@ have to bother about registering.
  @param module a module handle as is obtained by osl_loadModule 
  @return sal_True - the module could be registered for unloading, sal_False otherwise 
@@ -984,8 +987,8 @@
  
  
  #ifdef __cplusplus
---- ./solenv/inc/unxlngi6.mk.optimize~	2008-07-07 20:10:05.917096526 +0200
-+++ ./solenv/inc/unxlngi6.mk	2008-07-07 20:12:51.798847489 +0200
+--- ./solenv/inc/unxlngi6.mk.arkopts~	2008-07-17 11:49:01.750184223 +0200
++++ ./solenv/inc/unxlngi6.mk	2008-07-17 11:52:19.075048755 +0200
 @@ -60,7 +60,7 @@ JAVA_RUNTIME=-ljava_g
  
  # architecture dependent flags for the C and C++ compiler that can be changed by
@@ -1042,7 +1045,7 @@
  .ENDIF	# "$(PRODUCT)"!=""
  # Compiler flags for disabling optimizations
  CFLAGSNOOPT=-O0
-@@ -170,12 +170,12 @@ LINKFLAGSSHLCUI= -shared
+@@ -171,12 +171,12 @@ LINKFLAGSSHLCUI= -shared
  
  LINKFLAGSTACK=
  LINKFLAGSPROF=
@@ -1057,8 +1060,8 @@
  LINKVERSIONMAPFLAG=$(LINKFLAGSOPTIMIZE) -Wl,--version-script
  
  SONAME_SWITCH=-Wl,-h
---- ./store/inc/store/store.h.optimize~	2008-04-10 16:16:35.000000000 +0200
-+++ ./store/inc/store/store.h	2008-07-07 20:12:51.803847286 +0200
+--- ./store/inc/store/store.h.arkopts~	2008-07-17 11:49:18.057038431 +0200
++++ ./store/inc/store/store.h	2008-07-17 11:52:19.076064554 +0200
 @@ -46,7 +46,7 @@ typedef void* storeHandle;
      @param  Handle [in] the Handle.
      @return store_E_None upon success
@@ -1095,7 +1098,7 @@
  	rtl_uString     *pFilename,
  	storeAccessMode  eAccessMode,
  	sal_uInt16       nPageSize,
-@@ -104,7 +104,7 @@ storeError SAL_CALL store_openFile (
+@@ -105,7 +105,7 @@ storeError SAL_CALL store_openFile (
      @return store_E_None upon     success,
              store_E_InvalidHandle otherwise.
   */
@@ -1104,7 +1107,7 @@
  	storeFileHandle hFile
  ) SAL_THROW_EXTERN_C();
  
-@@ -113,7 +113,7 @@ storeError SAL_CALL store_closeFile (
+@@ -114,7 +114,7 @@ storeError SAL_CALL store_closeFile (
      @param  hFile [in] the File Handle.
      @return store_E_None upon success
   */
@@ -1113,7 +1116,7 @@
  	storeFileHandle hFile
  ) SAL_THROW_EXTERN_C();
  
-@@ -123,7 +123,7 @@ storeError SAL_CALL store_flushFile (
+@@ -124,7 +124,7 @@ storeError SAL_CALL store_flushFile (
      @param  pnRefCount [out] number of open directories and streams.
      @return store_E_None upon success
   */
@@ -1122,7 +1125,7 @@
  	storeFileHandle  hFile,
  	sal_uInt32      *pnRefCount
  ) SAL_THROW_EXTERN_C();
-@@ -134,7 +134,7 @@ storeError SAL_CALL store_getFileReferer
+@@ -135,7 +135,7 @@ storeError SAL_CALL store_getFileReferer
      @param  pnSize [out] the file size in bytes.
      @return store_E_None upon success
   */
@@ -1131,7 +1134,7 @@
  	storeFileHandle  hFile,
  	sal_uInt32      *pnSize
  ) SAL_THROW_EXTERN_C();
-@@ -147,7 +147,7 @@ storeError SAL_CALL store_getFileSize (
+@@ -148,7 +148,7 @@ storeError SAL_CALL store_getFileSize (
      @param  pDstFilename [in] created with store_AccessCreate.
      @return store_E_None upon success
   */
@@ -1140,7 +1143,7 @@
  	rtl_uString *pSrcFilename,
  	rtl_uString *pDstFilename
  ) SAL_THROW_EXTERN_C();
-@@ -169,7 +169,7 @@ typedef void* storeDirectoryHandle;
+@@ -170,7 +170,7 @@ typedef void* storeDirectoryHandle;
      @param  phDirectory [out] the Directory Handle.
      @return store_E_None upon success
   */
@@ -1149,7 +1152,7 @@
  	storeFileHandle       hFile,
  	rtl_uString          *pPath,
  	rtl_uString          *pName,
-@@ -183,7 +183,7 @@ storeError SAL_CALL store_openDirectory 
+@@ -184,7 +184,7 @@ storeError SAL_CALL store_openDirectory 
      @return store_E_None          upon success,
              store_E_InvalidHandle otherwise.
   */
@@ -1158,7 +1161,7 @@
  	storeDirectoryHandle hDirectory
  ) SAL_THROW_EXTERN_C();
  
-@@ -194,7 +194,7 @@ storeError SAL_CALL store_closeDirectory
+@@ -195,7 +195,7 @@ storeError SAL_CALL store_closeDirectory
      @return store_E_None       upon success,
              store_E_NoMoreFile upon end of iteration.
   */
@@ -1167,7 +1170,7 @@
  	storeDirectoryHandle  hDirectory,
  	storeFindData        *pFindData
  ) SAL_THROW_EXTERN_C();
-@@ -206,7 +206,7 @@ storeError SAL_CALL store_findFirst (
+@@ -207,7 +207,7 @@ storeError SAL_CALL store_findFirst (
      @return store_E_None       upon success,
              store_E_NoMoreFile upon end of iteration.
   */
@@ -1176,7 +1179,7 @@
  	storeDirectoryHandle  hDirectory,
  	storeFindData        *pFindData
  ) SAL_THROW_EXTERN_C();
-@@ -228,7 +228,7 @@ typedef void* storeStreamHandle;
+@@ -229,7 +229,7 @@ typedef void* storeStreamHandle;
      @param  phStrm [out] the Stream Handle.
      @return store_E_None upon success
   */
@@ -1185,7 +1188,7 @@
  	storeFileHandle    hFile,
  	rtl_uString       *pPath,
  	rtl_uString       *pName,
-@@ -242,7 +242,7 @@ storeError SAL_CALL store_openStream (
+@@ -243,7 +243,7 @@ storeError SAL_CALL store_openStream (
      @return store_E_None          upon success,
              store_E_InvalidHandle otherwise.
   */
@@ -1194,7 +1197,7 @@
  	storeStreamHandle hStrm
  ) SAL_THROW_EXTERN_C();
  
-@@ -255,7 +255,7 @@ storeError SAL_CALL store_closeStream (
+@@ -256,7 +256,7 @@ storeError SAL_CALL store_closeStream (
      @param  pnDone [out] the number of bytes actually read.
      @return store_E_None upon success
   */
@@ -1203,7 +1206,7 @@
  	storeStreamHandle  hStrm,
  	sal_uInt32         nOffset,
  	void              *pBuffer,
-@@ -272,7 +272,7 @@ storeError SAL_CALL store_readStream (
+@@ -273,7 +273,7 @@ storeError SAL_CALL store_readStream (
      @param  pnDone [out] the number of bytes actually written.
      @return store_E_None upon success
   */
@@ -1212,7 +1215,7 @@
  	storeStreamHandle  hStrm,
  	sal_uInt32         nOffset,
  	const void        *pBuffer,
-@@ -285,7 +285,7 @@ storeError SAL_CALL store_writeStream (
+@@ -286,7 +286,7 @@ storeError SAL_CALL store_writeStream (
      @param  hStrm [in] the Stream Handle.
      @return store_E_None upon success
   */
@@ -1221,7 +1224,7 @@
  	storeStreamHandle hStrm
  ) SAL_THROW_EXTERN_C();
  
-@@ -295,7 +295,7 @@ storeError SAL_CALL store_flushStream (
+@@ -296,7 +296,7 @@ storeError SAL_CALL store_flushStream (
      @param  pnSize [out] the stream size in bytes.
      @return store_E_None upon success
   */
@@ -1230,7 +1233,7 @@
  	storeStreamHandle  hStrm,
  	sal_uInt32        *pnSize
  ) SAL_THROW_EXTERN_C();
-@@ -306,7 +306,7 @@ storeError SAL_CALL store_getStreamSize 
+@@ -307,7 +307,7 @@ storeError SAL_CALL store_getStreamSize 
      @param  nSize [in] the new stream size in bytes.
      @return store_E_None upon success
   */
@@ -1239,7 +1242,7 @@
  	storeStreamHandle hStrm,
  	sal_uInt32        nSize
  ) SAL_THROW_EXTERN_C();
-@@ -322,7 +322,7 @@ storeError SAL_CALL store_setStreamSize 
+@@ -323,7 +323,7 @@ storeError SAL_CALL store_setStreamSize 
      @param  pnAttrib [out] the resulting attributes, may be NULL.
      @return store_E_None upon success
   */
@@ -1248,7 +1251,7 @@
  	storeFileHandle hFile,
  	rtl_uString    *pPath,
  	rtl_uString    *pName,
-@@ -344,7 +344,7 @@ storeError SAL_CALL store_attrib (
+@@ -345,7 +345,7 @@ storeError SAL_CALL store_attrib (
      @param  pDstName [in] the Destination name
      @return store_E_None upon success
   */
@@ -1257,7 +1260,7 @@
  	storeFileHandle hFile,
  	rtl_uString *pSrcPath, rtl_uString *pSrcName,
  	rtl_uString *pDstPath, rtl_uString *pDstName
-@@ -363,7 +363,7 @@ storeError SAL_CALL store_link (
+@@ -364,7 +364,7 @@ storeError SAL_CALL store_link (
      @param  pDstName [in] the Destination name
      @return store_E_None upon success
   */
@@ -1266,7 +1269,7 @@
  	storeFileHandle hFile,
  	rtl_uString *pSrcPath, rtl_uString *pSrcName,
  	rtl_uString *pDstPath, rtl_uString *pDstName
-@@ -378,7 +378,7 @@ storeError SAL_CALL store_symlink (
+@@ -379,7 +379,7 @@ storeError SAL_CALL store_symlink (
      @param  pDstName [in] the Destination name
      @return store_E_None upon success
   */
@@ -1275,7 +1278,7 @@
  	storeFileHandle hFile,
  	rtl_uString *pSrcPath, rtl_uString *pSrcName,
  	rtl_uString *pDstPath, rtl_uString *pDstName
-@@ -391,7 +391,7 @@ storeError SAL_CALL store_rename (
+@@ -392,7 +392,7 @@ storeError SAL_CALL store_rename (
      @param  pName [in] the entry name
      @return store_E_None upon success
   */
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]