[Libreoffice-commits] .: Branch 'integration/dev300_m101' - svtools/inc

[Bjoern Michaelsen]

 svtools/inc/svtools/svtabbx.hxx |    2 +-
 svtools/inc/svtools/tabbar.hxx  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 486c77f1eef1a7a5bd97a70b82038f05e505d305
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Sun Mar 13 01:48:37 2011 +0100

    removing remaining tools types from svtools

diff --git a/svtools/inc/svtools/svtabbx.hxx b/svtools/inc/svtools/svtabbx.hxx
index 02b362a..751453d 100644
--- a/svtools/inc/svtools/svtabbx.hxx
+++ b/svtools/inc/svtools/svtabbx.hxx
@@ -203,7 +203,7 @@ public:
     virtual sal_Bool				HasRowHeader() const; //GetColumnId
     /** @return  <TRUE/>, if the object can focus a cell. */
     virtual sal_Bool				IsCellFocusable() const;
-    virtual BOOL                    GoToCell( sal_Int32 _nRow, sal_uInt16 _nColumn );
+    virtual sal_Bool                    GoToCell( sal_Int32 _nRow, sal_uInt16 _nColumn );
 
     virtual void					SetNoSelection();
     using SvListView::SelectAll;
diff --git a/svtools/inc/svtools/tabbar.hxx b/svtools/inc/svtools/tabbar.hxx
index 7efee21..221ae3a 100644
--- a/svtools/inc/svtools/tabbar.hxx
+++ b/svtools/inc/svtools/tabbar.hxx
@@ -403,7 +403,7 @@ private:
     SVT_DLLPRIVATE void			ImplActivatePage();
     SVT_DLLPRIVATE long			ImplDeactivatePage();
     SVT_DLLPRIVATE void            ImplPrePaint();
-    SVT_DLLPRIVATE ImplTabBarItem* ImplGetLastTabBarItem( USHORT nItemCount );
+    SVT_DLLPRIVATE ImplTabBarItem* ImplGetLastTabBarItem( sal_uInt16 nItemCount );
     SVT_DLLPRIVATE Rectangle       ImplGetInsertTabRect(ImplTabBarItem* pItem) const;
                     DECL_DLLPRIVATE_LINK( ImplClickHdl, ImplTabButton* );