diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2016-01-28 13:38:46 +0200 |
|---|---|---|
| committer | Maxim Monastirsky <momonasmon@gmail.com> | 2016-01-28 15:03:55 +0200 |
| commit | 291544d481a79ce037018dd7cefbfec719b76f2d (patch) | |
| tree | 1080c81afc3e877525812f7a905ac21da2189a79 /starmath/source/view.cxx | |
| parent | b9160c2511287223d7e014de3134fde917b9320e (diff) | |
tdf#93837 starmath: Convert RID_VIEWMENU to xml
Also fixes .uno:Adjust->.uno:ZoomOptimal forgotten by
ffc2e5be1f712b09710e2096ad2f7eb81b80118d
Change-Id: Ifa3d1144b2d85290d7d27de50f5ad430ae0cfc8d
Diffstat (limited to 'starmath/source/view.cxx')
| -rw-r--r-- | starmath/source/view.cxx | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx index a808a6868a5f..fc7c04ca5173 100644 --- a/starmath/source/view.cxx +++ b/starmath/source/view.cxx @@ -563,9 +563,6 @@ void SmGraphicWindow::Command(const CommandEvent& rCEvt) case CommandEventId::ContextMenu: { GetParent()->ToTop(); - SmResId aResId( RID_VIEWMENU ); - std::unique_ptr<PopupMenu> xPopupMenu(new PopupMenu(aResId)); - xPopupMenu->SetSelectHdl(LINK(this, SmGraphicWindow, MenuSelectHdl)); Point aPos(5, 5); if (rCEvt.IsMouseEvent()) aPos = rCEvt.GetMousePosPixel(); @@ -573,7 +570,7 @@ void SmGraphicWindow::Command(const CommandEvent& rCEvt) // added for replaceability of context menus pViewShell->GetViewFrame()->GetBindings().GetDispatcher() - ->ExecutePopup( aResId, this, &aPos ); + ->ExecutePopup( this, &aPos ); bCallBase = false; } @@ -603,14 +600,6 @@ void SmGraphicWindow::Command(const CommandEvent& rCEvt) } -IMPL_LINK_TYPED( SmGraphicWindow, MenuSelectHdl, Menu *, pMenu, bool ) -{ - SmViewShell *pViewSh = GetView(); - if (pViewSh) - pViewSh->GetViewFrame()->GetDispatcher()->Execute( pMenu->GetCurItemId() ); - return false; -} - void SmGraphicWindow::SetZoom(sal_uInt16 Factor) { nZoom = std::min(std::max((sal_uInt16) Factor, (sal_uInt16) MINZOOM), (sal_uInt16) MAXZOOM); |