Attachment 49590 Details for Bug 35404 – ah well, can probably make it not crash with this anyway

[patch] ah well, can probably make it not crash with this anyway

0001-Related-fdo-35404-treat-failed-column-same-as-non-ex.patch (text/plain), 1.38 KB, created by Caolán McNamara on 2011-07-26 15:40:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Caolán McNamara

Created: 2011-07-26 15:40:44 UTC

Size: 1.38 KB

patch

obsolete

>From 4f80767275e3a610a62449d77c7d8b922af049b3 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
>Date: Tue, 26 Jul 2011 23:38:02 +0100
>Subject: [PATCH] Related: fdo#35404 treat failed column same as non-existing
> column
>
>---
> sw/source/ui/dbui/mmoutputpage.cxx |   18 ++++++++++++------
> 1 files changed, 12 insertions(+), 6 deletions(-)
>
>diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx
>index 8a6eaab..28c3f7b 100644
>--- a/sw/source/ui/dbui/mmoutputpage.cxx
>+++ b/sw/source/ui/dbui/mmoutputpage.cxx
>@@ -101,13 +101,19 @@ String lcl_GetExtensionForDocType(sal_uLong nDocType)
> ::rtl::OUString lcl_GetColumnValueOf(const ::rtl::OUString& rColumn, Reference < container::XNameAccess>& rxColAccess )
> {
>     ::rtl::OUString sRet;
>-    if(rxColAccess->hasByName(rColumn))
>+    try
>+    {
>+        if (rxColAccess->hasByName(rColumn))
>+        {
>+            Any aCol = rxColAccess->getByName(rColumn);
>+            Reference< sdb::XColumn > xColumn;
>+            aCol >>= xColumn;
>+            if(xColumn.is())
>+                sRet = xColumn->getString();
>+        }
>+    }
>+    catch (const uno::Exception&)
>     {
>-        Any aCol = rxColAccess->getByName(rColumn);
>-        Reference< sdb::XColumn > xColumn;
>-        aCol >>= xColumn;
>-        if(xColumn.is())
>-            sRet = xColumn->getString();
>     }
>     return sRet;
> }
>-- 
>1.7.6
>

Actions: View

Attachments on bug 35404: 44583 | 46731 | 47190 | 49575 | 49577 | 49580 | 49581 | 49583 | 49590