remove unnecessary use of OString::getStr

Change-Id: I0490efedf459190521f4339854b3394d57765fdb
Reviewed-on: https://gerrit.libreoffice.org/38058
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

2 files changed, 12 insertions, 22 deletions

diff --git a/desktop/source/deployment/registry/dp_registry.cxx b/desktop/source/deployment/registry/dp_registry.cxx
index d0b4211691ee..da6c96195158 100644
--- a/desktop/source/deployment/registry/dp_registry.cxx
+++ b/desktop/source/deployment/registry/dp_registry.cxx
@@ -257,17 +257,12 @@ void PackageRegistryImpl::insertBackend(
 #if OSL_DEBUG_LEVEL > 0
         else
         {
-            OUStringBuffer buf;
-            buf.append( "more than one PackageRegistryBackend for media-type=\"" );
-            buf.append( mediaType );
-            buf.append( "\" => " );
-            buf.append( Reference<lang::XServiceInfo>(
-                            xBackend, UNO_QUERY_THROW )->
-                        getImplementationName() );
-            buf.append( "\"!" );
-            OSL_FAIL( OUStringToOString(
-                            buf.makeStringAndClear(),
-                            RTL_TEXTENCODING_UTF8).getStr() );
+            SAL_WARN( "desktop", "more than one PackageRegistryBackend for media-type=\""
+                    << mediaType
+                    << "\" => "
+                    <<  Reference<lang::XServiceInfo>(
+                            xBackend, UNO_QUERY_THROW )->getImplementationName()
+                    << "\"!" );
         }
 #endif
     }
diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx
index cda1f56de4c4..93a8060231b1 100644
--- a/desktop/source/deployment/registry/package/dp_package.cxx
+++ b/desktop/source/deployment/registry/package/dp_package.cxx
@@ -843,10 +843,8 @@ void BackendImpl::PackageImpl::processPackage_(
                         }
                         catch (const Exception &)
                         {
-                            OSL_FAIL( OUStringToOString(
-                                            ::comphelper::anyToString(
-                                                ::cppu::getCaughtException() ),
-                                            RTL_TEXTENCODING_UTF8 ).getStr() );
+                            SAL_WARN( "desktop", ::comphelper::anyToString(
+                                                ::cppu::getCaughtException() ) );
                             // ignore any errors of rollback
                         }
                     }
@@ -934,7 +932,7 @@ OUString BackendImpl::PackageImpl::getDescription()
         }
         catch ( const css::deployment::DeploymentException& )
         {
-            OSL_FAIL( OUStringToOString( ::comphelper::anyToString( ::cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() );
+            SAL_WARN( "desktop", ::comphelper::anyToString( ::cppu::getCaughtException() ) );
         }
     }
 
@@ -1058,15 +1056,12 @@ void BackendImpl::PackageImpl::exportTo(
         }
         // xxx todo: think about exception specs:
         catch (const deployment::DeploymentException &) {
-            OSL_FAIL( OUStringToOString(
-                            ::comphelper::anyToString(
-                                ::cppu::getCaughtException() ),
-                            RTL_TEXTENCODING_UTF8 ).getStr() );
+            SAL_WARN( "desktop", ::comphelper::anyToString(
+                                ::cppu::getCaughtException() ) );
         }
         catch (const lang::IllegalArgumentException & exc) {
             (void) exc;
-            OSL_FAIL( OUStringToOString(
-                            exc.Message, RTL_TEXTENCODING_UTF8 ).getStr() );
+            SAL_WARN( "desktop", exc.Message );
         }
 
         std::vector< Sequence<beans::PropertyValue> > manifest;