[Libreoffice-commits] core.git: 2 commits - include/osl include/rtl
Stephan Bergmann
sbergman at redhat.com
Wed May 22 23:49:49 PDT 2013
include/osl/file.hxx | 66 ++++++++++++++++++++++++------------------------
include/rtl/string.hxx | 37 ++++++++++----------------
include/rtl/ustring.hxx | 45 +++++++++++++-------------------
3 files changed, 65 insertions(+), 83 deletions(-)
New commits:
commit f0199f76e05e3c00f43691151cd3715deba357b8
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu May 23 08:49:01 2013 +0200
Use C++ static_cast
Change-Id: I36793cf0144de5e051d277e70457f36dbfc933ff
diff --git a/include/osl/file.hxx b/include/osl/file.hxx
index ee52cd5..64fbcb7 100644
--- a/include/osl/file.hxx
+++ b/include/osl/file.hxx
@@ -127,7 +127,7 @@ public:
static inline RC getCanonicalName( const ::rtl::OUString& ustrRequestedURL, ::rtl::OUString& ustrValidURL )
{
- return (RC) osl_getCanonicalName( ustrRequestedURL.pData, &ustrValidURL.pData );
+ return static_cast< RC >( osl_getCanonicalName( ustrRequestedURL.pData, &ustrValidURL.pData ) );
}
/** Convert a path relative to a given directory into an full qualified file URL.
@@ -167,7 +167,7 @@ public:
static inline RC getAbsoluteFileURL( const ::rtl::OUString& ustrBaseDirectoryURL, const ::rtl::OUString& ustrRelativeFileURL, ::rtl::OUString& ustrAbsoluteFileURL )
{
- return (RC) osl_getAbsoluteFileURL( ustrBaseDirectoryURL.pData, ustrRelativeFileURL.pData, &ustrAbsoluteFileURL.pData );
+ return static_cast< RC >( osl_getAbsoluteFileURL( ustrBaseDirectoryURL.pData, ustrRelativeFileURL.pData, &ustrAbsoluteFileURL.pData ) );
}
/** Convert a file URL into a system dependend path.
@@ -187,7 +187,7 @@ public:
static inline RC getSystemPathFromFileURL( const ::rtl::OUString& ustrFileURL, ::rtl::OUString& ustrSystemPath )
{
- return (RC) osl_getSystemPathFromFileURL( ustrFileURL.pData, &ustrSystemPath.pData );
+ return static_cast< RC >( osl_getSystemPathFromFileURL( ustrFileURL.pData, &ustrSystemPath.pData ) );
}
/** Convert a system dependend path into a file URL.
@@ -207,7 +207,7 @@ public:
static inline RC getFileURLFromSystemPath( const ::rtl::OUString& ustrSystemPath, ::rtl::OUString& ustrFileURL )
{
- return (RC) osl_getFileURLFromSystemPath( ustrSystemPath.pData, &ustrFileURL.pData );
+ return static_cast< RC >( osl_getFileURLFromSystemPath( ustrSystemPath.pData, &ustrFileURL.pData ) );
}
/** Searche a full qualified system path or a file URL.
@@ -240,7 +240,7 @@ public:
static inline RC searchFileURL( const ::rtl::OUString& ustrFileName, const ::rtl::OUString& ustrSearchPath, ::rtl::OUString& ustrFileURL )
{
- return (RC) osl_searchFileURL( ustrFileName.pData, ustrSearchPath.pData, &ustrFileURL.pData );
+ return static_cast< RC >( osl_searchFileURL( ustrFileName.pData, ustrSearchPath.pData, &ustrFileURL.pData ) );
}
/** Retrieves the file URL of the system's temporary directory path.
@@ -255,7 +255,7 @@ public:
static inline RC getTempDirURL( ::rtl::OUString& ustrTempDirURL )
{
- return (RC) osl_getTempDirURL( &ustrTempDirURL.pData );
+ return static_cast< RC >( osl_getTempDirURL( &ustrTempDirURL.pData ) );
}
/** Creates a temporary file in the directory provided by the caller or the
@@ -314,7 +314,7 @@ public:
rtl_uString* pustr_dir_url = pustrDirectoryURL ? pustrDirectoryURL->pData : 0;
rtl_uString** ppustr_tmp_file_url = pustrTempFileURL ? &pustrTempFileURL->pData : 0;
- return (RC) osl_createTempFile(pustr_dir_url, pHandle, ppustr_tmp_file_url);
+ return static_cast< RC >( osl_createTempFile(pustr_dir_url, pHandle, ppustr_tmp_file_url) );
}
};
@@ -988,7 +988,7 @@ public:
inline RC open( sal_uInt32 uFlags )
{
- return (RC) osl_openFile( _aPath.pData, &_pData, uFlags );
+ return static_cast< RC >( osl_openFile( _aPath.pData, &_pData, uFlags ) );
}
/** Close an open file.
@@ -1015,7 +1015,7 @@ public:
_pData = NULL;
}
- return (RC) Error;
+ return static_cast< RC >( Error );
}
/** Set the internal position pointer of an open file.
@@ -1037,7 +1037,7 @@ public:
inline RC setPos( sal_uInt32 uHow, sal_Int64 uPos ) SAL_WARN_UNUSED_RESULT
{
- return (RC) osl_setFilePos( _pData, uHow, uPos );
+ return static_cast< RC >( osl_setFilePos( _pData, uHow, uPos ) );
}
/** Retrieve the current position of the internal pointer of an open file.
@@ -1058,7 +1058,7 @@ public:
inline RC getPos( sal_uInt64& uPos )
{
- return (RC) osl_getFilePos( _pData, &uPos );
+ return static_cast< RC >( osl_getFilePos( _pData, &uPos ) );
}
/** Test if the end of a file is reached.
@@ -1085,7 +1085,7 @@ public:
inline RC isEndOfFile( sal_Bool *pIsEOF )
{
- return (RC) osl_isEndOfFile( _pData, pIsEOF );
+ return static_cast< RC >( osl_isEndOfFile( _pData, pIsEOF ) );
}
/** Set the file size of an open file.
@@ -1108,7 +1108,7 @@ public:
inline RC setSize( sal_uInt64 uSize )
{
- return (RC) osl_setFileSize( _pData, uSize );
+ return static_cast< RC >( osl_setFileSize( _pData, uSize ) );
}
/** Get the file size of an open file.
@@ -1133,7 +1133,7 @@ public:
inline RC getSize( sal_uInt64 &rSize )
{
- return (RC) osl_getFileSize( _pData, &rSize );
+ return static_cast< RC >( osl_getFileSize( _pData, &rSize ) );
}
/** Read a number of bytes from a file.
@@ -1170,7 +1170,7 @@ public:
inline RC read( void *pBuffer, sal_uInt64 uBytesRequested, sal_uInt64& rBytesRead )
{
- return (RC) osl_readFile( _pData, pBuffer, uBytesRequested, &rBytesRead );
+ return static_cast< RC >( osl_readFile( _pData, pBuffer, uBytesRequested, &rBytesRead ) );
}
/** Write a number of bytes to a file.
@@ -1209,7 +1209,7 @@ public:
inline RC write(const void *pBuffer, sal_uInt64 uBytesToWrite, sal_uInt64& rBytesWritten)
{
- return (RC) osl_writeFile( _pData, pBuffer, uBytesToWrite, &rBytesWritten );
+ return static_cast< RC >( osl_writeFile( _pData, pBuffer, uBytesToWrite, &rBytesWritten ) );
}
@@ -1239,7 +1239,7 @@ public:
inline RC readLine( ::rtl::ByteSequence& aSeq )
{
- return (RC) osl_readLine( _pData, reinterpret_cast<sal_Sequence**>(&aSeq) );
+ return static_cast< RC >( osl_readLine( _pData, reinterpret_cast<sal_Sequence**>(&aSeq) ) );
}
/** Synchronize the memory representation of a file with that on the physical medium.
@@ -1275,7 +1275,7 @@ public:
inline RC sync() const
{
OSL_PRECOND(_pData, "File::sync(): File not open");
- return (RC)osl_syncFile(_pData);
+ return static_cast< RC >(osl_syncFile(_pData));
}
/** Copy a file to a new destination.
@@ -1306,7 +1306,7 @@ public:
inline static RC copy( const ::rtl::OUString& ustrSourceFileURL, const ::rtl::OUString& ustrDestFileURL )
{
- return (RC) osl_copyFile( ustrSourceFileURL.pData, ustrDestFileURL.pData );
+ return static_cast< RC >( osl_copyFile( ustrSourceFileURL.pData, ustrDestFileURL.pData ) );
}
/** Move a file or directory to a new destination or renames it.
@@ -1335,7 +1335,7 @@ public:
inline static RC move( const ::rtl::OUString& ustrSourceFileURL, const ::rtl::OUString& ustrDestFileURL )
{
- return (RC) osl_moveFile( ustrSourceFileURL.pData, ustrDestFileURL.pData );
+ return static_cast< RC >( osl_moveFile( ustrSourceFileURL.pData, ustrDestFileURL.pData ) );
}
/** Remove a regular file.
@@ -1368,7 +1368,7 @@ public:
inline static RC remove( const ::rtl::OUString& ustrFileURL )
{
- return (RC) osl_removeFile( ustrFileURL.pData );
+ return static_cast< RC >( osl_removeFile( ustrFileURL.pData ) );
}
/** Set file attributes.
@@ -1388,7 +1388,7 @@ public:
inline static RC setAttributes( const ::rtl::OUString& ustrFileURL, sal_uInt64 uAttributes )
{
- return (RC) osl_setFileAttributes( ustrFileURL.pData, uAttributes );
+ return static_cast< RC >( osl_setFileAttributes( ustrFileURL.pData, uAttributes ) );
}
/** Set the file time.
@@ -1419,11 +1419,11 @@ public:
const TimeValue& rLastAccessTime,
const TimeValue& rLastWriteTime )
{
- return (RC) osl_setFileTime(
+ return static_cast< RC >( osl_setFileTime(
ustrFileURL.pData,
&rCreationTime,
&rLastAccessTime,
- &rLastWriteTime );
+ &rLastWriteTime ) );
}
friend class DirectoryItem;
@@ -1537,7 +1537,7 @@ public:
rItem._pData = NULL;
}
- return (RC) osl_getDirectoryItem( ustrFileURL.pData, &rItem._pData );
+ return static_cast< RC >( osl_getDirectoryItem( ustrFileURL.pData, &rItem._pData ) );
}
/** Retrieve information about a single file or directory.
@@ -1574,7 +1574,7 @@ public:
inline RC getFileStatus( FileStatus& rStatus )
{
- return (RC) osl_getFileStatus( _pData, &rStatus._aStatus, rStatus._nMask );
+ return static_cast< RC >( osl_getFileStatus( _pData, &rStatus._aStatus, rStatus._nMask ) );
}
/** Determine if a directory item point the same underlying file
@@ -1709,7 +1709,7 @@ public:
inline RC open()
{
- return (RC) osl_openDirectory( _aPath.pData, &_pData );
+ return static_cast< RC >( osl_openDirectory( _aPath.pData, &_pData ) );
}
/** Query if directory is open.
@@ -1747,7 +1747,7 @@ public:
_pData = NULL;
}
- return (RC) Error;
+ return static_cast< RC >( Error );
}
@@ -1841,7 +1841,7 @@ public:
inline static RC getVolumeInfo( const ::rtl::OUString& ustrDirectoryURL, VolumeInfo& rInfo )
{
- return (RC) osl_getVolumeInformation( ustrDirectoryURL.pData, &rInfo._aInfo, rInfo._nMask );
+ return static_cast< RC >( osl_getVolumeInformation( ustrDirectoryURL.pData, &rInfo._aInfo, rInfo._nMask ) );
}
/** Create a directory.
@@ -1873,7 +1873,7 @@ public:
inline static RC create( const ::rtl::OUString& ustrDirectoryURL )
{
- return (RC) osl_createDirectory( ustrDirectoryURL.pData );
+ return static_cast< RC >( osl_createDirectory( ustrDirectoryURL.pData ) );
}
/** Remove an empty directory.
@@ -1906,7 +1906,7 @@ public:
inline static RC remove( const ::rtl::OUString& ustrDirectoryURL )
{
- return (RC) osl_removeDirectory( ustrDirectoryURL.pData );
+ return static_cast< RC >( osl_removeDirectory( ustrDirectoryURL.pData ) );
}
/** Create a directory path.
@@ -1965,10 +1965,10 @@ public:
const ::rtl::OUString& aDirectoryUrl,
DirectoryCreationObserver* aDirectoryCreationObserver = NULL)
{
- return (RC)osl_createDirectoryPath(
+ return static_cast< RC >(osl_createDirectoryPath(
aDirectoryUrl.pData,
(aDirectoryCreationObserver) ? onDirectoryCreated : NULL,
- aDirectoryCreationObserver);
+ aDirectoryCreationObserver));
}
};
commit d080e70af3f3f346be03f7a32052b1fcc8449e99
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu May 23 08:46:40 2013 +0200
Remove redundant (private) DO_NOT_ACQUIRE
...the constructors with SAL_NO_ACQUIRE argument do the same.
Change-Id: I5c893080c9ae14e9e7ecefb726f3d99fce67ec81
diff --git a/include/rtl/string.hxx b/include/rtl/string.hxx
index c834450..6cb69c647 100644
--- a/include/rtl/string.hxx
+++ b/include/rtl/string.hxx
@@ -94,15 +94,6 @@ public:
rtl_String * pData;
/// @endcond
-private:
- class DO_NOT_ACQUIRE;
-
- OString( rtl_String * value, SAL_UNUSED_PARAMETER DO_NOT_ACQUIRE * )
- {
- pData = value;
- }
-
-public:
/**
New string containing no characters.
*/
@@ -1070,7 +1061,7 @@ public:
{
rtl_String *pNew = 0;
rtl_string_newFromSubString( &pNew, pData, beginIndex, getLength() - beginIndex );
- return OString( pNew, (DO_NOT_ACQUIRE*)0 );
+ return OString( pNew, SAL_NO_ACQUIRE );
}
/**
@@ -1089,7 +1080,7 @@ public:
{
rtl_String *pNew = 0;
rtl_string_newFromSubString( &pNew, pData, beginIndex, count );
- return OString( pNew, (DO_NOT_ACQUIRE*)0 );
+ return OString( pNew, SAL_NO_ACQUIRE );
}
/**
@@ -1104,7 +1095,7 @@ public:
{
rtl_String* pNew = 0;
rtl_string_newConcat( &pNew, pData, str.pData );
- return OString( pNew, (DO_NOT_ACQUIRE*)0 );
+ return OString( pNew, SAL_NO_ACQUIRE );
}
#ifndef RTL_FAST_STRING
@@ -1131,7 +1122,7 @@ public:
{
rtl_String* pNew = 0;
rtl_string_newReplaceStrAt( &pNew, pData, index, count, newStr.pData );
- return OString( pNew, (DO_NOT_ACQUIRE*)0 );
+ return OString( pNew, SAL_NO_ACQUIRE );
}
/**
@@ -1151,7 +1142,7 @@ public:
{
rtl_String* pNew = 0;
rtl_string_newReplace( &pNew, pData, oldChar, newChar );
- return OString( pNew, (DO_NOT_ACQUIRE*)0 );
+ return OString( pNew, SAL_NO_ACQUIRE );
}
/**
@@ -1218,7 +1209,7 @@ public:
{
rtl_String* pNew = 0;
rtl_string_newToAsciiLowerCase( &pNew, pData );
- return OString( pNew, (DO_NOT_ACQUIRE*)0 );
+ return OString( pNew, SAL_NO_ACQUIRE );
}
/**
@@ -1235,7 +1226,7 @@ public:
{
rtl_String* pNew = 0;
rtl_string_newToAsciiUpperCase( &pNew, pData );
- return OString( pNew, (DO_NOT_ACQUIRE*)0 );
+ return OString( pNew, SAL_NO_ACQUIRE );
}
/**
@@ -1253,7 +1244,7 @@ public:
{
rtl_String* pNew = 0;
rtl_string_newTrim( &pNew, pData );
- return OString( pNew, (DO_NOT_ACQUIRE*)0 );
+ return OString( pNew, SAL_NO_ACQUIRE );
}
/**
@@ -1284,7 +1275,7 @@ public:
{
rtl_String * pNew = 0;
index = rtl_string_getToken( &pNew, pData, token, cTok, index );
- return OString( pNew, (DO_NOT_ACQUIRE *)0 );
+ return OString( pNew, SAL_NO_ACQUIRE );
}
/**
@@ -1441,7 +1432,7 @@ public:
sal_Char aBuf[RTL_STR_MAX_VALUEOFINT64];
rtl_String* pNewData = 0;
rtl_string_newFromStr_WithLength( &pNewData, aBuf, rtl_str_valueOfInt64( aBuf, ll, radix ) );
- return OString( pNewData, (DO_NOT_ACQUIRE*)0 );
+ return OString( pNewData, SAL_NO_ACQUIRE );
}
/// @overload
/// @since LibreOffice 4.1
@@ -1450,7 +1441,7 @@ public:
sal_Char aBuf[RTL_STR_MAX_VALUEOFUINT64];
rtl_String* pNewData = 0;
rtl_string_newFromStr_WithLength( &pNewData, aBuf, rtl_str_valueOfUInt64( aBuf, ll, radix ) );
- return OString( pNewData, (DO_NOT_ACQUIRE*)0 );
+ return OString( pNewData, SAL_NO_ACQUIRE );
}
/**
@@ -1467,7 +1458,7 @@ public:
sal_Char aBuf[RTL_STR_MAX_VALUEOFFLOAT];
rtl_String* pNewData = 0;
rtl_string_newFromStr_WithLength( &pNewData, aBuf, rtl_str_valueOfFloat( aBuf, f ) );
- return OString( pNewData, (DO_NOT_ACQUIRE*)0 );
+ return OString( pNewData, SAL_NO_ACQUIRE );
}
/**
@@ -1484,7 +1475,7 @@ public:
sal_Char aBuf[RTL_STR_MAX_VALUEOFDOUBLE];
rtl_String* pNewData = 0;
rtl_string_newFromStr_WithLength( &pNewData, aBuf, rtl_str_valueOfDouble( aBuf, d ) );
- return OString( pNewData, (DO_NOT_ACQUIRE*)0 );
+ return OString( pNewData, SAL_NO_ACQUIRE );
}
/**
@@ -1519,7 +1510,7 @@ public:
sal_Char aBuf[RTL_STR_MAX_VALUEOFBOOLEAN];
rtl_String* pNewData = 0;
rtl_string_newFromStr_WithLength( &pNewData, aBuf, rtl_str_valueOfBoolean( aBuf, b ) );
- return OString( pNewData, (DO_NOT_ACQUIRE*)0 );
+ return OString( pNewData, SAL_NO_ACQUIRE );
}
/**
diff --git a/include/rtl/ustring.hxx b/include/rtl/ustring.hxx
index da5b909..f776da3 100644
--- a/include/rtl/ustring.hxx
+++ b/include/rtl/ustring.hxx
@@ -91,15 +91,6 @@ public:
rtl_uString * pData;
/// @endcond
-private:
- class DO_NOT_ACQUIRE{};
-
- OUString( rtl_uString * value, SAL_UNUSED_PARAMETER DO_NOT_ACQUIRE * )
- {
- pData = value;
- }
-
-public:
/**
New string containing no characters.
*/
@@ -1422,7 +1413,7 @@ public:
{
rtl_uString *pNew = 0;
rtl_uString_newFromSubString( &pNew, pData, beginIndex, getLength() - beginIndex );
- return OUString( pNew, (DO_NOT_ACQUIRE*)0 );
+ return OUString( pNew, SAL_NO_ACQUIRE );
}
/**
@@ -1441,7 +1432,7 @@ public:
{
rtl_uString *pNew = 0;
rtl_uString_newFromSubString( &pNew, pData, beginIndex, count );
- return OUString( pNew, (DO_NOT_ACQUIRE*)0 );
+ return OUString( pNew, SAL_NO_ACQUIRE );
}
/**
@@ -1456,7 +1447,7 @@ public:
{
rtl_uString* pNew = 0;
rtl_uString_newConcat( &pNew, pData, str.pData );
- return OUString( pNew, (DO_NOT_ACQUIRE*)0 );
+ return OUString( pNew, SAL_NO_ACQUIRE );
}
#ifndef RTL_FAST_STRING
@@ -1483,7 +1474,7 @@ public:
{
rtl_uString* pNew = 0;
rtl_uString_newReplaceStrAt( &pNew, pData, index, count, newStr.pData );
- return OUString( pNew, (DO_NOT_ACQUIRE*)0 );
+ return OUString( pNew, SAL_NO_ACQUIRE );
}
/**
@@ -1503,7 +1494,7 @@ public:
{
rtl_uString* pNew = 0;
rtl_uString_newReplace( &pNew, pData, oldChar, newChar );
- return OUString( pNew, (DO_NOT_ACQUIRE*)0 );
+ return OUString( pNew, SAL_NO_ACQUIRE );
}
/**
@@ -1681,7 +1672,7 @@ public:
{
rtl_uString* pNew = 0;
rtl_uString_newToAsciiLowerCase( &pNew, pData );
- return OUString( pNew, (DO_NOT_ACQUIRE*)0 );
+ return OUString( pNew, SAL_NO_ACQUIRE );
}
/**
@@ -1698,7 +1689,7 @@ public:
{
rtl_uString* pNew = 0;
rtl_uString_newToAsciiUpperCase( &pNew, pData );
- return OUString( pNew, (DO_NOT_ACQUIRE*)0 );
+ return OUString( pNew, SAL_NO_ACQUIRE );
}
/**
@@ -1716,7 +1707,7 @@ public:
{
rtl_uString* pNew = 0;
rtl_uString_newTrim( &pNew, pData );
- return OUString( pNew, (DO_NOT_ACQUIRE*)0 );
+ return OUString( pNew, SAL_NO_ACQUIRE );
}
/**
@@ -1747,7 +1738,7 @@ public:
{
rtl_uString * pNew = 0;
index = rtl_uString_getToken( &pNew, pData, token, cTok, index );
- return OUString( pNew, (DO_NOT_ACQUIRE *)0 );
+ return OUString( pNew, SAL_NO_ACQUIRE );
}
/**
@@ -1892,7 +1883,7 @@ public:
throw std::bad_alloc();
#endif
}
- return OUString( pNew, (DO_NOT_ACQUIRE *)0 );
+ return OUString( pNew, SAL_NO_ACQUIRE );
}
/**
@@ -1935,7 +1926,7 @@ public:
throw std::bad_alloc();
#endif
}
- return OUString( pNew, (DO_NOT_ACQUIRE *)0 );
+ return OUString( pNew, SAL_NO_ACQUIRE );
}
/**
@@ -2042,7 +2033,7 @@ public:
sal_Unicode aBuf[RTL_USTR_MAX_VALUEOFINT32];
rtl_uString* pNewData = 0;
rtl_uString_newFromStr_WithLength( &pNewData, aBuf, rtl_ustr_valueOfInt32( aBuf, i, radix ) );
- return OUString( pNewData, (DO_NOT_ACQUIRE*)0 );
+ return OUString( pNewData, SAL_NO_ACQUIRE );
}
/// @overload
/// @since LibreOffice 4.1
@@ -2069,7 +2060,7 @@ public:
sal_Unicode aBuf[RTL_STR_MAX_VALUEOFINT64];
rtl_uString* pNewData = 0;
rtl_uString_newFromStr_WithLength( &pNewData, aBuf, rtl_ustr_valueOfInt64( aBuf, ll, radix ) );
- return OUString( pNewData, (DO_NOT_ACQUIRE*)0 );
+ return OUString( pNewData, SAL_NO_ACQUIRE );
}
/// @overload
/// @since LibreOffice 4.1
@@ -2078,7 +2069,7 @@ public:
sal_Unicode aBuf[RTL_STR_MAX_VALUEOFUINT64];
rtl_uString* pNewData = 0;
rtl_uString_newFromStr_WithLength( &pNewData, aBuf, rtl_ustr_valueOfUInt64( aBuf, ll, radix ) );
- return OUString( pNewData, (DO_NOT_ACQUIRE*)0 );
+ return OUString( pNewData, SAL_NO_ACQUIRE );
}
/**
@@ -2095,7 +2086,7 @@ public:
sal_Unicode aBuf[RTL_USTR_MAX_VALUEOFFLOAT];
rtl_uString* pNewData = 0;
rtl_uString_newFromStr_WithLength( &pNewData, aBuf, rtl_ustr_valueOfFloat( aBuf, f ) );
- return OUString( pNewData, (DO_NOT_ACQUIRE*)0 );
+ return OUString( pNewData, SAL_NO_ACQUIRE );
}
/**
@@ -2112,7 +2103,7 @@ public:
sal_Unicode aBuf[RTL_USTR_MAX_VALUEOFDOUBLE];
rtl_uString* pNewData = 0;
rtl_uString_newFromStr_WithLength( &pNewData, aBuf, rtl_ustr_valueOfDouble( aBuf, d ) );
- return OUString( pNewData, (DO_NOT_ACQUIRE*)0 );
+ return OUString( pNewData, SAL_NO_ACQUIRE );
}
/**
@@ -2147,7 +2138,7 @@ public:
sal_Unicode aBuf[RTL_USTR_MAX_VALUEOFBOOLEAN];
rtl_uString* pNewData = 0;
rtl_uString_newFromStr_WithLength( &pNewData, aBuf, rtl_ustr_valueOfBoolean( aBuf, b ) );
- return OUString( pNewData, (DO_NOT_ACQUIRE*)0 );
+ return OUString( pNewData, SAL_NO_ACQUIRE );
}
/**
@@ -2239,7 +2230,7 @@ public:
{
rtl_uString* pNew = 0;
rtl_uString_newFromAscii( &pNew, value );
- return OUString( pNew, (DO_NOT_ACQUIRE*)0 );
+ return OUString( pNew, SAL_NO_ACQUIRE );
}
};
More information about the Libreoffice-commits
mailing list