summaryrefslogtreecommitdiff
path: root/store
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@suse.cz>2013-04-07 12:06:47 +0200
committerLuboš Luňák <l.lunak@suse.cz>2013-04-07 14:23:11 +0200
commit1946794ae09ba732022fe6a74ea45e304ab70b84 (patch)
treee32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /store
parent5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (diff)
mass removal of rtl:: prefixes for O(U)String*
Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk have kept them, in order not to break external API (the automatic using declaration is LO-internal). Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
Diffstat (limited to 'store')
-rw-r--r--store/inc/store/store.hxx32
-rw-r--r--store/source/lockbyte.cxx4
-rw-r--r--store/source/store.cxx1
-rw-r--r--store/workben/t_base.cxx4
-rw-r--r--store/workben/t_file.cxx2
-rw-r--r--store/workben/t_page.cxx2
-rw-r--r--store/workben/t_store.cxx3
7 files changed, 23 insertions, 25 deletions
diff --git a/store/inc/store/store.hxx b/store/inc/store/store.hxx
index d5a2f604e254..43ef8859c52e 100644
--- a/store/inc/store/store.hxx
+++ b/store/inc/store/store.hxx
@@ -99,8 +99,8 @@ public:
*/
inline storeError create (
storeFileHandle hFile,
- rtl::OUString const & rPath,
- rtl::OUString const & rName,
+ OUString const & rPath,
+ OUString const & rName,
storeAccessMode eMode) SAL_THROW(())
{
if (m_hImpl)
@@ -264,8 +264,8 @@ public:
*/
inline storeError create (
storeFileHandle hFile,
- rtl::OUString const & rPath,
- rtl::OUString const & rName,
+ OUString const & rPath,
+ OUString const & rName,
storeAccessMode eMode) SAL_THROW(())
{
if (m_hImpl)
@@ -429,7 +429,7 @@ public:
@see store_openFile()
*/
inline storeError create (
- rtl::OUString const & rFilename,
+ OUString const & rFilename,
storeAccessMode eAccessMode,
sal_uInt16 nPageSize = STORE_DEFAULT_PAGESIZE) SAL_THROW(())
{
@@ -504,8 +504,8 @@ public:
@see store_attrib()
*/
inline storeError attrib (
- rtl::OUString const & rPath,
- rtl::OUString const & rName,
+ OUString const & rPath,
+ OUString const & rName,
sal_uInt32 nMask1,
sal_uInt32 nMask2,
sal_uInt32 & rnAttrib) SAL_THROW(())
@@ -520,8 +520,8 @@ public:
@see store_attrib()
*/
inline storeError attrib (
- rtl::OUString const & rPath,
- rtl::OUString const & rName,
+ OUString const & rPath,
+ OUString const & rName,
sal_uInt32 nMask1,
sal_uInt32 nMask2) SAL_THROW(())
{
@@ -535,8 +535,8 @@ public:
@see store_link()
*/
inline storeError link (
- rtl::OUString const & rSrcPath, rtl::OUString const & rSrcName,
- rtl::OUString const & rDstPath, rtl::OUString const & rDstName) SAL_THROW(())
+ OUString const & rSrcPath, OUString const & rSrcName,
+ OUString const & rDstPath, OUString const & rDstName) SAL_THROW(())
{
if (!m_hImpl)
return store_E_InvalidHandle;
@@ -549,8 +549,8 @@ public:
@see store_symlink()
*/
inline storeError symlink (
- rtl::OUString const & rSrcPath, rtl::OUString const & rSrcName,
- rtl::OUString const & rDstPath, rtl::OUString const & rDstName) SAL_THROW(())
+ OUString const & rSrcPath, OUString const & rSrcName,
+ OUString const & rDstPath, OUString const & rDstName) SAL_THROW(())
{
if (!m_hImpl)
return store_E_InvalidHandle;
@@ -562,8 +562,8 @@ public:
@see store_rename()
*/
inline storeError rename (
- rtl::OUString const & rSrcPath, rtl::OUString const & rSrcName,
- rtl::OUString const & rDstPath, rtl::OUString const & rDstName) SAL_THROW(())
+ OUString const & rSrcPath, OUString const & rSrcName,
+ OUString const & rDstPath, OUString const & rDstName) SAL_THROW(())
{
if (!m_hImpl)
return store_E_InvalidHandle;
@@ -575,7 +575,7 @@ public:
@see store_remove()
*/
inline storeError remove (
- rtl::OUString const & rPath, rtl::OUString const & rName) SAL_THROW(())
+ OUString const & rPath, OUString const & rName) SAL_THROW(())
{
if (!m_hImpl)
return store_E_InvalidHandle;
diff --git a/store/source/lockbyte.cxx b/store/source/lockbyte.cxx
index 9a05e94c57ef..2c322bacc6d4 100644
--- a/store/source/lockbyte.cxx
+++ b/store/source/lockbyte.cxx
@@ -221,7 +221,7 @@ struct FileHandle
return store_E_InvalidParameter;
// Convert into FileUrl.
- rtl::OUString aFileUrl;
+ OUString aFileUrl;
if (osl_getFileURLFromSystemPath (pFilename, &(aFileUrl.pData)) != osl_File_E_None)
{
// Not system path. Assume file url.
@@ -230,7 +230,7 @@ struct FileHandle
if (!aFileUrl.startsWith("file://"))
{
// Not file url. Assume relative path.
- rtl::OUString aCwdUrl;
+ OUString aCwdUrl;
(void) osl_getProcessWorkingDir (&(aCwdUrl.pData));
// Absolute file url.
diff --git a/store/source/store.cxx b/store/source/store.cxx
index 184de2ca2cd0..11780b6e57d6 100644
--- a/store/source/store.cxx
+++ b/store/source/store.cxx
@@ -33,7 +33,6 @@
#include "storlckb.hxx"
using rtl::Reference;
-using rtl::OString;
namespace store
{
diff --git a/store/workben/t_base.cxx b/store/workben/t_base.cxx
index e60db8970121..99320b7052a6 100644
--- a/store/workben/t_base.cxx
+++ b/store/workben/t_base.cxx
@@ -184,7 +184,7 @@ static storeError __store_namei (
const sal_Unicode *pszName,
OStorePageKey &rKey)
{
- rtl::OString aName (
+ OString aName (
pszName, rtl_ustr_getLength (pszName), RTL_TEXTENCODING_UTF8);
rtl_String *pszNameA = 0;
@@ -304,7 +304,7 @@ int SAL_CALL main (int argc, char **argv)
rtl::Reference<ILockBytes> xLockBytes;
- rtl::OUString aFilename (
+ OUString aFilename (
argv[1], rtl_str_getLength(argv[1]),
osl_getThreadTextEncoding());
diff --git a/store/workben/t_file.cxx b/store/workben/t_file.cxx
index 058d04b3577a..62b7540c363b 100644
--- a/store/workben/t_file.cxx
+++ b/store/workben/t_file.cxx
@@ -46,7 +46,7 @@ int SAL_CALL main (int argc, char **argv)
if (argc > 1)
{
- rtl::OUString aFilename (
+ OUString aFilename (
argv[1], rtl_str_getLength(argv[1]),
osl_getThreadTextEncoding());
diff --git a/store/workben/t_page.cxx b/store/workben/t_page.cxx
index 8abbd563ba24..5fa7ca62bc29 100644
--- a/store/workben/t_page.cxx
+++ b/store/workben/t_page.cxx
@@ -852,7 +852,7 @@ struct FileHandle
return osl_File_E_INVAL;
// Convert into FileUrl.
- rtl::OUString aFileUrl;
+ OUString aFileUrl;
if (osl_getFileURLFromSystemPath (pFilename, &(aFileUrl.pData)) != osl_File_E_None)
{
// Not system path. Maybe a file url, already.
diff --git a/store/workben/t_store.cxx b/store/workben/t_store.cxx
index 507edde5d6a3..e1c1a1c4a1fd 100644
--- a/store/workben/t_store.cxx
+++ b/store/workben/t_store.cxx
@@ -37,7 +37,6 @@ extern "C"
}
#endif /* PROFILE */
-using rtl::OUString;
/*========================================================================
*
@@ -180,7 +179,7 @@ sal_Bool DirectoryTraveller::visit (const iter& it)
m_nCount++;
if (m_nOptions & OPTION_DUMP)
{
- rtl::OString aName (it.m_pszName, it.m_nLength, RTL_TEXTENCODING_UTF8);
+ OString aName (it.m_pszName, it.m_nLength, RTL_TEXTENCODING_UTF8);
printf ("Visit(%u,%u): %s [0x%08x] %d [Bytes]\n",
m_nLevel, m_nCount,
aName.pData->buffer, (unsigned int)(it.m_nAttrib), (unsigned int)(it.m_nSize));