summaryrefslogtreecommitdiff
path: root/sc/source/ui/inc
diff options
context:
space:
mode:
authorPetr Mladek <pmladek@suse.cz>2013-03-04 16:56:53 +0100
committerPetr Mladek <pmladek@suse.cz>2013-03-04 16:56:53 +0100
commit08e4a33966786b29550406fbd20ec8bb4f04d5b4 (patch)
tree1b184355689670680ac48eeefb4144babc76bea9 /sc/source/ui/inc
parentbafef6a9e36380c7c75169e600632914fe099453 (diff)
parent5b932053079c0ed73ea23fd802d5f2f7c291ec25 (diff)
Merge tag 'libreoffice-3.6.5.2' into suse-3.6
Tag libreoffice-3.6.5.2 Conflicts: editeng/source/editeng/impedit3.cxx instsetoo_native/util/openoffice.lst oovbaapi/UnoApi_oovbaapi.mk sc/source/filter/oox/workbookhelper.cxx sc/source/ui/app/scmod.cxx sc/source/ui/cctrl/checklistmenu.cxx solenv/inc/minor.mk writerfilter/source/dmapper/DomainMapper_Impl.cxx writerfilter/source/dmapper/DomainMapper_Impl.hxx writerfilter/source/dmapper/PropertyMap.cxx Change-Id: I7ea70b82b3b874cbe78354d5dd97307e63842e72
Diffstat (limited to 'sc/source/ui/inc')
-rw-r--r--sc/source/ui/inc/tabview.hxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx
index 2288480f4075..3b3e49055489 100644
--- a/sc/source/ui/inc/tabview.hxx
+++ b/sc/source/ui/inc/tabview.hxx
@@ -195,7 +195,7 @@ private:
void UpdateVarZoom();
static void SetScrollBar( ScrollBar& rScroll, long nRangeMax, long nVisible, long nPos, bool bLayoutRTL );
- static long GetScrollBarPos( ScrollBar& rScroll, bool bLayoutRTL );
+ static long GetScrollBarPos( ScrollBar& rScroll );
void GetPageMoveEndPosition(SCsCOL nMovX, SCsROW nMovY, SCsCOL& rPageX, SCsROW& rPageY);
void GetAreaMoveEndPosition(SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode,