strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

convert sw/inc/iodetect.hxx from String to OUString

Browse source 
Change-Id: I0badca2b6a1d547e862eb0cd7f2887af39c988f1
This commit is contained in:
Noel Grandin 2013-10-10 14:51:22 +02:00
parent 2ce8bbbcb5
commit 7c43784537
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
sw/inc/iodetect.hxx
View file

@ -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 );
};

12
sw/source/filter/basflt/iodetect.cxx
View file

@ -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();