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

[Caolán McNamara]

 svl/source/svdde/ddesvr.cxx      |    2 +-
 sw/source/ui/uiview/viewport.cxx |    4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 2e92ad18466d235864df82dc2a3a729d144736c3
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Feb 13 14:13:20 2012 +0000

    fix windows build, String::GetTokenCount is gone

diff --git a/svl/source/svdde/ddesvr.cxx b/svl/source/svdde/ddesvr.cxx
index e4fc303..916823c 100644
--- a/svl/source/svdde/ddesvr.cxx
+++ b/svl/source/svdde/ddesvr.cxx
@@ -110,7 +110,7 @@ HDDEDATA CALLBACK _export DdeInternal::SvrCallback(
                             }
                         }
                         else
-                            nTopics += sTopics.GetTokenCount( '\t' );
+                            nTopics += comphelper::string::getTokenCount(sTopics, '\t');
                     }
                 }
             }
commit 2ad3b48ce59723842d77f5eeed4fd4336c9d8362
Author: Ivan Timofeev <timofeev.i.s at gmail.com>
Date:   Thu Feb 9 21:06:06 2012 +0400

    always use the *real* visibility of the SwScrollbar

diff --git a/sw/source/ui/uiview/viewport.cxx b/sw/source/ui/uiview/viewport.cxx
index 2591b50..0e09076 100644
--- a/sw/source/ui/uiview/viewport.cxx
+++ b/sw/source/ui/uiview/viewport.cxx
@@ -840,9 +840,7 @@ void SwView::CalcAndSetBorderPixel( SvBorder &rToFill, sal_Bool /*bInner*/ )
         else
             rToFill.Right()  = nTmp;
     }
-    //#i32913# in browse mode the visibility of the horizontal scrollbar
-    // depends on the content (fixed width tables may require a scrollbar)
-    if ( pHScrollbar->IsVisible(pWrtShell->GetViewOptions()->getBrowseMode()) )
+    if ( pHScrollbar->IsVisible(sal_True) )
         rToFill.Bottom() = nTmp;
 
     SetBorderPixel( rToFill );