summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2013-10-10 14:51:22 +0200
committerNoel Grandin <noel@peralex.com>2013-10-15 12:25:36 +0200
commit7c43784537119d519c724f8c3987ad4aedac10ca (patch)
tree83ea1267875f2cbb2e3138fdcb0c3cfbfd2b481d /sw
parent2ce8bbbcb51cbe2dcd91f00dc38e41eb7fce7420 (diff)
convert sw/inc/iodetect.hxx from String to OUString
Change-Id: I0badca2b6a1d547e862eb0cd7f2887af39c988f1
Diffstat (limited to 'sw')
-rw-r--r--sw/inc/iodetect.hxx10
-rw-r--r--sw/source/filter/basflt/iodetect.cxx12
2 files changed, 11 insertions, 11 deletions
diff --git a/sw/inc/iodetect.hxx b/sw/inc/iodetect.hxx
index b47ba35fb175..e347c190c8b0 100644
--- a/sw/inc/iodetect.hxx
+++ b/sw/inc/iodetect.hxx
@@ -88,20 +88,20 @@ class SwIoSystem
public:
/// find for an internal format name the corresponding filter entry
SWD_DLLPUBLIC static const SfxFilter*
- GetFilterOfFormat( const String& rFormat,
+ GetFilterOfFormat( const OUString& rFormat,
const SfxFilterContainer* pCnt = 0 );
/** Detect for the given file which filter should be used. The filter name
is returned. If no filter could be found, the name of the ASCII filter
is returned! */
SWD_DLLPUBLIC static const SfxFilter*
- GetFileFilter( const String& rFileName,
- const String& rPrefFltName,
+ GetFileFilter( const OUString& rFileName,
+ const OUString& rPrefFltName,
SfxMedium* pMedium = 0 );
/** Detect whether the given file is in the given format.
For now, only our own filters are supported! */
- static sal_Bool IsFileFilter(SfxMedium& rMedium, const String& rFmtName);
+ static sal_Bool IsFileFilter(SfxMedium& rMedium, const OUString& rFmtName);
static sal_Bool IsValidStgFilter( SotStorage& , const SfxFilter& );
static sal_Bool IsValidStgFilter( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rStg, const SfxFilter& rFilter);
@@ -112,7 +112,7 @@ public:
static const SfxFilter* GetTextFilter( const sal_Char* pBuf, sal_uLong nLen );
- SWD_DLLPUBLIC static const String
+ SWD_DLLPUBLIC static const OUString
GetSubStorageName( const SfxFilter& rFltr );
};
diff --git a/sw/source/filter/basflt/iodetect.cxx b/sw/source/filter/basflt/iodetect.cxx
index ea681fa9884b..e1138d3fb480 100644
--- a/sw/source/filter/basflt/iodetect.cxx
+++ b/sw/source/filter/basflt/iodetect.cxx
@@ -87,7 +87,7 @@ OUString SwIoDetect::IsReader(const sal_Char* pHeader, sal_uLong nLen_) const
return bRet ? sName : OUString();
}
-const String SwIoSystem::GetSubStorageName( const SfxFilter& rFltr )
+const OUString SwIoSystem::GetSubStorageName( const SfxFilter& rFltr )
{
/* bei den StorageFiltern noch den SubStorageNamen setzen */
const OUString& rUserData = rFltr.GetUserData();
@@ -100,7 +100,7 @@ const String SwIoSystem::GetSubStorageName( const SfxFilter& rFltr )
return OUString();
}
-const SfxFilter* SwIoSystem::GetFilterOfFormat(const String& rFmtNm,
+const SfxFilter* SwIoSystem::GetFilterOfFormat(const OUString& rFmtNm,
const SfxFilterContainer* pCnt)
{
SfxFilterContainer aCntSw( OUString(sSWRITER) );
@@ -194,7 +194,7 @@ void TerminateBuffer(sal_Char *pBuffer, sal_uLong nBytesRead, sal_uLong nBufferL
/* Feststellen ob das File in dem entsprechenden Format vorliegt. */
/* Z.z werden nur unsere eigene Filter unterstuetzt */
-sal_Bool SwIoSystem::IsFileFilter(SfxMedium& rMedium, const String& rFmtName)
+sal_Bool SwIoSystem::IsFileFilter(SfxMedium& rMedium, const OUString& rFmtName)
{
sal_Bool bRet = sal_False;
@@ -269,8 +269,8 @@ sal_Bool SwIoSystem::IsFileFilter(SfxMedium& rMedium, const String& rFmtName)
/* returnt !! Der Returnwert ist der interne Filtername! */
/* rPrefFltName ist der interne Name des Filters, den der Benutzer im */
/* Open-Dialog eingestellt hat. */
-const SfxFilter* SwIoSystem::GetFileFilter(const String& rFileName,
- const String& rPrefFltName, SfxMedium* pMedium)
+const SfxFilter* SwIoSystem::GetFileFilter(const OUString& rFileName,
+ const OUString& rPrefFltName, SfxMedium* pMedium)
{
SfxFilterContainer aCntSw( OUString(sSWRITER) );
SfxFilterContainer aCntSwWeb( OUString(sSWRITERWEB) );
@@ -394,7 +394,7 @@ const SfxFilter* SwIoSystem::GetFileFilter(const String& rFileName,
/* Ok, bis jetzt kein Filter gefunden, also befrage mal die */
/* "WORD 4 WORD" Filter */
- if( rFileName.Len() )
+ if( !rFileName.isEmpty() )
{
if( pMedium )
pMedium->CloseInStream();