[Libreoffice-commits] core.git: reportdesign/source

[Maxim Monastirsky]

 reportdesign/source/ui/misc/toolboxcontroller.cxx |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 16ba360f2a526654cedfcd4cda230442c3a8a522
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date:   Thu May 22 11:27:33 2014 +0300

    reportdesign: Update shape buttons with sub toolbar selection
    
    Change-Id: Ie39f1005182da118475fdf9c4e463bfb902d4446

diff --git a/reportdesign/source/ui/misc/toolboxcontroller.cxx b/reportdesign/source/ui/misc/toolboxcontroller.cxx
index 492f647..2bdbd25 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)