[Libreoffice-commits] core.git: unotools/source

Stephan Bergmann sbergman at redhat.com
Thu Nov 14 02:18:57 PST 2013


 unotools/source/misc/mediadescriptor.cxx |   13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

New commits:
commit 7f183f136b0b4d8b5b09f30b2831b27e8d6cf5e7
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Nov 14 11:16:39 2013 +0100

    Adapt MediaDescriptor log area code
    
    ...post 24cad6a6490b245bd88ec3e3c87195628914f6a2 "Move MediaDescriptor from
    comphelper to unotools."
    
    Change-Id: I71b4f4e1c1b68c3281f77dc15a2df30bfbf7e587

diff --git a/unotools/source/misc/mediadescriptor.cxx b/unotools/source/misc/mediadescriptor.cxx
index 34e54ff..936270b 100644
--- a/unotools/source/misc/mediadescriptor.cxx
+++ b/unotools/source/misc/mediadescriptor.cxx
@@ -60,7 +60,7 @@ OUString removeFragment(OUString const & uri) {
         ref->clearFragment();
         return ref->getUriReference();
     } else {
-        SAL_WARN("comphelper", "cannot parse <" << uri << ">");
+        SAL_WARN("unotools.misc", "cannot parse <" << uri << ">");
         return uri;
     }
 }
@@ -519,7 +519,8 @@ sal_Bool MediaDescriptor::impl_addInputStream( sal_Bool bLockFile )
     catch(const css::uno::Exception& ex)
     {
         SAL_WARN(
-            "comphelper", "invalid MediaDescriptor detected: " << ex.Message);
+            "unotools.misc",
+            "invalid MediaDescriptor detected: " << ex.Message);
         return false;
     }
 }
@@ -628,7 +629,7 @@ sal_Bool MediaDescriptor::impl_openStreamWithURL( const OUString& sURL, sal_Bool
     catch(const css::ucb::ContentCreationException& e)
         {
             SAL_WARN(
-                "comphelper",
+                "unotools.misc",
                 "caught ContentCreationException \"" << e.Message
                     << "\" while opening <" << sURL << ">");
             return sal_False; // TODO error handling
@@ -636,7 +637,7 @@ sal_Bool MediaDescriptor::impl_openStreamWithURL( const OUString& sURL, sal_Bool
     catch(const css::uno::Exception& e)
         {
             SAL_WARN(
-                "comphelper",
+                "unotools.misc",
                 "caught Exception \"" << e.Message << "\" while opening <"
                     << sURL << ">");
             return sal_False; // TODO error handling
@@ -679,7 +680,7 @@ sal_Bool MediaDescriptor::impl_openStreamWithURL( const OUString& sURL, sal_Bool
                 if (!pInteraction->wasWriteError() || bModeRequestedExplicitly)
                 {
                     SAL_WARN(
-                        "comphelper",
+                        "unotools.misc",
                         "caught Exception \"" << e.Message
                             << "\" while opening <" << sURL << ">");
                     return sal_False;
@@ -739,7 +740,7 @@ sal_Bool MediaDescriptor::impl_openStreamWithURL( const OUString& sURL, sal_Bool
         catch(const css::uno::Exception& e)
             {
                 SAL_WARN(
-                    "comphelper",
+                    "unotools.misc",
                     "caught Exception \"" << e.Message << "\" while opening <"
                         << sURL << ">");
                 return sal_False;


More information about the Libreoffice-commits mailing list