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

[Caolán McNamara]

 chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx |    2 --
 chart2/source/controller/main/ChartController.hxx             |    2 +-
 chart2/source/controller/main/DragMethod_RotateDiagram.cxx    |    1 -
 sc/source/core/data/dpobject.cxx                              |    1 +
 sc/source/filter/inc/xeroot.hxx                               |    2 +-
 sc/source/filter/inc/xiroot.hxx                               |    2 +-
 sc/source/filter/inc/xlroot.hxx                               |    2 +-
 sc/source/ui/vba/vbarange.cxx                                 |    2 +-
 sc/source/ui/view/drawview.cxx                                |    2 --
 9 files changed, 6 insertions(+), 10 deletions(-)

New commits:
commit 43cd488840131fc2b30e1606ddc6504666e27a43
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Jan 24 14:43:59 2011 +0000

    WaE: gcc 4.6.0 various warnings

diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
index cfb5ce5..3f3c22f 100644
--- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
@@ -230,7 +230,6 @@ void SAL_CALL UpDownBarWrapper::removeVetoableChangeListener( const ::rtl::OUStr
 void SAL_CALL UpDownBarWrapper::setPropertyValues( const uno::Sequence< ::rtl::OUString >& rNameSeq, const uno::Sequence< uno::Any >& rValueSeq )
                     throw (beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
 {
-    bool bUnknownProperty = false;
     sal_Int32 nMinCount = std::min( rValueSeq.getLength(), rNameSeq.getLength() );
     for(sal_Int32 nN=0; nN<nMinCount; nN++)
     {
@@ -242,7 +241,6 @@ void SAL_CALL UpDownBarWrapper::setPropertyValues( const uno::Sequence< ::rtl::O
         catch( beans::UnknownPropertyException& ex )
         {
             ASSERT_EXCEPTION( ex );
-            bUnknownProperty = true;
         }
     }
     //todo: store unknown properties elsewhere
diff --git a/chart2/source/controller/main/ChartController.hxx b/chart2/source/controller/main/ChartController.hxx
index 3927da9..93b1706 100644
--- a/chart2/source/controller/main/ChartController.hxx
+++ b/chart2/source/controller/main/ChartController.hxx
@@ -545,7 +545,7 @@ private:
                 TheModel* operator->() const { return m_pTheModel; }
         private:
             TheModel*				m_pTheModel;
-            mutable ::osl::Mutex&	m_rModelMutex;
+            ::osl::Mutex&	m_rModelMutex;
     };
 
 private:
diff --git a/chart2/source/controller/main/DragMethod_RotateDiagram.cxx b/chart2/source/controller/main/DragMethod_RotateDiagram.cxx
index 5b2ca0b..9fdfdb1 100644
--- a/chart2/source/controller/main/DragMethod_RotateDiagram.cxx
+++ b/chart2/source/controller/main/DragMethod_RotateDiagram.cxx
@@ -85,7 +85,6 @@ DragMethod_RotateDiagram::DragMethod_RotateDiagram( DrawViewWrapper& rDrawViewWr
     if(pObj && m_pScene)
     {
         m_aReferenceRect = pObj->GetLogicRect();
-        Rectangle aTemp = m_pScene->GetLogicRect();
 
         m_aWireframePolyPolygon = m_pScene->CreateWireframe();
 
diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index 48295c6..bbee292 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -1592,6 +1592,7 @@ void ScDPObject::ToggleDetails(const DataPilotTableHeaderData& rElemDesc, ScDPOb
     }
 
     DBG_ASSERT( bFound, "member not found" );
+    (void)bFound;
 
     //!	use Hierarchy and Level in SaveData !!!!
 
diff --git a/sc/source/filter/inc/xeroot.hxx b/sc/source/filter/inc/xeroot.hxx
index cac22f4..dc8652e 100644
--- a/sc/source/filter/inc/xeroot.hxx
+++ b/sc/source/filter/inc/xeroot.hxx
@@ -168,7 +168,7 @@ private:
     XclExpRootData::XclExpLinkMgrRef GetLocalLinkMgrRef() const;
 
 private:
-    mutable XclExpRootData& mrExpData;      /// Reference to the global export data struct.
+    XclExpRootData& mrExpData;      /// Reference to the global export data struct.
 };
 
 // ============================================================================
diff --git a/sc/source/filter/inc/xiroot.hxx b/sc/source/filter/inc/xiroot.hxx
index 1b4153e..83953e3 100644
--- a/sc/source/filter/inc/xiroot.hxx
+++ b/sc/source/filter/inc/xiroot.hxx
@@ -218,7 +218,7 @@ public:
     void                ReadCodeName( XclImpStream& rStrm, bool bGlobals );
 
 private:
-    mutable XclImpRootData& mrImpData;      /// Reference to the global import data struct.
+    XclImpRootData& mrImpData;      /// Reference to the global import data struct.
 };
 
 // ============================================================================
diff --git a/sc/source/filter/inc/xlroot.hxx b/sc/source/filter/inc/xlroot.hxx
index 5e132fa..3f9f6fa 100644
--- a/sc/source/filter/inc/xlroot.hxx
+++ b/sc/source/filter/inc/xlroot.hxx
@@ -285,7 +285,7 @@ public:
     inline void         IncCurrScTab() { ++mrData.mnScTab; }
 
 private:
-    mutable XclRootData& mrData;        /// Reference to the global data struct.
+    XclRootData& mrData;        /// Reference to the global data struct.
 };
 
 // ============================================================================
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index 7f67ce7..c161aa1 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -5574,7 +5574,7 @@ ScVbaRange:: ClearOutline(  ) throw (script::BasicErrorException, uno::RuntimeEx
     RangeHelper thisRange( mxRange );
     table::CellRangeAddress thisAddress = thisRange.getCellRangeAddressable()->getRangeAddress();
     uno::Reference< sheet::XSheetOutline > xSheetOutline( thisRange.getSpreadSheet(), uno::UNO_QUERY_THROW );
-        xSheetOutline->clearOutline();
+    xSheetOutline->clearOutline();
 }
 
 void
diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx
index 33f34c2..96e8298 100644
--- a/sc/source/ui/view/drawview.cxx
+++ b/sc/source/ui/view/drawview.cxx
@@ -378,7 +378,6 @@ void ScDrawView::MarkListHasChanged()
 
     SdrOle2Obj* pOle2Obj = NULL;
     SdrGrafObj* pGrafObj = NULL;
-    SdrMediaObj* pMediaObj = NULL;
 
     const SdrMarkList& rMarkList = GetMarkedObjectList();
     ULONG nMarkCount = rMarkList.GetMarkCount();
@@ -411,7 +410,6 @@ void ScDrawView::MarkListHasChanged()
         }
         else if (pObj->GetObjIdentifier() == OBJ_MEDIA)
         {
-            pMediaObj = (SdrMediaObj*) pObj;
             pViewSh->SetMediaShell(TRUE);
             bSubShellSet = TRUE;
         }