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

[Stephan Bergmann]

 unotools/source/config/configitem.cxx |   22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

New commits:
commit 7f67dd5dfae59a492a88fb2569ee5600add1ecde
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Jul 23 19:00:33 2013 +0200

    OSL_FAIL -> SAL_WARN
    
    Change-Id: If0c4dce547184ca48f221793daf33e4592912cb2

diff --git a/unotools/source/config/configitem.cxx b/unotools/source/config/configitem.cxx
index 228fc5d..3403140 100644
--- a/unotools/source/config/configitem.cxx
+++ b/unotools/source/config/configitem.cxx
@@ -487,23 +487,11 @@ Sequence< Any > ConfigItem::GetProperties(const Sequence< OUString >& rNames)
             }
             catch (const Exception& rEx)
             {
-#if OSL_DEBUG_LEVEL > 0
-                OString sMsg("XHierarchicalNameAccess: ");
-                sMsg += OString(rEx.Message.getStr(),
-                    rEx.Message.getLength(),
-                     RTL_TEXTENCODING_ASCII_US);
-                sMsg += OString("\n/org.openoffice.");
-                sMsg += OString(sSubTree.getStr(),
-                    sSubTree.getLength(),
-                     RTL_TEXTENCODING_ASCII_US);
-                sMsg += OString("/");
-                sMsg += OString(pNames[i].getStr(),
-                    pNames[i].getLength(),
-                     RTL_TEXTENCODING_ASCII_US);
-                OSL_FAIL(sMsg.getStr());
-#else
-                (void) rEx; // avoid warning
-#endif
+                SAL_WARN(
+                    "unotools.config",
+                    "ignoring XHierarchicalNameAccess to /org.openoffice."
+                        << sSubTree << "/" << pNames[i] << " Exception: "
+                        << rEx.Message);
             }
         }