summaryrefslogtreecommitdiff
path: root/sot/source/sdstor/storinfo.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sot/source/sdstor/storinfo.cxx')
-rw-r--r--sot/source/sdstor/storinfo.cxx10
1 files changed, 7 insertions, 3 deletions
diff --git a/sot/source/sdstor/storinfo.cxx b/sot/source/sdstor/storinfo.cxx
index 34a664fde425..bd785d96902d 100644
--- a/sot/source/sdstor/storinfo.cxx
+++ b/sot/source/sdstor/storinfo.cxx
@@ -66,22 +66,26 @@ sal_uLong ReadClipboardFormat( SvStream & rStm )
void WriteClipboardFormat( SvStream & rStm, sal_uLong nFormat )
{
// determine the clipboard format string
- String aCbFmt;
+ OUString aCbFmt;
if( nFormat > FORMAT_GDIMETAFILE )
aCbFmt = SotExchange::GetFormatName( nFormat );
- if( aCbFmt.Len() )
+ if( !aCbFmt.isEmpty() )
{
OString aAsciiCbFmt(OUStringToOString(aCbFmt,
- RTL_TEXTENCODING_ASCII_US));
+ RTL_TEXTENCODING_ASCII_US));
rStm << (sal_Int32) (aAsciiCbFmt.getLength() + 1);
rStm << (const char *)aAsciiCbFmt.getStr();
rStm << (sal_uInt8) 0;
}
else if( nFormat )
+ {
rStm << (sal_Int32) -1 // for Windows
<< (sal_Int32) nFormat;
+ }
else
+ {
rStm << (sal_Int32) 0; // no clipboard format
+ }
}