[Libreoffice-commits] .: binfilter/bf_svx binfilter/bf_sw binfilter/inc
Norbert Thiebaud
nthiebaud at kemper.freedesktop.org
Sun Nov 21 18:31:02 PST 2010
binfilter/bf_svx/source/items/svx_algitem.cxx | 10 ++++----
binfilter/bf_svx/source/items/svx_frmitems.cxx | 26 +++++++++++------------
binfilter/bf_svx/source/items/svx_pageitem.cxx | 4 +--
binfilter/bf_svx/source/items/svx_paraitem.cxx | 4 +--
binfilter/bf_svx/source/items/svx_rotmodit.cxx | 2 -
binfilter/bf_sw/source/ui/app/sw_swlib.cxx | 1
binfilter/bf_sw/source/ui/inc/wrtsh.hxx | 6 ++---
binfilter/inc/bf_sfx2/event.hxx | 8 +++----
binfilter/inc/bf_sw/iodetect.hxx | 28 ++++++++++++-------------
9 files changed, 44 insertions(+), 45 deletions(-)
New commits:
commit 0c166223ebaa3ffa27439b6a5a76f5e508e0a4e1
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sun Nov 21 20:30:39 2010 -0600
squashed a couple hundreds warning.
diff --git a/binfilter/bf_svx/source/items/svx_algitem.cxx b/binfilter/bf_svx/source/items/svx_algitem.cxx
index 1781bc4..ebc31c7 100644
--- a/binfilter/bf_svx/source/items/svx_algitem.cxx
+++ b/binfilter/bf_svx/source/items/svx_algitem.cxx
@@ -132,7 +132,7 @@ using namespace ::com::sun::star;
/*N*/ table::CellHoriJustify eUno;
/*N*/ if(!(rVal >>= eUno))
/*N*/ {
-/*N*/ sal_Int32 nValue;
+/*N*/ sal_Int32 nValue = 0;
/*?*/ if(!(rVal >>= nValue))
/*?*/ return sal_False;
/*?*/ eUno = (table::CellHoriJustify)nValue;
@@ -154,7 +154,7 @@ using namespace ::com::sun::star;
/*N*/ case MID_HORJUST_ADJUST:
/*N*/ {
/*N*/ // property contains ParagraphAdjust values as sal_Int16
-/*N*/ sal_Int16 nVal;
+/*N*/ sal_Int16 nVal = 0;
/*?*/ if(!(rVal >>= nVal))
/*?*/ return sal_False;
/*?*/
@@ -231,7 +231,7 @@ using namespace ::com::sun::star;
/*N*/ table::CellVertJustify eUno;
/*N*/ if(!(rVal >>= eUno))
/*N*/ {
-/*?*/ sal_Int32 nValue;
+/*?*/ sal_Int32 nValue = 0;
/*?*/ if(!(rVal >>= nValue))
/*?*/ return sal_False;
/*?*/ eUno = (table::CellVertJustify)nValue;
@@ -309,7 +309,7 @@ using namespace ::com::sun::star;
/*N*/ table::CellOrientation eOrient;
/*N*/ if(!(rVal >>= eOrient))
/*N*/ {
-/*?*/ sal_Int32 nValue;
+/*?*/ sal_Int32 nValue = 0;
/*?*/ if(!(rVal >>= nValue))
/*?*/ return sal_False;
/*?*/ eOrient = (table::CellOrientation)nValue;
@@ -478,7 +478,7 @@ using namespace ::com::sun::star;
/*N*/ {
/*N*/ sal_Bool bConvert = ( ( nMemberId & CONVERT_TWIPS ) != 0 );
/*N*/ long nMaxVal = bConvert ? TWIP_TO_MM100(SHRT_MAX) : SHRT_MAX; // Members sind sal_Int16
-/*N*/ sal_Int32 nVal;
+/*N*/ sal_Int32 nVal = 0;
/*N*/ if(!(rVal >>= nVal) || (nVal > nMaxVal))
/*N*/ return sal_False;
/*N*/
diff --git a/binfilter/bf_svx/source/items/svx_frmitems.cxx b/binfilter/bf_svx/source/items/svx_frmitems.cxx
index 923e2f7..cd0f995 100644
--- a/binfilter/bf_svx/source/items/svx_frmitems.cxx
+++ b/binfilter/bf_svx/source/items/svx_frmitems.cxx
@@ -260,7 +260,7 @@ using namespace ::com::sun::star;
/*N*/ break;
/*N*/ case MID_SIZE_WIDTH:
/*N*/ {
-/*N*/ sal_Int32 nVal;
+/*N*/ sal_Int32 nVal = 0;
/*N*/ if(!(rVal >>= nVal ))
/*N*/ return sal_False;
/*N*/
@@ -269,7 +269,7 @@ using namespace ::com::sun::star;
/*N*/ break;
/*N*/ case MID_SIZE_HEIGHT:
/*N*/ {
-/*N*/ sal_Int32 nVal;
+/*N*/ sal_Int32 nVal = 0;
/*N*/ if(!(rVal >>= nVal))
/*N*/ return sal_True;
/*N*/
@@ -440,8 +440,8 @@ using namespace ::com::sun::star;
/*N*/ case MID_L_REL_MARGIN:
/*N*/ case MID_R_REL_MARGIN:
/*N*/ {
-/*N*/ sal_Int32 nRel;
-/*N*/ if((rVal >>= nRel) && nRel >= 0 && nRel < USHRT_MAX)
+/*N*/ sal_Int32 nRel = 0;
+/*N*/ if((rVal >>= nRel) && nRel >= 0 && nRel < USHRT_MAX)
/*N*/ {
/*N*/ if(MID_L_REL_MARGIN== nMemberId)
/*N*/ nPropLeftMargin = (USHORT)nRel;
@@ -693,7 +693,7 @@ using namespace ::com::sun::star;
/*N*/ {
/*N*/ sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
/*N*/ nMemberId &= ~CONVERT_TWIPS;
-/*N*/ sal_Int32 nVal;
+/*N*/ sal_Int32 nVal = 0;
/*N*/ switch( nMemberId )
/*N*/ {
/*N*/ case MID_UP_MARGIN :
@@ -709,7 +709,7 @@ using namespace ::com::sun::star;
/*N*/ case MID_UP_REL_MARGIN:
/*N*/ case MID_LO_REL_MARGIN:
/*N*/ {
-/*N*/ sal_Int32 nRel;
+/*N*/ sal_Int32 nRel = 0;
/*?*/ if((rVal >>= nRel) && nRel > 1 )
/*?*/ {
/*?*/ if(MID_UP_REL_MARGIN == nMemberId)
@@ -1381,7 +1381,7 @@ using namespace ::com::sun::star;
/*N*/
/*N*/ if( bDistMember || nMemberId == BORDER_DISTANCE )
/*N*/ {
-/*N*/ sal_Int32 nDist;
+/*N*/ sal_Int32 nDist = 0;
/*N*/ if(!(rVal >>= nDist))
/*N*/ return sal_False;
/*N*/
@@ -1420,7 +1420,7 @@ using namespace ::com::sun::star;
/*?*/ aNew >>= aSeq;
/*?*/ if ( aSeq.getLength() == 4 )
/*?*/ {
-/*?*/ sal_Int32 nVal;
+/*?*/ sal_Int32 nVal = 0;
/*?*/ if ( aSeq[0] >>= nVal )
/*?*/ aBorderLine.Color = nVal;
/*?*/ if ( aSeq[1] >>= nVal )
@@ -1891,7 +1891,7 @@ using namespace ::com::sun::star;
/*N*/
/*N*/ if(!(rVal >>= nBreak))
/*N*/ {
-/*N*/ sal_Int32 nValue;
+/*N*/ sal_Int32 nValue= 0;
/*?*/ if(!(rVal >>= nValue))
/*?*/ return sal_False;
/*?*/
@@ -2399,7 +2399,7 @@ class SvxBrushItemLink_Impl : public SfxBrushItemLink
/*N*/ case MID_BACK_COLOR:
/*N*/ case MID_BACK_COLOR_R_G_B:
/*N*/ {
-/*N*/ sal_Int32 nCol;
+/*N*/ sal_Int32 nCol = 0;
/*N*/ if ( !( rVal >>= nCol ) )
/*N*/ return sal_False;
/*N*/ if(MID_BACK_COLOR_R_G_B == nMemberId)
@@ -2412,7 +2412,7 @@ class SvxBrushItemLink_Impl : public SfxBrushItemLink
/*N*/ break;
/*N*/ case MID_BACK_COLOR_TRANSPARENCY:
/*N*/ {
-/*N*/ sal_Int32 nTrans;
+/*N*/ sal_Int32 nTrans = 0;
/*N*/ if ( !( rVal >>= nTrans ) || nTrans < 0 || nTrans > 100 )
/*N*/ return sal_False;
/*N*/ aColor.SetTransparency(lcl_PercentToTransparency(nTrans));
@@ -2424,7 +2424,7 @@ class SvxBrushItemLink_Impl : public SfxBrushItemLink
/*N*/ style::GraphicLocation eLocation;
/*N*/ if ( !( rVal>>=eLocation ) )
/*N*/ {
-/*N*/ sal_Int32 nValue;
+/*N*/ sal_Int32 nValue = 0;
/*?*/ if ( !( rVal >>= nValue ) )
/*?*/ return sal_False;
/*?*/ eLocation = (style::GraphicLocation)nValue;
@@ -2823,7 +2823,7 @@ SfxPoolItem* SvxFrameDirectionItem::Create( SvStream & rStrm, USHORT /*nVer*/ )
/*N*/ bool SvxFrameDirectionItem::PutValue( const ::com::sun::star::uno::Any& rVal,
/*N*/ BYTE )
/*N*/ {
-/*N*/ sal_Int16 nVal;
+/*N*/ sal_Int16 nVal = 0;
/*N*/ sal_Bool bRet = ( rVal >>= nVal );
/*N*/ if( bRet )
/*N*/ {
diff --git a/binfilter/bf_svx/source/items/svx_pageitem.cxx b/binfilter/bf_svx/source/items/svx_pageitem.cxx
index b98cd0d..1efd850 100644
--- a/binfilter/bf_svx/source/items/svx_pageitem.cxx
+++ b/binfilter/bf_svx/source/items/svx_pageitem.cxx
@@ -161,7 +161,7 @@ using namespace ::com::sun::star;
/*N*/ {
/*N*/ case MID_PAGE_NUMTYPE:
/*N*/ {
-/*N*/ sal_Int32 nValue;
+/*N*/ sal_Int32 nValue = 0;
/*N*/ if(!(rVal >>= nValue))
/*N*/ return sal_False;
/*N*/
@@ -176,7 +176,7 @@ using namespace ::com::sun::star;
/*N*/ style::PageStyleLayout eLayout;
/*N*/ if(!(rVal >>= eLayout))
/*N*/ {
-/*N*/ sal_Int32 nValue;
+/*N*/ sal_Int32 nValue = 0;
/*?*/ if(!(rVal >>= nValue))
/*?*/ return sal_False;
/*?*/ eLayout = (style::PageStyleLayout)nValue;
diff --git a/binfilter/bf_svx/source/items/svx_paraitem.cxx b/binfilter/bf_svx/source/items/svx_paraitem.cxx
index 5e7b9d5..7b67795 100644
--- a/binfilter/bf_svx/source/items/svx_paraitem.cxx
+++ b/binfilter/bf_svx/source/items/svx_paraitem.cxx
@@ -850,7 +850,7 @@ typedef sequence ::com::sun::star::style::TabStop> TabSTopSequence;
/*?*/ if (!(rAnySeq[0] >>= aSeq[n].Position)) return sal_False;
/*?*/ if (!(rAnySeq[1] >>= aSeq[n].Alignment))
/*?*/ {
-/*?*/ sal_Int32 nVal;
+/*?*/ sal_Int32 nVal = 0;
/*?*/ if (rAnySeq[1] >>= nVal)
/*?*/ aSeq[n].Alignment = (::com::sun::star::style::TabAlign) nVal;
/*?*/ else
@@ -904,7 +904,7 @@ typedef sequence ::com::sun::star::style::TabStop> TabSTopSequence;
/*N*/ }
/*N*/ case MID_STD_TAB:
/*N*/ {
-/*N*/ sal_Int32 nNewPos;
+/*N*/ sal_Int32 nNewPos = 0;
/*N*/ if (!(rVal >>= nNewPos) )
/*N*/ return sal_False;
/*N*/ const SvxTabStop& rTab = *(GetStart());
diff --git a/binfilter/bf_svx/source/items/svx_rotmodit.cxx b/binfilter/bf_svx/source/items/svx_rotmodit.cxx
index d0396cd..27f70d7 100644
--- a/binfilter/bf_svx/source/items/svx_rotmodit.cxx
+++ b/binfilter/bf_svx/source/items/svx_rotmodit.cxx
@@ -107,7 +107,7 @@ using namespace ::com::sun::star;
/*N*/ table::CellVertJustify eUno;
/*N*/ if(!(rVal >>= eUno))
/*N*/ {
-/*N*/ sal_Int32 nValue;
+/*N*/ sal_Int32 nValue = 0;
/*?*/ if(!(rVal >>= nValue))
/*?*/ return sal_False;
/*?*/ eUno = (table::CellVertJustify)nValue;
diff --git a/binfilter/bf_sw/source/ui/app/sw_swlib.cxx b/binfilter/bf_sw/source/ui/app/sw_swlib.cxx
index 1413114..02f3f9d 100644
--- a/binfilter/bf_sw/source/ui/app/sw_swlib.cxx
+++ b/binfilter/bf_sw/source/ui/app/sw_swlib.cxx
@@ -131,7 +131,6 @@ void SwDLL::LibInit()
// create a dummy-module for Object-Factory-Pointer
SW_MOD() = (SwModule*)new SwModuleDummy( 0, TRUE, &SwWebDocShell::Factory(), pWriterFactory, pGlobalFactory );
- SwModule* pMod = SW_MOD();
}
//-------------------------------------------------------------------------
diff --git a/binfilter/bf_sw/source/ui/inc/wrtsh.hxx b/binfilter/bf_sw/source/ui/inc/wrtsh.hxx
index 80e1027..840316c 100644
--- a/binfilter/bf_sw/source/ui/inc/wrtsh.hxx
+++ b/binfilter/bf_sw/source/ui/inc/wrtsh.hxx
@@ -214,9 +214,9 @@ private:
bIns;
ModeStack(ModeStack *pNextMode, BOOL _bIns, BOOL _bExt, BOOL _bAdd):
pNext(pNextMode),
+ bAdd(_bAdd),
bIns(_bIns),
- bExt(_bExt),
- bAdd(_bAdd) {}
+ bExt(_bExt) {}
} *pModeStack;
// Cursor bei PageUp / -Down mitnehmen
@@ -237,7 +237,7 @@ private:
CrsrStack( BOOL bValid, BOOL bFrmSel, const Point &rDocPos,
SwTwips lOff, CrsrStack *pN )
- : aDocPos(rDocPos), lOffset(lOff), pNext(pN)
+ : aDocPos(rDocPos), pNext(pN), lOffset(lOff)
{
bValidCurPos = bValid;
bIsFrmSel = bFrmSel;
diff --git a/binfilter/inc/bf_sfx2/event.hxx b/binfilter/inc/bf_sfx2/event.hxx
index c9517c4..647c38e 100644
--- a/binfilter/inc/bf_sfx2/event.hxx
+++ b/binfilter/inc/bf_sfx2/event.hxx
@@ -56,8 +56,8 @@ public:
SfxObjectShell *pObj = 0 )
: nEventId(nId),
pObjShell(pObj),
- _bAddToHistory(FALSE),
- _aArgs( rArgs )
+ _aArgs( rArgs ),
+ _bAddToHistory(FALSE)
{}
SfxEventHint( USHORT nId, SfxObjectShell *pObj = 0 )
: nEventId(nId),
@@ -92,8 +92,8 @@ public:
SfxObjectShell *pObj = 0 )
: _aEventName( rName ),
_pObjShell( pObj),
- _bAddToHistory( FALSE ),
- _aArgs( rArgs )
+ _aArgs( rArgs ),
+ _bAddToHistory( FALSE )
{}
SfxNamedHint( const String& rName,
diff --git a/binfilter/inc/bf_sw/iodetect.hxx b/binfilter/inc/bf_sw/iodetect.hxx
index 3695d11..df4a633 100644
--- a/binfilter/inc/bf_sw/iodetect.hxx
+++ b/binfilter/inc/bf_sw/iodetect.hxx
@@ -160,32 +160,32 @@ sal_Char __FAR_DATA sSwDos[] = "SW6"; \
\
\
SwIoDetect aReaderWriter[ MAXFILTER ] = { \
-/* 0*/ SwIoEntry(FILTER_SW5, 4, &::binfilter::GetSw3Writer, TRUE), \
-/* 1*/ SwIoEntry(FILTER_SW4, 4, &::binfilter::GetSw3Writer, FALSE), \
-/* 2*/ SwIoEntry(FILTER_SW3, 4, &::binfilter::GetSw3Writer, FALSE), \
-/* 3*/ SwIoEntry(FILTER_SWG, STRING_LEN, 0, TRUE), \
-/* 4*/ SwIoEntry(FILTER_SWGV, 4, 0, FALSE), \
+ {/* 0*/ SwIoEntry(FILTER_SW5, 4, &::binfilter::GetSw3Writer, TRUE)}, \
+ {/* 1*/ SwIoEntry(FILTER_SW4, 4, &::binfilter::GetSw3Writer, FALSE)}, \
+ {/* 2*/ SwIoEntry(FILTER_SW3, 4, &::binfilter::GetSw3Writer, FALSE)}, \
+ {/* 3*/ SwIoEntry(FILTER_SWG, STRING_LEN, 0, TRUE)}, \
+ {/* 4*/ SwIoEntry(FILTER_SWGV, 4, 0, FALSE)}, \
/* 5 SwIoEntry(FILTER_RTF, STRING_LEN, &::GetRTFWriter, TRUE), */\
-/* 6*/ SwIoEntry(sSwDos, STRING_LEN, 0, TRUE), \
-/* 7*/ SwIoEntry(FILTER_BAS, STRING_LEN, &::binfilter::GetASCWriter, FALSE), \
+ {/* 6*/ SwIoEntry(sSwDos, STRING_LEN, 0, TRUE)}, \
+ {/* 7*/ SwIoEntry(FILTER_BAS, STRING_LEN, &::binfilter::GetASCWriter, FALSE)}, \
/* 8 SwIoEntry(sWW6, STRING_LEN, &::GetWW8Writer, TRUE), */\
/* 9 SwIoEntry(FILTER_WW8, STRING_LEN, &::GetWW8Writer, FALSE), */\
-/* 10*/ SwIoEntry(FILTER_W4W, 3, &::binfilter::GetW4WWriter, TRUE), \
+ {/* 10*/ SwIoEntry(FILTER_W4W, 3, &::binfilter::GetW4WWriter, TRUE)}, \
/* 11 SwIoEntry(sRtfWH, STRING_LEN, &::GetRTFWriter, FALSE), */\
-/* 12*/ SwIoEntry(sCExcel, 5, 0, TRUE), \
-/* 13*/ SwIoEntry(sExcel, 4, 0, FALSE), \
-/* 14*/ SwIoEntry(sLotusD, 5, 0, TRUE), \
+ {/* 12*/ SwIoEntry(sCExcel, 5, 0, TRUE)}, \
+ {/* 13*/ SwIoEntry(sExcel, 4, 0, FALSE)}, \
+ {/* 14*/ SwIoEntry(sLotusD, 5, 0, TRUE)}, \
/* 15 SwIoEntry(sHTML, 4, &::GetHTMLWriter, TRUE), */\
/* 16 SwIoEntry(sWW1, STRING_LEN, 0, TRUE), */\
/* 17 SwIoEntry(sWW5, STRING_LEN, 0, FALSE), */\
-/* 18*/ SwIoEntry(sSwg1, 4, 0, FALSE), \
-/* 19*/ SwIoEntry(FILTER_XML, 4, &::binfilter::GetXMLWriter, TRUE) \
+ {/* 18*/ SwIoEntry(sSwg1, 4, 0, FALSE)}, \
+ {/* 19*/ SwIoEntry(FILTER_XML, 4, &::binfilter::GetXMLWriter, TRUE)} \
\
/* opt DEB_SH_SwIoEntry(sW4W_Int, STRING_LEN, 0, TRUE) */\
/* opt DEB_DBWRT_SwIoEntry(sDebug,STRING_LEN, &::GetDebugWriter, FALSE) */\
/* opt DEB_DBWRT_SwIoEntry(sUndo, STRING_LEN, &::GetUndoWriter, FALSE) */\
, \
-/*last*/ SwIoEntry(FILTER_TEXT, 4, &::binfilter::GetASCWriter, TRUE) \
+/*last*/ {SwIoEntry(FILTER_TEXT, 4, &::binfilter::GetASCWriter, TRUE)} \
}; \
More information about the Libreoffice-commits
mailing list