oox/source/drawingml/shapecontext.cxx | 5 +++++
oox/source/drawingml/shapegroupcontext.cxx | 2 ++
oox/source/drawingml/textcharacterpropertiescontext.cxx | 2 +-
3 files changed, 8 insertions(+), 1 deletion(-)
New commits:
commit 527440c9d9086ae01c277b0dca96a87eb0868ae6
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Fri Apr 4 10:11:33 2014 +0200
oox: fix a few bogus SAL_WARN
The idea is that when an element is unhandled, it's either unhandled
explicitly by an empty "case..break" block (so grep can quickly find it)
or we raise a warning. Add a few placeholders for cases that we won't
probably handle better in the near future to silence warnings.
Change-Id: I41dec7802c4671550130393b4f98a8f0d8dfc059
diff --git a/oox/source/drawingml/shapecontext.cxx
b/oox/source/drawingml/shapecontext.cxx
index eef5a78..bc246d2 100644
--- a/oox/source/drawingml/shapecontext.cxx
+++ b/oox/source/drawingml/shapecontext.cxx
@@ -103,6 +103,7 @@ ContextHandlerRef ShapeContext::onCreateContext( sal_Int32
aElementToken, const
case XML_txXfrm:
{
mpShapePtr->getTextBody()->getTextProperties().moRotation =
rAttribs.getInteger( XML_rot );
+ return 0;
break;
}
case XML_cNvSpPr:
@@ -120,6 +121,10 @@ ContextHandlerRef ShapeContext::onCreateContext( sal_Int32
aElementToken, const
break;
case XML_nvPicPr:
break;
+ case XML_relIds:
+ break;
+ case XML_nvSpPr:
+ break;
default:
SAL_WARN("oox", "ShapeContext::onCreateContext: unhandled element: "
<< getBaseToken(aElementToken));
break;
diff --git a/oox/source/drawingml/shapegroupcontext.cxx
b/oox/source/drawingml/shapegroupcontext.cxx
index d5eb503..d795c39 100644
--- a/oox/source/drawingml/shapegroupcontext.cxx
+++ b/oox/source/drawingml/shapegroupcontext.cxx
@@ -75,6 +75,8 @@ ContextHandlerRef ShapeGroupContext::onCreateContext(
sal_Int32 aElementToken, c
case XML_grpSpPr:
return new ShapePropertiesContext( *this, *mpGroupShapePtr );
+ case XML_nvGrpSpPr:
+ return 0;
case XML_spPr:
return new ShapePropertiesContext( *this, *mpGroupShapePtr );
/*
diff --git a/oox/source/drawingml/textcharacterpropertiescontext.cxx
b/oox/source/drawingml/textcharacterpropertiescontext.cxx
index 898806e..7bedd8e 100644
--- a/oox/source/drawingml/textcharacterpropertiescontext.cxx
+++ b/oox/source/drawingml/textcharacterpropertiescontext.cxx
@@ -216,7 +216,7 @@ ContextHandlerRef
TextCharacterPropertiesContext::onCreateContext( sal_Int32 aEl
}
break;
default:
- SAL_INFO("oox", "TextCharacterPropertiesContext::onCreateContext:
unhandled element: " << getBaseToken(aElementToken));
+ SAL_WARN("oox", "TextCharacterPropertiesContext::onCreateContext:
unhandled element: " << getBaseToken(aElementToken));
break;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
