diff options
| author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2015-11-19 13:37:22 +0100 |
|---|---|---|
| committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2015-11-19 13:39:17 +0100 |
| commit | a3eec8a043eae4417276938968a5a8e227d23111 (patch) | |
| tree | 9ce7c150832d0ca0a97ec0c34556cae52c65e939 /framework | |
| parent | 928fb2c711c10b372dc5b4fb3703a2fa5c40ac03 (diff) | |
Toolbar: Add 'Save As' to 'Save' dropdown
Change-Id: I6597ae5569b29d09a8c44fc9a55b71166aa37b05
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/inc/classes/resource.hrc | 3 | ||||
| -rw-r--r-- | framework/source/classes/resource.src | 5 | ||||
| -rw-r--r-- | framework/source/uielement/saveasmenucontroller.cxx | 15 |
3 files changed, 7 insertions, 16 deletions
diff --git a/framework/inc/classes/resource.hrc b/framework/inc/classes/resource.hrc index c7fc3946aa78..4331a42a21cb 100644 --- a/framework/inc/classes/resource.hrc +++ b/framework/inc/classes/resource.hrc @@ -51,8 +51,7 @@ #define STR_CLEAR_RECENT_FILES_HELP (RID_STR_START+24) #define STR_LANGSTATUS_HINT (RID_STR_START+25) #define STR_OPEN_REMOTE (RID_STR_START+26) -#define STR_REMOTE_FILE (RID_STR_START+27) -#define STR_REMOTE_TITLE (RID_STR_START+28) +#define STR_REMOTE_TITLE (RID_STR_START+27) #define POPUPMENU_TOOLBAR_QUICKCUSTOMIZATION (RID_MENU_START+0) diff --git a/framework/source/classes/resource.src b/framework/source/classes/resource.src index 570e2884b713..66f5a2451642 100644 --- a/framework/source/classes/resource.src +++ b/framework/source/classes/resource.src @@ -119,11 +119,6 @@ String STR_OPEN_REMOTE Text [ en-US ] = "Open remote file"; }; -String STR_REMOTE_FILE -{ - Text [ en-US ] = "Save Remote File..."; -}; - String STR_REMOTE_TITLE { Text [ en-US ] = " (Remote)"; diff --git a/framework/source/uielement/saveasmenucontroller.cxx b/framework/source/uielement/saveasmenucontroller.cxx index d056be277eec..e6f4eddcde4b 100644 --- a/framework/source/uielement/saveasmenucontroller.cxx +++ b/framework/source/uielement/saveasmenucontroller.cxx @@ -40,6 +40,7 @@ using namespace framework; namespace { +static const char CMD_SAVEAS[] = ".uno:SaveAs"; static const char CMD_SAVE_REMOTE[] = ".uno:SaveAsRemote"; class SaveAsMenuController : public svt::PopupMenuControllerBase @@ -112,11 +113,8 @@ void SaveAsMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPo if ( pVCLPopupMenu ) { - // Open remote menu entry - pVCLPopupMenu->InsertItem( sal_uInt16( 1 ), - FWK_RESSTR( STR_REMOTE_FILE ) ); - pVCLPopupMenu->SetItemCommand( sal_uInt16( 1 ), - CMD_SAVE_REMOTE ); + pVCLPopupMenu->InsertItem( CMD_SAVEAS, m_xFrame ); + pVCLPopupMenu->InsertItem( CMD_SAVE_REMOTE, m_xFrame ); } } @@ -155,12 +153,11 @@ void SAL_CALL SaveAsMenuController::itemSelected( const css::awt::MenuEvent& rEv OSL_TRACE( "SaveAsMenuController::itemSelected() - Command : %s", OUStringToOString( aCommand, RTL_TEXTENCODING_UTF8 ).getStr() ); + Sequence< PropertyValue > aArgsList( 0 ); if ( aCommand == CMD_SAVE_REMOTE ) - { - Sequence< PropertyValue > aArgsList( 0 ); - dispatchCommand( CMD_SAVE_REMOTE, aArgsList ); - } + else if ( aCommand == CMD_SAVEAS ) + dispatchCommand( CMD_SAVEAS, aArgsList ); } } |