[Libreoffice-commits] core.git: sd/inc sd/source

[Miklos Vajna]

 sd/inc/drawdoc.hxx                     |    2 +-
 sd/source/ui/table/TableDesignPane.cxx |   10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 3057b5cdb989d44613518900b25ebad8b7c600a2
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Tue Apr 19 17:38:14 2016 +0200

    Related: tdf#99396 sd: make table controller undo code unit-testable
    
    With these it's possible to create a table controller with the unit test
    user profile (that lacks .ui files) + also the sd undo stack can be
    asserted.
    
    Change-Id: I48f09e4bb985c32227deed736cd158dec9f4f315

diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx
index 099f36b..bf5e0db 100644
--- a/sd/inc/drawdoc.hxx
+++ b/sd/inc/drawdoc.hxx
@@ -570,7 +570,7 @@ public:
         languages set at this document */
     SAL_DLLPRIVATE void getDefaultFonts( vcl::Font& rLatinFont, vcl::Font& rCJKFont, vcl::Font& rCTLFont );
 
-    SAL_DLLPRIVATE sd::UndoManager* GetUndoManager() const;
+    sd::UndoManager* GetUndoManager() const;
 
     /** converts the given western font height to a corresponding ctl font height, depending on the system language */
     SAL_DLLPRIVATE static sal_uInt32 convertFontHeightToCTL( sal_uInt32 nWesternFontHeight );
diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx
index 064fb2c..5e06d2c 100644
--- a/sd/source/ui/table/TableDesignPane.cxx
+++ b/sd/source/ui/table/TableDesignPane.cxx
@@ -807,7 +807,15 @@ short TableDesignDialog::Execute()
 
 VclPtr<vcl::Window> createTableDesignPanel( vcl::Window* pParent, ViewShellBase& rBase )
 {
-    return VclPtr<TableDesignPane>::Create( pParent, rBase );
+    VclPtr<TableDesignPane> pRet = nullptr;
+    try
+    {
+        pRet = VclPtr<TableDesignPane>::Create( pParent, rBase );
+    }
+    catch (const uno::Exception& rException)
+    {
+    }
+    return pRet;
 }
 
 void showTableDesignDialog( vcl::Window* pParent, ViewShellBase& rBase )