diff options
| -rw-r--r-- | framework/source/uielement/popuptoolbarcontroller.cxx | 9 | ||||
| -rw-r--r-- | officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu | 11 |
2 files changed, 12 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 ); diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu index 6de8c2854e42..cb81fa510201 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu @@ -1129,6 +1129,17 @@ <value>com.sun.star.comp.framework.SaveToolbarController</value> </prop> </node> + <node oor:name="SimpleSaveInRelationDesign" oor:op="replace"> + <prop oor:name="Command"> + <value>.uno:Save</value> + </prop> + <prop oor:name="Module"> + <value>com.sun.star.sdb.RelationDesign</value> + </prop> + <prop oor:name="Controller"> + <value>com.sun.star.comp.framework.GenericPopupToolbarController</value> + </prop> + </node> <node oor:name="FreezePanesToolbarController" oor:op="replace"> <prop oor:name="Command"> <value>.uno:FreezePanes</value> |