diff options
author | Maxim Monastirsky <momonasmon@gmail.com> | 2016-02-21 02:21:06 +0200 |
---|---|---|
committer | Maxim Monastirsky <momonasmon@gmail.com> | 2016-02-21 16:41:31 +0200 |
commit | 144546b622fd6146e023efe27b74f1271ff47008 (patch) | |
tree | c44389eb5d1a79a1ccd33ca9ac40465612cdf28c | |
parent | c1f275055e9577749345ccf6cb4771861f7557a7 (diff) |
tdf#93837 Convert RID_POPUP_DLGED to xml
Change-Id: I0588063aef397ee95923ad5acd332bc6052fafc7
-rw-r--r-- | basctl/UIConfig_basicide.mk | 4 | ||||
-rw-r--r-- | basctl/inc/basidesh.hrc | 1 | ||||
-rw-r--r-- | basctl/source/basicide/baside3.cxx | 6 | ||||
-rw-r--r-- | basctl/source/basicide/basidesh.cxx | 2 | ||||
-rw-r--r-- | basctl/source/basicide/basidesh.src | 14 | ||||
-rw-r--r-- | basctl/uiconfig/basicide/popupmenu/dialog.xml | 16 | ||||
-rw-r--r-- | include/svx/svxcommands.h | 1 | ||||
-rw-r--r-- | officecfg/registry/data/org/openoffice/Office/UI/BasicIDEWindowState.xcu | 5 |
8 files changed, 29 insertions, 20 deletions
diff --git a/basctl/UIConfig_basicide.mk b/basctl/UIConfig_basicide.mk index e556374d35d8..31b0334d1fd7 100644 --- a/basctl/UIConfig_basicide.mk +++ b/basctl/UIConfig_basicide.mk @@ -9,6 +9,10 @@ $(eval $(call gb_UIConfig_UIConfig,modules/BasicIDE)) +$(eval $(call gb_UIConfig_add_popupmenufiles,modules/BasicIDE,\ + basctl/uiconfig/basicide/popupmenu/dialog \ +)) + $(eval $(call gb_UIConfig_add_menubarfiles,modules/BasicIDE,\ basctl/uiconfig/basicide/menubar/menubar \ )) diff --git a/basctl/inc/basidesh.hrc b/basctl/inc/basidesh.hrc index df9f997a2bce..d90497e73cc5 100644 --- a/basctl/inc/basidesh.hrc +++ b/basctl/inc/basidesh.hrc @@ -30,7 +30,6 @@ #define RID_POPUP_BRKDLG ( RID_BASICIDE_START + 10 ) #define RID_POPUP_BRKPROPS ( RID_BASICIDE_START + 11 ) #define RID_POPUP_TABBAR ( RID_BASICIDE_START + 12 ) -#define RID_POPUP_DLGED ( RID_BASICIDE_START + 62 ) #define RID_PRINTDLG_STRLIST ( RID_BASICIDE_START + 78 ) #define RID_IMGBTN_REMOVEWATCH ( RID_BASICIDE_START + 8 ) diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx index 72a7ab7ce535..36855cb8d946 100644 --- a/basctl/source/basicide/baside3.cxx +++ b/basctl/source/basicide/baside3.cxx @@ -195,7 +195,7 @@ void DialogWindow::Command( const CommandEvent& rCEvt ) } else if ( rCEvt.GetCommand() == CommandEventId::ContextMenu ) { - if (SfxDispatcher* pDispatcher = GetDispatcher()) + if (GetDispatcher()) { SdrView& rView = GetView(); if( !rCEvt.IsMouseEvent() && rView.AreObjectsMarked() ) @@ -203,11 +203,11 @@ void DialogWindow::Command( const CommandEvent& rCEvt ) Rectangle aMarkedRect( rView.GetMarkedRect() ); Point MarkedCenter( aMarkedRect.Center() ); Point PosPixel( LogicToPixel( MarkedCenter ) ); - pDispatcher->ExecutePopup( IDEResId(RID_POPUP_DLGED), this, &PosPixel ); + SfxDispatcher::ExecutePopup( this, &PosPixel ); } else { - pDispatcher->ExecutePopup( IDEResId(RID_POPUP_DLGED) ); + SfxDispatcher::ExecutePopup(); } } diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx index 5758dec8c716..54c92e6d6ee8 100644 --- a/basctl/source/basicide/basidesh.cxx +++ b/basctl/source/basicide/basidesh.cxx @@ -139,7 +139,7 @@ void basctl_Shell::InitInterface_Impl() GetStaticInterface()->RegisterChildWindow(SID_SHOW_PROPERTYBROWSER, false, BASICIDE_UI_FEATURE_SHOW_BROWSER); GetStaticInterface()->RegisterChildWindow(SfxInfoBarContainerChild::GetChildWindowId()); - GetStaticInterface()->RegisterPopupMenu(IDEResId(RID_POPUP_DLGED)); + GetStaticInterface()->RegisterPopupMenu("dialog"); } unsigned Shell::nShellCount = 0; diff --git a/basctl/source/basicide/basidesh.src b/basctl/source/basicide/basidesh.src index 65c706635e74..357c0069a8d6 100644 --- a/basctl/source/basicide/basidesh.src +++ b/basctl/source/basicide/basidesh.src @@ -444,20 +444,6 @@ Menu RID_POPUP_TABBAR }; }; -Menu RID_POPUP_DLGED -{ - DefaultItemId = SID_SHOW_PROPERTYBROWSER ; - ItemList = - { - MenuItem - { - Identifier = SID_SHOW_PROPERTYBROWSER ; - HelpId = CMD_SID_SHOW_PROPERTYBROWSER ; - Text [ en-US ] = "Properties..."; - }; - }; -}; - ImageList RID_IMGLST_LAYOUT { Prefix = "im"; diff --git a/basctl/uiconfig/basicide/popupmenu/dialog.xml b/basctl/uiconfig/basicide/popupmenu/dialog.xml new file mode 100644 index 000000000000..17f96b8740bb --- /dev/null +++ b/basctl/uiconfig/basicide/popupmenu/dialog.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * +--> +<menu:menupopup xmlns:menu="http://openoffice.org/2001/menu"> + <menu:menuitem menu:id=".uno:Cut"/> + <menu:menuitem menu:id=".uno:Copy"/> + <menu:menuitem menu:id=".uno:Paste"/> + <menu:menuseparator/> + <menu:menuitem menu:id=".uno:ShowPropBrowser"/> +</menu:menupopup> diff --git a/include/svx/svxcommands.h b/include/svx/svxcommands.h index 1149e3df10d3..4d2cb3b6f4e3 100644 --- a/include/svx/svxcommands.h +++ b/include/svx/svxcommands.h @@ -104,7 +104,6 @@ #define CMD_SID_FRAME_TO_BOTTOM ".uno:SendToBack" #define CMD_SID_SET_DEFAULT ".uno:SetDefault" #define CMD_SID_ATTR_CHAR_SHADOWED ".uno:Shadowed" -#define CMD_SID_SHOW_PROPERTYBROWSER ".uno:ShowPropBrowser" #define CMD_SID_FM_SHOW_PROPERTY_BROWSER ".uno:ShowPropertyBrowser" #define CMD_SID_ATTR_PARA_LINESPACE_10 ".uno:SpacePara1" #define CMD_SID_ATTR_PARA_LINESPACE_15 ".uno:SpacePara15" diff --git a/officecfg/registry/data/org/openoffice/Office/UI/BasicIDEWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/BasicIDEWindowState.xcu index 0a6157747db2..df5a35de1f35 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/BasicIDEWindowState.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/BasicIDEWindowState.xcu @@ -20,6 +20,11 @@ <oor:component-data xmlns:install="http://openoffice.org/2004/installation" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" oor:name="BasicIDEWindowState" oor:package="org.openoffice.Office.UI"> <node oor:name="UIElements"> <node oor:name="States"> + <node oor:name="private:resource/popupmenu/dialog" oor:op="replace"> + <prop oor:name="UIName" oor:type="xs:string"> + <value xml:lang="en-US">Dialog</value> + </prop> + </node> <node oor:name="private:resource/toolbar/standardbar" oor:op="replace"> <prop oor:name="DockPos" oor:type="xs:string"> <value>0,0</value> |