[Libreoffice-commits] .: 2 commits - svtools/source vcl/source

[Caolán McNamara]

 svtools/source/control/tabbar.cxx |    2 +-
 vcl/source/window/printdlg.cxx    |    5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

New commits:
commit 2409f38d5eb8c93f4ce173a2d6679ec4ebd01e6b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Mar 18 17:29:22 2011 +0000

    WaE: PAGE_NOT_FOUND is a 16bit value

diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx
index 9b61f88..0455df6 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -1972,7 +1972,7 @@ void TabBar::Clear()
     if ( IsReallyVisible() && IsUpdateMode() )
         Invalidate();
 
-    CallEventListeners( VCLEVENT_TABBAR_PAGEREMOVED, (void*) PAGE_NOT_FOUND );
+    CallEventListeners( VCLEVENT_TABBAR_PAGEREMOVED, reinterpret_cast<void*>(sal::static_int_cast<sal_IntPtr>(PAGE_NOT_FOUND)) );
 }
 
 // -----------------------------------------------------------------------
commit f0ad5b38424e64790f3f3e96430d855df1e61379
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Mar 18 17:17:49 2011 +0000

    WaE: nCurSubGroup unused

diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index 408773e..9dd335b 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -1046,7 +1046,7 @@ void PrintDialog::setupOptionalUI()
     boost::shared_ptr< vcl::RowOrColumn > pCurColumn;
 
     Window* pCurParent = 0, *pDynamicPageParent = 0;
-    sal_uInt16 nOptPageId = 9, nCurSubGroup = 0;
+    sal_uInt16 nOptPageId = 9;
     bool bOnStaticPage = false;
     bool bSubgroupOnStaticPage = false;
 
@@ -1227,9 +1227,6 @@ void PrintDialog::setupOptionalUI()
             // set help text
             setHelpText( pNewGroup, aHelpTexts, 0 );
 
-            // reset subgroup counter
-            nCurSubGroup = 0;
-
             aDynamicColumns.push_back( boost::dynamic_pointer_cast<vcl::RowOrColumn>(pNewGroup->getLayout()) );
             pCurColumn = aDynamicColumns.back();
             pCurColumn->setParentWindow( pNewGroup );