Revert "use the new OUString::fromUtf8 method"

This reverts commit 05050cdb23de586870bf479a9df5ced06828d498,
not all places that use e.g. OStringToOUString to convert potential UTF-8
are guaranteed to fulfil the prerequisites necessary to use fromUtf8 (and
some places like e.g. in codemaker are happy with the best-effort effect
of OStringToOUString's OSTRING_TO_OUSTRING_CVTFLAGS).

5 files changed, 8 insertions, 7 deletions

diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index d5d355276f0f..897f26851024 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -1084,7 +1084,7 @@ OUString HtmlExport::DocumentMetadata() const
 
     OString aData(reinterpret_cast<const char*>(aStream.GetData()), aStream.GetSize());
 
-    return OUString::fromUtf8(aData);
+    return OStringToOUString(aData, RTL_TEXTENCODING_UTF8);
 }
 
 bool HtmlExport::CreateHtmlTextForPresPages()
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 506af5bb0c16..0429ecfbe769 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -443,7 +443,7 @@ bool ImplSdPPTImport::Import()
                                             {   // second pass, searching for a SlideName
                                                 for ( nToken = 0; nToken < nTokenCount; nToken++ )
                                                 {
-                                                    OUString aToken(OUString::fromUtf8(aStringAry[nToken]));
+                                                    OUString aToken(OStringToOUString(aStringAry[nToken], RTL_TEXTENCODING_UTF8));
                                                     std::vector<OUString>::const_iterator pIter =
                                                             std::find(maSlideNameList.begin(),maSlideNameList.end(),aToken);
 
diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
index 46e0d4a369a2..6a68229968fc 100644
--- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
@@ -627,7 +627,7 @@ vcl::Window * lcl_GetTopmostParent( vcl::Window * pWindow )
 
 void CustomAnimationCreateDialog::setPosition()
 {
-    SvtViewOptions aDlgOpt(E_TABDIALOG, OUString::fromUtf8(GetHelpId()));
+    SvtViewOptions aDlgOpt(E_TABDIALOG, OStringToOUString(GetHelpId(), RTL_TEXTENCODING_UTF8));
     if ( aDlgOpt.Exists() )
     {
         SetWindowState( OUStringToOString(aDlgOpt.GetWindowState(),
@@ -654,7 +654,7 @@ void CustomAnimationCreateDialog::setPosition()
 void CustomAnimationCreateDialog::storePosition()
 {
     // save settings (screen position and current page)
-    SvtViewOptions aDlgOpt(E_TABDIALOG, OUString::fromUtf8(GetHelpId()));
+    SvtViewOptions aDlgOpt(E_TABDIALOG, OStringToOUString(GetHelpId(), RTL_TEXTENCODING_UTF8));
     aDlgOpt.SetWindowState(OStringToOUString(
         GetWindowState(WINDOWSTATE_MASK_POS), RTL_TEXTENCODING_ASCII_US));
 }
diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx b/sd/source/ui/remotecontrol/BluetoothServer.cxx
index e3c336f5f6a1..d5bf9663a97c 100644
--- a/sd/source/ui/remotecontrol/BluetoothServer.cxx
+++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx
@@ -492,7 +492,7 @@ sal_Int32 OSXBluetoothWrapper::readLine( OString& aLine )
                 mBuffer.erase( mBuffer.begin(), aIt + 1 ); // Also delete the empty line
 
                 // yeps
-                SAL_INFO( "sdremote.bluetooth", "  returning, got \"" << OUString::fromUtf8( aLine ) << "\"" );
+                SAL_INFO( "sdremote.bluetooth", "  returning, got \"" << OStringToOUString( aLine, RTL_TEXTENCODING_UTF8 ) << "\"" );
                 return aLine.getLength() + 1;
             }
 
diff --git a/sd/source/ui/remotecontrol/Server.cxx b/sd/source/ui/remotecontrol/Server.cxx
index 07321bad6e94..7404bbddcfbf 100644
--- a/sd/source/ui/remotecontrol/Server.cxx
+++ b/sd/source/ui/remotecontrol/Server.cxx
@@ -131,8 +131,9 @@ void RemoteServer::execute()
             MutexGuard aGuard( sDataMutex );
             ::boost::shared_ptr< ClientInfoInternal > pClient(
                 new ClientInfoInternal(
-                    OUString::fromUtf8( aName ),
-                    aAddress, false, pSocket, OUString::fromUtf8( aPin ) ) );
+                    OStringToOUString( aName, RTL_TEXTENCODING_UTF8 ),
+                    aAddress, false, pSocket, OStringToOUString( aPin,
+                                                                 RTL_TEXTENCODING_UTF8 ) ) );
             mAvailableClients.push_back( pClient );
 
             // Read off any additional non-empty lines