[Libreoffice-commits] .: 5 commits - binfilter/bf_sw lotuswordpro/source oox/source unoxml/source writerfilter/source
Caolán McNamara
caolan at kemper.freedesktop.org
Wed Apr 13 03:37:02 PDT 2011
binfilter/bf_sw/source/ui/inc/edtwin.hxx | 2 +-
binfilter/bf_sw/source/ui/utlui/makefile.mk | 2 --
binfilter/bf_sw/source/ui/utlui/sw_initui.cxx | 6 +++---
binfilter/bf_sw/source/ui/utlui/sw_uiitems.cxx | 2 +-
lotuswordpro/source/filter/schxmlwrapper.cxx | 14 +++++++-------
oox/source/helper/propertymap.cxx | 2 +-
oox/source/ppt/slidepersist.cxx | 4 ++--
unoxml/source/dom/documentbuilder.cxx | 2 +-
writerfilter/source/doctok/resourcesimpl.xsl | 4 ++--
9 files changed, 18 insertions(+), 20 deletions(-)
New commits:
commit 76854327414bcce266d1da2e3c1f06f5c2c208ab
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Apr 13 11:36:30 2011 +0100
mark this dir as warnings free
diff --git a/binfilter/bf_sw/source/ui/inc/edtwin.hxx b/binfilter/bf_sw/source/ui/inc/edtwin.hxx
index b4136f0..d697c44 100644
--- a/binfilter/bf_sw/source/ui/inc/edtwin.hxx
+++ b/binfilter/bf_sw/source/ui/inc/edtwin.hxx
@@ -170,7 +170,7 @@ public:
BOOL IsDrawAction() { return (bInsDraw); }
void SetDrawAction(BOOL bFlag) { bInsDraw = bFlag; }
- inline UINT16 GetDrawMode(BOOL bBuf = FALSE) const { return eDrawMode; }
+ inline UINT16 GetDrawMode(BOOL /*bBuf*/ = FALSE) const { return eDrawMode; }
inline void SetDrawMode(UINT16 eDrwMode) { eDrawMode = eDrwMode; }
BOOL IsFrmAction() { return (bInsFrm); }
inline UINT16 GetBezierMode() { return eBezierMode; }
diff --git a/binfilter/bf_sw/source/ui/utlui/makefile.mk b/binfilter/bf_sw/source/ui/utlui/makefile.mk
index 5406c69..0de628d 100644
--- a/binfilter/bf_sw/source/ui/utlui/makefile.mk
+++ b/binfilter/bf_sw/source/ui/utlui/makefile.mk
@@ -25,8 +25,6 @@
#
#*************************************************************************
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-
PRJ=..$/..$/..$/..
BFPRJ=..$/..$/..
diff --git a/binfilter/bf_sw/source/ui/utlui/sw_initui.cxx b/binfilter/bf_sw/source/ui/utlui/sw_initui.cxx
index 3d21df3..d0e0bc6 100644
--- a/binfilter/bf_sw/source/ui/utlui/sw_initui.cxx
+++ b/binfilter/bf_sw/source/ui/utlui/sw_initui.cxx
@@ -64,8 +64,8 @@ SvStringsDtor* pAuthFieldTypeList = 0;
/*N*/ ShellResource::ShellResource()
/*N*/ : Resource( SW_RES(RID_SW_SHELLRES) ),
-/*N*/ aPostItPage( SW_RES( STR_POSTIT_PAGE ) ),
/*N*/ aPostItAuthor( SW_RES( STR_POSTIT_AUTHOR ) ),
+/*N*/ aPostItPage( SW_RES( STR_POSTIT_PAGE ) ),
/*N*/ aPostItLine( SW_RES( STR_POSTIT_LINE ) ),
/*N*/ aCalc_Syntax( SW_RES( STR_CALC_SYNTAX ) ),
/*N*/ aCalc_ZeroDiv( SW_RES( STR_CALC_ZERODIV ) ),
@@ -88,10 +88,10 @@ SvStringsDtor* pAuthFieldTypeList = 0;
/*N*/ aTOXObjectsName( SW_RES(STR_TOX_OBJ)),
/*N*/ aTOXTablesName( SW_RES(STR_TOX_TBL)),
/*N*/ aTOXAuthoritiesName( SW_RES(STR_TOX_AUTH)),
+/*N*/ pAutoFmtNameLst( 0 ),
/*N*/ sPageDescFirstName( SW_RES(STR_PAGEDESC_FIRSTNAME)),
/*N*/ sPageDescFollowName( SW_RES(STR_PAGEDESC_FOLLOWNAME)),
-/*N*/ sPageDescName( SW_RES(STR_PAGEDESC_NAME)),
-/*N*/ pAutoFmtNameLst( 0 )
+/*N*/ sPageDescName( SW_RES(STR_PAGEDESC_NAME))
/*N*/ {
/*N*/ const USHORT nCount = FLD_DOCINFO_END - FLD_DOCINFO_BEGIN;
/*N*/
diff --git a/binfilter/bf_sw/source/ui/utlui/sw_uiitems.cxx b/binfilter/bf_sw/source/ui/utlui/sw_uiitems.cxx
index 9e2ff1b..d92f679 100644
--- a/binfilter/bf_sw/source/ui/utlui/sw_uiitems.cxx
+++ b/binfilter/bf_sw/source/ui/utlui/sw_uiitems.cxx
@@ -94,7 +94,7 @@ static const USHORT nFtnLines[] = {
/*N*/ switch(nMemberId & ~CONVERT_TWIPS)
/*N*/ {
/*N*/ case MID_FTN_HEIGHT : rVal <<= (sal_Int32)TWIP_TO_MM100(aFtnInfo.GetHeight());break;
-/*N*/ case MID_LINE_WEIGHT : rVal <<= (sal_Int16)TWIP_TO_MM100(aFtnInfo.GetLineWidth());break;
+/*N*/ case MID_LINE_WEIGHT : rVal <<= (sal_Int16)TWIP_TO_MM100_UNSIGNED(aFtnInfo.GetLineWidth());break;
/*N*/ case MID_LINE_COLOR : rVal <<= (sal_Int32)aFtnInfo.GetLineColor().GetColor();break;
/*N*/ case MID_LINE_RELWIDTH :
/*N*/ {
commit ac5af03e3a8ca40cc05a8a2ddacf56b9986dd5db
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Apr 13 11:34:26 2011 +0100
catch by const reference
diff --git a/writerfilter/source/doctok/resourcesimpl.xsl b/writerfilter/source/doctok/resourcesimpl.xsl
index 564cfe9..256ac2b 100644
--- a/writerfilter/source/doctok/resourcesimpl.xsl
+++ b/writerfilter/source/doctok/resourcesimpl.xsl
@@ -238,7 +238,7 @@ using namespace ::std;
resolveNoAuto(rHandler);
</xsl:if>
<xsl:text>
- } catch (Exception & e) {
+ } catch (const Exception & e) {
clog << e.getText() << endl;
}
}
@@ -483,7 +483,7 @@ using namespace ::std;
{
rHandler.entry(n, pEntry);
}
- catch (ExceptionOutOfBounds e)
+ catch (const ExceptionOutOfBounds&)
{
}
}
commit b20d33855c85e375db8008765ab770230f651626
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Apr 13 11:24:11 2011 +0100
catch by const reference
diff --git a/oox/source/helper/propertymap.cxx b/oox/source/helper/propertymap.cxx
index f893ebe..aa7059c 100644
--- a/oox/source/helper/propertymap.cxx
+++ b/oox/source/helper/propertymap.cxx
@@ -377,7 +377,7 @@ void PropertyMap::dump( Reference< XPropertySet > rXPropSet )
try {
lclDumpAnyValue (rXPropSet->getPropertyValue( props [i].Name ));
- } catch(Exception e) {
+ } catch(const Exception& e) {
fprintf (stderr,"unable to get '%s' value\n", USS(props [i].Name));
}
}
diff --git a/oox/source/ppt/slidepersist.cxx b/oox/source/ppt/slidepersist.cxx
index 1a35dae..15615d2 100644
--- a/oox/source/ppt/slidepersist.cxx
+++ b/oox/source/ppt/slidepersist.cxx
@@ -192,7 +192,7 @@ void SlidePersist::createBackground( const XmlFilterBase& rFilterBase )
rFilterBase.getGraphicHelper(), oox::drawingml::FillProperties::DEFAULT_IDS, 0, nPhClr );
xPagePropSet->setPropertyValue( sBackground, Any( xPropertySet ) );
}
- catch( Exception )
+ catch( const Exception& )
{
}
}
@@ -315,7 +315,7 @@ void SlidePersist::applyTextStyles( const XmlFilterBase& rFilterBase )
}
}
}
- catch( Exception& )
+ catch( const Exception& )
{
}
}
commit 37ba35690a5f101f50f154e51a0cd97f53e5bc53
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Apr 13 09:59:27 2011 +0100
catch by const reference
diff --git a/lotuswordpro/source/filter/schxmlwrapper.cxx b/lotuswordpro/source/filter/schxmlwrapper.cxx
index c0c1b2e..fd78211 100644
--- a/lotuswordpro/source/filter/schxmlwrapper.cxx
+++ b/lotuswordpro/source/filter/schxmlwrapper.cxx
@@ -234,27 +234,27 @@ sal_Int32 SchXMLWrapper::ImportStream(
}
}
}
- catch( xml::sax::SAXParseException&)
+ catch(const xml::sax::SAXParseException&)
{
if( bEncrypted )
return ERRCODE_SFX_WRONGPASSWORD;
return ERRCODE_SFX_GENERAL;
}
- catch( xml::sax::SAXException&)
+ catch(const xml::sax::SAXException&)
{
if( bEncrypted )
return ERRCODE_SFX_WRONGPASSWORD;
return ERRCODE_SFX_GENERAL;
}
- catch( io::IOException&)
+ catch(const io::IOException&)
{
return ERRCODE_SFX_GENERAL;
}
- catch( packages::zip::ZipIOException& )
+ catch(const packages::zip::ZipIOException&)
{
return ERRCODE_IO_BROKENPACKAGE;
}
- catch( uno::Exception&)
+ catch(const uno::Exception&)
{
return ERRCODE_SFX_GENERAL;
}
@@ -388,7 +388,7 @@ sal_Bool SchXMLWrapper::ExportStream(
rOutputStream->Commit();
}
}
- catch( uno::Exception )
+ catch(const uno::Exception&)
{
}
@@ -481,7 +481,7 @@ sal_Bool SchXMLWrapper::Export()
// graphics resolver has to be destroyed this way!
SvXMLGraphicHelper::Destroy( pGraphicHelper );
}
- catch( uno::Exception)
+ catch(const uno::Exception&)
{
}
commit 4409a5d66e6f32817c781c640e706e47f1674e55
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Apr 13 09:58:32 2011 +0100
catch by const reference
diff --git a/unoxml/source/dom/documentbuilder.cxx b/unoxml/source/dom/documentbuilder.cxx
index f950964..8b38fd3 100644
--- a/unoxml/source/dom/documentbuilder.cxx
+++ b/unoxml/source/dom/documentbuilder.cxx
@@ -83,7 +83,7 @@ namespace DOM
Content aContent(sSystemId, aEnvironment);
is.aInputStream = aContent.openStream();
- } catch (com::sun::star::uno::Exception) {
+ } catch (const com::sun::star::uno::Exception&) {
OSL_FAIL("exception in default entity resolver");
is.aInputStream = Reference< XInputStream >();
}
More information about the Libreoffice-commits
mailing list