oox/source/docprop/docprophandler.cxx | 3 +--
oox/source/vml/vmlshape.cxx | 4 +++-
2 files changed, 4 insertions(+), 3 deletions(-)
New commits:
commit 52e07f1fd2ba3d1cf25ec8fe8c1892398c7cd364
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Oct 11 17:55:38 2013 +0200
-Werror,-Wunused-variable
Change-Id: I7f4f232475339d524eed7ba578e22b53991bd123
diff --git a/oox/source/docprop/docprophandler.cxx
b/oox/source/docprop/docprophandler.cxx
index e9a35b2..39082a2 100644
--- a/oox/source/docprop/docprophandler.cxx
+++ b/oox/source/docprop/docprophandler.cxx
@@ -333,8 +333,7 @@ void SAL_CALL OOXMLDocPropHandler::startFastElement(
::sal_Int32 nElement, const
void SAL_CALL OOXMLDocPropHandler::startUnknownElement( const OUString&
aNamespace, const OUString& aName, const uno::Reference<
xml::sax::XFastAttributeList >& )
throw (xml::sax::SAXException, uno::RuntimeException)
{
- OUString aUnknown = "Unknown element" + aNamespace + ":" + aName;
- OSL_FAIL( OUStringToOString( aUnknown, RTL_TEXTENCODING_UTF8 ).getStr() );
+ SAL_WARN("oox", "Unknown element " << aNamespace << ":" << aName);
if ( m_nInBlock == SAL_MAX_INT32 )
throw uno::RuntimeException();
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index a9ef5f8..5d89a9b 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -942,7 +942,9 @@ Reference< XShape > ComplexShape::implConvertAndInsert(
const Reference< XShapes
// try to find registered OLE object info
if( const OleObjectInfo* pOleObjectInfo = mrDrawing.getOleObjectInfo(
maTypeModel.maShapeId ) )
{
- OSL_ENSURE( nShapeType == VML_SHAPETYPE_PICTUREFRAME,
"ComplexShape::implConvertAndInsert - unexpected shape type" );
+ SAL_WARN_IF(
+ nShapeType != VML_SHAPETYPE_PICTUREFRAME, "oox",
+ "ComplexShape::implConvertAndInsert - unexpected shape type");
// if OLE object is embedded into a DrawingML shape (PPTX), do not
create it here
if( pOleObjectInfo->mbDmlShape )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
