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

[David Tardon]

 sw/source/core/table/swtable.cxx |    7 -------
 sw/source/ui/vba/vbadocument.hxx |    1 +
 2 files changed, 1 insertion(+), 7 deletions(-)

New commits:
commit 154cd765ef0f654fc0cf1379c214fc260793a5ad
Author: David Tardon <dtardon at redhat.com>
Date:   Wed Mar 30 13:13:02 2011 +0200

    WaE: overloaded virtual

diff --git a/sw/source/ui/vba/vbadocument.hxx b/sw/source/ui/vba/vbadocument.hxx
index a8ff27a..f2c2db6 100644
--- a/sw/source/ui/vba/vbadocument.hxx
+++ b/sw/source/ui/vba/vbadocument.hxx
@@ -78,6 +78,7 @@ public:
     virtual void SAL_CALL setHyphenationZone( ::sal_Int32 _hyphenationzone ) throw (css::uno::RuntimeException);
     virtual ::sal_Int32 SAL_CALL getConsecutiveHyphensLimit() throw (css::uno::RuntimeException);
     virtual void SAL_CALL setConsecutiveHyphensLimit( ::sal_Int32 _consecutivehyphenslimit ) throw (css::uno::RuntimeException);
+    using VbaDocumentBase::Protect;
     virtual void SAL_CALL Protect( ::sal_Int32 Type, const css::uno::Any& NOReset, const css::uno::Any& Password, const css::uno::Any& UseIRM, const css::uno::Any& EnforceStyleLock ) throw (css::uno::RuntimeException);
     virtual void SAL_CALL PrintOut( const css::uno::Any& Background, const css::uno::Any& Append, const css::uno::Any& Range, const css::uno::Any& OutputFileName, const css::uno::Any& From, const css::uno::Any& To, const css::uno::Any& Item, const css::uno::Any& Copies, const css::uno::Any& Pages, const css::uno::Any& PageType, const css::uno::Any& PrintToFile, const css::uno::Any& Collate, const css::uno::Any& FileName, const css::uno::Any& ActivePrinterMacGX, const css::uno::Any& ManualDuplexPrint, const css::uno::Any& PrintZoomColumn, const css::uno::Any& PrintZoomRow, const css::uno::Any& PrintZoomPaperWidth, const css::uno::Any& PrintZoomPaperHeight ) throw (css::uno::RuntimeException);
     virtual void SAL_CALL PrintPreview(  ) throw (css::uno::RuntimeException);
commit 2b9726405495529d64e7ab8537ea30119f607d1e
Author: David Tardon <dtardon at redhat.com>
Date:   Wed Mar 30 06:18:21 2011 +0200

    WaE: unused variable

diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx
index b96c63a..0c9e3dd 100644
--- a/sw/source/core/table/swtable.cxx
+++ b/sw/source/core/table/swtable.cxx
@@ -2257,7 +2257,6 @@ void SwTableBoxFmt::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
         const SwTblBoxNumFormat *pNewFmt = 0;
         const SwTblBoxFormula *pNewFml = 0;
         const SwTblBoxValue *pNewVal = 0;
-        double aOldValue = 0;
         sal_uLong nOldFmt = NUMBERFORMAT_TEXT;
 
         switch( pNew ? pNew->Which() : 0 )
@@ -2271,10 +2270,6 @@ void SwTableBoxFmt::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
                             GetChgSet()->Get( RES_BOXATR_FORMAT )).GetValue();
                 rSet.GetItemState( RES_BOXATR_FORMULA, sal_False,
                                     (const SfxPoolItem**)&pNewFml );
-                if( SFX_ITEM_SET == rSet.GetItemState( RES_BOXATR_VALUE,
-                                    sal_False, (const SfxPoolItem**)&pNewVal ) )
-                    aOldValue = ((SwTblBoxValue&)((SwAttrSetChg*)pOld)->
-                            GetChgSet()->Get( RES_BOXATR_VALUE )).GetValue();
             }
             break;
 
@@ -2287,7 +2282,6 @@ void SwTableBoxFmt::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
             break;
         case RES_BOXATR_VALUE:
             pNewVal = (SwTblBoxValue*)pNew;
-            aOldValue = ((SwTblBoxValue*)pOld)->GetValue();
             break;
         }
 
@@ -2827,4 +2821,4 @@ void SwTableBox::ForgetFrmFmt()
 }
 
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */