diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-04-17 23:47:38 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-04-18 13:03:21 +0100 |
| commit | f0ae0d8403acc86d8f72fb12fc6d1ce82c080662 (patch) | |
| tree | ce376f36eabc1df1b514b61160e2146c6026628a /svtools | |
| parent | 2b3ec82a04adb327385fbc529f6e447baa3529ed (diff) | |
UniString->rtl::OUString
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/edit/texteng.cxx | 15 | ||||
| -rw-r--r-- | svtools/source/misc/embedhlp.cxx | 2 | ||||
| -rw-r--r-- | svtools/source/misc/templatefoldercache.cxx | 6 |
3 files changed, 6 insertions, 17 deletions
diff --git a/svtools/source/edit/texteng.cxx b/svtools/source/edit/texteng.cxx index bc6a47b963f7..04b6d8d91fd7 100644 --- a/svtools/source/edit/texteng.cxx +++ b/svtools/source/edit/texteng.cxx @@ -217,26 +217,15 @@ void TextEngine::SetFont( const Font& rFont ) maFont.SetAlign( ALIGN_TOP ); mpRefDev->SetFont( maFont); Size aTextSize; - aTextSize.Width() = mpRefDev->GetTextWidth( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( " " ) ) ); + aTextSize.Width() = mpRefDev->GetTextWidth(rtl::OUString(" ")); aTextSize.Height() = mpRefDev->GetTextHeight(); if ( !aTextSize.Width() ) - aTextSize.Width() = mpRefDev->GetTextWidth( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "XXXX" ) ) ); + aTextSize.Width() = mpRefDev->GetTextWidth(rtl::OUString("XXXX")); mnDefTab = (sal_uInt16)aTextSize.Width(); if ( !mnDefTab ) mnDefTab = 1; mnCharHeight = (sal_uInt16)aTextSize.Height(); -/* - // #93746# Doesn't work with CJK HalfWidth/FullWidth - FontMetric aRealFont( mpRefDev->GetFontMetric() ); - if ( aRealFont.GetPitch() == PITCH_FIXED ) - { - String aX100; - aX100.Fill( 100, 'X' ); - mnFixCharWidth100 = (sal_uInt16)mpRefDev->GetTextWidth( aX100 ); - } - else -*/ mnFixCharWidth100 = 0; FormatFullDoc(); diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx index 2ca04746395c..1a7a70186e98 100644 --- a/svtools/source/misc/embedhlp.cxx +++ b/svtools/source/misc/embedhlp.cxx @@ -599,7 +599,7 @@ void EmbeddedObjectRef::DrawPaintReplacement( const Rectangle &rRect, const Stri { MapMode aMM( MAP_APPFONT ); Size aAppFontSz = pOut->LogicToLogic( Size( 0, 8 ), &aMM, NULL ); - Font aFnt( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "Helvetica" ) ), aAppFontSz ); + Font aFnt( rtl::OUString("Helvetica"), aAppFontSz ); aFnt.SetTransparent( sal_True ); aFnt.SetColor( Color( COL_LIGHTRED ) ); aFnt.SetWeight( WEIGHT_BOLD ); diff --git a/svtools/source/misc/templatefoldercache.cxx b/svtools/source/misc/templatefoldercache.cxx index 1486fb2a8590..da29646e7294 100644 --- a/svtools/source/misc/templatefoldercache.cxx +++ b/svtools/source/misc/templatefoldercache.cxx @@ -480,7 +480,7 @@ namespace svt sal_Bool implReadFolder( const ::rtl::Reference< TemplateContent >& _rxRoot ); - static String getCacheFileName(); + static rtl::OUString getCacheFileName(); static sal_Int32 getMagicNumber(); static void normalize( TemplateFolderContent& _rState ); @@ -523,9 +523,9 @@ namespace svt } //--------------------------------------------------------------------- - String TemplateFolderCacheImpl::getCacheFileName() + rtl::OUString TemplateFolderCacheImpl::getCacheFileName() { - return String::CreateFromAscii( ".templdir.cache" ); + return rtl::OUString(".templdir.cache"); } |