summaryrefslogtreecommitdiff
path: root/xmloff
diff options
context:
space:
mode:
authorChris Sherlock <chris.sherlock79@gmail.com>2017-05-07 17:03:35 +1000
committerChris Sherlock <chris.sherlock79@gmail.com>2017-05-07 17:03:35 +1000
commit97eb00c75e173d4c8d0b483a7941ad3d2f23783e (patch)
tree7974a8b9423c56982646366b0859dfb2a1a88d50 /xmloff
parentd0a99cc2ed76be220f7e868e332ba19f6e48a440 (diff)
revert OSL_ASSERT changes
Change-Id: I365d140446bd2a62cf8256acbfdd53fe72987380
Diffstat (limited to 'xmloff')
-rw-r--r--xmloff/source/chart/SchXMLChartContext.cxx6
-rw-r--r--xmloff/source/chart/SchXMLExport.cxx2
-rw-r--r--xmloff/source/core/attrlist.cxx6
3 files changed, 7 insertions, 7 deletions
diff --git a/xmloff/source/chart/SchXMLChartContext.cxx b/xmloff/source/chart/SchXMLChartContext.cxx
index 13797e9c92e9..8e264843e2dd 100644
--- a/xmloff/source/chart/SchXMLChartContext.cxx
+++ b/xmloff/source/chart/SchXMLChartContext.cxx
@@ -972,7 +972,7 @@ void SchXMLChartContext::EndElement()
void SchXMLChartContext::MergeSeriesForStockChart()
{
- assert( mbIsStockChart );
+ OSL_ASSERT( mbIsStockChart );
try
{
uno::Reference< chart::XChartDocument > xOldDoc( mrImportHelper.GetChartDocument());
@@ -1009,7 +1009,7 @@ void SchXMLChartContext::MergeSeriesForStockChart()
const sal_Int32 nSeriesCount( aSeriesSeq.getLength());
const sal_Int32 nSeriesPerCandleStick = bHasJapaneseCandlestick ? 4: 3;
sal_Int32 nCandleStickCount = nSeriesCount / nSeriesPerCandleStick;
- assert( nSeriesPerCandleStick * nCandleStickCount == nSeriesCount );
+ OSL_ASSERT( nSeriesPerCandleStick * nCandleStickCount == nSeriesCount );
uno::Sequence< uno::Reference< chart2::XDataSeries > > aNewSeries( nCandleStickCount );
for( sal_Int32 i=0; i<nCandleStickCount; ++i )
{
@@ -1120,7 +1120,7 @@ SvXMLImportContext* SchXMLChartContext::CreateChildContext(
{
if( !msColTrans.isEmpty() )
{
- assert( msRowTrans.isEmpty() );
+ OSL_ASSERT( msRowTrans.isEmpty() );
pTableContext->setColumnPermutation( lcl_getNumberSequenceFromString( msColTrans, true ));
msColTrans.clear();
}
diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx
index 2ef90c0afe79..35f4a3ffd0be 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -2896,7 +2896,7 @@ void SchXMLExportHelper_Impl::exportRegressionCurve(
const awt::Size& rPageSize,
bool bExportContent )
{
- assert( mxExpPropMapper.is());
+ OSL_ASSERT( mxExpPropMapper.is());
std::vector< XMLPropertyState > aPropertyStates;
std::vector< XMLPropertyState > aEquationPropertyStates;
diff --git a/xmloff/source/core/attrlist.cxx b/xmloff/source/core/attrlist.cxx
index ac59cb9f1409..4cd94a6d768b 100644
--- a/xmloff/source/core/attrlist.cxx
+++ b/xmloff/source/core/attrlist.cxx
@@ -160,7 +160,7 @@ void SvXMLAttributeList::Clear()
{
m_pImpl->vecAttribute.clear();
- assert( ! getLength() );
+ OSL_ASSERT( ! getLength() );
}
void SvXMLAttributeList::RemoveAttribute( const OUString& sName )
@@ -177,7 +177,7 @@ void SvXMLAttributeList::RemoveAttribute( const OUString& sName )
void SvXMLAttributeList::AppendAttributeList( const uno::Reference< css::xml::sax::XAttributeList > &r )
{
- assert( r.is() );
+ OSL_ASSERT( r.is() );
sal_Int16 nMax = r->getLength();
SvXMLAttributeList_Impl::size_type nTotalSize =
@@ -190,7 +190,7 @@ void SvXMLAttributeList::AppendAttributeList( const uno::Reference< css::xml::sa
r->getValueByIndex( i )));
}
- assert( nTotalSize == (SvXMLAttributeList_Impl::size_type)getLength());
+ OSL_ASSERT( nTotalSize == (SvXMLAttributeList_Impl::size_type)getLength());
}
void SvXMLAttributeList::SetValueByIndex( sal_Int16 i,