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/source/edit | |
| parent | 2b3ec82a04adb327385fbc529f6e447baa3529ed (diff) | |
UniString->rtl::OUString
Diffstat (limited to 'svtools/source/edit')
| -rw-r--r-- | svtools/source/edit/texteng.cxx | 15 |
1 files changed, 2 insertions, 13 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(); |