ditch some UniStrings and intermediate temporaries

5 files changed, 9 insertions, 10 deletions

diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 86a9b4816684..ad33e824736f 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -1167,7 +1167,7 @@ Size ComboBox::CalcSize( sal_uInt16 nColumns, sal_uInt16 nLines ) const
 
     // Breite
     if ( nColumns )
-        aSz.Width() = nColumns * GetTextWidth( UniString( 'X' ) );
+        aSz.Width() = nColumns * GetTextWidth(rtl::OUString(static_cast<sal_Unicode>('X')));
     else
         aSz.Width() = aMinSz.Width();
 
@@ -1190,7 +1190,7 @@ Size ComboBox::CalcSize( sal_uInt16 nColumns, sal_uInt16 nLines ) const
 
 void ComboBox::GetMaxVisColumnsAndLines( sal_uInt16& rnCols, sal_uInt16& rnLines ) const
 {
-    long nCharWidth = GetTextWidth( UniString( 'x' ) );
+    long nCharWidth = GetTextWidth(rtl::OUString(static_cast<sal_Unicode>('x')));
     if ( !IsDropDownBox() )
     {
         Size aOutSz = mpImplLB->GetMainWindow()->GetOutputSizePixel();
diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx
index 9d2f7aaba3c8..c7729c43af58 100644
--- a/vcl/source/control/lstbox.cxx
+++ b/vcl/source/control/lstbox.cxx
@@ -1424,7 +1424,7 @@ Size ListBox::CalcSize( sal_uInt16 nColumns, sal_uInt16 nLines ) const
 
 void ListBox::GetMaxVisColumnsAndLines( sal_uInt16& rnCols, sal_uInt16& rnLines ) const
 {
-    long nCharWidth = GetTextWidth( UniString( 'x' ) );
+    long nCharWidth = GetTextWidth( rtl::OUString(static_cast<sal_Unicode>('x')) );
     if ( !IsDropDownBox() )
     {
         Size aOutSz = mpImplLB->GetMainWindow()->GetOutputSizePixel();
diff --git a/vcl/source/gdi/jobset.cxx b/vcl/source/gdi/jobset.cxx
index 2415500a905a..dfe78b2e1330 100644
--- a/vcl/source/gdi/jobset.cxx
+++ b/vcl/source/gdi/jobset.cxx
@@ -306,8 +306,8 @@ SvStream& operator>>( SvStream& rIStream, JobSetup& rJobSetup )
 
             rJobSetup.mpData = new ImplJobSetup;
             ImplJobSetup* pJobData = rJobSetup.mpData;
-            pJobData->maPrinterName = UniString( pData->cPrinterName, aStreamEncoding );
-            pJobData->maDriver      = UniString( pData->cDriverName, aStreamEncoding );
+            pJobData->maPrinterName = UniString(pData->cPrinterName, aStreamEncoding);
+            pJobData->maDriver = UniString(pData->cDriverName, aStreamEncoding);
 
             // Sind es unsere neuen JobSetup-Daten?
             if ( nSystem == JOBSET_FILE364_SYSTEM ||
diff --git a/vcl/source/window/mnemonic.cxx b/vcl/source/window/mnemonic.cxx
index 21e7cbdf8850..daeae8ba3b04 100644
--- a/vcl/source/window/mnemonic.cxx
+++ b/vcl/source/window/mnemonic.cxx
@@ -295,10 +295,9 @@ sal_Bool MnemonicGenerator::CreateMnemonic( XubString& rKey )
                 if ( maMnemonics[nMnemonicIndex] )
                 {
                     maMnemonics[nMnemonicIndex] = 0;
-                    UniString aStr( '(' );
-                    aStr += MNEMONIC_CHAR;
-                    aStr += c;
-                    aStr += ')';
+                    rtl::OUString aStr = rtl::OUStringBuffer().
+                        append('(').append(MNEMONIC_CHAR).append(c).
+                        append(')').makeStringAndClear();
                     nIndex = rKey.Len();
                     if( nIndex >= 2 )
                     {
diff --git a/vcl/unx/generic/app/i18n_ic.cxx b/vcl/unx/generic/app/i18n_ic.cxx
index fad955c0a238..0ee7073ef96f 100644
--- a/vcl/unx/generic/app/i18n_ic.cxx
+++ b/vcl/unx/generic/app/i18n_ic.cxx
@@ -577,7 +577,7 @@ SalI18N_InputContext::CommitKeyEvent(sal_Unicode* pText, sal_Size nLength)
         aTextEvent.mnTime        = 0;
         aTextEvent.mpTextAttr    = 0;
         aTextEvent.mnCursorPos   = nLength;
-        aTextEvent.maText        = UniString(pText, nLength);
+        aTextEvent.maText        = rtl::OUString(pText, nLength);
         aTextEvent.mnCursorFlags = 0;
         aTextEvent.mnDeltaStart  = 0;
         aTextEvent.mbOnlyCursor  = False;