[Libreoffice-commits] .: 3 commits - binfilter/bf_sw binfilter/bf_xmloff filter/source
Caolán McNamara
caolan at kemper.freedesktop.org
Wed Apr 6 06:16:20 PDT 2011
binfilter/bf_sw/source/filter/writer/makefile.mk | 2 --
binfilter/bf_sw/source/filter/writer/sw_wrtswtbl.cxx | 8 ++++++--
binfilter/bf_xmloff/source/text/XMLTextPropertySetContext.hxx | 2 ++
binfilter/bf_xmloff/source/text/makefile.mk | 2 --
binfilter/bf_xmloff/source/text/xmloff_XMLTextShapeStyleContext.cxx | 2 ++
binfilter/bf_xmloff/source/text/xmloff_txtimppr.cxx | 3 +--
binfilter/bf_xmloff/util/makefile.mk | 2 --
filter/source/svg/svgreader.cxx | 4 ++++
8 files changed, 15 insertions(+), 10 deletions(-)
New commits:
commit 53362ec74b72085a34452a6939bb4a9f2f4a0979
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Apr 6 11:34:53 2011 +0100
WaE: silence unused width/height variables
diff --git a/filter/source/svg/svgreader.cxx b/filter/source/svg/svgreader.cxx
index 02cf95e..8e7af6f 100644
--- a/filter/source/svg/svgreader.cxx
+++ b/filter/source/svg/svgreader.cxx
@@ -1544,6 +1544,8 @@ struct ShapeWritingVisitor
xAttrs->AddAttribute( USTR( "svg:x" ), rtl::OUString::valueOf(pt2mm(x))+USTR("mm"));
xAttrs->AddAttribute( USTR( "svg:y" ), rtl::OUString::valueOf(pt2mm(y))+USTR("mm"));
+ (void)width;
+ (void)height;
xAttrs->AddAttribute( USTR( "draw:style-name" ), USTR("svggraphicstyle")+sStyleId );
mxDocumentHandler->startElement(USTR("draw:frame"),xUnoAttrs);
@@ -2475,6 +2477,8 @@ struct ShapeRenderingVisitor
mrOutDev.DrawText(Point(basegfx::fround(pt100thmm(x)),
basegfx::fround(pt100thmm(y))),
aText);
+ (void)width;
+ (void)height;
break;
}
}
commit 518e759643399604402f94ed780e3a82478b0808
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Apr 6 09:58:34 2011 +0100
WaE: mark this dir as warnings free
diff --git a/binfilter/bf_sw/source/filter/writer/makefile.mk b/binfilter/bf_sw/source/filter/writer/makefile.mk
index 5252939..6e24475 100644
--- a/binfilter/bf_sw/source/filter/writer/makefile.mk
+++ b/binfilter/bf_sw/source/filter/writer/makefile.mk
@@ -25,8 +25,6 @@
#
#*************************************************************************
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-
PRJ=..$/..$/..$/..
BFPRJ=..$/..$/..
diff --git a/binfilter/bf_sw/source/filter/writer/sw_wrtswtbl.cxx b/binfilter/bf_sw/source/filter/writer/sw_wrtswtbl.cxx
index e377328..a9ec254 100644
--- a/binfilter/bf_sw/source/filter/writer/sw_wrtswtbl.cxx
+++ b/binfilter/bf_sw/source/filter/writer/sw_wrtswtbl.cxx
@@ -44,8 +44,12 @@
namespace binfilter {
SwWriteTableCol::SwWriteTableCol( USHORT nPosition )
- : nPos(nPosition), bLeftBorder(TRUE), bRightBorder(TRUE),
- nWidthOpt( 0 ), bRelWidthOpt( FALSE ), bOutWidth( TRUE )
+ : nPos(nPosition)
+ , nWidthOpt( 0 )
+ , bRelWidthOpt( FALSE )
+ , bOutWidth( TRUE )
+ , bLeftBorder(TRUE)
+ , bRightBorder(TRUE)
{
}
diff --git a/binfilter/bf_xmloff/source/text/makefile.mk b/binfilter/bf_xmloff/source/text/makefile.mk
index 0170600..9206890 100644
--- a/binfilter/bf_xmloff/source/text/makefile.mk
+++ b/binfilter/bf_xmloff/source/text/makefile.mk
@@ -25,8 +25,6 @@
#
#*************************************************************************
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-
PRJ=..$/..$/..
PRJNAME=binfilter
diff --git a/binfilter/bf_xmloff/util/makefile.mk b/binfilter/bf_xmloff/util/makefile.mk
index e8a9582..ff6b544 100644
--- a/binfilter/bf_xmloff/util/makefile.mk
+++ b/binfilter/bf_xmloff/util/makefile.mk
@@ -25,8 +25,6 @@
#
#*************************************************************************
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-
PRJ=..$/..
PRJNAME=binfilter
commit ccabc9dd9e839be65f05cc76f372968ea5c488d9
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Apr 6 09:54:50 2011 +0100
WaE: mark this dir as warnings free
diff --git a/binfilter/bf_xmloff/source/text/XMLTextPropertySetContext.hxx b/binfilter/bf_xmloff/source/text/XMLTextPropertySetContext.hxx
index f93cf41..e75aa71 100644
--- a/binfilter/bf_xmloff/source/text/XMLTextPropertySetContext.hxx
+++ b/binfilter/bf_xmloff/source/text/XMLTextPropertySetContext.hxx
@@ -51,6 +51,8 @@ public:
virtual ~XMLTextPropertySetContext();
+ using SvXMLPropertySetContext::CreateChildContext;
+
virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
const ::rtl::OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList,
diff --git a/binfilter/bf_xmloff/source/text/xmloff_XMLTextShapeStyleContext.cxx b/binfilter/bf_xmloff/source/text/xmloff_XMLTextShapeStyleContext.cxx
index 7a3649d..3e8fd13 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_XMLTextShapeStyleContext.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_XMLTextShapeStyleContext.cxx
@@ -57,6 +57,8 @@ public:
virtual ~XMLTextShapePropertySetContext_Impl();
+ using SvXMLPropertySetContext::CreateChildContext;
+
virtual SvXMLImportContext *CreateChildContext( USHORT nInPrefix,
const OUString& rLocalName,
const Reference< XAttributeList >& xAttrList,
diff --git a/binfilter/bf_xmloff/source/text/xmloff_txtimppr.cxx b/binfilter/bf_xmloff/source/text/xmloff_txtimppr.cxx
index dd1c333..11f9aa4 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_txtimppr.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_txtimppr.cxx
@@ -300,7 +300,6 @@ void XMLTextImportPropertyMapper::finished(
XMLPropertyState* pNewBorders[4] = { 0, 0, 0, 0 };
XMLPropertyState* pAllBorderWidth = 0;
XMLPropertyState* pBorderWidths[4] = { 0, 0, 0, 0 };
- XMLPropertyState* pAnchorType = 0;
XMLPropertyState* pVertOrient = 0;
XMLPropertyState* pVertOrientRelAsChar = 0;
XMLPropertyState* pBackTransparency = NULL; // transparency in %
@@ -346,7 +345,7 @@ void XMLTextImportPropertyMapper::finished(
case CTF_RIGHTBORDERWIDTH: pBorderWidths[XML_LINE_RIGHT] = &(*property); break;
case CTF_TOPBORDERWIDTH: pBorderWidths[XML_LINE_TOP] = &(*property); break;
case CTF_BOTTOMBORDERWIDTH: pBorderWidths[XML_LINE_BOTTOM] = &(*property); break;
- case CTF_ANCHORTYPE: pAnchorType = &(*property); break;
+ case CTF_ANCHORTYPE: break;
case CTF_VERTICALPOS: pVertOrient = &(*&(*property)); break;
case CTF_VERTICALREL_ASCHAR: pVertOrientRelAsChar = &(*property); break;
More information about the Libreoffice-commits
mailing list