framework/source/uielement/popuptoolbarcontroller.cxx | 13 +++----- icon-themes/breeze/links.txt | 27 ++++++++++++++++++ icon-themes/elementary/links.txt | 19 ++++++++++++ icon-themes/galaxy/links.txt | 27 ++++++++++++++++++ icon-themes/hicontrast/links.txt | 17 +++++++++++ icon-themes/human/links.txt | 17 +++++++++++ icon-themes/oxygen/links.txt | 18 ++++++++++++ icon-themes/sifr/links.txt | 15 ++++++++++ icon-themes/tango/links.txt | 27 ++++++++++++++++++ icon-themes/tango_testing/links.txt | 5 +++ sd/uiconfig/simpress/menubar/menubar.xml | 26 ++++++++--------- sd/uiconfig/simpress/toolbar/commontaskbar.xml | 8 ++--- sd/uiconfig/simpress/toolbar/standardbar.xml | 18 ++++++------ 13 files changed, 203 insertions(+), 34 deletions(-)
New commits: commit 0f27cc992a99568e46ffe807ef9dbb5ba0bc601f Author: Maxim Monastirsky <[email protected]> Date: Wed Apr 13 02:11:01 2016 +0300 tdf#84258 Link icons and use new commands in menu/toolbars Change-Id: Ia034fd91926ec6729346274f524d3751d59fcf35 diff --git a/icon-themes/breeze/links.txt b/icon-themes/breeze/links.txt index 14f7be2..fb05be8 100644 --- a/icon-themes/breeze/links.txt +++ b/icon-themes/breeze/links.txt @@ -829,6 +829,33 @@ cmd/sc_dsbrowserexplorer.png cmd/sc_showfmexplorer.png cmd/lc_savesimple.png cmd/lc_save.png cmd/sc_savesimple.png cmd/sc_save.png +# Slide command aliases +cmd/lc_insertslide.png cmd/lc_insertpage.png +cmd/lc_duplicateslide.png cmd/lc_duplicatepage.png +cmd/lc_deleteslide.png cmd/lc_deletepage.png +cmd/lc_moveslidefirst.png cmd/lc_movepagefirst.png +cmd/lc_moveslidelast.png cmd/lc_movepagelast.png +cmd/lc_moveslideup.png cmd/lc_upsearch.png +cmd/lc_moveslidedown.png cmd/lc_downsearch.png +cmd/lc_firstslide.png cmd/lc_firstpage.png +cmd/lc_lastslide.png cmd/lc_lastrecord.png +cmd/lc_previousslide.png cmd/lc_prevrecord.png +cmd/lc_nextslide.png cmd/lc_nextrecord.png +cmd/lc_slidesetup.png cmd/lc_pagesetup.png + +cmd/sc_insertslide.png cmd/sc_insertpage.png +cmd/sc_duplicateslide.png cmd/sc_duplicatepage.png +cmd/sc_deleteslide.png cmd/sc_deletepage.png +cmd/sc_moveslidefirst.png cmd/sc_movepagefirst.png +cmd/sc_moveslidelast.png cmd/sc_movepagelast.png +cmd/sc_moveslideup.png cmd/sc_upsearch.png +cmd/sc_moveslidedown.png cmd/sc_downsearch.png +cmd/sc_firstslide.png cmd/sc_firstpage.png +cmd/sc_lastslide.png cmd/sc_lastrecord.png +cmd/sc_previousslide.png cmd/sc_prevrecord.png +cmd/sc_nextslide.png cmd/sc_nextrecord.png +cmd/sc_slidesetup.png cmd/sc_pagesetup.png + # database # ============================================== database/linked_text_table.png cmd/sc_dataimport.png diff --git a/icon-themes/elementary/links.txt b/icon-themes/elementary/links.txt index 9ea5555..cc24355 100644 --- a/icon-themes/elementary/links.txt +++ b/icon-themes/elementary/links.txt @@ -634,3 +634,22 @@ cmd/lc_mailmergenextentry.png cmd/lc_nextrecord.png cmd/sc_mailmergenextentry.png cmd/sc_nextrecord.png cmd/lc_mailmergepreventry.png cmd/lc_prevrecord.png cmd/sc_mailmergepreventry.png cmd/sc_prevrecord.png + +# Slide command aliases +cmd/lc_insertslide.png cmd/lc_insertpage.png +cmd/lc_duplicateslide.png cmd/lc_duplicatepage.png +cmd/lc_deleteslide.png cmd/lc_deletepage.png +cmd/lc_firstslide.png cmd/lc_firstpage.png +cmd/lc_lastslide.png cmd/lc_lastpage.png +cmd/lc_previousslide.png cmd/lc_navigateback.png +cmd/lc_nextslide.png cmd/lc_navigateforward.png +cmd/lc_slidesetup.png cmd/lc_setdocumentproperties.png + +cmd/sc_insertslide.png cmd/sc_insertpage.png +cmd/sc_duplicateslide.png cmd/sc_duplicatepage.png +cmd/sc_deleteslide.png cmd/sc_deletepage.png +cmd/sc_firstslide.png cmd/sc_firstpage.png +cmd/sc_lastslide.png cmd/sc_lastpage.png +cmd/sc_previousslide.png cmd/sc_navigateback.png +cmd/sc_nextslide.png cmd/sc_navigateforward.png +cmd/sc_slidesetup.png cmd/sc_setdocumentproperties.png diff --git a/icon-themes/galaxy/links.txt b/icon-themes/galaxy/links.txt index 8decd02..b70b093 100644 --- a/icon-themes/galaxy/links.txt +++ b/icon-themes/galaxy/links.txt @@ -111,3 +111,30 @@ cmd/lc_scrolltonext.png cmd/lc_downsearch.png cmd/sc_scrolltonext.png cmd/sc_downsearch.png cmd/lc_scrolltoprevious.png cmd/lc_upsearch.png cmd/sc_scrolltoprevious.png cmd/sc_upsearch.png + +# Slide command aliases +cmd/lc_insertslide.png cmd/lc_insertpage.png +cmd/lc_duplicateslide.png cmd/lc_duplicatepage.png +cmd/lc_deleteslide.png cmd/lc_deletepage.png +cmd/lc_moveslidefirst.png cmd/lc_movepagefirst.png +cmd/lc_moveslidelast.png cmd/lc_movepagelast.png +cmd/lc_moveslideup.png cmd/lc_movepageup.png +cmd/lc_moveslidedown.png cmd/lc_movepagedown.png +cmd/lc_firstslide.png cmd/lc_firstpage.png +cmd/lc_lastslide.png cmd/lc_lastpage.png +cmd/lc_previousslide.png cmd/lc_previouspage.png +cmd/lc_nextslide.png cmd/lc_nextpage.png +cmd/lc_slidesetup.png cmd/lc_setdocumentproperties.png + +cmd/sc_insertslide.png cmd/sc_insertpage.png +cmd/sc_duplicateslide.png cmd/sc_duplicatepage.png +cmd/sc_deleteslide.png cmd/sc_deletepage.png +cmd/sc_moveslidefirst.png cmd/sc_movepagefirst.png +cmd/sc_moveslidelast.png cmd/sc_movepagelast.png +cmd/sc_moveslideup.png cmd/sc_movepageup.png +cmd/sc_moveslidedown.png cmd/sc_movepagedown.png +cmd/sc_firstslide.png cmd/sc_firstpage.png +cmd/sc_lastslide.png cmd/sc_lastpage.png +cmd/sc_previousslide.png cmd/sc_previouspage.png +cmd/sc_nextslide.png cmd/sc_nextpage.png +cmd/sc_slidesetup.png cmd/sc_setdocumentproperties.png diff --git a/icon-themes/hicontrast/links.txt b/icon-themes/hicontrast/links.txt index 278aabd..c26adee 100644 --- a/icon-themes/hicontrast/links.txt +++ b/icon-themes/hicontrast/links.txt @@ -26,3 +26,20 @@ cmd/lc_mailmergenextentry.png cmd/lc_nextrecord.png cmd/sc_mailmergenextentry.png cmd/sc_nextrecord.png cmd/lc_mailmergepreventry.png cmd/lc_prevrecord.png cmd/sc_mailmergepreventry.png cmd/sc_prevrecord.png + +# Slide command aliases +cmd/lc_insertslide.png cmd/lc_insertpage.png +cmd/lc_duplicateslide.png cmd/lc_duplicatepage.png +cmd/lc_firstslide.png cmd/lc_firstpage.png +cmd/lc_lastslide.png cmd/lc_lastpage.png +cmd/lc_previousslide.png cmd/lc_previouspage.png +cmd/lc_nextslide.png cmd/lc_nextpage.png +cmd/lc_slidesetup.png cmd/lc_setdocumentproperties.png + +cmd/sc_insertslide.png cmd/sc_insertpage.png +cmd/sc_duplicateslide.png cmd/sc_duplicatepage.png +cmd/sc_firstslide.png cmd/sc_firstpage.png +cmd/sc_lastslide.png cmd/sc_lastpage.png +cmd/sc_previousslide.png cmd/sc_previouspage.png +cmd/sc_nextslide.png cmd/sc_nextpage.png +cmd/sc_slidesetup.png cmd/sc_setdocumentproperties.png diff --git a/icon-themes/human/links.txt b/icon-themes/human/links.txt index 5b518d3..2b24056 100644 --- a/icon-themes/human/links.txt +++ b/icon-themes/human/links.txt @@ -25,3 +25,20 @@ cmd/lc_mailmergenextentry.png cmd/lc_nextrecord.png cmd/sc_mailmergenextentry.png cmd/sc_nextrecord.png cmd/lc_mailmergepreventry.png cmd/lc_prevrecord.png cmd/sc_mailmergepreventry.png cmd/sc_prevrecord.png + +# Slide command aliases +cmd/lc_insertslide.png cmd/lc_insertpage.png +cmd/lc_duplicateslide.png cmd/lc_duplicatepage.png +cmd/lc_firstslide.png cmd/lc_firstpage.png +cmd/lc_lastslide.png cmd/lc_lastpage.png +cmd/lc_previousslide.png cmd/lc_previouspage.png +cmd/lc_nextslide.png cmd/lc_nextpage.png +cmd/lc_slidesetup.png cmd/lc_pagesetup.png + +cmd/sc_insertslide.png cmd/sc_insertpage.png +cmd/sc_duplicateslide.png cmd/sc_duplicatepage.png +cmd/sc_firstslide.png cmd/sc_firstpage.png +cmd/sc_lastslide.png cmd/sc_lastpage.png +cmd/sc_previousslide.png cmd/sc_previouspage.png +cmd/sc_nextslide.png cmd/sc_nextpage.png +cmd/sc_slidesetup.png cmd/sc_setdocumentproperties.png diff --git a/icon-themes/oxygen/links.txt b/icon-themes/oxygen/links.txt index 6642c92..80cba48 100644 --- a/icon-themes/oxygen/links.txt +++ b/icon-themes/oxygen/links.txt @@ -20,3 +20,21 @@ cmd/lc_mailmergenextentry.png cmd/lc_nextrecord.png cmd/sc_mailmergenextentry.png cmd/sc_nextrecord.png cmd/lc_mailmergepreventry.png cmd/lc_prevrecord.png cmd/sc_mailmergepreventry.png cmd/sc_prevrecord.png + +# Slide command aliases +cmd/lc_insertslide.png cmd/lc_insertpage.png +cmd/lc_duplicateslide.png cmd/lc_duplicatepage.png +cmd/lc_deleteslide.png cmd/lc_deletepage.png +cmd/lc_firstslide.png cmd/lc_firstpage.png +cmd/lc_lastslide.png cmd/lc_lastpage.png +cmd/lc_previousslide.png cmd/lc_previouspage.png +cmd/lc_nextslide.png cmd/lc_nextpage.png +cmd/lc_slidesetup.png cmd/lc_pagesetup.png + +cmd/sc_insertslide.png cmd/sc_insertpage.png +cmd/sc_duplicateslide.png cmd/sc_duplicatepage.png +cmd/sc_firstslide.png cmd/sc_firstpage.png +cmd/sc_lastslide.png cmd/sc_lastpage.png +cmd/sc_previousslide.png cmd/sc_previouspage.png +cmd/sc_nextslide.png cmd/sc_nextpage.png +cmd/sc_slidesetup.png cmd/sc_setdocumentproperties.png diff --git a/icon-themes/sifr/links.txt b/icon-themes/sifr/links.txt index 4035889..dc1e369 100644 --- a/icon-themes/sifr/links.txt +++ b/icon-themes/sifr/links.txt @@ -173,3 +173,18 @@ cmd/lc_mailmergenextentry.png cmd/lc_nextrecord.png cmd/sc_mailmergenextentry.png cmd/sc_nextrecord.png cmd/lc_mailmergepreventry.png cmd/lc_prevrecord.png cmd/sc_mailmergepreventry.png cmd/sc_prevrecord.png + +# Slide command aliases +cmd/lc_insertslide.png cmd/lc_insertpage.png +cmd/lc_duplicateslide.png cmd/lc_duplicatepage.png +cmd/lc_deleteslide.png cmd/lc_deletepage.png +cmd/lc_firstslide.png cmd/lc_firstpage.png +cmd/lc_lastslide.png cmd/lc_lastpage.png +cmd/lc_slidesetup.png cmd/lc_pagesetup.png + +cmd/sc_insertslide.png cmd/sc_insertpage.png +cmd/sc_duplicateslide.png cmd/sc_duplicatepage.png +cmd/sc_deleteslide.png cmd/sc_deletepage.png +cmd/sc_firstslide.png cmd/sc_firstpage.png +cmd/sc_lastslide.png cmd/sc_lastpage.png +cmd/sc_slidesetup.png cmd/sc_pagesetup.png diff --git a/icon-themes/tango/links.txt b/icon-themes/tango/links.txt index 2189051..9dd7758 100644 --- a/icon-themes/tango/links.txt +++ b/icon-themes/tango/links.txt @@ -550,3 +550,30 @@ cmd/lc_mailmergenextentry.png cmd/lc_nextrecord.png cmd/sc_mailmergenextentry.png cmd/sc_nextrecord.png cmd/lc_mailmergepreventry.png cmd/lc_prevrecord.png cmd/sc_mailmergepreventry.png cmd/sc_prevrecord.png + +# Slide command aliases +cmd/lc_insertslide.png cmd/lc_insertpage.png +cmd/lc_duplicateslide.png cmd/lc_duplicatepage.png +cmd/lc_deleteslide.png cmd/lc_deletepage.png +cmd/lc_moveslidefirst.png cmd/lc_movepagefirst.png +cmd/lc_moveslidelast.png cmd/lc_movepagelast.png +cmd/lc_moveslideup.png cmd/lc_movepageup.png +cmd/lc_moveslidedown.png cmd/lc_movepagedown.png +cmd/lc_firstslide.png cmd/lc_firstpage.png +cmd/lc_lastslide.png cmd/lc_lastpage.png +cmd/lc_previousslide.png cmd/lc_navigateback.png +cmd/lc_nextslide.png cmd/lc_navigateforward.png +cmd/lc_slidesetup.png cmd/lc_setdocumentproperties.png + +cmd/sc_insertslide.png cmd/sc_insertpage.png +cmd/sc_duplicateslide.png cmd/sc_duplicatepage.png +cmd/sc_deleteslide.png cmd/sc_deletepage.png +cmd/sc_moveslidefirst.png cmd/sc_movepagefirst.png +cmd/sc_moveslidelast.png cmd/sc_movepagelast.png +cmd/sc_moveslideup.png cmd/sc_movepageup.png +cmd/sc_moveslidedown.png cmd/sc_movepagedown.png +cmd/sc_firstslide.png cmd/sc_firstpage.png +cmd/sc_lastslide.png cmd/sc_lastpage.png +cmd/sc_previousslide.png cmd/sc_navigateback.png +cmd/sc_nextslide.png cmd/sc_navigateforward.png +cmd/sc_slidesetup.png cmd/sc_setdocumentproperties.png diff --git a/icon-themes/tango_testing/links.txt b/icon-themes/tango_testing/links.txt index 147c5f1..8dd08cb 100644 --- a/icon-themes/tango_testing/links.txt +++ b/icon-themes/tango_testing/links.txt @@ -48,3 +48,8 @@ cmd/lc_mailmergenextentry.png cmd/lc_nextrecord.png cmd/sc_mailmergenextentry.png cmd/sc_nextrecord.png cmd/lc_mailmergepreventry.png cmd/lc_prevrecord.png cmd/sc_mailmergepreventry.png cmd/sc_prevrecord.png + +# Slide command aliases +cmd/lc_insertslide.png cmd/lc_insertpage.png +cmd/lc_previousslide.png cmd/lc_previouspage.png +cmd/lc_nextslide.png cmd/lc_nextpage.png diff --git a/sd/uiconfig/simpress/menubar/menubar.xml b/sd/uiconfig/simpress/menubar/menubar.xml index 257a343..0d01083 100644 --- a/sd/uiconfig/simpress/menubar/menubar.xml +++ b/sd/uiconfig/simpress/menubar/menubar.xml @@ -471,9 +471,9 @@ </menu:menu> <menu:menu menu:id=".uno:SlideMenu"> <menu:menupopup> - <menu:menuitem menu:id=".uno:InsertPage"/> - <menu:menuitem menu:id=".uno:DuplicatePage"/> - <menu:menuitem menu:id=".uno:DeletePage"/> + <menu:menuitem menu:id=".uno:InsertSlide"/> + <menu:menuitem menu:id=".uno:DuplicateSlide"/> + <menu:menuitem menu:id=".uno:DeleteSlide"/> <menu:menuseparator/> <menu:menuitem menu:id=".uno:InsertMasterPage"/> <menu:menuitem menu:id=".uno:DeleteMasterPage"/> @@ -500,7 +500,7 @@ <menu:menuitem menu:id=".uno:AssignLayout?WhatLayout:long=30"/> </menu:menupopup> </menu:menu> - <menu:menuitem menu:id=".uno:PageSetup"/> + <menu:menuitem menu:id=".uno:SlideSetup"/> <menu:menuitem menu:id=".uno:SelectBackground"/> <menu:menuitem menu:id=".uno:SaveBackground"/> <menu:menuseparator/> @@ -511,26 +511,26 @@ <menu:menuseparator/> <menu:menuitem menu:id=".uno:HideSlide"/> <menu:menuitem menu:id=".uno:ShowSlide"/> - <menu:menuitem menu:id=".uno:RenamePage"/> + <menu:menuitem menu:id=".uno:RenameSlide"/> <menu:menuseparator/> <menu:menuitem menu:id=".uno:SummaryPage"/> <menu:menuitem menu:id=".uno:ExpandPage"/> <menu:menuseparator/> <menu:menu menu:id=".uno:SlideNavigateMenu"> <menu:menupopup> - <menu:menuitem menu:id=".uno:FirstPage"/> - <menu:menuitem menu:id=".uno:PreviousPage"/> - <menu:menuitem menu:id=".uno:NextPage"/> - <menu:menuitem menu:id=".uno:LastPage"/> + <menu:menuitem menu:id=".uno:FirstSlide"/> + <menu:menuitem menu:id=".uno:PreviousSlide"/> + <menu:menuitem menu:id=".uno:NextSlide"/> + <menu:menuitem menu:id=".uno:LastSlide"/> </menu:menupopup> </menu:menu> <menu:menuitem menu:id=".uno:RestoreEditingView"/> <menu:menu menu:id=".uno:SlideMoveMenu"> <menu:menupopup> - <menu:menuitem menu:id=".uno:MovePageFirst"/> - <menu:menuitem menu:id=".uno:MovePageUp"/> - <menu:menuitem menu:id=".uno:MovePageDown"/> - <menu:menuitem menu:id=".uno:MovePageLast"/> + <menu:menuitem menu:id=".uno:MoveSlideFirst"/> + <menu:menuitem menu:id=".uno:MoveSlideUp"/> + <menu:menuitem menu:id=".uno:MoveSlideDown"/> + <menu:menuitem menu:id=".uno:MoveSlideLast"/> </menu:menupopup> </menu:menu> <menu:menuseparator/> diff --git a/sd/uiconfig/simpress/toolbar/commontaskbar.xml b/sd/uiconfig/simpress/toolbar/commontaskbar.xml index 7f0db66..85397d6 100644 --- a/sd/uiconfig/simpress/toolbar/commontaskbar.xml +++ b/sd/uiconfig/simpress/toolbar/commontaskbar.xml @@ -18,10 +18,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar"; xmlns:xlink="http://www.w3.org/1999/xlink";> - <toolbar:toolbaritem xlink:href=".uno:InsertPage"/> - <toolbar:toolbaritem xlink:href=".uno:DuplicatePage" toolbar:helpid="27342"/> - <toolbar:toolbaritem xlink:href=".uno:RenamePage" toolbar:visible="false"/> - <toolbar:toolbaritem xlink:href=".uno:DeletePage"/> + <toolbar:toolbaritem xlink:href=".uno:InsertSlide"/> + <toolbar:toolbaritem xlink:href=".uno:DuplicateSlide" toolbar:helpid="27342"/> + <toolbar:toolbaritem xlink:href=".uno:RenameSlide" toolbar:visible="false"/> + <toolbar:toolbaritem xlink:href=".uno:DeleteSlide"/> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:AssignLayout"/> <toolbar:toolbaritem xlink:href=".uno:PresentationLayout" toolbar:visible="false" toolbar:helpid="27064"/> diff --git a/sd/uiconfig/simpress/toolbar/standardbar.xml b/sd/uiconfig/simpress/toolbar/standardbar.xml index dd42e68..bfb7b17 100644 --- a/sd/uiconfig/simpress/toolbar/standardbar.xml +++ b/sd/uiconfig/simpress/toolbar/standardbar.xml @@ -64,21 +64,21 @@ <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:DisplayMode"/> <toolbar:toolbaritem xlink:href=".uno:ToggleTabBarVisibility"/> - <toolbar:toolbaritem xlink:href=".uno:PageSetup"/> + <toolbar:toolbaritem xlink:href=".uno:SlideSetup"/> <toolbar:toolbaritem xlink:href=".uno:SlideMasterPage"/> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:Presentation" toolbar:helpid="10157"/> <toolbar:toolbaritem xlink:href=".uno:PresentationCurrentSlide"/> <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:FirstPage" toolbar:visible="false"/> - <toolbar:toolbaritem xlink:href=".uno:PreviousPage" toolbar:visible="false"/> - <toolbar:toolbaritem xlink:href=".uno:NextPage" toolbar:visible="false"/> - <toolbar:toolbaritem xlink:href=".uno:LastPage" toolbar:visible="false"/> + <toolbar:toolbaritem xlink:href=".uno:FirstSlide" toolbar:visible="false"/> + <toolbar:toolbaritem xlink:href=".uno:PreviousSlide" toolbar:visible="false"/> + <toolbar:toolbaritem xlink:href=".uno:NextSlide" toolbar:visible="false"/> + <toolbar:toolbaritem xlink:href=".uno:LastSlide" toolbar:visible="false"/> <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:MovePageFirst" toolbar:visible="false"/> - <toolbar:toolbaritem xlink:href=".uno:MovePageUp" toolbar:visible="false"/> - <toolbar:toolbaritem xlink:href=".uno:MovePageDown" toolbar:visible="false"/> - <toolbar:toolbaritem xlink:href=".uno:MovePageLast" toolbar:visible="false"/> + <toolbar:toolbaritem xlink:href=".uno:MoveSlideFirst" toolbar:visible="false"/> + <toolbar:toolbaritem xlink:href=".uno:MoveSlideUp" toolbar:visible="false"/> + <toolbar:toolbaritem xlink:href=".uno:MoveSlideDown" toolbar:visible="false"/> + <toolbar:toolbaritem xlink:href=".uno:MoveSlideLast" toolbar:visible="false"/> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:HelpIndex" toolbar:visible="false"/> <toolbar:toolbaritem xlink:href=".uno:ExtendedHelp" toolbar:visible="false"/> commit 9ced1d7f5aa8ba728a62ae403f126dd6c35b8923 Author: Maxim Monastirsky <[email protected]> Date: Wed Apr 13 00:29:00 2016 +0300 Tooltip/bits should also depend on state change Change-Id: I18093e42dd2fc54483e620759e4ba00c988ce9db diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx b/framework/source/uielement/popuptoolbarcontroller.cxx index e156752..de5143b 100644 --- a/framework/source/uielement/popuptoolbarcontroller.cxx +++ b/framework/source/uielement/popuptoolbarcontroller.cxx @@ -461,20 +461,17 @@ void SaveToolbarController::statusChanged( const css::frame::FeatureStateEvent& if ( !getToolboxId( nId, &pToolBox ) ) return; - if ( m_bSaveAsModeAllowed ) + if ( !m_bSaveAsModeAllowed ) + pToolBox->EnableItem( nId, rEvent.IsEnabled ); + else if ( m_bSaveAsModeActive == bool( rEvent.IsEnabled ) ) { + m_bSaveAsModeActive = !m_bSaveAsModeActive; pToolBox->SetQuickHelpText( nId, vcl::CommandInfoProvider::Instance().GetTooltipForCommand( rEvent.IsEnabled ? m_aCommandURL : OUString( ".uno:SaveAs" ), m_xFrame ) ); pToolBox->SetItemBits( nId, pToolBox->GetItemBits( nId ) & ~( rEvent.IsEnabled ? ToolBoxItemBits::DROPDOWNONLY : ToolBoxItemBits::DROPDOWN ) ); pToolBox->SetItemBits( nId, pToolBox->GetItemBits( nId ) | ( rEvent.IsEnabled ? ToolBoxItemBits::DROPDOWN : ToolBoxItemBits::DROPDOWNONLY ) ); - if ( m_bSaveAsModeActive == bool( rEvent.IsEnabled ) ) - { - m_bSaveAsModeActive = !rEvent.IsEnabled; - updateImage(); - } + updateImage(); } - else - pToolBox->EnableItem( nId, rEvent.IsEnabled ); } void SaveToolbarController::modified( const css::lang::EventObject& /*rEvent*/ ) _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
