diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2020-08-12 15:42:50 +0300 |
|---|---|---|
| committer | Maxim Monastirsky <momonasmon@gmail.com> | 2020-08-13 00:40:05 +0200 |
| commit | 839b27f249197c83ce0260396a67a2f15bdf4e9a (patch) | |
| tree | aba269e9b4bf92c617c2e29c463d2c1fa6dff603 /sd | |
| parent | d9f944ce9447ec86b3536c9fc8f6f8c6dd450a73 (diff) | |
Merge toolbar popup classes
Now that all popups are welded.
Change-Id: I5ad8a4eb6b9512ea9dd075b56d0ae6ee201fff19
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100597
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/controller/slidelayoutcontroller.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx index 41071def8409..284df02be296 100644 --- a/sd/source/ui/controller/slidelayoutcontroller.cxx +++ b/sd/source/ui/controller/slidelayoutcontroller.cxx @@ -170,9 +170,9 @@ LayoutToolbarMenu::LayoutToolbarMenu(SlideLayoutController* pControl, weld::Widg DrawViewMode eMode = DrawViewMode_DRAW; // find out which view is running - if( mxFrame.is() ) try + if( m_xFrame.is() ) try { - Reference< XPropertySet > xControllerSet( mxFrame->getController(), UNO_QUERY_THROW ); + Reference< XPropertySet > xControllerSet( m_xFrame->getController(), UNO_QUERY_THROW ); xControllerSet->getPropertyValue( "DrawViewMode" ) >>= eMode; } catch( Exception& ) @@ -220,7 +220,7 @@ LayoutToolbarMenu::LayoutToolbarMenu(SlideLayoutController* pControl, weld::Widg if( eMode != DrawViewMode_DRAW ) return; - if( !mxFrame.is() ) + if( !m_xFrame.is() ) return; OUString sSlotStr; @@ -230,7 +230,7 @@ LayoutToolbarMenu::LayoutToolbarMenu(SlideLayoutController* pControl, weld::Widg else sSlotStr = ".uno:Undo"; - css::uno::Reference<css::graphic::XGraphic> xSlotImage = vcl::CommandInfoProvider::GetXGraphicForCommand(sSlotStr, mxFrame); + css::uno::Reference<css::graphic::XGraphic> xSlotImage = vcl::CommandInfoProvider::GetXGraphicForCommand(sSlotStr, m_xFrame); OUString sSlotTitle; if( bInsertPage ) |