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

[Miklos Vajna (via logerrit)]

 writerperfect/source/calc/MSWorksCalcImportFilter.cxx |   34 ++++++++++--------
 1 file changed, 19 insertions(+), 15 deletions(-)

New commits:
commit 838935758a5ec8e0e68f4df0cf5bfcf737e3f6f2
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Wed Jan 8 21:05:34 2020 +0100
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Thu Jan 9 08:33:31 2020 +0100

    writerprefect: add missing braces around try-catch
    
    Spelling them out helps readability.
    
    Change-Id: I878e1a258b7d15b673ff3dbb42e40147bf60b41a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86453
    Tested-by: Jenkins
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>

diff --git a/writerperfect/source/calc/MSWorksCalcImportFilter.cxx b/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
index 875f7ebe32cd..9eec43b28545 100644
--- a/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
+++ b/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
@@ -38,24 +38,28 @@ namespace MSWorksCalcImportFilterInternal
 {
 /// returns the list of stream name present in a folder
 static uno::Reference<sdbc::XResultSet>
-getResultSet(const css::uno::Reference<css::ucb::XContent>& xPackageContent) try
+getResultSet(const css::uno::Reference<css::ucb::XContent>& xPackageContent)
 {
-    if (xPackageContent.is())
+    try
     {
-        ucbhelper::Content packageContent(xPackageContent,
-                                          uno::Reference<ucb::XCommandEnvironment>(),
-                                          comphelper::getProcessComponentContext());
-        uno::Sequence<OUString> lPropNames{ "Title" };
-        uno::Reference<sdbc::XResultSet> xResultSet(
-            packageContent.createCursor(lPropNames, ucbhelper::INCLUDE_DOCUMENTS_ONLY));
-        return xResultSet;
+        if (xPackageContent.is())
+        {
+            ucbhelper::Content packageContent(xPackageContent,
+                                              uno::Reference<ucb::XCommandEnvironment>(),
+                                              comphelper::getProcessComponentContext());
+            uno::Sequence<OUString> lPropNames{ "Title" };
+            uno::Reference<sdbc::XResultSet> xResultSet(
+                packageContent.createCursor(lPropNames, ucbhelper::INCLUDE_DOCUMENTS_ONLY));
+            return xResultSet;
+        }
+        return uno::Reference<sdbc::XResultSet>();
+    }
+    catch (...)
+    {
+        SAL_WARN("writerperfect",
+                 "ignoring Exception in MSWorksCalcImportFilterInternal:getResultSet");
+        return uno::Reference<sdbc::XResultSet>();
     }
-    return uno::Reference<sdbc::XResultSet>();
-}
-catch (...)
-{
-    SAL_WARN("writerperfect", "ignoring Exception in MSWorksCalcImportFilterInternal:getResultSet");
-    return uno::Reference<sdbc::XResultSet>();
 }
 
 namespace