[Libreoffice-commits] .: binfilter/bf_sw
Christian Lohmaier
cloph at kemper.freedesktop.org
Wed Apr 20 18:54:14 PDT 2011
binfilter/bf_sw/source/core/para/sw_paratr.cxx | 6 +++---
binfilter/bf_sw/source/filter/excel/sw_exctools.cxx | 2 +-
binfilter/bf_sw/source/filter/w4w/sw_w4wpar2.cxx | 4 ++--
binfilter/bf_sw/source/ui/uno/sw_unomod.cxx | 6 +++---
binfilter/bf_sw/source/ui/utlui/sw_uiitems.cxx | 6 +++---
5 files changed, 12 insertions(+), 12 deletions(-)
New commits:
commit 7acd10a82180b948131ae809dd17afa9fab3ae96
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date: Thu Apr 21 03:54:26 2011 +0200
WaE - variable may be used uninitialized
diff --git a/binfilter/bf_sw/source/core/para/sw_paratr.cxx b/binfilter/bf_sw/source/core/para/sw_paratr.cxx
index aa94869..79ff4a9 100644
--- a/binfilter/bf_sw/source/core/para/sw_paratr.cxx
+++ b/binfilter/bf_sw/source/core/para/sw_paratr.cxx
@@ -210,7 +210,7 @@ using namespace ::com::sun::star;
/*N*/ {
/*N*/ case MID_DROPCAP_LINES :
/*N*/ {
-/*N*/ sal_Int8 nTemp;
+/*N*/ sal_Int8 nTemp(0);
/*N*/ rVal >>= nTemp;
/*N*/ if(nTemp >=1 && nTemp < 0x7f)
/*N*/ nLines = (BYTE)nTemp;
@@ -218,7 +218,7 @@ using namespace ::com::sun::star;
/*N*/ break;
/*N*/ case MID_DROPCAP_COUNT :
/*N*/ {
-/*N*/ sal_Int16 nTemp;
+/*N*/ sal_Int16 nTemp(0);
/*N*/ rVal >>= nTemp;
/*N*/ if(nTemp >=1 && nTemp < 0x7f)
/*N*/ nChars = (BYTE)nTemp;
@@ -226,7 +226,7 @@ using namespace ::com::sun::star;
/*N*/ break;
/*N*/ case MID_DROPCAP_DISTANCE :
/*N*/ {
-/*N*/ sal_Int16 nVal;
+/*N*/ sal_Int16 nVal(0);
/*N*/ if ( rVal >>= nVal )
/*N*/ nDistance = (sal_Int16) MM100_TO_TWIP((sal_Int32)nVal);
/*N*/ else
diff --git a/binfilter/bf_sw/source/filter/excel/sw_exctools.cxx b/binfilter/bf_sw/source/filter/excel/sw_exctools.cxx
index 271aef3..df1c2c0 100644
--- a/binfilter/bf_sw/source/filter/excel/sw_exctools.cxx
+++ b/binfilter/bf_sw/source/filter/excel/sw_exctools.cxx
@@ -1089,7 +1089,7 @@ void XF_Buffer::SetItemSets( UINT16 nCol, UINT16 nStartRow, UINT16 nEndRow,
SwTableBoxFmt* pBoxFmt = (SwTableBoxFmt*)pSttBox->ClaimFrmFmt();
pBoxFmt->SetAttr( *pBoxAttr );
- SwTableBox* pEndBox;
+ SwTableBox* pEndBox = NULL;
if( nStartRow != nEndRow )
{
for( UINT16 nRow = nStartRow ; nRow <= nEndRow ; nRow++ )
diff --git a/binfilter/bf_sw/source/filter/w4w/sw_w4wpar2.cxx b/binfilter/bf_sw/source/filter/w4w/sw_w4wpar2.cxx
index bcad2ad..d37c929 100644
--- a/binfilter/bf_sw/source/filter/w4w/sw_w4wpar2.cxx
+++ b/binfilter/bf_sw/source/filter/w4w/sw_w4wpar2.cxx
@@ -1560,7 +1560,7 @@ void SwW4WParser::Adjust_pTabDefs() // Aufrufe siehe .<CDS> und .<BRO>
pTabDefs[nTabCols].nLeftTw = pTabDefs[0].nLeftTw + nTabWidthTw;
long nWidthTw; // Groesse der aktuellen Zelle
- long nMittel; // zur Erkennung, ob alle Zellen gleich gross
+ long nMittel=0; // zur Erkennung, ob alle Zellen gleich gross
for (i=0; i<(int)nTabCols; i++)
{
@@ -2033,7 +2033,7 @@ void SwW4WParser::Read_BeginColumnMode() // (BCM)
{
// Hilfsvaris zum uebersichtlicheren Zugriff auf Zeilen-Arrays
USHORT* aThisRow = (*pTabBorders)[ iR ];
- USHORT* aAboveRow;
+ USHORT* aAboveRow = 0;
if( iR > 0 )
aAboveRow = (*pTabBorders)[ iR-1 ];
USHORT* aBelowRow(NULL);
diff --git a/binfilter/bf_sw/source/ui/uno/sw_unomod.cxx b/binfilter/bf_sw/source/ui/uno/sw_unomod.cxx
index 1ac6d28..b5c2cea 100644
--- a/binfilter/bf_sw/source/ui/uno/sw_unomod.cxx
+++ b/binfilter/bf_sw/source/ui/uno/sw_unomod.cxx
@@ -396,7 +396,7 @@ void SwXPrintSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo,
break;
case HANDLE_PRINTSET_ANNOTATION_MODE:
{
- sal_Int16 nVal;
+ sal_Int16 nVal(0);
rValue >>= nVal;
if(nVal <= text::NotePrintMode_PAGE_END)
mpPrtOpt->SetPrintPostIts(nVal);
@@ -601,7 +601,7 @@ void SwXViewSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo, c
break;
case HANDLE_VIEWSET_ZOOM :
{
- sal_Int16 nZoom;
+ sal_Int16 nZoom(0);
if(!(rValue >>= nZoom) || nZoom > 1000 || nZoom < 5)
throw lang::IllegalArgumentException();
mpViewOption->SetZoom((sal_uInt16)nZoom);
@@ -610,7 +610,7 @@ void SwXViewSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo, c
break;
case HANDLE_VIEWSET_ZOOM_TYPE:
{
- sal_Int16 nZoom;
+ sal_Int16 nZoom(0);
if(!(rValue >>= nZoom))
throw IllegalArgumentException();
SvxZoomType eZoom = (SvxZoomType)USHRT_MAX;
diff --git a/binfilter/bf_sw/source/ui/utlui/sw_uiitems.cxx b/binfilter/bf_sw/source/ui/utlui/sw_uiitems.cxx
index d92f679..bb99325 100644
--- a/binfilter/bf_sw/source/ui/utlui/sw_uiitems.cxx
+++ b/binfilter/bf_sw/source/ui/utlui/sw_uiitems.cxx
@@ -141,7 +141,7 @@ static const USHORT nFtnLines[] = {
/*N*/ break;
/*N*/ case MID_LINE_WEIGHT :
/*N*/ {
-/*N*/ sal_Int16 nSet; rVal >>= nSet;
+/*N*/ sal_Int16 nSet(0); rVal >>= nSet;
/*N*/ if(nSet >= 0)
/*N*/ aFtnInfo.SetLineWidth(MM100_TO_TWIP(nSet));
/*N*/ else
@@ -150,7 +150,7 @@ static const USHORT nFtnLines[] = {
/*N*/ break;
/*N*/ case MID_LINE_RELWIDTH :
/*N*/ {
-/*N*/ sal_Int8 nSet; rVal >>= nSet;
+/*N*/ sal_Int8 nSet(0); rVal >>= nSet;
/*N*/ if(nSet < 0)
/*N*/ bRet = false;
/*N*/ else
@@ -159,7 +159,7 @@ static const USHORT nFtnLines[] = {
/*N*/ break;
/*N*/ case MID_LINE_ADJUST :
/*N*/ {
-/*N*/ sal_Int16 nSet; rVal >>= nSet;
+/*N*/ sal_Int16 nSet(0); rVal >>= nSet;
/*N*/ if(nSet >= 0 && nSet < 3) //com::sun::star::text::HorizontalAdjust
/*N*/ aFtnInfo.SetAdj((SwFtnAdj)nSet);
/*N*/ else
More information about the Libreoffice-commits
mailing list