diff options
author | Caolán McNamara <caolanm@redhat.com> | 2012-07-04 23:58:05 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2012-07-09 12:16:56 +0100 |
commit | 104261010aa5ccbb7df4a82a3a3cafcfb0591fa7 (patch) | |
tree | b8db79d2707ff5925ad01dba8a41bd8ab6d66847 /svtools/source | |
parent | 1a1e953ee33c213dc8b88dd96a69ca9fc5e42d50 (diff) |
some UniString->rtl::OUString
Change-Id: Ie69b30094da25df23a36baca2c7723d6a41f48c3
Diffstat (limited to 'svtools/source')
-rw-r--r-- | svtools/source/brwbox/brwbox1.cxx | 2 | ||||
-rw-r--r-- | svtools/source/contnr/fileview.cxx | 6 | ||||
-rw-r--r-- | svtools/source/contnr/svtreebx.cxx | 2 | ||||
-rw-r--r-- | svtools/source/control/ctrlbox.cxx | 2 | ||||
-rw-r--r-- | svtools/source/dialogs/filedlg2.cxx | 2 | ||||
-rw-r--r-- | svtools/source/edit/syntaxhighlight.cxx | 2 | ||||
-rw-r--r-- | svtools/source/edit/texteng.cxx | 2 | ||||
-rw-r--r-- | svtools/source/edit/textview.cxx | 6 | ||||
-rw-r--r-- | svtools/source/filter/filter.cxx | 2 | ||||
-rw-r--r-- | svtools/source/filter/sgvtext.cxx | 2 | ||||
-rw-r--r-- | svtools/source/filter/wmf/emfwr.cxx | 2 | ||||
-rw-r--r-- | svtools/source/filter/wmf/winmtf.cxx | 2 |
12 files changed, 16 insertions, 16 deletions
diff --git a/svtools/source/brwbox/brwbox1.cxx b/svtools/source/brwbox/brwbox1.cxx index a1e0dbbc4325..07c6224a31c9 100644 --- a/svtools/source/brwbox/brwbox1.cxx +++ b/svtools/source/brwbox/brwbox1.cxx @@ -239,7 +239,7 @@ void BrowseBox::SetFont( const Font& rNewFont ) sal_uLong BrowseBox::GetDefaultColumnWidth( const String& _rText ) const { - return GetDataWindow().GetTextWidth( _rText ) + GetDataWindow().GetTextWidth( '0' ) * 4; + return GetDataWindow().GetTextWidth( _rText ) + GetDataWindow().GetTextWidth(rtl::OUString('0')) * 4; } //------------------------------------------------------------------- diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx index 4487a68c5776..7b3eb3c79939 100644 --- a/svtools/source/contnr/fileview.cxx +++ b/svtools/source/contnr/fileview.cxx @@ -672,7 +672,7 @@ OUString CreateExactSizeText( sal_Int64 nSize ) long nMega = 1024 * 1024; long nGiga = nMega * 1024; - String aUnitStr = ' '; + rtl::OUString aUnitStr(' '); if ( nSize < 10000 ) { @@ -1117,12 +1117,12 @@ void ViewTabListBox_Impl::DoQuickSearch( const xub_Unicode& rChar ) sal_uInt32 aLastPos = mnSearchIndex; sal_Bool bFound = sal_False; - maQuickSearchText += OUString( String( rChar ) ).toAsciiLowerCase(); + maQuickSearchText += OUString(rChar).toAsciiLowerCase(); bFound = mpParent->SearchNextEntry( mnSearchIndex, maQuickSearchText, sal_False ); if ( !bFound && ( aLastText.getLength() == 1 ) && - ( aLastText == OUString( String( rChar ) ) ) ) + ( aLastText == OUString(rChar) ) ) { mnSearchIndex = aLastPos + 1; maQuickSearchText = aLastText; diff --git a/svtools/source/contnr/svtreebx.cxx b/svtools/source/contnr/svtreebx.cxx index fe513db90113..7e6475e4571f 100644 --- a/svtools/source/contnr/svtreebx.cxx +++ b/svtools/source/contnr/svtreebx.cxx @@ -872,7 +872,7 @@ short SvTreeListBox::GetHeightOffset(const Font& /* rFont */, Size& aSizeLogic ) { DBG_CHKTHIS(SvTreeListBox,0); short nOffset = 0; - aSizeLogic = Size(GetTextWidth('X'), GetTextHeight()); + aSizeLogic = Size(GetTextWidth(rtl::OUString('X')), GetTextHeight()); if( GetEntryHeight() > aSizeLogic.Height() ) nOffset = ( GetEntryHeight() - (short)aSizeLogic.Height()) / 2; return nOffset; diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx index 47d455334c2c..ca70c0eb23c8 100644 --- a/svtools/source/control/ctrlbox.cxx +++ b/svtools/source/control/ctrlbox.cxx @@ -1927,7 +1927,7 @@ void FontSizeBox::SetRelative( sal_Bool bNewRelative ) SetDecimalDigits( 0 ); SetMin( nRelMin ); SetMax( nRelMax ); - SetCustomUnitText( '%' ); + SetCustomUnitText(rtl::OUString('%')); SetUnit( FUNIT_CUSTOM ); Clear(); diff --git a/svtools/source/dialogs/filedlg2.cxx b/svtools/source/dialogs/filedlg2.cxx index 5785246090e0..2e1303865487 100644 --- a/svtools/source/dialogs/filedlg2.cxx +++ b/svtools/source/dialogs/filedlg2.cxx @@ -83,7 +83,7 @@ KbdListBox::PreNotify( NotifyEvent& rNEvt ) UniString aEntry = GetEntry ( (i + nCurrentPos) % nEntries ); aEntry = comphelper::string::stripStart(aEntry, ' '); aEntry.ToUpperAscii(); - UniString aCompare( cCharCode ); + UniString aCompare = rtl::OUString(cCharCode); aCompare.ToUpperAscii(); if ( aEntry.CompareTo( aCompare, 1 ) == COMPARE_EQUAL ) diff --git a/svtools/source/edit/syntaxhighlight.cxx b/svtools/source/edit/syntaxhighlight.cxx index 3f3d1e3ccc00..49e559eb1b88 100644 --- a/svtools/source/edit/syntaxhighlight.cxx +++ b/svtools/source/edit/syntaxhighlight.cxx @@ -335,7 +335,7 @@ bool LetterTable::isLetterUnicode( sal_Unicode c ) static CharClass* pCharClass = NULL; if( pCharClass == NULL ) pCharClass = new CharClass( Application::GetSettings().GetLocale() ); - String aStr( c ); + rtl::OUString aStr( c ); bool bRet = pCharClass->isLetter( aStr, 0 ); return bRet; } diff --git a/svtools/source/edit/texteng.cxx b/svtools/source/edit/texteng.cxx index 9ea2dcd18d4d..efce793b44b0 100644 --- a/svtools/source/edit/texteng.cxx +++ b/svtools/source/edit/texteng.cxx @@ -766,7 +766,7 @@ TextPaM TextEngine::ImpInsertText( sal_Unicode c, const TextSelection& rCurSel, if ( IsUndoEnabled() && !IsInUndo() ) { - TextUndoInsertChars* pNewUndo = new TextUndoInsertChars( this, aPaM, c ); + TextUndoInsertChars* pNewUndo = new TextUndoInsertChars( this, aPaM, rtl::OUString(c) ); sal_Bool bTryMerge = ( !bDoOverwrite && ( c != ' ' ) ) ? sal_True : sal_False; InsertUndo( pNewUndo, bTryMerge ); } diff --git a/svtools/source/edit/textview.cxx b/svtools/source/edit/textview.cxx index b30bbfc1ecea..1b6254109d22 100644 --- a/svtools/source/edit/textview.cxx +++ b/svtools/source/edit/textview.cxx @@ -716,7 +716,7 @@ sal_Bool TextView::KeyInput( const KeyEvent& rKeyEvent ) { if ( !mpImpl->mbReadOnly && !rKeyEvent.GetKeyCode().IsShift() && !rKeyEvent.GetKeyCode().IsMod1() && !rKeyEvent.GetKeyCode().IsMod2() && - ImplCheckTextLen( 'x' ) ) + ImplCheckTextLen( rtl::OUString('x') ) ) { aCurSel = mpImpl->mpTextEngine->ImpInsertText( aCurSel, '\t', !IsInsertMode() ); bModified = sal_True; @@ -730,7 +730,7 @@ sal_Bool TextView::KeyInput( const KeyEvent& rKeyEvent ) // Shift-RETURN darf nicht geschluckt werden, weil dann keine // mehrzeilige Eingabe in Dialogen/Property-Editor moeglich. if ( !mpImpl->mbReadOnly && !rKeyEvent.GetKeyCode().IsMod1() && - !rKeyEvent.GetKeyCode().IsMod2() && ImplCheckTextLen( 'x' ) ) + !rKeyEvent.GetKeyCode().IsMod2() && ImplCheckTextLen( rtl::OUString('x') ) ) { mpImpl->mpTextEngine->UndoActionStart(); aCurSel = mpImpl->mpTextEngine->ImpInsertParaBreak( aCurSel ); @@ -765,7 +765,7 @@ sal_Bool TextView::KeyInput( const KeyEvent& rKeyEvent ) if ( TextEngine::IsSimpleCharInput( rKeyEvent ) ) { xub_Unicode nCharCode = rKeyEvent.GetCharCode(); - if ( !mpImpl->mbReadOnly && ImplCheckTextLen( nCharCode ) ) // sonst trotzdem das Zeichen schlucken... + if ( !mpImpl->mbReadOnly && ImplCheckTextLen( rtl::OUString(nCharCode) ) ) // sonst trotzdem das Zeichen schlucken... { aCurSel = mpImpl->mpTextEngine->ImpInsertText( nCharCode, aCurSel, !IsInsertMode(), sal_True ); bModified = sal_True; diff --git a/svtools/source/filter/filter.cxx b/svtools/source/filter/filter.cxx index 063f2cd64092..aebb2d5c6d8e 100644 --- a/svtools/source/filter/filter.cxx +++ b/svtools/source/filter/filter.cxx @@ -895,7 +895,7 @@ static String ImpCreateFullFilterPath( const String& rPath, const String& rFilte ::rtl::OUString aPathURL; ::osl::FileBase::getFileURLFromSystemPath( rPath, aPathURL ); - aPathURL += String( '/' ); + aPathURL += rtl::OUString( '/' ); ::rtl::OUString aSystemPath; ::osl::FileBase::getSystemPathFromFileURL( aPathURL, aSystemPath ); diff --git a/svtools/source/filter/sgvtext.cxx b/svtools/source/filter/sgvtext.cxx index 3f59d6a3e014..3d77afd442b0 100644 --- a/svtools/source/filter/sgvtext.cxx +++ b/svtools/source/filter/sgvtext.cxx @@ -693,7 +693,7 @@ sal_uInt16 GetCharWidth(OutputDevice& rOut, UCHAR c) if (c==' ') { - ChrWidth=(sal_uInt16)rOut.GetTextWidth( String('A') ); + ChrWidth=(sal_uInt16)rOut.GetTextWidth( rtl::OUString('A') ); if (rOut.GetFont().GetPitch()!=PITCH_FIXED) { ChrWidth=MulDiv(ChrWidth,DefaultSpace,100); } diff --git a/svtools/source/filter/wmf/emfwr.cxx b/svtools/source/filter/wmf/emfwr.cxx index 25fab138c30a..0c998e1320d9 100644 --- a/svtools/source/filter/wmf/emfwr.cxx +++ b/svtools/source/filter/wmf/emfwr.cxx @@ -816,7 +816,7 @@ void EMFWriter::ImplWriteTextRecord( const Point& rPos, const String rText, cons if( nLen > 1 ) { - nNormWidth = pDX[ nLen - 2 ] + maVDev.GetTextWidth( rText.GetChar( nLen - 1 ) ); + nNormWidth = pDX[ nLen - 2 ] + maVDev.GetTextWidth( rtl::OUString(rText.GetChar( nLen - 1 )) ); if( nWidth && nNormWidth && ( nWidth != nNormWidth ) ) { diff --git a/svtools/source/filter/wmf/winmtf.cxx b/svtools/source/filter/wmf/winmtf.cxx index bb672e884f07..3cc3ef9ee104 100644 --- a/svtools/source/filter/wmf/winmtf.cxx +++ b/svtools/source/filter/wmf/winmtf.cxx @@ -1553,7 +1553,7 @@ void WinMtfOutput::DrawText( Point& rPosition, String& rText, sal_Int32* pDXArry if( pDXArry ) { sal_uInt32 nLen = rText.Len(); - nTextWidth = pVDev->GetTextWidth( rText.GetChar( (sal_uInt16)( nLen - 1 ) ) ); + nTextWidth = pVDev->GetTextWidth( rtl::OUString(rText.GetChar( (sal_uInt16)( nLen - 1 ) )) ); if( nLen > 1 ) nTextWidth += pDXArry[ nLen - 2 ]; } |