diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-04-19 17:38:14 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-04-19 17:55:59 +0200 |
| commit | 3057b5cdb989d44613518900b25ebad8b7c600a2 (patch) | |
| tree | 3728b14d1925d3c53a7e8424ff92e742ffbac2f2 /sd | |
| parent | 024d2fde2aae13b07cf5c7b4d85fc3c6abce6913 (diff) | |
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
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/inc/drawdoc.hxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/table/TableDesignPane.cxx | 10 |
2 files changed, 10 insertions, 2 deletions
diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx index 099f36b970ea..bf5e0db7429f 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 064fb2c50821..5e06d2cacb96 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 ) |