[Libreoffice-commits] .: 4 commits - binfilter/bf_sw binfilter/bf_xmloff lotuswordpro/source oox/inc oox/source writerperfect/source
Caolán McNamara
caolan at kemper.freedesktop.org
Mon Feb 14 05:24:20 PST 2011
binfilter/bf_sw/source/core/layout/sw_pagechg.cxx | 7 +++++--
binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx | 3 +--
binfilter/bf_sw/source/ui/config/sw_viewopt.cxx | 2 +-
binfilter/bf_sw/source/ui/utlui/sw_uiitems.cxx | 2 +-
binfilter/bf_xmloff/source/style/xmloff_xmlnumi.cxx | 2 +-
lotuswordpro/source/filter/lwpobjstrm.cxx | 4 ++--
lotuswordpro/source/filter/lwptblformula.cxx | 4 ++--
oox/inc/oox/export/chartexport.hxx | 3 +++
oox/inc/oox/ole/vbaprojectfilter.hxx | 3 +++
oox/source/export/ColorPropertySet.cxx | 3 +++
oox/source/export/ColorPropertySet.hxx | 3 +++
oox/source/export/SchXMLSeriesHelper.cxx | 3 +++
oox/source/export/SchXMLSeriesHelper.hxx | 3 +++
oox/source/export/chartexport.cxx | 3 +++
oox/source/ole/vbaprojectfilter.cxx | 3 +++
writerperfect/source/filter/DocumentHandlerInterface.hxx | 3 +++
writerperfect/source/filter/GraphicsStyle.cxx | 3 +++
writerperfect/source/filter/GraphicsStyle.hxx | 3 +++
writerperfect/source/filter/InternalHandler.cxx | 3 +++
writerperfect/source/filter/InternalHandler.hxx | 3 +++
writerperfect/source/filter/OdgExporter.cxx | 3 +++
writerperfect/source/filter/OdgExporter.hxx | 3 +++
22 files changed, 58 insertions(+), 11 deletions(-)
New commits:
commit 28d197969e213310d7fc6763141cce0c8cbb80d4
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 14 13:23:54 2011 +0000
throw out some warnings
diff --git a/binfilter/bf_sw/source/core/layout/sw_pagechg.cxx b/binfilter/bf_sw/source/core/layout/sw_pagechg.cxx
index 9eba7f1..7443949 100644
--- a/binfilter/bf_sw/source/core/layout/sw_pagechg.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_pagechg.cxx
@@ -1783,11 +1783,14 @@ void SwRootFrm::RemoveSuperfluous()
/*N*/ switch ( rHori.GetHoriOrient() )
/*N*/ {
/*?*/ case HORI_NONE:
-/*?*/ // add 1st param to <SwBorderAttrs::CalcRight(..)>
-/*?*/ nWidth += rAttrs.CalcLeft( pFrm ) + rAttrs.CalcRight( pFrm );
+/*?*/ // add 1st param to <SwBorderAttrs::CalcRight(..)>
+/*?*/ nWidth += rAttrs.CalcLeft( pFrm ) + rAttrs.CalcRight( pFrm );
/*?*/ break;
/*?*/ case HORI_LEFT_AND_WIDTH:
/*?*/ nWidth += rAttrs.CalcLeft( pFrm );
+/*?*/ break;
+/*?*/ default:
+/*?*/ break;
/*N*/ }
/*N*/ nBrowseWidth = Max( nBrowseWidth, nWidth );
/*N*/ }
diff --git a/binfilter/bf_sw/source/ui/config/sw_viewopt.cxx b/binfilter/bf_sw/source/ui/config/sw_viewopt.cxx
index a4cd7ed..061a305 100644
--- a/binfilter/bf_sw/source/ui/config/sw_viewopt.cxx
+++ b/binfilter/bf_sw/source/ui/config/sw_viewopt.cxx
@@ -296,7 +296,7 @@ static const char aPostItStr[] = " ";
/*N*/ }
/*************************************************************************/
-/*N*/ void SwViewOption::SetAppearanceFlag(sal_Int32 nFlag, BOOL bSet, BOOL bSaveInConfig )
+/*N*/ void SwViewOption::SetAppearanceFlag(sal_Int32 /*nFlag*/, BOOL bSet, BOOL /*bSaveInConfig*/ )
/*N*/ {DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
diff --git a/binfilter/bf_sw/source/ui/utlui/sw_uiitems.cxx b/binfilter/bf_sw/source/ui/utlui/sw_uiitems.cxx
index 1c7a577..9e2ff1b 100644
--- a/binfilter/bf_sw/source/ui/utlui/sw_uiitems.cxx
+++ b/binfilter/bf_sw/source/ui/utlui/sw_uiitems.cxx
@@ -114,7 +114,7 @@ static const USHORT nFtnLines[] = {
/*N*/ bool SwPageFtnInfoItem::PutValue(const Any& rVal, BYTE nMemberId)
/*N*/ {
-/*N*/ sal_Int32 nSet32;
+/*N*/ sal_Int32 nSet32(0);
/*N*/ bool bRet = true;
/*N*/ switch(nMemberId & ~CONVERT_TWIPS)
/*N*/ {
diff --git a/binfilter/bf_xmloff/source/style/xmloff_xmlnumi.cxx b/binfilter/bf_xmloff/source/style/xmloff_xmlnumi.cxx
index 8454160..4f91be9 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_xmlnumi.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_xmlnumi.cxx
@@ -741,7 +741,7 @@ SvxXMLListLevelStyleAttrContext_Impl::SvxXMLListLevelStyleAttrContext_Impl(
if( pFontDecls->FillProperties( sFontName, aProps, 0, 1, 2, 3, 4 ) )
{
OUString sTmp;
- sal_Int16 nTmp;
+ sal_Int16 nTmp(0);
::std::vector< XMLPropertyState >::iterator i;
for( i = aProps.begin(); i != aProps.end(); i++ )
{
commit a6550d49aa669a663a9dd073860ff89080a4b1d0
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 14 09:27:42 2011 +0000
add mode lines to new files
diff --git a/oox/inc/oox/export/chartexport.hxx b/oox/inc/oox/export/chartexport.hxx
index 8c20d50..4dddbd6 100644
--- a/oox/inc/oox/export/chartexport.hxx
+++ b/oox/inc/oox/export/chartexport.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -214,3 +215,5 @@ public:
}}
#endif /* ndef _OOX_EXPORT_CHART_HXX_ */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/inc/oox/ole/vbaprojectfilter.hxx b/oox/inc/oox/ole/vbaprojectfilter.hxx
index 6ccd498..c2baaf6 100644
--- a/oox/inc/oox/ole/vbaprojectfilter.hxx
+++ b/oox/inc/oox/ole/vbaprojectfilter.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -69,3 +70,5 @@ private:
} // namespace oox
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/export/ColorPropertySet.cxx b/oox/source/export/ColorPropertySet.cxx
index 07b2830..c421249 100644
--- a/oox/source/export/ColorPropertySet.cxx
+++ b/oox/source/export/ColorPropertySet.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -228,3 +229,5 @@ uno::Any SAL_CALL ColorPropertySet::getPropertyDefault( const OUString& aPropert
} // namespace chart
} // namespace xmloff
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/export/ColorPropertySet.hxx b/oox/source/export/ColorPropertySet.hxx
index fa52384..0da33fc 100644
--- a/oox/source/export/ColorPropertySet.hxx
+++ b/oox/source/export/ColorPropertySet.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -124,3 +125,5 @@ private:
// XMLOFF_COLORPROPERTYSET_HXX
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/export/SchXMLSeriesHelper.cxx b/oox/source/export/SchXMLSeriesHelper.cxx
index b76a20e..0ffb610 100644
--- a/oox/source/export/SchXMLSeriesHelper.cxx
+++ b/oox/source/export/SchXMLSeriesHelper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -296,3 +297,5 @@ uno::Reference< beans::XPropertySet > SchXMLSeriesHelper::createOldAPIDataPointP
return xRet;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/export/SchXMLSeriesHelper.hxx b/oox/source/export/SchXMLSeriesHelper.hxx
index 5899644..1fdabba 100644
--- a/oox/source/export/SchXMLSeriesHelper.hxx
+++ b/oox/source/export/SchXMLSeriesHelper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -78,3 +79,5 @@ public:
// _XMLOFF_SCH_XML_SERIESHELPER_HXX
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx
index 583fbd0..79cc527 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -2801,3 +2802,5 @@ sal_Bool ChartExport::isDeep3dChart()
}// drawingml
}// oox
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/ole/vbaprojectfilter.cxx b/oox/source/ole/vbaprojectfilter.cxx
index 82cba31..7cb883b 100644
--- a/oox/source/ole/vbaprojectfilter.cxx
+++ b/oox/source/ole/vbaprojectfilter.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -102,3 +103,5 @@ OUString WordVbaProjectFilter::implGetImplementationName() const
} // namespace ole
} // namespace oox
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerperfect/source/filter/DocumentHandlerInterface.hxx b/writerperfect/source/filter/DocumentHandlerInterface.hxx
index 73ced7d..0e9ee56 100644
--- a/writerperfect/source/filter/DocumentHandlerInterface.hxx
+++ b/writerperfect/source/filter/DocumentHandlerInterface.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* Copyright (C) 2004 William Lachance (wlach at interlog.com)
* Copyright (C) 2004 Net Integration Technologies (http://www.net-itech.com)
@@ -43,3 +44,5 @@ public:
virtual void characters(const WPXString &sCharacters) = 0;
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerperfect/source/filter/GraphicsStyle.cxx b/writerperfect/source/filter/GraphicsStyle.cxx
index 4067f55..abca6a8 100644
--- a/writerperfect/source/filter/GraphicsStyle.cxx
+++ b/writerperfect/source/filter/GraphicsStyle.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/* GraphicsStyle:
*
* Copyright (C) 2007 Fridrich Strba .strba at bluewin.ch)
@@ -38,3 +39,5 @@ GraphicsStyle::~GraphicsStyle()
void GraphicsStyle::write(DocumentHandlerInterface * /* pHandler */) const
{
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerperfect/source/filter/GraphicsStyle.hxx b/writerperfect/source/filter/GraphicsStyle.hxx
index b6ee0c6..bef9b54 100644
--- a/writerperfect/source/filter/GraphicsStyle.hxx
+++ b/writerperfect/source/filter/GraphicsStyle.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/* GraphicsStyle:
*
* Copyright (C) 2007 Fridrich Strba .strba at bluewin.ch)
@@ -38,3 +39,5 @@ public:
virtual void write(DocumentHandlerInterface *pHandler) const;
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerperfect/source/filter/InternalHandler.cxx b/writerperfect/source/filter/InternalHandler.cxx
index 82479bd..a020827 100644
--- a/writerperfect/source/filter/InternalHandler.cxx
+++ b/writerperfect/source/filter/InternalHandler.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* Copyright (C) 2007 Fridrich Strba .strba at bluewin.ch)
*
@@ -52,3 +53,5 @@ void InternalHandler::characters(const WPXString &sCharacters)
{
mpElements->push_back(new CharDataElement(sCharacters.cstr()));
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerperfect/source/filter/InternalHandler.hxx b/writerperfect/source/filter/InternalHandler.hxx
index 9913ac8..0869ad1 100644
--- a/writerperfect/source/filter/InternalHandler.hxx
+++ b/writerperfect/source/filter/InternalHandler.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* Copyright (C) 2007 Fridrich Strba .strba at bluewin.ch)
*
@@ -44,3 +45,5 @@ private:
std::vector<DocumentElement *> *mpElements;
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerperfect/source/filter/OdgExporter.cxx b/writerperfect/source/filter/OdgExporter.cxx
index 6baa2d6..03f75bb 100644
--- a/writerperfect/source/filter/OdgExporter.cxx
+++ b/writerperfect/source/filter/OdgExporter.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/* libwpg
* Copyright (C) 2006 Ariya Hidayat (ariya at kde.org)
* Copyright (C) 2006 Fridrich Strba (fridrich.strba at bluewin.ch)
@@ -646,3 +647,5 @@ WPXString OdgExporter::doubleToString(const double value)
}
return WPXString(stringValue.c_str());
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerperfect/source/filter/OdgExporter.hxx b/writerperfect/source/filter/OdgExporter.hxx
index 948d3b8..f3ff92b 100644
--- a/writerperfect/source/filter/OdgExporter.hxx
+++ b/writerperfect/source/filter/OdgExporter.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/* libwpg
* Copyright (C) 2006 Ariya Hidayat (ariya at kde.org)
*
@@ -88,3 +89,5 @@ private:
};
#endif // __ODGEXPORTER_HXX__
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit f40898da29e926b14cb093e02bc3f6ac0f0efbca
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 14 09:27:18 2011 +0000
throw out some warnings
diff --git a/lotuswordpro/source/filter/lwpobjstrm.cxx b/lotuswordpro/source/filter/lwpobjstrm.cxx
index 3eec749..59a8a1d 100644
--- a/lotuswordpro/source/filter/lwpobjstrm.cxx
+++ b/lotuswordpro/source/filter/lwpobjstrm.cxx
@@ -360,10 +360,10 @@ sal_uInt16 LwpObjectStream::DecompressBuffer(sal_uInt8* pDst, sal_uInt8* pSrc, s
*/
OUString LwpObjectStream::QuickReadStringPtr(void)
{
- sal_uInt16 len, diskSize;
+ sal_uInt16 diskSize;
diskSize = QuickReaduInt16();
- len = QuickReaduInt16();
+ QuickReaduInt16(); //len
OUString str;
rtl_TextEncoding rEncode = RTL_TEXTENCODING_MS_1252;
diff --git a/lotuswordpro/source/filter/lwptblformula.cxx b/lotuswordpro/source/filter/lwptblformula.cxx
index 4abe47b..005492d 100644
--- a/lotuswordpro/source/filter/lwptblformula.cxx
+++ b/lotuswordpro/source/filter/lwptblformula.cxx
@@ -116,8 +116,8 @@ sal_Bool LwpFormulaInfo::ReadConst()
*/
sal_Bool LwpFormulaInfo::ReadText()
{
- USHORT nDiskSize,nStrLen;
- nDiskSize = m_pObjStrm->QuickReadInt16();
+ sal_uInt16 nStrLen;
+ m_pObjStrm->QuickReadInt16(); //Disk Size
nStrLen = m_pObjStrm->QuickReadInt16();
auto_ptr<char> pBuf(new char[nStrLen+1]);
commit f1e246d4bcfe3f5d250796a9f6e87adc25cc296e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 14 09:27:11 2011 +0000
throw out some warnings
diff --git a/binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx b/binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx
index 6e881e8..0836af9 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx
@@ -4480,7 +4480,6 @@ void SwChartEventListenerContainer::ChartDataChanged()
for(sal_uInt16 i = 0; i < pListenerArr->Count(); i++)
{
- XEventListenerPtr pElem = pListenerArr->GetObject(i);
try
{
XEventListenerPtr pElem = pListenerArr->GetObject(i);
@@ -4488,7 +4487,7 @@ void SwChartEventListenerContainer::ChartDataChanged()
Reference<XChartDataChangeEventListener> XChartEventListener = (XChartDataChangeEventListener*)(*pElem).get();
XChartEventListener->chartDataChanged( aEvent );
}
- catch(Exception&)
+ catch(Exception const&)
{
}
}
More information about the Libreoffice-commits
mailing list