commit 16ba360f2a526654cedfcd4cda230442c3a8a522
author Maxim Monastirsky <momonasmon@gmail.com> Thu May 22 11:27:33 2014 +0300
committer Maxim Monastirsky <momonasmon@gmail.com> Sun May 25 10:42:44 2014 +0300
tree b457c348dd1a5d992007185e51896370915e626c
parent 0ccced3941c003505db64f562431a454415a56c5

reportdesign: Update shape buttons with sub toolbar selection

Change-Id: Ie39f1005182da118475fdf9c4e463bfb902d4446

reportdesign/source/ui/misc/toolboxcontroller.cxx

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)