[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sc/source

[Caolán McNamara]

 sc/source/ui/view/tabvwshb.cxx |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit cd603063f44c152bbc3a1f3eb3796722eb422c0e
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Oct 6 16:00:35 2014 +0100

    Resolves: fdo#80101 inserting non-chart as chart -> unhandled exception
    
    Change-Id: I4d5438292d9a5c49f1336304ebd3dc4e155dd212
    (cherry picked from commit 76d4db3181dfd1524620377bb12a8e0332ae8ab0)
    Reviewed-on: https://gerrit.libreoffice.org/11833
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>

diff --git a/sc/source/ui/view/tabvwshb.cxx b/sc/source/ui/view/tabvwshb.cxx
index 3871bc8..b8ae65b 100644
--- a/sc/source/ui/view/tabvwshb.cxx
+++ b/sc/source/ui/view/tabvwshb.cxx
@@ -311,6 +311,7 @@ void ScTabViewShell::ExecDrawIns(SfxRequest& rReq)
             break;
 
         case SID_INSERT_DIAGRAM_FROM_FILE:
+            try
             {
                 sfx2::FileDialogHelper aDlg(ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE,
                         0, OUString("com.sun.star.chart2.ChartDocument"));
@@ -321,6 +322,10 @@ void ScTabViewShell::ExecDrawIns(SfxRequest& rReq)
                     FuInsertChartFromFile(this, pWin, pView, pDrModel, rReq, aURL);
                 }
             }
+            catch (const uno::Exception& e)
+            {
+                SAL_WARN( "sc", "Cannot Insert Chart: " << e.Message);
+            }
             break;
 
         case SID_OBJECTRESIZE: