summaryrefslogtreecommitdiff
path: root/framework/source/uielement/popuptoolbarcontroller.cxx
diff options
context:
space:
mode:
authorMaxim Monastirsky <momonasmon@gmail.com>2016-04-05 00:47:03 +0300
committerMaxim Monastirsky <momonasmon@gmail.com>2016-04-12 00:03:34 +0300
commite58b8075983330737642c68bd7e67071efecd906 (patch)
tree64ebedd1932e9c2b82e2a4530d1268c09dc6b3c0 /framework/source/uielement/popuptoolbarcontroller.cxx
parentcf1ecad26d22e3dc5f556f976bdc49a31bfa5630 (diff)
SaveToolbarController: Blacklist RelationDesign in officecfg
Change-Id: I8aa14bb76a26aa12771000b393bee37d26ba85e7
Diffstat (limited to 'framework/source/uielement/popuptoolbarcontroller.cxx')
-rw-r--r--framework/source/uielement/popuptoolbarcontroller.cxx9
1 files changed, 1 insertions, 8 deletions
diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx b/framework/source/uielement/popuptoolbarcontroller.cxx
index 23c81d72453a..e49770518e62 100644
--- a/framework/source/uielement/popuptoolbarcontroller.cxx
+++ b/framework/source/uielement/popuptoolbarcontroller.cxx
@@ -371,21 +371,14 @@ void SaveToolbarController::initialize( const css::uno::Sequence< css::uno::Any
{
PopupMenuToolbarController::initialize( aArguments );
- bool bRelationDesignModule = m_sModuleName.endsWith( "RelationDesign" );
-
ToolBox* pToolBox = nullptr;
sal_uInt16 nId = 0;
- if ( getToolboxId( nId, &pToolBox )
- && ( bRelationDesignModule || pToolBox->GetItemCommand( nId ) != m_aCommandURL ) )
+ if ( getToolboxId( nId, &pToolBox ) && pToolBox->GetItemCommand( nId ) != m_aCommandURL )
{
m_bSplitButton = false;
pToolBox->SetItemBits( nId, pToolBox->GetItemBits( nId ) & ~ ToolBoxItemBits::DROPDOWN );
}
- if ( bRelationDesignModule )
- // No modified icon there, just disable the button if there's nothing to save.
- return;
-
css::uno::Reference< css::frame::XController > xController( m_xFrame->getController(), css::uno::UNO_QUERY );
if ( xController.is() )
m_xModifiable.set( xController->getModel(), css::uno::UNO_QUERY );