Attachment 112604 Details for Bug 88001 – proposed patch to change default view in Writer to single page, and relable automatic views to be multi page

proposed patch to change default view in Writer to single page, and relable automatic views to be multi page

fdo88001_patch.txt (text/plain), 2.62 KB, created by V Stuart Foote on 2015-01-21 15:09:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: V Stuart Foote

Created: 2015-01-21 15:09:48 UTC

Size: 2.62 KB

patch

obsolete

>fdo#88001: change default document views from automatic to single page
>relabel automatic sizing from Two page view to Multi page view
>
>
>--- a/sw/source/uibase/utlui/viewlayoutctrl.cxx
>+++ b/sw/source/uibase/utlui/viewlayoutctrl.cxx
>@@ -31,4 +31,4 @@
> 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;
>
>@@ -42,7 +42,7 @@
> SwViewLayoutControl::SwViewLayoutControl( sal_uInt16 _nSlotId, sal_uInt16 _nId, StatusBar& rStatusBar ) :
>     SfxStatusBarControl( _nSlotId, _nId, rStatusBar ),
>     mpImpl( new SwViewLayoutControl_Impl )
> {
>-    mpImpl->mnState = 0;
>+    mpImpl->mnState = 1;
> 
>     mpImpl->maImageSingleColumn         = Image( SW_RES(IMG_VIEWLAYOUT_SINGLECOLUMN) );
>
>--- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
>+++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
>@@ -1582,8 +1582,8 @@
>         <prop oor:name="Columns" oor:type="xs:int" oor:nillable="false">
>           
>           <info>
>             <desc>Specifies number of columns of the view layout. 0 means the view layout is set to automatic.</desc>
>             <label>View Layout Columns</label>
>           </info>
>-          <value>0</value>
>+          <value>1</value>
>         </prop>
>
>
>
>--- a/sw/source/uibase/utlui/statusbar.src
>+++ b/sw/source/uibase/utlui/statusbar.src
>@@ -20,5 +20,5 @@
> 
>-String STR_VIEWLAYOUT_TWO
>+String STR_VIEWLAYOUT_MULTI
> {
>-    Text [ en-US ] = "Two page view";
>+    Text [ en-US ] = "Multi page view";
> };
>
>
>--- a/sw/source/uibase/inc/utlui.hrc
>+++ b/sw/source/uibase/inc/utlui.hrc
>@@ -48,6 +48,6 @@
> // 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)
>
>--- a/sw/source/uibase/utlui/viewlayoutctrl.cxx
>+++ b/sw/source/uibase/utlui/viewlayoutctrl.cxx
>@@ -210,5 +210,5 @@
>     else if ( nXDiff < nXOffset + nImageWidthSingle + nImageWidthAuto )
>     {
>-        GetStatusBar().SetQuickHelpText(GetId(), SW_RESSTR(STR_VIEWLAYOUT_TWO));
>+        GetStatusBar().SetQuickHelpText(GetId(), SW_RESSTR(STR_VIEWLAYOUT_MULTI));
>     }
>     else
>

Actions: View

Attachments on bug 88001: 111703 | 112604