diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-10-11 17:55:38 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-10-11 17:55:38 +0200 |
| commit | 52e07f1fd2ba3d1cf25ec8fe8c1892398c7cd364 (patch) | |
| tree | bdecb862bbef879c47b39e6627eb2cad82ab0f37 /oox | |
| parent | d404c67e8a0f597e3d2fdd027e8e822823c6b1ae (diff) | |
-Werror,-Wunused-variable
Change-Id: I7f4f232475339d524eed7ba578e22b53991bd123
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/docprop/docprophandler.cxx | 3 | ||||
| -rw-r--r-- | oox/source/vml/vmlshape.cxx | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/oox/source/docprop/docprophandler.cxx b/oox/source/docprop/docprophandler.cxx index e9a35b2cff40..39082a2d9c66 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 a9ef5f838349..5d89a9b38524 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 ) |