[Libreoffice-commits] .: sc/source

[Caolán McNamara]

 sc/source/filter/xml/XMLConsolidationContext.cxx |    3 +--
 sc/source/filter/xml/xmlstyle.cxx                |    6 ++----
 sc/source/ui/drawfunc/futext.cxx                 |    1 -
 3 files changed, 3 insertions(+), 7 deletions(-)

New commits:
commit 01666e23f66d43b5ea94f3562305dea52becd470
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jan 26 09:02:11 2011 +0000

    WaE: gcc 4.6.0 various warnings

diff --git a/sc/source/filter/xml/XMLConsolidationContext.cxx b/sc/source/filter/xml/XMLConsolidationContext.cxx
index eef6bfe..4da10de 100644
--- a/sc/source/filter/xml/XMLConsolidationContext.cxx
+++ b/sc/source/filter/xml/XMLConsolidationContext.cxx
@@ -117,7 +117,6 @@ void ScXMLConsolidationContext::EndElement()
         aConsParam.nTab = aTargetAddr.Tab();
         aConsParam.eFunction = eFunction;
 
-        sal_Bool bError = sal_False;
         USHORT nCount = (USHORT) Min( ScRangeStringConverter::GetTokenCount( sSourceList ), (sal_Int32)0xFFFF );
         ScArea** ppAreas = nCount ? new ScArea*[ nCount ] : NULL;
         if( ppAreas )
@@ -130,7 +129,7 @@ void ScXMLConsolidationContext::EndElement()
                 if ( !ScRangeStringConverter::GetAreaFromString(
                     *ppAreas[ nIndex ], sSourceList, GetScImport().GetDocument(), ::formula::FormulaGrammar::CONV_OOO, nOffset ) )
                 {
-                    bError = sal_True;		//! handle error
+                    //! handle error
                 }
             }
 
diff --git a/sc/source/filter/xml/xmlstyle.cxx b/sc/source/filter/xml/xmlstyle.cxx
index b24d8f8..4f8dd01 100644
--- a/sc/source/filter/xml/xmlstyle.cxx
+++ b/sc/source/filter/xml/xmlstyle.cxx
@@ -215,8 +215,6 @@ void ScXMLCellExportPropertyMapper::ContextFilter(
     XMLPropertyState* pSWBorder_Left = NULL;
     XMLPropertyState* pSWBorder_Right = NULL;
     XMLPropertyState* pSWBorder_Top = NULL;
-    XMLPropertyState* pDiagonalTLBR = NULL;
-    XMLPropertyState* pDiagonalBLTR = NULL;
 
     XMLPropertyState* pAllBorderWidthState = NULL;
     XMLPropertyState* pLeftBorderWidthState = NULL;
@@ -277,9 +275,9 @@ void ScXMLCellExportPropertyMapper::ContextFilter(
                 case CTF_RIGHTBORDERWIDTH:	    pSWRightBorderWidthState = propertie; break;
                 case CTF_TOPBORDERWIDTH:		pSWTopBorderWidthState = propertie; break;
                 case CTF_BOTTOMBORDERWIDTH:	    pSWBottomBorderWidthState = propertie; break;
-                case CTF_SC_DIAGONALTLBR:       pDiagonalTLBR = propertie; break;
+                case CTF_SC_DIAGONALTLBR:       break; //old diagonal line attribute names without "s" are only read, not written
                 case CTF_SC_DIAGONALTLBRWIDTH:  pDiagonalTLBRWidthState = propertie; break;
-                case CTF_SC_DIAGONALBLTR:       pDiagonalBLTR = propertie; break;
+                case CTF_SC_DIAGONALBLTR:       break; //old diagonal line attribute names without "s" are only read, not written
                 case CTF_SC_DIAGONALBLTRWIDTH:  pDiagonalBLTRWidthState = propertie; break;
                 case CTF_SD_SHAPE_PARA_ADJUST:  pParaAdjust = propertie; break;
                 case CTF_PARA_ADJUSTLAST:       pParaAdjustLast = propertie; break;
diff --git a/sc/source/ui/drawfunc/futext.cxx b/sc/source/ui/drawfunc/futext.cxx
index 7a9e6a1..9ba657e 100644
--- a/sc/source/ui/drawfunc/futext.cxx
+++ b/sc/source/ui/drawfunc/futext.cxx
@@ -691,7 +691,6 @@ void FuText::SetInEditMode(SdrObject* pObj, const Point* pMousePixel,
             pObj->ISA(SdrTextObj))
         {
             SdrPageView* pPV = pView->GetSdrPageView();
-            Rectangle aRect = pObj->GetLogicRect();
 
             if ( pObj->HasTextEdit() )
             {