[Libreoffice-commits] .: 2 commits - basctl/source sc/source

Stephan Bergmann sbergmann at kemper.freedesktop.org
Mon Jul 23 11:23:13 PDT 2012


 basctl/source/basicide/baside2b.cxx |   26 +++-----------------------
 sc/source/ui/docshell/olinefun.cxx  |    3 +--
 sc/source/ui/inc/olinefun.hxx       |    2 +-
 sc/source/ui/unoobj/cellsuno.cxx    |    2 +-
 sc/source/ui/view/dbfunc3.cxx       |    2 +-
 5 files changed, 7 insertions(+), 28 deletions(-)

New commits:
commit f9d86d0bc2dd1c2b93f1de47379e65be0a1eaf42
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Jul 23 20:23:05 2012 +0200

    Some clean-up
    
    Change-Id: Ib515db3b5e3bc77a397d24ed7ec1ed446f2998a2

diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index 3682d72..4fbd360 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -1967,46 +1967,26 @@ sal_Bool WatchTreeListBox::EditedEntry( SvLBoxEntry* pEntry, const rtl::OUString
 
 sal_Bool WatchTreeListBox::ImplBasicEntryEdited( SvLBoxEntry* pEntry, const String& rResult )
 {
-    WatchItem* pItem = (WatchItem*)pEntry->GetUserData();
-    String aVName( pItem->maName );
-
-    sal_Bool bError = sal_False;
-    String aResult( rResult );
-    String aIndex;
     bool bArrayElement;
     SbxBase* pSBX = ImplGetSBXForEntry( pEntry, bArrayElement );
 
-    SbxBase* pToBeChanged = NULL;
     if ( pSBX && pSBX->ISA( SbxVariable ) && !pSBX->ISA( SbxMethod ) )
     {
         SbxVariable* pVar = (SbxVariable*)pSBX;
         SbxDataType eType = pVar->GetType();
-        if ( (sal_uInt8)eType == (sal_uInt8)SbxOBJECT )
-            bError = sal_True;
-        else if ( eType & SbxARRAY )
-            bError = sal_True;
-        else
-            pToBeChanged = pSBX;
-    }
-
-    if ( pToBeChanged )
-    {
-        if ( pToBeChanged->ISA( SbxVariable ) )
+        if ( (sal_uInt8)eType != (sal_uInt8)SbxOBJECT
+             && ( eType & SbxARRAY ) == 0 )
         {
             // If the type is variable, the conversion of the SBX does not matter,
             // else the string is converted.
-            ((SbxVariable*)pToBeChanged)->PutStringExt( aResult );
+            pVar->PutStringExt( rResult );
         }
-        else
-            bError = sal_True;
     }
 
     if ( SbxBase::IsError() )
     {
-        bError = sal_True;
         SbxBase::ResetError();
     }
-    (void)bError; // used to Beep.
 
     UpdateWatches();
 
commit 55c390d526a1877bc5370d94338b9ebd75a9f3da
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Jul 23 20:22:43 2012 +0200

    Properly fix -Werror=unused-parameter
    
    Change-Id: Ia526b347e977836226bdac2b9741fa95e38e9788

diff --git a/sc/source/ui/docshell/olinefun.cxx b/sc/source/ui/docshell/olinefun.cxx
index 223eb2d..54f1d7c 100644
--- a/sc/source/ui/docshell/olinefun.cxx
+++ b/sc/source/ui/docshell/olinefun.cxx
@@ -442,9 +442,8 @@ sal_Bool ScOutlineDocFunc::SelectLevel( SCTAB nTab, sal_Bool bColumns, sal_uInt1
 
 //------------------------------------------------------------------------
 
-sal_Bool ScOutlineDocFunc::ShowMarkedOutlines( const ScRange& rRange, sal_Bool bRecord, sal_Bool bApi )
+sal_Bool ScOutlineDocFunc::ShowMarkedOutlines( const ScRange& rRange, sal_Bool bRecord )
 {
-    (void)bApi;
     sal_Bool bDone = false;
 
     SCCOL nStartCol = rRange.aStart.Col();
diff --git a/sc/source/ui/inc/olinefun.hxx b/sc/source/ui/inc/olinefun.hxx
index 2dee30c..c32ecab 100644
--- a/sc/source/ui/inc/olinefun.hxx
+++ b/sc/source/ui/inc/olinefun.hxx
@@ -45,7 +45,7 @@ public:
     sal_Bool        SelectLevel( SCTAB nTab, sal_Bool bColumns, sal_uInt16 nLevel,
                                     sal_Bool bRecord, sal_Bool bPaint, sal_Bool bApi );
 
-    sal_Bool        ShowMarkedOutlines( const ScRange& rRange, sal_Bool bRecord, sal_Bool bApi );
+    sal_Bool        ShowMarkedOutlines( const ScRange& rRange, sal_Bool bRecord );
     sal_Bool        HideMarkedOutlines( const ScRange& rRange, sal_Bool bRecord, sal_Bool bApi );
 
     sal_Bool        ShowOutline( SCTAB nTab, sal_Bool bColumns, sal_uInt16 nLevel, sal_uInt16 nEntry,
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index b880f23..d98d0a3 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -7961,7 +7961,7 @@ void SAL_CALL ScTableSheetObj::showDetail( const table::CellRangeAddress& rCellR
         ScRange aMarkRange;
         ScUnoConversion::FillScRange( aMarkRange, rCellRange );
         ScOutlineDocFunc aFunc(*pDocSh);
-        aFunc.ShowMarkedOutlines( aMarkRange, sal_True, sal_True );
+        aFunc.ShowMarkedOutlines( aMarkRange, sal_True );
     }
 }
 
diff --git a/sc/source/ui/view/dbfunc3.cxx b/sc/source/ui/view/dbfunc3.cxx
index cf7d96a..9882a40 100644
--- a/sc/source/ui/view/dbfunc3.cxx
+++ b/sc/source/ui/view/dbfunc3.cxx
@@ -351,7 +351,7 @@ void ScDBFunc::ShowMarkedOutlines( sal_Bool bRecord )
     {
         ScDocShell* pDocSh = GetViewData()->GetDocShell();
         ScOutlineDocFunc aFunc(*pDocSh);
-        sal_Bool bDone = aFunc.ShowMarkedOutlines( aRange, bRecord, false );
+        sal_Bool bDone = aFunc.ShowMarkedOutlines( aRange, bRecord );
         if (bDone)
             UpdateScrollBars();
     }


More information about the Libreoffice-commits mailing list