some UniString->rtl::OUString

Change-Id: Ie69b30094da25df23a36baca2c7723d6a41f48c3

9 files changed, 11 insertions, 11 deletions

diff --git a/filter/source/flash/swfwriter1.cxx b/filter/source/flash/swfwriter1.cxx
index dfc7edf05b93..0bff4ba87df7 100644
--- a/filter/source/flash/swfwriter1.cxx
+++ b/filter/source/flash/swfwriter1.cxx
@@ -563,7 +563,7 @@ void Writer::Impl_writeText( const Point& rPos, const String& rText, const sal_I
 
         if( nLen > 1 )
         {
-            aNormSize.Width() = pDX[ nLen - 2 ] + mpVDev->GetTextWidth( rText.GetChar(  (sal_uInt16) nLen - 1 ) );
+            aNormSize.Width() = pDX[ nLen - 2 ] + mpVDev->GetTextWidth( rtl::OUString(rText.GetChar((sal_uInt16) nLen - 1)) );
 
             if( nWidth && aNormSize.Width() && ( nWidth != aNormSize.Width() ) )
             {
diff --git a/filter/source/flash/swfwriter2.cxx b/filter/source/flash/swfwriter2.cxx
index 9377efc950ea..70a621e040c5 100644
--- a/filter/source/flash/swfwriter2.cxx
+++ b/filter/source/flash/swfwriter2.cxx
@@ -467,7 +467,7 @@ sal_uInt16 FlashFont::getGlyph( sal_uInt16 nChar, VirtualDevice* pVDev )
 
     // let the virtual device convert the character to polygons
     PolyPolygon aPolyPoly;
-    pVDev->GetTextOutline( aPolyPoly, nChar );
+    pVDev->GetTextOutline( aPolyPoly, rtl::OUString(nChar) );
 
     maGlyphOffsets.push_back( _uInt16( maGlyphData.getOffset() ) );
 
diff --git a/filter/source/graphicfilter/eos2met/eos2met.cxx b/filter/source/graphicfilter/eos2met/eos2met.cxx
index 3d2ce16baf43..64ba6ed43def 100644
--- a/filter/source/graphicfilter/eos2met/eos2met.cxx
+++ b/filter/source/graphicfilter/eos2met/eos2met.cxx
@@ -1926,7 +1926,7 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF )
                                 aPt2 = aPolyDummy.GetPoint( 0 );
                             }
                         }
-                        METChrStr( aPt2, String( aStr.GetChar( i ) ) );
+                        METChrStr( aPt2, rtl::OUString( aStr.GetChar( i ) ) );
                     }
                 }
                 else
@@ -1980,7 +1980,7 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF )
                             aPt2 = aPolyDummy.GetPoint( 0 );
                         }
                     }
-                    METChrStr( aPt2, String( aStr.GetChar( i ) ) );
+                    METChrStr( aPt2, rtl::OUString( aStr.GetChar( i ) ) );
                 }
 
                 delete[] pDXAry;
diff --git a/filter/source/graphicfilter/epict/epict.cxx b/filter/source/graphicfilter/epict/epict.cxx
index 9db541c784dd..7646ed2da0b0 100644
--- a/filter/source/graphicfilter/epict/epict.cxx
+++ b/filter/source/graphicfilter/epict/epict.cxx
@@ -1357,7 +1357,7 @@ void PictWriter::WriteTextArray(Point & rPoint, const String& rString, const sal
                 if ( i > 0 )
                     aPt.X() += pDXAry[ i - 1 ];
 
-                WriteOpcode_Text( aPt, String( c ), bDelta );
+                WriteOpcode_Text( aPt, rtl::OUString( c ), bDelta );
                 bDelta = sal_True;
             }
         }
diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx
index 8e2c2aa0b7c1..ec33629f69b5 100644
--- a/filter/source/graphicfilter/eps/eps.cxx
+++ b/filter/source/graphicfilter/eps/eps.cxx
@@ -2046,7 +2046,7 @@ void PSWriter::ImplWriteString( const rtl::OString& rString, VirtualDevice& rVDe
             {
                 if ( i > 0 )
                     nx = pDXArry[ i - 1 ];
-                ImplWriteDouble( ( bStretch ) ? nx : rVDev.GetTextWidth( rString[i] ) );
+                ImplWriteDouble( ( bStretch ) ? nx : rVDev.GetTextWidth( rtl::OUString(rString[i]) ) );
                 ImplWriteDouble( nx );
                 ImplWriteLine( "(", PS_NONE );
                 ImplWriteCharacter( rString[i] );
diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx
index f6f9b158864f..999da176994b 100644
--- a/filter/source/pdf/impdialog.cxx
+++ b/filter/source/pdf/impdialog.cxx
@@ -447,7 +447,7 @@ Sequence< PropertyValue > ImpPDFTabDialog::GetFilterData()
     if( mbIsRangeChecked )
     {
         aRet[ nLength - nElementAdded ].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "PageRange" ) );
-        aRet[ nLength - nElementAdded ].Value <<= OUString( msPageRange );
+        aRet[ nLength - nElementAdded ].Value <<= msPageRange;
         nElementAdded--;
     }
     else if( mbSelectionIsChecked )
@@ -689,7 +689,7 @@ void ImpPDFTabGeneralPage::GetFilterConfigItem( ImpPDFTabDialog* paParent )
     if( maRbRange.IsChecked() )
     {
         paParent->mbIsRangeChecked = sal_True;
-        paParent->msPageRange = String( maEdPages.GetText() ); //FIXME all right on other languages ?
+        paParent->msPageRange = maEdPages.GetText(); //FIXME all right on other languages ?
     }
     else if( maRbSelection.IsChecked() )
     {
diff --git a/filter/source/pdf/impdialog.hxx b/filter/source/pdf/impdialog.hxx
index 45747fd5c6d0..8c468b148e0e 100644
--- a/filter/source/pdf/impdialog.hxx
+++ b/filter/source/pdf/impdialog.hxx
@@ -141,7 +141,7 @@ protected:
     com::sun::star::uno::Reference< com::sun::star::beans::XMaterialHolder > mxPreparedPasswords;
 
     sal_Bool                    mbIsRangeChecked;
-    String                      msPageRange;
+    rtl::OUString               msPageRange;
     sal_Bool                    mbSelectionIsChecked;
 
     sal_Bool                    mbExportRelativeFsysLinks;
diff --git a/filter/source/svg/svgfontexport.cxx b/filter/source/svg/svgfontexport.cxx
index eef0e6f43832..3c2de0f124c2 100644
--- a/filter/source/svg/svgfontexport.cxx
+++ b/filter/source/svg/svgfontexport.cxx
@@ -281,7 +281,7 @@ void SVGFontExport::implEmbedGlyph( OutputDevice& rOut, const ::rtl::OUString& r
         mrExport.AddAttribute( XML_NAMESPACE_NONE, "unicode", rCellStr );
 
         if( rCellStr[ 0 ] == nSpace && rCellStr.getLength() == 1 )
-            aBoundRect = Rectangle( Point( 0, 0 ), Size( rOut.GetTextWidth( sal_Unicode( ' ' ) ), 0 ) );
+            aBoundRect = Rectangle( Point( 0, 0 ), Size( rOut.GetTextWidth( rtl::OUString(' ') ), 0 ) );
 
         mrExport.AddAttribute( XML_NAMESPACE_NONE, "horiz-adv-x", ::rtl::OUString::valueOf( aBoundRect.GetWidth() ) );
 
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index a74e17522110..1e2a2c0197e6 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -1195,7 +1195,7 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const String& rText,
     {
         if( nLen > 1 )
         {
-            aNormSize.Width() = pDX[ nLen - 2 ] + mpVDev->GetTextWidth( rText.GetChar(  nLen - 1 ) );
+            aNormSize.Width() = pDX[ nLen - 2 ] + mpVDev->GetTextWidth( rtl::OUString(rText.GetChar(nLen - 1)) );
 
             if( nWidth && aNormSize.Width() && ( nWidth != aNormSize.Width() ) )
             {