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

[Ivan Timofeev]

 sc/source/filter/excel/xecontent.cxx |    1 +
 sw/source/ui/uiview/pview.cxx        |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 6f6a419a39f8d97a49a84ae730ecd3d93738a744
Author: Ivan Timofeev <timofeev.i.s at gmail.com>
Date:   Tue May 15 10:39:17 2012 +0400

    missing break (I suppose)
    
    Change-Id: I504cbe271ef4475963b8277a1ab7dcb09b0dda38

diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx
index 9bf323e..a4315ba 100644
--- a/sc/source/filter/excel/xecontent.cxx
+++ b/sc/source/filter/excel/xecontent.cxx
@@ -822,6 +822,7 @@ const char* GetOperatorString(ScConditionMode eMode, bool& bFrmla2)
             break;
         case SC_COND_DIRECT:
             pRet = "expression";
+            break;
         case SC_COND_NONE:
         default:
             pRet = "";
commit 9b01e60444b0c176770f0adafc8f1bb4718dfba5
Author: Ivan Timofeev <timofeev.i.s at gmail.com>
Date:   Tue May 15 10:35:41 2012 +0400

    use real visibility of SwScrollbar again
    
    Change-Id: Idd21d7efa2708ab2486cdaf8bf5910af36551687

diff --git a/sw/source/ui/uiview/pview.cxx b/sw/source/ui/uiview/pview.cxx
index 2f1fea6..0bf63ec 100644
--- a/sw/source/ui/uiview/pview.cxx
+++ b/sw/source/ui/uiview/pview.cxx
@@ -1367,7 +1367,7 @@ void SwPagePreView::CalcAndSetBorderPixel( SvBorder &rToFill, sal_Bool /*bInner*
     const long nTmp = rSet.GetScrollBarSize();
     if ( pVScrollbar->IsVisible( true ) )
         rToFill.Right()  = nTmp;
-    if ( pHScrollbar->IsVisible( false ) )
+    if ( pHScrollbar->IsVisible( true ) )
         rToFill.Bottom() = nTmp;
     SetBorderPixel( rToFill );
 }