[Libreoffice-commits] core.git: officecfg/registry sw/source

[vsfoote]

 officecfg/registry/schema/org/openoffice/Office/Writer.xcs |    2 +-
 sw/source/uibase/inc/utlui.hrc                             |    2 +-
 sw/source/uibase/utlui/statusbar.src                       |    4 ++--
 sw/source/uibase/utlui/viewlayoutctrl.cxx                  |    6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 603c8845728cb96908388ab26db934735825bf10
Author: vsfoote <vstuart.foote at utsa.edu>
Date:   Wed Mar 11 21:54:43 2015 -0500

    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 at ubuntu.com>
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
index a43cbc6..b3dc942 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
@@ -1585,7 +1585,7 @@
             <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>
         <prop oor:name="BookMode" oor:type="xs:boolean" oor:nillable="false">
           <!-- UIHints: (Status Bar) -->
diff --git a/sw/source/uibase/inc/utlui.hrc b/sw/source/uibase/inc/utlui.hrc
index 4caa3b3..87dabfd 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 493beb3..1424ea2 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 aa45d37..8ba1e3b 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
     {