diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2014-05-22 11:27:33 +0300 |
|---|---|---|
| committer | Maxim Monastirsky <momonasmon@gmail.com> | 2014-05-29 22:25:08 +0300 |
| commit | 5a03ef2ae2740d04cd58e2339834f568173ac771 (patch) | |
| tree | 50ab4d9f0f41a5c671f04d8d9c6dc584c8fa7c16 /reportdesign | |
| parent | 9f7694b6e61aa19898802c57a397812efc364d03 (diff) | |
reportdesign: Update shape buttons with sub toolbar selection
Change-Id: Ie39f1005182da118475fdf9c4e463bfb902d4446
(cherry picked from commit 16ba360f2a526654cedfcd4cda230442c3a8a522)
Diffstat (limited to 'reportdesign')
| -rw-r--r-- | reportdesign/source/ui/misc/toolboxcontroller.cxx | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/reportdesign/source/ui/misc/toolboxcontroller.cxx b/reportdesign/source/ui/misc/toolboxcontroller.cxx index 492f64717580..2bdbd25a9c45 100644 --- a/reportdesign/source/ui/misc/toolboxcontroller.cxx +++ b/reportdesign/source/ui/misc/toolboxcontroller.cxx @@ -278,7 +278,12 @@ Reference< awt::XWindow > SAL_CALL OToolboxController::createPopupWindow() throw sal_Bool SAL_CALL OToolboxController::opensSubToolbar() throw (uno::RuntimeException, std::exception) { - return m_nSlotId == SID_DRAWTBX_CS_BASIC; + return ( m_nSlotId == SID_DRAWTBX_CS_BASIC || + m_nSlotId == SID_DRAWTBX_CS_SYMBOL || + m_nSlotId == SID_DRAWTBX_CS_ARROW || + m_nSlotId == SID_DRAWTBX_CS_FLOWCHART || + m_nSlotId == SID_DRAWTBX_CS_CALLOUT || + m_nSlotId == SID_DRAWTBX_CS_STAR ); } OUString SAL_CALL OToolboxController::getSubToolbarName() throw (uno::RuntimeException, std::exception) |