diff options
author | Chris Sherlock <chris.sherlock79@gmail.com> | 2017-05-07 17:03:35 +1000 |
---|---|---|
committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2017-05-07 17:03:35 +1000 |
commit | 97eb00c75e173d4c8d0b483a7941ad3d2f23783e (patch) | |
tree | 7974a8b9423c56982646366b0859dfb2a1a88d50 /filter | |
parent | d0a99cc2ed76be220f7e868e332ba19f6e48a440 (diff) |
revert OSL_ASSERT changes
Change-Id: I365d140446bd2a62cf8256acbfdd53fe72987380
Diffstat (limited to 'filter')
-rw-r--r-- | filter/source/flash/swfexporter.cxx | 6 | ||||
-rw-r--r-- | filter/source/flash/swffilter.cxx | 2 | ||||
-rw-r--r-- | filter/source/msfilter/escherex.cxx | 6 | ||||
-rw-r--r-- | filter/source/msfilter/mscodec.cxx | 4 | ||||
-rw-r--r-- | filter/source/odfflatxml/OdfFlatXml.cxx | 6 | ||||
-rw-r--r-- | filter/source/svg/svgimport.cxx | 2 | ||||
-rw-r--r-- | filter/source/svg/svgreader.cxx | 6 | ||||
-rw-r--r-- | filter/source/t602/t602filter.cxx | 2 | ||||
-rw-r--r-- | filter/source/xsltfilter/LibXSLTTransformer.cxx | 8 | ||||
-rw-r--r-- | filter/source/xsltfilter/OleHandler.cxx | 2 | ||||
-rw-r--r-- | filter/source/xsltfilter/XSLTFilter.cxx | 12 |
11 files changed, 28 insertions, 28 deletions
diff --git a/filter/source/flash/swfexporter.cxx b/filter/source/flash/swfexporter.cxx index c163df0e9224..34d7d10bb9f9 100644 --- a/filter/source/flash/swfexporter.cxx +++ b/filter/source/flash/swfexporter.cxx @@ -160,7 +160,7 @@ bool FlashExporter::exportAll( const Reference< XComponent >& xDoc, Reference< X } catch( const Exception& ) { - assert( false ); + OSL_ASSERT( false ); return false; // no writer, no cookies } @@ -289,7 +289,7 @@ bool FlashExporter::exportSlides( const Reference< XDrawPage >& xDrawPage, Refer } catch( const Exception& ) { - assert( false ); + OSL_ASSERT( false ); } exportDrawPageContents(xDrawPage, true, false); @@ -631,7 +631,7 @@ void FlashExporter::exportShape( const Reference< XShape >& xShape, bool bMaster } catch( const Exception& ) { - assert(false); + OSL_ASSERT(false); } } diff --git a/filter/source/flash/swffilter.cxx b/filter/source/flash/swffilter.cxx index 4dc4eec9f8fb..459bc8da3bbc 100644 --- a/filter/source/flash/swffilter.cxx +++ b/filter/source/flash/swffilter.cxx @@ -450,7 +450,7 @@ bool FlashExportFilter::ExportAsSingleFile(const Sequence< PropertyValue >& aDes if (!xOutputStream.is() ) { - assert ( false ); + OSL_ASSERT ( false ); return false; } diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx index 32b2c787e596..ee786573f1a0 100644 --- a/filter/source/msfilter/escherex.cxx +++ b/filter/source/msfilter/escherex.cxx @@ -1731,7 +1731,7 @@ bool EscherPropertyContainer::CreateGraphicProperties( // write out link to graphic else { - assert(aGraphicUrl.getLength()); + OSL_ASSERT(aGraphicUrl.getLength()); AddOpt( ESCHER_Prop_pibName, aGraphicUrl ); sal_uInt32 nPibFlags=0; @@ -2075,7 +2075,7 @@ sal_Int32 lcl_GetAdjustValueCount( const XPolygon& rPoly ) sal_Int32 lcl_GetConnectorAdjustValue ( const XPolygon& rPoly, sal_uInt16 nIndex ) { sal_uInt16 k = rPoly.GetSize(); - assert ( k >= ( 3 + nIndex ) ); + OSL_ASSERT ( k >= ( 3 + nIndex ) ); Point aPt; Point aStart = rPoly[0]; @@ -2355,7 +2355,7 @@ sal_Int32 EscherPropertyContainer::GetValueForEnhancedCustomShapeParameter( cons case css::drawing::EnhancedCustomShapeParameterType::EQUATION : { size_t nIndex = (size_t) nValue; - assert(nIndex < rEquationOrder.size()); + OSL_ASSERT(nIndex < rEquationOrder.size()); if ( nIndex < rEquationOrder.size() ) { nValue = (sal_uInt16)rEquationOrder[ nIndex ]; diff --git a/filter/source/msfilter/mscodec.cxx b/filter/source/msfilter/mscodec.cxx index b32a8a2e14b9..83dee6c37223 100644 --- a/filter/source/msfilter/mscodec.cxx +++ b/filter/source/msfilter/mscodec.cxx @@ -44,7 +44,7 @@ namespace { template< typename Type > inline void lclRotateLeft( Type& rnValue, int nBits ) { - assert( + OSL_ASSERT( nBits >= 0 && sal::static_int_cast< unsigned int >(nBits) < sizeof( Type ) * 8 ); rnValue = static_cast< Type >( (rnValue << nBits) | (rnValue >> (sizeof( Type ) * 8 - nBits)) ); @@ -54,7 +54,7 @@ inline void lclRotateLeft( Type& rnValue, int nBits ) template< typename Type > inline void lclRotateLeft( Type& rnValue, sal_uInt8 nBits, sal_uInt8 nWidth ) { - assert( (nBits < nWidth) && (nWidth < sizeof( Type ) * 8) ); + OSL_ASSERT( (nBits < nWidth) && (nWidth < sizeof( Type ) * 8) ); Type nMask = static_cast< Type >( (1UL << nWidth) - 1 ); rnValue = static_cast< Type >( ((rnValue << nBits) | ((rnValue & nMask) >> (nWidth - nBits))) & nMask ); diff --git a/filter/source/odfflatxml/OdfFlatXml.cxx b/filter/source/odfflatxml/OdfFlatXml.cxx index e91cbc523c12..685d6ebce9eb 100644 --- a/filter/source/odfflatxml/OdfFlatXml.cxx +++ b/filter/source/odfflatxml/OdfFlatXml.cxx @@ -126,7 +126,7 @@ OdfFlatXml::importer( sourceData[paramIdx].Value >>= url; } - assert(inputStream.is()); + OSL_ASSERT(inputStream.is()); if (!inputStream.is()) return false; @@ -186,10 +186,10 @@ OdfFlatXml::exporter(const Sequence< PropertyValue >& sourceData, } // get data source interface ... Reference<XActiveDataSource> dataSource(getDelegate(), UNO_QUERY); - assert(dataSource.is()); + OSL_ASSERT(dataSource.is()); if (!dataSource.is()) return false; - assert(outputStream.is()); + OSL_ASSERT(outputStream.is()); if (!outputStream.is()) return false; dataSource->setOutputStream(outputStream); diff --git a/filter/source/svg/svgimport.cxx b/filter/source/svg/svgimport.cxx index 4927facc3c98..445d233fe6d5 100644 --- a/filter/source/svg/svgimport.cxx +++ b/filter/source/svg/svgimport.cxx @@ -85,7 +85,7 @@ bool SVGFilter::implImport(const Sequence< PropertyValue >& rDescriptor) xSeek->seek(0); } - assert(xInputStream.is()); + OSL_ASSERT(xInputStream.is()); if(!xInputStream.is()) return false; diff --git a/filter/source/svg/svgreader.cxx b/filter/source/svg/svgreader.cxx index fad6cbd5b6a7..0546eea3132e 100644 --- a/filter/source/svg/svgreader.cxx +++ b/filter/source/svg/svgreader.cxx @@ -595,7 +595,7 @@ struct AnnotatingVisitor aBuf.append( sal_Int32(nBlue), 16 ); // TODO(F3): respect alpha transparency (polygons etc.) - assert(rColor.a == 1.0); + OSL_ASSERT(rColor.a == 1.0); return aBuf.makeStringAndClear(); } @@ -1253,11 +1253,11 @@ struct AnnotatingVisitor nDummyIndex=0; OUString aCurrAttrib( aCurrToken.getToken(0,':',nDummyIndex).trim()); - assert(nDummyIndex!=-1); + OSL_ASSERT(nDummyIndex!=-1); nDummyIndex=0; OUString aCurrValue( aCurrToken.getToken(1,':',nDummyIndex).trim()); - assert(nDummyIndex==-1); + OSL_ASSERT(nDummyIndex==-1); // recurse into normal attribute parsing parseAttribute( getTokenId(aCurrAttrib), diff --git a/filter/source/t602/t602filter.cxx b/filter/source/t602/t602filter.cxx index 2ca25e8190a2..45ebedc2d900 100644 --- a/filter/source/t602/t602filter.cxx +++ b/filter/source/t602/t602filter.cxx @@ -258,7 +258,7 @@ bool SAL_CALL T602ImportFilter::importImpl( const Sequence< css::beans::Property if ( !mxInputStream.is() ) { - assert( false ); + OSL_ASSERT( false ); return false; } diff --git a/filter/source/xsltfilter/LibXSLTTransformer.cxx b/filter/source/xsltfilter/LibXSLTTransformer.cxx index bdfa6387c6e7..d828cbd91991 100644 --- a/filter/source/xsltfilter/LibXSLTTransformer.cxx +++ b/filter/source/xsltfilter/LibXSLTTransformer.cxx @@ -268,10 +268,10 @@ namespace XSLT void Reader::execute() { - assert(m_transformer != nullptr); - assert(m_transformer->getInputStream().is()); - assert(m_transformer->getOutputStream().is()); - assert(!m_transformer->getStyleSheetURL().isEmpty()); + OSL_ASSERT(m_transformer != nullptr); + OSL_ASSERT(m_transformer->getInputStream().is()); + OSL_ASSERT(m_transformer->getOutputStream().is()); + OSL_ASSERT(!m_transformer->getStyleSheetURL().isEmpty()); ::std::map<const char*, OString>::iterator pit; ::std::map<const char*, OString> pmap = m_transformer->getParameters(); ::std::vector< const char* > params( pmap.size() * 2 + 1 ); // build parameters diff --git a/filter/source/xsltfilter/OleHandler.cxx b/filter/source/xsltfilter/OleHandler.cxx index ed54f2e34d67..6564d2ea88a9 100644 --- a/filter/source/xsltfilter/OleHandler.cxx +++ b/filter/source/xsltfilter/OleHandler.cxx @@ -53,7 +53,7 @@ namespace XSLT { Reference<XStream> SAL_CALL OleHandler::createTempFile() { Reference<XStream> tempFile( TempFile::create(m_xContext), UNO_QUERY); - assert(tempFile.is()); + OSL_ASSERT(tempFile.is()); return tempFile; } diff --git a/filter/source/xsltfilter/XSLTFilter.cxx b/filter/source/xsltfilter/XSLTFilter.cxx index d64ae15f21b9..47d9e380ae14 100644 --- a/filter/source/xsltfilter/XSLTFilter.cxx +++ b/filter/source/xsltfilter/XSLTFilter.cxx @@ -296,7 +296,7 @@ namespace XSLT else if ( aName == "InteractionHandler" ) value >>= xInterActionHandler; } - assert(xInputStream.is()); + OSL_ASSERT(xInputStream.is()); if (!xInputStream.is()) return false; @@ -320,9 +320,9 @@ namespace XSLT m_tcontrol = impl_createTransformer(msUserData[1], args); - assert(xHandler.is()); - assert(xInputStream.is()); - assert(m_tcontrol.is()); + OSL_ASSERT(xHandler.is()); + OSL_ASSERT(xInputStream.is()); + OSL_ASSERT(m_tcontrol.is()); if (xHandler.is() && xInputStream.is() && m_tcontrol.is()) { try @@ -473,8 +473,8 @@ namespace XSLT m_tcontrol = impl_createTransformer(msUserData[1], args); - assert(m_rOutputStream.is()); - assert(m_tcontrol.is()); + OSL_ASSERT(m_rOutputStream.is()); + OSL_ASSERT(m_tcontrol.is()); if (m_tcontrol.is() && m_rOutputStream.is()) { // we want to be notfied when the processing is done... |