[Libreoffice-commits] .: 2 commits - sw/source

[Cédric Bosdonnat]

 sw/source/filter/ww8/wrtw8sty.cxx |    3 ++-
 sw/source/ui/uiview/scroll.cxx    |    5 +----
 2 files changed, 3 insertions(+), 5 deletions(-)

New commits:
commit d38a56fcf0cd3052f44d6de5157fe8ef8cec3e36
Author: Cédric Bosdonnat <cedric.bosdonnat.ooo at free.fr>
Date:   Fri Jan 13 12:00:19 2012 +0100

    fdo#30788: why not showing horizontal scrollbar when needed?

diff --git a/sw/source/ui/uiview/scroll.cxx b/sw/source/ui/uiview/scroll.cxx
index cd33e92..2bf1d6d 100644
--- a/sw/source/ui/uiview/scroll.cxx
+++ b/sw/source/ui/uiview/scroll.cxx
@@ -132,10 +132,7 @@ void SwScrollbar::AutoShow()
             if(ScrollBar::IsVisible())
                 ScrollBar::Show(sal_False);
         }
-        else if ( !ScrollBar::IsVisible() &&
-                  (!bHori || nVis) )        //Optimierung fuer Browser.
-                                            //Horizontaler Scrollbar per
-                                            //default aus.
+        else if ( !ScrollBar::IsVisible() )
         {
             ScrollBar::Show(sal_True);
         }
commit 516bb47afcc71e69f8f6c6a6246455a2c4269c4c
Author: Cédric Bosdonnat <cedric.bosdonnat.ooo at free.fr>
Date:   Tue Jan 10 14:53:56 2012 +0100

    n#715421 - Word 2010 validation: no plcfhdd if ccpHdd is 0

diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx
index 2207f37..21dc7c7 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -1830,7 +1830,8 @@ void WW8_WrPlcSepx::WritePlcSed( WW8Export& rWrt ) const
 
 void WW8_WrPlcSepx::WritePlcHdd( WW8Export& rWrt ) const
 {
-    if( pTxtPos && pTxtPos->Count() )
+    // Don't write out the PlcfHdd if ccpHdd is 0: it's a validation failure case.
+    if( rWrt.pFib->ccpHdr != 0 && pTxtPos && pTxtPos->Count() )
     {
         rWrt.pFib->fcPlcfhdd = rWrt.pTableStrm->Tell();
         pTxtPos->Write( *rWrt.pTableStrm );             // Plc0