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

Caolán McNamara caolan at kemper.freedesktop.org
Mon Jan 17 12:47:53 PST 2011


 sc/source/core/tool/address.cxx |    2 +-
 sc/source/ui/view/viewfun4.cxx  |    3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 51a97371151bd6b94ae820416c296fad6f59b890
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Sun Jan 16 23:25:01 2011 +0100

    cppcheck: remove unused variable 'pEditSel'

diff --git a/sc/source/ui/view/viewfun4.cxx b/sc/source/ui/view/viewfun4.cxx
index fa5a904..eb12b25 100644
--- a/sc/source/ui/view/viewfun4.cxx
+++ b/sc/source/ui/view/viewfun4.cxx
@@ -478,14 +478,12 @@ void ScViewFunc::DoSheetConversion( const ScConversionParam& rConvParam, BOOL bR
     ScMarkData& rMark = rViewData.GetMarkData();
     ScSplitPos eWhich = rViewData.GetActivePart();
     EditView* pEditView = NULL;
-    ESelection* pEditSel = NULL;
     BOOL bIsEditMode = rViewData.HasEditView(eWhich);
     if (bRecord && !pDoc->IsUndoEnabled())
         bRecord = FALSE;
     if (bIsEditMode)                                            // Edit-Mode aktiv
     {
         rViewData.GetEditView(eWhich, pEditView, nCol, nRow);
-        pEditSel = new ESelection(pEditView->GetSelection());
         SC_MOD()->InputEnterHandler();
     }
     else
@@ -505,7 +503,6 @@ void ScViewFunc::DoSheetConversion( const ScConversionParam& rConvParam, BOOL bR
         if (!aTester.IsEditable())
         {
             ErrorMessage(aTester.GetMessageId());
-            delete pEditSel;
             return;
         }
     }
commit fd75ebf26bb3447487f56a732538a14bb04b9d19
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Sun Jan 16 23:15:10 2011 +0100

    cppcheck: reduce scope of variable 'nTab'

diff --git a/sc/source/core/tool/address.cxx b/sc/source/core/tool/address.cxx
index 5a650f9..f7eda7f 100644
--- a/sc/source/core/tool/address.cxx
+++ b/sc/source/core/tool/address.cxx
@@ -905,10 +905,10 @@ lcl_ScRange_Parse_XL_A1( ScRange& r,
     tmp1 = lcl_a1_get_col( p, &r.aEnd, &nFlags2 );
     if( !tmp1 && !aEndTabName.Len() )     // Probably the aEndTabName was specified after the first range
     {
-        SCTAB nTab = 0;
         p = lcl_XL_ParseSheetRef( p, aEndTabName, false, NULL );
         if( p )
         {
+            SCTAB nTab = 0;
             if( aEndTabName.Len() && pDoc->GetTable( aEndTabName, nTab ) )
             {
                 r.aEnd.SetTab( nTab );


More information about the Libreoffice-commits mailing list