diff options
author | Noel Grandin <noelgrandin@gmail.com> | 2016-06-12 11:39:15 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2016-06-17 06:39:30 +0000 |
commit | e6c004dd9f24c32f5e7468182a5e8d42293ec7b6 (patch) | |
tree | 7128862b7cfe1770d07ef2b3613a52ea26b410c6 /xmloff/source/draw/shapeimport.cxx | |
parent | 9c79945ca62b18213728cdd23d9f390304aee1de (diff) |
convert DBG_ASSERT in xmloff
Change-Id: I2f4bbbef451026fc34638e17fa29b6db2c14d850
Reviewed-on: https://gerrit.libreoffice.org/26191
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'xmloff/source/draw/shapeimport.cxx')
-rw-r--r-- | xmloff/source/draw/shapeimport.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/xmloff/source/draw/shapeimport.cxx b/xmloff/source/draw/shapeimport.cxx index 39326381933e..b2614a144ea6 100644 --- a/xmloff/source/draw/shapeimport.cxx +++ b/xmloff/source/draw/shapeimport.cxx @@ -162,7 +162,7 @@ XMLShapeImportHelper::XMLShapeImportHelper( XMLShapeImportHelper::~XMLShapeImportHelper() { - DBG_ASSERT( mpImpl->maConnections.empty(), "XMLShapeImportHelper::restoreConnections() was not called!" ); + SAL_WARN_IF( !mpImpl->maConnections.empty(), "xmloff", "XMLShapeImportHelper::restoreConnections() was not called!" ); // cleanup factory, decrease refcount. Should lead to destruction. mpSdPropHdlFactory.clear(); @@ -782,7 +782,7 @@ void ShapeSortContext::moveShape( sal_Int32 nSourcePos, sal_Int32 nDestPos ) { if( rHint.nIs < nSourcePos ) { - DBG_ASSERT( rHint.nIs >= nDestPos, "shape sorting failed" ); + SAL_WARN_IF( rHint.nIs < nDestPos, "xmloff", "shape sorting failed" ); rHint.nIs++; } } @@ -862,7 +862,7 @@ void XMLShapeImportHelper::pushGroupForSorting( uno::Reference< drawing::XShapes void XMLShapeImportHelper::popGroupAndSort() { - DBG_ASSERT( mpImpl->mpSortContext, "No context to sort!" ); + SAL_WARN_IF( !mpImpl->mpSortContext, "xmloff", "No context to sort!" ); if( mpImpl->mpSortContext == nullptr ) return; @@ -1060,7 +1060,7 @@ void XMLShapeImportHelper::startPage( css::uno::Reference< css::drawing::XShapes /** this method must be calling after the last shape is imported for the given page */ void XMLShapeImportHelper::endPage( css::uno::Reference< css::drawing::XShapes >& rShapes ) { - DBG_ASSERT( mpPageContext && (mpPageContext->mxShapes == rShapes), "wrong call to endPage(), no startPage called or wrong page" ); + SAL_WARN_IF( !mpPageContext || (mpPageContext->mxShapes != rShapes), "xmloff", "wrong call to endPage(), no startPage called or wrong page" ); if( nullptr == mpPageContext ) return; |