some UniString->rtl::OUString

Change-Id: Ie69b30094da25df23a36baca2c7723d6a41f48c3

9 files changed, 35 insertions, 36 deletions

diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx
index e9464787ded6..36be7f935710 100644
--- a/sfx2/source/appl/appuno.cxx
+++ b/sfx2/source/appl/appuno.cxx
@@ -1960,11 +1960,11 @@ ErrCode SfxMacroLoader::loadMacro( const ::rtl::OUString& rURL, com::sun::star::
     else
     {
         // direct API call on a specified object
-        String aCall( '[' );
-        aCall += String(INetURLObject::decode(aMacro.Copy(6), INET_HEX_ESCAPE,
-        INetURLObject::DECODE_WITH_CHARSET));
-        aCall += ']';
-        pAppMgr->GetLib(0)->Execute( aCall );
+        rtl::OUStringBuffer aCall;
+        aCall.append('[').append(INetURLObject::decode(aMacro.Copy(6), INET_HEX_ESCAPE,
+            INetURLObject::DECODE_WITH_CHARSET));
+        aCall.append(']');
+        pAppMgr->GetLib(0)->Execute(aCall.makeStringAndClear());
         nErr = SbxBase::GetError();
     }
 
diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx
index a9f9be711dc1..18038dac690c 100644
--- a/sfx2/source/appl/childwin.cxx
+++ b/sfx2/source/appl/childwin.cxx
@@ -278,24 +278,22 @@ void SfxChildWindow::SaveStatus(const SfxChildWinInfo& rInfo)
 {
     sal_uInt16 nID = GetType();
 
-    String aWinData( 'V' );
-    aWinData += String::CreateFromInt32( nVersion );
-    aWinData += ',';
-    aWinData += rInfo.bVisible ? 'V' : 'H';
-    aWinData += ',';
-    aWinData += String::CreateFromInt32( rInfo.nFlags );
+    rtl::OUStringBuffer aWinData;
+    aWinData.append('V').append(static_cast<sal_Int32>(nVersion)).
+        append(',').append(rInfo.bVisible ? 'V' : 'H').append(',').
+        append(static_cast<sal_Int32>(rInfo.nFlags));
     if ( rInfo.aExtraString.Len() )
     {
-        aWinData += ',';
-        aWinData += rInfo.aExtraString;
+        aWinData.append(',');
+        aWinData.append(rInfo.aExtraString);
     }
 
     SvtViewOptions aWinOpt( E_WINDOW, String::CreateFromInt32( nID ) );
     aWinOpt.SetWindowState(rtl::OStringToOUString(rInfo.aWinState, RTL_TEXTENCODING_UTF8));
 
     ::com::sun::star::uno::Sequence < ::com::sun::star::beans::NamedValue > aSeq(1);
-    aSeq[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Data") );
-    aSeq[0].Value <<= ::rtl::OUString( aWinData );
+    aSeq[0].Name = ::rtl::OUString("Data");
+    aSeq[0].Value <<= aWinData.makeStringAndClear();
     aWinOpt.SetUserData( aSeq );
 
     // ... but save status at runtime!
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 184d400526c6..0e5e6978be65 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -3056,7 +3056,7 @@ IMPL_LINK_NOARG(SfxHelpWindow_Impl, OpenHdl)
     else
     {
         String aId;
-        String aAnchor = String('#');
+        String aAnchor = rtl::OUString('#');
         if ( comphelper::string::getTokenCount(aEntry, '#') == 2 )
         {
             aId = aEntry.GetToken( 0, '#' );
diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx
index c02d750e9775..208875026df7 100644
--- a/sfx2/source/bastyp/fltfnc.cxx
+++ b/sfx2/source/bastyp/fltfnc.cxx
@@ -833,7 +833,7 @@ IMPL_STATIC_LINK( SfxFilterMatcher, MaybeFileHdl_Impl, String*, pString )
     const SfxFilter* pFilter = pThis->GetFilter4Extension( *pString, SFX_FILTER_IMPORT );
     if (pFilter && !pFilter->GetWildcard().Matches( String() ) &&
         !pFilter->GetWildcard().Matches(DEFINE_CONST_UNICODE("*.*")) &&
-        !pFilter->GetWildcard().Matches('*')
+        !pFilter->GetWildcard().Matches(rtl::OUString('*'))
        )
     {
         return sal_True;
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 811984fb33b4..2b9e2ba087a8 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -113,7 +113,7 @@ static const char DOCUMENT_SIGNATURE_MENU_CMD[] = "Signature";
 String CreateSizeText( sal_uIntPtr nSize, sal_Bool bExtraBytes = sal_True, sal_Bool bSmartExtraBytes = sal_False );
 String CreateSizeText( sal_uIntPtr nSize, sal_Bool bExtraBytes, sal_Bool bSmartExtraBytes )
 {
-    String aUnitStr = ' ';
+    String aUnitStr = rtl::OUString(' ');
     aUnitStr += SfxResId(STR_BYTES).toString();
     sal_uIntPtr nSize1 = nSize;
     sal_uIntPtr nSize2 = nSize1;
@@ -889,7 +889,7 @@ IMPL_LINK_NOARG(SfxDocumentPage, DeleteHdl)
     aPrintValFt.SetText( aEmpty );
     const Time aTime( 0 );
     aTimeLogValFt.SetText( aLocaleWrapper.getDuration( aTime ) );
-    aDocNoValFt.SetText( '1' );
+    aDocNoValFt.SetText(rtl::OUString('1'));
     bHandleDelete = sal_True;
     return 0;
 }
@@ -1717,7 +1717,7 @@ void CustomPropertiesDurationField::RequestHelp( const HelpEvent& rHEvt )
 void CustomPropertiesDurationField::SetDuration( const util::Duration& rDuration )
 {
     m_aDuration = rDuration;
-    String sText(rDuration.Negative ? '-' : '+');
+    String sText(rDuration.Negative ? rtl::OUString('-') : rtl::OUString('+'));
     sText += m_pLine->m_sDurationFormat;
     sText.SearchAndReplace(rtl::OUString("%1"), String::CreateFromInt32( rDuration.Years ) );
     sText.SearchAndReplace(rtl::OUString("%2"), String::CreateFromInt32( rDuration.Months ) );
diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx
index 85f5fc03de9b..a865280c1017 100644
--- a/sfx2/source/dialog/splitwin.cxx
+++ b/sfx2/source/dialog/splitwin.cxx
@@ -306,11 +306,12 @@ SfxSplitWindow::~SfxSplitWindow()
 void SfxSplitWindow::SaveConfig_Impl()
 {
     // Save configuration
-    String aWinData('V');
-    aWinData += String::CreateFromInt32( VERSION );
-    aWinData += ',';
-    aWinData += String::CreateFromInt32( pEmptyWin->nState );
-    aWinData += ',';
+    rtl::OUStringBuffer aWinData;
+    aWinData.append('V');
+    aWinData.append(static_cast<sal_Int32>(VERSION));
+    aWinData.append(',');
+    aWinData.append(static_cast<sal_Int32>(pEmptyWin->nState));
+    aWinData.append(',');
 
     sal_uInt16 nCount = 0;
     sal_uInt16 n;
@@ -321,7 +322,7 @@ void SfxSplitWindow::SaveConfig_Impl()
             nCount++;
     }
 
-    aWinData += String::CreateFromInt32( nCount );
+    aWinData.append(static_cast<sal_Int32>(nCount));
 
     for ( n=0; n<pDockArr->size(); n++ )
     {
@@ -329,15 +330,15 @@ void SfxSplitWindow::SaveConfig_Impl()
         if ( !pDock->bHide && !pDock->pWin )
             continue;
         if ( pDock->bNewLine )
-            aWinData += DEFINE_CONST_UNICODE(",0");
-        aWinData += ',';
-        aWinData += String::CreateFromInt32( pDock->nType);
+            aWinData.append(",0");
+        aWinData.append(',');
+        aWinData.append(static_cast<sal_Int32>(pDock->nType));
     }
 
     String aWindowId = rtl::OUString("SplitWindow");
     aWindowId += String::CreateFromInt32( (sal_Int32) GetAlign() );
     SvtViewOptions aWinOpt( E_WINDOW, aWindowId );
-    aWinOpt.SetUserItem( USERITEM_NAME, makeAny( OUString( aWinData ) ) );
+    aWinOpt.SetUserItem( USERITEM_NAME, makeAny( aWinData.makeStringAndClear() ) );
 }
 
 //-------------------------------------------------------------------------
diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx
index aee34e984954..d3680ebac99e 100644
--- a/sfx2/source/doc/doctemplates.cxx
+++ b/sfx2/source/doc/doctemplates.cxx
@@ -404,14 +404,14 @@ void SfxDocTplService_Impl::init_Impl()
 
     // convert locale to string
     OUString aLang = maLocale.Language;
-    aLang += String( '-' );
+    aLang += OUString( '-' );
     aLang += maLocale.Country;
 
     // set maRootContent to the root of the templates hierarchy. Create the
     // entry if necessary
 
     maRootURL = OUString( TEMPLATE_ROOT_URL  );
-    maRootURL += String( '/' );
+    maRootURL += OUString( '/' );
     maRootURL += aLang;
 
     ::rtl::OUString aTemplVersPropName( TEMPLATE_VERSION  );
diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx
index 65967eed6c6f..f6c84109ade5 100644
--- a/sfx2/source/doc/new.cxx
+++ b/sfx2/source/doc/new.cxx
@@ -532,9 +532,9 @@ SfxNewFileDialog_Impl::SfxNewFileDialog_Impl(
     String &rExtra = pAntiImplP->GetExtraData();
     sal_Int32 nTokCount = comphelper::string::getTokenCount(rExtra, '|');
     if( nTokCount > 0 && nFlags )
-        MORE_BTN(SetState( rExtra.GetToken( 0, '|' ) == 'Y' ));
+        MORE_BTN(SetState(comphelper::string::equals(rExtra.GetToken( 0, '|'), 'Y')));
     if( nTokCount > 1 && nFlags )
-        aPreviewBtn.Check( rExtra.GetToken( 1 ,'|' ) == 'Y' );
+        aPreviewBtn.Check(comphelper::string::equals(rExtra.GetToken( 1 ,'|'), 'Y'));
 
     aTemplateLb.SetSelectHdl(LINK(this, SfxNewFileDialog_Impl, TemplateSelect));
     aTemplateLb.SetDoubleClickHdl(LINK(this, SfxNewFileDialog_Impl, DoubleClick));
diff --git a/sfx2/source/notify/eventsupplier.cxx b/sfx2/source/notify/eventsupplier.cxx
index ba04fe52b5a4..2b4508e891fa 100644
--- a/sfx2/source/notify/eventsupplier.cxx
+++ b/sfx2/source/notify/eventsupplier.cxx
@@ -472,9 +472,9 @@ void SfxEvents_Impl::NormalizeMacro( const ::comphelper::NamedValueCollection& i
         {
             aScript = rtl::OUString( MACRO_PRFIX  );
             if ( aLibrary.compareTo( SFX_APP()->GetName() ) != 0 && !aLibrary.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("StarDesktop")) && !aLibrary.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("application")) )
-                aScript += String('.');
+                aScript += rtl::OUString('.');
 
-            aScript += String('/');
+            aScript += rtl::OUString('/');
             aScript += aMacroName;
             aScript += rtl::OUString( MACRO_POSTFIX  );
         }