diff options
author | Caolán McNamara <caolanm@redhat.com> | 2016-10-05 15:47:30 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2016-10-05 15:47:30 +0100 |
commit | 5eb4e551f88e4d12daeabe020aefd405578844c8 (patch) | |
tree | 7aadc71371b7f7b28f7a07f63826f180098574b9 /sc/source/ui | |
parent | 449dcb850de1ee4fb718d659034fc0c8b0b99583 (diff) |
move these string resources out of the window resource
Change-Id: I66be174603eb1d08e537d4865ad35f89adfbff34
Diffstat (limited to 'sc/source/ui')
-rw-r--r-- | sc/source/ui/navipi/navipi.cxx | 14 | ||||
-rw-r--r-- | sc/source/ui/navipi/navipi.hrc | 10 | ||||
-rw-r--r-- | sc/source/ui/navipi/navipi.src | 75 |
3 files changed, 48 insertions, 51 deletions
diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx index 410f30fd9811..4e56e96275b7 100644 --- a/sc/source/ui/navipi/navipi.cxx +++ b/sc/source/ui/navipi/navipi.cxx @@ -544,11 +544,11 @@ ScNavigatorDlg::ScNavigatorDlg( SfxBindings* pB, SfxChildWindowContext* pCW, vcl aEdRow ( VclPtr<RowEdit>::Create( this, ScResId( ED_ROW ) ) ), aTbxCmd ( VclPtr<CommandToolBox>::Create( this, ScResId( TBX_CMD ) ) ), aLbEntries ( VclPtr<ScContentTree>::Create( this, ScResId( LB_ENTRIES ) ) ), - aWndScenarios( VclPtr<ScScenarioWindow>::Create( this,ScResId( STR_QHLP_SCEN_LISTBOX), ScResId(STR_QHLP_SCEN_COMMENT)) ), + aWndScenarios( VclPtr<ScScenarioWindow>::Create( this,ScResId( SCSTR_QHLP_SCEN_LISTBOX), ScResId(SCSTR_QHLP_SCEN_COMMENT)) ), aLbDocuments( VclPtr<ListBox>::Create( this, ScResId( LB_DOCUMENTS ) ) ), - aStrDragMode ( ScResId( STR_DRAGMODE ) ), - aStrDisplay ( ScResId( STR_DISPLAY ) ), - aStrActiveWin( ScResId( STR_ACTIVEWIN ) ), + aStrDragMode ( ScResId( SCSTR_DRAGMODE ) ), + aStrDisplay ( ScResId( SCSTR_DISPLAY ) ), + aStrActiveWin( ScResId( SCSTR_ACTIVEWIN ) ), pContextWin ( pCW ), pMarkArea ( nullptr ), pViewData ( nullptr ), @@ -569,13 +569,13 @@ ScNavigatorDlg::ScNavigatorDlg( SfxBindings* pB, SfxChildWindowContext* pCW, vcl aLbDocuments->SetDropDownLineCount(9); aLbDocuments->SetSelectHdl(LINK(this, ScNavigatorDlg, DocumentSelectHdl)); aStrActive = " (" - + OUString( ScResId( STR_ACTIVE ) ) + + OUString( ScResId( SCSTR_ACTIVE ) ) + ")"; // " (active)" aStrNotActive = " (" - + OUString( ScResId( STR_NOTACTIVE ) ) + + OUString( ScResId( SCSTR_NOTACTIVE ) ) + ")"; // " (not active)" aStrHidden = " (" - + OUString( ScResId( STR_HIDDEN ) ) + + OUString( ScResId( SCSTR_HIDDEN ) ) + ")"; // " (hidden)" aTitleBase = GetText(); diff --git a/sc/source/ui/navipi/navipi.hrc b/sc/source/ui/navipi/navipi.hrc index a360547082da..76e1eb60ce9a 100644 --- a/sc/source/ui/navipi/navipi.hrc +++ b/sc/source/ui/navipi/navipi.hrc @@ -25,15 +25,7 @@ #define LB_DOCUMENTS 5 #define LB_ENTRIES 6 #define TBX_CMD 7 -#define STR_DRAGMODE 8 -#define STR_DISPLAY 9 -#define STR_ACTIVE 10 -#define STR_NOTACTIVE 11 -#define STR_HIDDEN 12 -#define STR_ACTIVEWIN 13 -#define STR_QHLP_SCEN_LISTBOX 15 -#define STR_QHLP_SCEN_COMMENT 16 -#define IL_CMD 17 +#define IL_CMD 8 #define IID_AREAS 1 #define IID_DBAREAS 2 diff --git a/sc/source/ui/navipi/navipi.src b/sc/source/ui/navipi/navipi.src index 64335b0bbde7..dfa00c3b5c1b 100644 --- a/sc/source/ui/navipi/navipi.src +++ b/sc/source/ui/navipi/navipi.src @@ -159,41 +159,6 @@ Window RID_SCDLG_NAVIGATOR }; }; }; - String STR_DRAGMODE - { - Text [ en-US ] = "Drag Mode" ; - }; - String STR_DISPLAY - { - Text [ en-US ] = "Display" ; - }; - String STR_ACTIVE - { - Text [ en-US ] = "active" ; - }; - String STR_NOTACTIVE - { - Text [ en-US ] = "inactive" ; - }; - String STR_HIDDEN - { - Text [ en-US ] = "hidden" ; - }; - String STR_ACTIVEWIN - { - Text [ en-US ] = "Active Window" ; - }; - - String STR_QHLP_SCEN_LISTBOX - { - Text [ en-US ] = "Scenario Name"; - }; - - String STR_QHLP_SCEN_COMMENT - { - Text [ en-US ] = "Comment"; - }; - }; ImageList RID_IMAGELIST_NAVCONT @@ -298,6 +263,46 @@ String SCSTR_CONTENT_DRAWING Text [ en-US ] = "Drawing objects"; }; +String SCSTR_DRAGMODE +{ + Text [ en-US ] = "Drag Mode" ; +}; + +String SCSTR_DISPLAY +{ + Text [ en-US ] = "Display" ; +}; + +String SCSTR_ACTIVE +{ + Text [ en-US ] = "active" ; +}; + +String SCSTR_NOTACTIVE +{ + Text [ en-US ] = "inactive" ; +}; + +String SCSTR_HIDDEN +{ + Text [ en-US ] = "hidden" ; +}; + +String SCSTR_ACTIVEWIN +{ + Text [ en-US ] = "Active Window" ; +}; + +String SCSTR_QHLP_SCEN_LISTBOX +{ + Text [ en-US ] = "Scenario Name"; +}; + +String SCSTR_QHLP_SCEN_COMMENT +{ + Text [ en-US ] = "Comment"; +}; + // PopupMenu ------------------------------------------------------------- Menu RID_POPUP_DROPMODE { |