[Libreoffice-commits] .: binfilter/bf_sc binfilter/bf_sw binfilter/inc

[Caolán McNamara]

 binfilter/bf_sc/source/core/tool/sc_interpr5.cxx    |    2 +-
 binfilter/bf_sc/source/core/tool/sc_rangeutl.cxx    |    2 +-
 binfilter/bf_sc/source/ui/unoobj/sc_miscuno.cxx     |    1 -
 binfilter/bf_sw/source/filter/excel/sw_excimpop.cxx |    2 +-
 binfilter/inc/bf_svx/numitem.hxx                    |    4 +---
 5 files changed, 4 insertions(+), 7 deletions(-)

New commits:
commit d09cf17a6c791228370f3f534ba058325cc0c4f5
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Feb 27 12:43:23 2012 +0000

    some windows warnings

diff --git a/binfilter/bf_sc/source/core/tool/sc_interpr5.cxx b/binfilter/bf_sc/source/core/tool/sc_interpr5.cxx
index 99a8ef6..d59dd4d 100644
--- a/binfilter/bf_sc/source/core/tool/sc_interpr5.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_interpr5.cxx
@@ -2443,7 +2443,7 @@ void ScInterpreter::ScRGP()
         return;
     }
     BYTE nCase;                         // 1 = normal, 2,3 = mehrfach
-    USHORT nCX, nRX, nCY, nRY, M, N;
+    USHORT nCX, nRX, nCY, nRY, M(0), N(0);
     pMatY->GetDimensions(nCY, nRY);
     ULONG nCountY = (ULONG) nCY * nRY;
     for ( ULONG i = 0; i < nCountY; i++ )
diff --git a/binfilter/bf_sc/source/core/tool/sc_rangeutl.cxx b/binfilter/bf_sc/source/core/tool/sc_rangeutl.cxx
index a0c8573..531a923 100644
--- a/binfilter/bf_sc/source/core/tool/sc_rangeutl.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_rangeutl.cxx
@@ -107,7 +107,7 @@ namespace binfilter {
 /*N*/ {
 /*N*/   BOOL bResult=FALSE;
 /*N*/   ScRangeUtil     aRangeUtil;
-/*N*/   USHORT          nTab, nColStart, nColEnd, nRowStart, nRowEnd;
+/*N*/   USHORT          nTab(0), nColStart(0), nColEnd(0), nRowStart(0), nRowEnd(0);
 /*N*/
 /*N*/   if( eScope==RUTL_NAMES )
 /*N*/   {
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_miscuno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_miscuno.cxx
index 17972e6..1730d6b 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_miscuno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_miscuno.cxx
@@ -320,7 +320,6 @@ sal_Int32 SAL_CALL ScNameToIndexAccess::getCount(  ) throw(::com::sun::star::uno
         return xNameAccess->getByName( aNames.getConstArray()[nIndex] );
 
     throw lang::IndexOutOfBoundsException();
-    return uno::Any();
 }
 
 // XElementAccess
diff --git a/binfilter/bf_sw/source/filter/excel/sw_excimpop.cxx b/binfilter/bf_sw/source/filter/excel/sw_excimpop.cxx
index 8ebf9e9..66a62fb 100644
--- a/binfilter/bf_sw/source/filter/excel/sw_excimpop.cxx
+++ b/binfilter/bf_sw/source/filter/excel/sw_excimpop.cxx
@@ -170,7 +170,7 @@ void SwExcelParser::Label25()
 // ------------------------------------------------------------------ 0x06
 void SwExcelParser::Formula25()
     {
-    UINT16 nRow, nCol, nXF, nFormLen;
+    UINT16 nRow, nCol, nXF(0), nFormLen;
     double fCurVal;
     BYTE nAttr0, nFlag0;
 
diff --git a/binfilter/inc/bf_svx/numitem.hxx b/binfilter/inc/bf_svx/numitem.hxx
index 2159420..f21c0a5 100644
--- a/binfilter/inc/bf_svx/numitem.hxx
+++ b/binfilter/inc/bf_svx/numitem.hxx
@@ -140,13 +140,11 @@ class SvxNumberFormat : public SvxNumberType
 
     BitmapEx*           pScaledImageCache;  // Image scaled to aGraphicSize, only cached for WINDOW/VDEV
 
-//  void GetCharStr( ULONG nNo, String& rStr ) const;
-//  void GetCharStrN( ULONG nNo, String& rStr ) const;
 public:
     SvxNumberFormat(sal_Int16 nNumberingType);
     SvxNumberFormat(const SvxNumberFormat& rFormat);
     SvxNumberFormat(SvStream &rStream);
-    ~SvxNumberFormat();
+    virtual ~SvxNumberFormat();
 
     SvStream&   Store(SvStream &rStream, FontToSubsFontConverter) { return rStream; }