random OUString to String conversions

Change-Id: I9cfb8e7183b9cce7c690f3a43a64b61a2aa8c754

5 files changed, 7 insertions, 8 deletions

diff --git a/scripting/source/dlgprov/dlgevtatt.cxx b/scripting/source/dlgprov/dlgevtatt.cxx
index 0826a3054641..f6393cfd9724 100644
--- a/scripting/source/dlgprov/dlgevtatt.cxx
+++ b/scripting/source/dlgprov/dlgevtatt.cxx
@@ -633,7 +633,7 @@ namespace dlgprov
             ResMgr* pResMgr = SFX_APP()->GetSfxResManager();
             if( pResMgr )
             {
-                String aRes( ResId(STR_ERRUNOEVENTBINDUNG, *pResMgr) );
+                OUString aRes( ResId(STR_ERRUNOEVENTBINDUNG, *pResMgr) );
                 OUString aQuoteChar( "\""  );
 
                 OUString aOURes = aRes;
diff --git a/slideshow/source/engine/rehearsetimingsactivity.cxx b/slideshow/source/engine/rehearsetimingsactivity.cxx
index 44e03051fd00..99a0061fe7df 100644
--- a/slideshow/source/engine/rehearsetimingsactivity.cxx
+++ b/slideshow/source/engine/rehearsetimingsactivity.cxx
@@ -163,8 +163,7 @@ RehearseTimingsActivity::RehearseTimingsActivity( const SlideShowContext& rConte
     blackHole.SetMapMode( MAP_PIXEL );
     Rectangle rect;
     const FontMetric metric( blackHole.GetFontMetric() );
-    blackHole.GetTextBoundRect(
-        rect, String("XX:XX:XX") );
+    blackHole.GetTextBoundRect( rect, OUString("XX:XX:XX") );
     maSpriteSizePixel.setX( rect.getWidth() * 12 / 10 );
     maSpriteSizePixel.setY( metric.GetLineHeight() * 11 / 10 );
     mnYOffset = (metric.GetAscent() + (metric.GetLineHeight() / 20));
diff --git a/starmath/qa/cppunit/test_nodetotextvisitors.cxx b/starmath/qa/cppunit/test_nodetotextvisitors.cxx
index e1d10b1ce312..e2da017d554a 100644
--- a/starmath/qa/cppunit/test_nodetotextvisitors.cxx
+++ b/starmath/qa/cppunit/test_nodetotextvisitors.cxx
@@ -20,14 +20,14 @@
 
 namespace CppUnit {
 template<>
-struct assertion_traits<String>
+struct assertion_traits<OUString>
 {
-    static bool equal(const String& x, const String& y)
+    static bool equal(const OUString& x, const OUString& y)
     {
         return x == y;
     }
 
-    static std::string toString(const String& x)
+    static std::string toString(const OUString& x)
     {
         OStringStream ost;
         ost << OUStringToOString(x, RTL_TEXTENCODING_UTF8).getStr();
diff --git a/starmath/source/cfgitem.cxx b/starmath/source/cfgitem.cxx
index df339aff6f9f..57886b7e7611 100644
--- a/starmath/source/cfgitem.cxx
+++ b/starmath/source/cfgitem.cxx
@@ -819,7 +819,7 @@ void SmMathConfig::StripFontFormatList( const std::vector< SmSym > &rSymbols )
     SmFontFormatList &rFntFmtList = GetFontFormatList();
     size_t nCnt = rFntFmtList.GetCount();
     SmFontFormat *pTmpFormat = new SmFontFormat[ nCnt ];
-    String       *pId     = new String      [ nCnt ];
+    OUString     *pId        = new OUString    [ nCnt ];
     size_t k;
     for (k = 0;  k < nCnt;  ++k)
     {
diff --git a/sw/qa/core/macros-test.cxx b/sw/qa/core/macros-test.cxx
index 3ac4145f4273..f99885be6713 100644
--- a/sw/qa/core/macros-test.cxx
+++ b/sw/qa/core/macros-test.cxx
@@ -135,7 +135,7 @@ void SwMacrosTest::testVba()
         sMsg.append ( aFileName );
         CPPUNIT_ASSERT_MESSAGE( OUStringToOString( sMsg.makeStringAndClear(), RTL_TEXTENCODING_UTF8 ).getStr(), xComponent.is() );
 
-        String sUrl = testInfo[i].sMacroUrl;
+        OUString sUrl = testInfo[i].sMacroUrl;
         Any aRet;
         Sequence< sal_Int16 > aOutParamIndex;
         Sequence< Any > aOutParam;