[Libreoffice-commits] .: 2 commits - basic/source sfx2/source

[David Tardon]

 basic/source/sbx/sbxcurr.cxx  |    2 +-
 sfx2/source/dialog/tabdlg.cxx |    6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

New commits:
commit 7d2b98faa2a99a18605c226ae87b82ba3f1d3804
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Feb 8 08:22:04 2011 +0100

    WaE: unused variable

diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index f5a6ca3..1202b56 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -388,11 +388,7 @@ const SfxPoolItem* SfxTabPage::GetItem( const SfxItemSet& rSet, USHORT nSlot, sa
     const SfxItemPool* pPool = rSet.GetPool();
     USHORT nWh = pPool->GetWhich( nSlot, bDeep );
     const SfxPoolItem* pItem = 0;
-#ifdef DEBUG
-    SfxItemState eState;
-    eState =
-#endif
-            rSet.GetItemState( nWh, TRUE, &pItem );  // -Wall required??
+    rSet.GetItemState( nWh, TRUE, &pItem );
 
     if ( !pItem && nWh != nSlot )
         pItem = &pPool->GetDefaultItem( nWh );
commit 5f08b8c1cc989b7d0dd89b8fd306cd46efe60dd7
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Feb 8 08:15:39 2011 +0100

    assign the right var

diff --git a/basic/source/sbx/sbxcurr.cxx b/basic/source/sbx/sbxcurr.cxx
index 1c039ef..de80ea2 100644
--- a/basic/source/sbx/sbxcurr.cxx
+++ b/basic/source/sbx/sbxcurr.cxx
@@ -488,7 +488,7 @@ start:
             {
                 SbxBase::SetError( SbxERR_OVERFLOW ); val = SbxMININT;
             }
-            *p->pInteger = (INT16) r; break;
+            *p->pInteger = (INT16) val; break;
         }
         case SbxBYREF | SbxERROR:
         case SbxBYREF | SbxUSHORT: