diff options
| author | vsfoote <vstuart.foote@utsa.edu> | 2015-03-11 21:54:43 -0500 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2015-03-23 16:56:00 +0000 |
| commit | 603c8845728cb96908388ab26db934735825bf10 (patch) | |
| tree | 8f60512ac55360bac323c66684f95cef0d78a2ab /sw | |
| parent | 05ad682e73fb4b654056d7d5c49a7ac2dca4b10a (diff) | |
tdf#88001 -- Default document view, force single page rather than automatic
This commit changes sw default to be single page view rather than automatic
defaulting to a multi-page view and automatic fit. Also, sets status bar page
icon default to single page, and corrects lableing of view to read "multi-page"
rather than "two page".
Change-Id: I1a2f81150d7066ea56af0870e83c1e4ae66d3404
Reviewed-on: https://gerrit.libreoffice.org/14835
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/uibase/inc/utlui.hrc | 2 | ||||
| -rw-r--r-- | sw/source/uibase/utlui/statusbar.src | 4 | ||||
| -rw-r--r-- | sw/source/uibase/utlui/viewlayoutctrl.cxx | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/sw/source/uibase/inc/utlui.hrc b/sw/source/uibase/inc/utlui.hrc index 4caa3b387604..87dabfd00b06 100644 --- a/sw/source/uibase/inc/utlui.hrc +++ b/sw/source/uibase/inc/utlui.hrc @@ -48,7 +48,7 @@ // Statusbar: Word count/Viewlayout/Page count #define STR_WORDCOUNT_HINT (RC_UTLUI_BEGIN + 20) #define STR_VIEWLAYOUT_ONE (RC_UTLUI_BEGIN + 21) -#define STR_VIEWLAYOUT_TWO (RC_UTLUI_BEGIN + 22) +#define STR_VIEWLAYOUT_MULTI (RC_UTLUI_BEGIN + 22) #define STR_VIEWLAYOUT_BOOK (RC_UTLUI_BEGIN + 23) #define STR_BOOKCTRL_HINT (RC_UTLUI_BEGIN + 24) #define STR_BOOKCTRL_HINT_EXTENDED (RC_UTLUI_BEGIN + 25) diff --git a/sw/source/uibase/utlui/statusbar.src b/sw/source/uibase/utlui/statusbar.src index 493beb3a2023..1424ea2adfb3 100644 --- a/sw/source/uibase/utlui/statusbar.src +++ b/sw/source/uibase/utlui/statusbar.src @@ -18,9 +18,9 @@ String STR_VIEWLAYOUT_ONE Text [ en-US ] = "Single-page view"; }; -String STR_VIEWLAYOUT_TWO +String STR_VIEWLAYOUT_MULTI { - Text [ en-US ] = "Two page view"; + Text [ en-US ] = "Multiple-page view"; }; String STR_VIEWLAYOUT_BOOK diff --git a/sw/source/uibase/utlui/viewlayoutctrl.cxx b/sw/source/uibase/utlui/viewlayoutctrl.cxx index aa45d375c315..8ba1e3befd82 100644 --- a/sw/source/uibase/utlui/viewlayoutctrl.cxx +++ b/sw/source/uibase/utlui/viewlayoutctrl.cxx @@ -30,7 +30,7 @@ SFX_IMPL_STATUSBAR_CONTROL( SwViewLayoutControl, SvxViewLayoutItem ); struct SwViewLayoutControl::SwViewLayoutControl_Impl { - sal_uInt16 mnState; // 0 = single, 1 = auto, 2 = book, 3 = none + sal_uInt16 mnState; // 0 = auto, 1= single, 2 = book, 3 = none Image maImageSingleColumn; Image maImageSingleColumn_Active; Image maImageAutomatic; @@ -43,7 +43,7 @@ SwViewLayoutControl::SwViewLayoutControl( sal_uInt16 _nSlotId, sal_uInt16 _nId, SfxStatusBarControl( _nSlotId, _nId, rStatusBar ), mpImpl( new SwViewLayoutControl_Impl ) { - mpImpl->mnState = 0; + mpImpl->mnState = 1; mpImpl->maImageSingleColumn = Image( SW_RES(IMG_VIEWLAYOUT_SINGLECOLUMN) ); mpImpl->maImageSingleColumn_Active = Image( SW_RES(IMG_VIEWLAYOUT_SINGLECOLUMN_ACTIVE) ); @@ -209,7 +209,7 @@ bool SwViewLayoutControl::MouseMove( const MouseEvent & rEvt ) } else if ( nXDiff < nXOffset + nImageWidthSingle + nImageWidthAuto ) { - GetStatusBar().SetQuickHelpText(GetId(), SW_RESSTR(STR_VIEWLAYOUT_TWO)); + GetStatusBar().SetQuickHelpText(GetId(), SW_RESSTR(STR_VIEWLAYOUT_MULTI)); } else { |