[Libreoffice-commits] .: 24 commits - binfilter/bf_forms binfilter/bf_sc binfilter/bf_sch binfilter/bf_sd binfilter/bf_sfx2 binfilter/bf_so3 binfilter/bf_svtools binfilter/bf_svx binfilter/bf_sw binfilter/bf_xmloff binfilter/inc binfilter/legacysmgr filter/source oox/source unoxml/source writerfilter/inc writerfilter/source
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Sun Mar 13 08:47:13 PDT 2011
binfilter/bf_forms/source/component/forms_Columns.cxx | 2
binfilter/bf_forms/source/component/forms_Filter.cxx | 2
binfilter/bf_forms/source/component/forms_errorbroadcaster.cxx | 2
binfilter/bf_sc/source/core/data/sc_attarray.cxx | 2
binfilter/bf_sc/source/core/data/sc_stlpool.cxx | 2
binfilter/bf_sc/source/core/data/sc_table2.cxx | 2
binfilter/bf_sc/source/filter/xml/sc_xmlwrap.cxx | 10 +-
binfilter/bf_sc/source/ui/unoobj/sc_cellsuno.cxx | 2
binfilter/bf_sch/source/core/sch_SchAddInCollection.cxx | 3
binfilter/bf_sch/source/core/sch_chartbar.cxx | 2
binfilter/bf_sch/source/core/sch_chaxis.cxx | 2
binfilter/bf_sch/source/core/sch_chtmode3.cxx | 12 ++-
binfilter/bf_sch/source/core/sch_chtmode4.cxx | 2
binfilter/bf_sch/source/core/sch_chtmode5.cxx | 2
binfilter/bf_sch/source/core/sch_chtmode8.cxx | 2
binfilter/bf_sch/source/core/sch_chtmode9.cxx | 2
binfilter/bf_sch/source/core/sch_chtmodel.cxx | 4 -
binfilter/bf_sch/source/core/sch_chtscene.cxx | 2
binfilter/bf_sch/source/core/sch_globfunc.cxx | 8 +-
binfilter/bf_sch/source/core/sch_memchrt.cxx | 6 -
binfilter/bf_sch/source/core/sch_objid.cxx | 4 -
binfilter/bf_sch/source/filter/xml/sch_SchXMLWrapper.cxx | 8 +-
binfilter/bf_sch/source/ui/app/sch_schdll.cxx | 2
binfilter/bf_sch/source/ui/docshell/sch_docshell.cxx | 4 -
binfilter/bf_sch/source/ui/unoidl/sch_ChXChartAxis.cxx | 8 +-
binfilter/bf_sch/source/ui/unoidl/sch_ChXChartDocument.cxx | 10 +-
binfilter/bf_sch/source/ui/unoidl/sch_ChXChartObject.cxx | 8 +-
binfilter/bf_sch/source/ui/unoidl/sch_ChXDataPoint.cxx | 8 +-
binfilter/bf_sch/source/ui/unoidl/sch_ChXDataRow.cxx | 8 +-
binfilter/bf_sch/source/ui/unoidl/sch_ChXDiagram.cxx | 14 +--
binfilter/bf_sch/source/ui/unoidl/sch_mapprov.cxx | 2
binfilter/bf_sd/source/filter/xml/sd_sdxmlwrp.cxx | 12 +--
binfilter/bf_sfx2/source/appl/sfx2_appbas.cxx | 2
binfilter/bf_sfx2/source/appl/sfx2_imestatuswindow.cxx | 4 -
binfilter/bf_sfx2/source/appl/sfx2_namecont.cxx | 36 +++++-----
binfilter/bf_sfx2/source/appl/sfx2_scriptcont.cxx | 4 -
binfilter/bf_sfx2/source/bastyp/sfx2_fltfnc.cxx | 2
binfilter/bf_so3/source/inplace/client.cxx | 12 +--
binfilter/bf_so3/source/inplace/embobj.cxx | 8 +-
binfilter/bf_so3/source/inplace/ipclient.cxx | 2
binfilter/bf_so3/source/inplace/ipobj.cxx | 4 -
binfilter/bf_so3/source/inplace/protocol.cxx | 4 -
binfilter/bf_so3/source/inplace/rmapplet.cxx | 28 +++----
binfilter/bf_so3/source/misc/iface.cxx | 6 -
binfilter/bf_so3/source/persist/persist.cxx | 4 -
binfilter/bf_svtools/source/config/svt_inetoptions.cxx | 3
binfilter/bf_svtools/source/config/svt_itemholder2.cxx | 2
binfilter/bf_svtools/source/config/svt_miscopt.cxx | 20 ++---
binfilter/bf_svtools/source/filter.vcl/wmf/svt_emfwr.cxx | 2
binfilter/bf_svtools/source/inc/poolio.hxx | 6 -
binfilter/bf_svtools/source/items1/svt_itemset.cxx | 10 +-
binfilter/bf_svx/source/svdraw/svx_svdattr.cxx | 4 -
binfilter/bf_svx/source/svdraw/svx_svdio.cxx | 6 -
binfilter/bf_svx/source/svdraw/svx_svdmodel.cxx | 4 -
binfilter/bf_svx/source/svdraw/svx_svdpage.cxx | 4 -
binfilter/bf_sw/source/core/bastyp/sw_swcache.cxx | 2
binfilter/bf_sw/source/core/doc/sw_docdraw.cxx | 10 +-
binfilter/bf_sw/source/core/draw/sw_dcontact.cxx | 2
binfilter/bf_sw/source/core/fields/sw_fldbas.cxx | 4 -
binfilter/bf_sw/source/core/layout/sw_calcmove.cxx | 2
binfilter/bf_sw/source/core/layout/sw_fly.cxx | 5 -
binfilter/bf_sw/source/core/text/sw_porfly.cxx | 2
binfilter/bf_sw/source/core/text/sw_txtfly.cxx | 2
binfilter/bf_sw/source/filter/xml/sw_XMLRedlineImportHelper.cxx | 2
binfilter/bf_sw/source/filter/xml/sw_swxml.cxx | 10 +-
binfilter/bf_xmloff/source/chart/xmloff_SchXMLExport.cxx | 14 +--
binfilter/bf_xmloff/source/chart/xmloff_SchXMLPlotAreaContext.cxx | 12 +--
binfilter/bf_xmloff/source/core/xmloff_xmlerror.cxx | 2
binfilter/inc/bf_sch/chtmodel.hxx | 10 +-
binfilter/inc/bf_sch/objid.hxx | 2
binfilter/legacysmgr/source/legacy/legacy_binfilters_smgr.cxx | 8 +-
filter/source/msfilter/msocximex.cxx | 2
filter/source/msfilter/svdfppt.cxx | 2
filter/source/odfflatxml/OdfFlatXml.cxx | 2
filter/source/xsltdialog/xmlfileview.cxx | 32 --------
filter/source/xsltfilter/XSLTFilter.cxx | 2
oox/source/core/filterbase.cxx | 2
oox/source/core/xmlfilterbase.cxx | 2
oox/source/drawingml/chart/axisconverter.cxx | 4 -
oox/source/drawingml/chart/chartconverter.cxx | 2
oox/source/drawingml/chart/chartdrawingfragment.cxx | 4 -
oox/source/drawingml/chart/converterbase.cxx | 6 -
oox/source/drawingml/chart/objectformatter.cxx | 3
oox/source/drawingml/chart/plotareaconverter.cxx | 4 -
oox/source/drawingml/chart/seriesconverter.cxx | 10 +-
oox/source/drawingml/chart/typegroupconverter.cxx | 8 +-
oox/source/drawingml/color.cxx | 6 -
oox/source/drawingml/lineproperties.cxx | 4 -
oox/source/export/ColorPropertySet.cxx | 8 +-
oox/source/export/SchXMLSeriesHelper.cxx | 8 +-
oox/source/export/chartexport.cxx | 8 +-
oox/source/helper/binaryinputstream.cxx | 2
oox/source/helper/binaryoutputstream.cxx | 4 -
oox/source/helper/binarystreambase.cxx | 4 -
oox/source/helper/containerhelper.cxx | 2
oox/source/helper/graphichelper.cxx | 6 -
oox/source/helper/propertyset.cxx | 8 +-
oox/source/helper/zipstorage.cxx | 2
oox/source/ole/axcontrol.cxx | 14 +--
oox/source/ole/olehelper.cxx | 4 -
oox/source/ole/olestorage.cxx | 4 -
oox/source/ole/vbacontrol.cxx | 4 -
oox/source/ole/vbamodule.cxx | 6 -
oox/source/ppt/presentationfragmenthandler.cxx | 3
oox/source/ppt/slidefragmenthandler.cxx | 3
oox/source/ppt/slidetransition.cxx | 4 -
oox/source/vml/vmlformatting.cxx | 8 +-
oox/source/xls/addressconverter.cxx | 2
oox/source/xls/autofiltercontext.cxx | 8 +-
oox/source/xls/biffcodec.cxx | 4 -
oox/source/xls/biffdetector.cxx | 3
oox/source/xls/biffhelper.cxx | 4 -
oox/source/xls/condformatbuffer.cxx | 6 -
oox/source/xls/drawingfragment.cxx | 12 +--
oox/source/xls/excelchartconverter.cxx | 2
oox/source/xls/externallinkbuffer.cxx | 4 -
oox/source/xls/externallinkfragment.cxx | 2
oox/source/xls/formulabase.cxx | 10 +-
oox/source/xls/formulaparser.cxx | 10 +-
oox/source/xls/numberformatsbuffer.cxx | 8 --
oox/source/xls/pagesettings.cxx | 3
oox/source/xls/pivotcachebuffer.cxx | 14 +--
oox/source/xls/pivotcachefragment.cxx | 4 -
oox/source/xls/pivottablebuffer.cxx | 4 -
oox/source/xls/sheetdatacontext.cxx | 6 -
oox/source/xls/stylesbuffer.cxx | 8 +-
oox/source/xls/tablebuffer.cxx | 2
oox/source/xls/viewsettings.cxx | 2
oox/source/xls/worksheetbuffer.cxx | 2
oox/source/xls/worksheethelper.cxx | 6 -
unoxml/source/rdf/librdf_repository.cxx | 6 -
writerfilter/inc/resourcemodel/TableManager.hxx | 2
writerfilter/source/dmapper/BorderHandler.cxx | 2
writerfilter/source/dmapper/CellColorHandler.cxx | 2
writerfilter/source/dmapper/CellMarginHandler.cxx | 4 -
writerfilter/source/dmapper/DomainMapper.cxx | 18 ++---
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 22 +++---
writerfilter/source/dmapper/GraphicImport.cxx | 6 -
writerfilter/source/dmapper/MeasureHandler.cxx | 2
writerfilter/source/dmapper/ModelEventListener.cxx | 2
writerfilter/source/dmapper/NumberingManager.cxx | 8 +-
writerfilter/source/dmapper/OLEHandler.cxx | 6 -
writerfilter/source/dmapper/PropertyMap.cxx | 12 +--
writerfilter/source/dmapper/SectionColumnHandler.cxx | 4 -
writerfilter/source/dmapper/SettingsTable.cxx | 2
writerfilter/source/dmapper/StyleSheetTable.cxx | 16 ++--
writerfilter/source/dmapper/TDefTableHandler.cxx | 2
147 files changed, 416 insertions(+), 448 deletions(-)
New commits:
commit 48871c43ce76f86108161e4b259ef99d5da9548b
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sat Mar 12 20:40:18 2011 +0100
Fix non-debug build
diff --git a/binfilter/bf_sch/source/core/sch_chtmode3.cxx b/binfilter/bf_sch/source/core/sch_chtmode3.cxx
index 2893f47..e196e33 100644
--- a/binfilter/bf_sch/source/core/sch_chtmode3.cxx
+++ b/binfilter/bf_sch/source/core/sch_chtmode3.cxx
@@ -1004,7 +1004,9 @@ namespace binfilter {
/*N*/ }
/*N*/ long nId=pObjId->GetObjId();
/*N*/
+ #if OSL_DEBUG_LEVEL > 0
/*N*/ CHART_TRACE2( "ChartModel::StoreObjectsAttributes Id=%s %s", GetCHOBJIDName( nId ), bReplaceAll? "ReplaceAll" : "Merge" );
+ #endif
/*N*/
/*N*/ switch(nId)
/*N*/ {
@@ -1118,7 +1120,9 @@ namespace binfilter {
/*N*/ ZAxisTitle()=rTitle;
/*N*/ break;
/*N*/ default:
+ #if OSL_DEBUG_LEVEL > 0
/*?*/ CHART_TRACE2( "SetTitle: Title not found by id %ld (%s) ", nId, GetCHOBJIDName( nId ));
+ #endif
/*N*/ break;
/*N*/ }
/*N*/ }
@@ -1138,7 +1142,9 @@ namespace binfilter {
/*N*/ case CHOBJID_DIAGRAM_TITLE_Z_AXIS:
/*N*/ return ZAxisTitle();
/*N*/ default:
+ #if OSL_DEBUG_LEVEL > 0
/*?*/ CHART_TRACE2( "GetTitle: Title not found by id %ld (%s) ", nId, GetCHOBJIDName( nId ));
+ #endif
/*?*/ return String();
/*N*/ }
/*N*/ }
@@ -1167,7 +1173,9 @@ namespace binfilter {
/*N*/ SetLegendHasBeenMoved(bMoved);
/*N*/ break;
/*N*/ default:
+ #if OSL_DEBUG_LEVEL > 0
/*?*/ CHART_TRACE2( "SetHasBeenMoved: Object not found by id %ld (%s) ", nId, GetCHOBJIDName( nId ));
+ #endif
/*N*/ break;
/*N*/ }
/*N*/ }
diff --git a/binfilter/bf_sch/source/core/sch_objid.cxx b/binfilter/bf_sch/source/core/sch_objid.cxx
index 53deb21..0a491ab 100644
--- a/binfilter/bf_sch/source/core/sch_objid.cxx
+++ b/binfilter/bf_sch/source/core/sch_objid.cxx
@@ -154,7 +154,7 @@ namespace binfilter {
/*N*/ rIn >> nObjId;
/*N*/ }
-/*N*/ #ifdef DBG_UTIL
+/*N*/ #if OSL_DEBUG_LEVEL > 0
// this function is for debugging only
// therefore it is ok to use char* instead of UniString
@@ -221,7 +221,7 @@ namespace binfilter {
/*N*/ }
/*N*/ }
-/*N*/ #endif // DBG_UTIL
+/*N*/ #endif // OSL_DEBUG_LEVEL
diff --git a/binfilter/inc/bf_sch/objid.hxx b/binfilter/inc/bf_sch/objid.hxx
index ddabb75..11069e6 100644
--- a/binfilter/inc/bf_sch/objid.hxx
+++ b/binfilter/inc/bf_sch/objid.hxx
@@ -71,7 +71,7 @@ extern SdrObject* GetObjWithId(UINT16 nObjId, const SdrObjList& rObjList,
SdrIterMode eMode = IM_FLAT);
//Die hier folgenden Funktionen dienen AUSSCHLIESSLICH zu DEBUG-Zwecken
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 0
extern char *GetCHOBJIDName(const long id);
#endif
commit 29f2f3e6b8a97434ac91a5a3cce94746823a2221
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sat Mar 12 20:00:39 2011 +0100
Fix non-debug build
diff --git a/binfilter/bf_svtools/source/items1/svt_itemset.cxx b/binfilter/bf_svtools/source/items1/svt_itemset.cxx
index 695509b..ebe6b2b 100644
--- a/binfilter/bf_svtools/source/items1/svt_itemset.cxx
+++ b/binfilter/bf_svtools/source/items1/svt_itemset.cxx
@@ -53,7 +53,7 @@ namespace binfilter
// STATIC DATA -----------------------------------------------------------
static const USHORT nInitCount = 10; // einzelne USHORTs => 5 Paare ohne '0'
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
static ULONG nRangesCopyCount = 0; // wie oft wurden Ranges kopiert
#endif
@@ -285,7 +285,9 @@ SfxItemSet::SfxItemSet( SfxItemPool& rPool,
void SfxItemSet::InitRanges_Impl(const USHORT *pWhichPairTable)
{
DBG_CHKTHIS(SfxItemSet, 0);
+ #if OSL_DEBUG_LEVEL > 1
OSL_TRACE("SfxItemSet: Ranges-CopyCount==%ul", ++nRangesCopyCount);
+ #endif
USHORT nCnt = 0;
const USHORT* pPtr = pWhichPairTable;
@@ -365,7 +367,9 @@ SfxItemSet::SfxItemSet( const SfxItemSet& rASet ):
*ppDst = &_pPool->Put( **ppSrc );
// dann noch die Which Ranges kopieren
+ #if OSL_DEBUG_LEVEL > 1
OSL_TRACE("SfxItemSet: Ranges-CopyCount==%ul", ++nRangesCopyCount);
+ #endif
std::ptrdiff_t cnt = pPtr - rASet._pWhichRanges+1;
_pWhichRanges = new USHORT[ cnt ];
memcpy( _pWhichRanges, rASet._pWhichRanges, sizeof( USHORT ) * cnt);
commit 9fa58fb2efc293ee3e83bd3e4e066127b8fcd428
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sat Mar 12 13:26:27 2011 +0100
OSL_TRACE: Use format string for GetBuffer()
diff --git a/binfilter/bf_so3/source/inplace/client.cxx b/binfilter/bf_so3/source/inplace/client.cxx
index 7098600..230f18f 100644
--- a/binfilter/bf_so3/source/inplace/client.cxx
+++ b/binfilter/bf_so3/source/inplace/client.cxx
@@ -271,7 +271,7 @@ void SvEmbeddedClient::TestMemberObjRef( BOOL bFree )
{
ByteString aTest = "\t\tGetEmbedObj() == ";
aTest.Append( ByteString::CreateFromInt32( (ULONG)(SvObject *)GetEmbedObj() ) );
- OSL_TRACE( aTest.GetBuffer() );
+ OSL_TRACE( "%s", aTest.GetBuffer() );
}
#endif
}
@@ -286,7 +286,7 @@ void SvEmbeddedClient::TestMemberInvariant( BOOL bPrint )
{
ByteString aTest( "\t\tSvClientData == " );
aTest.Append( ByteString::CreateFromInt32( (ULONG)GetClientData() ) );
- OSL_TRACE( aTest.GetBuffer() );
+ OSL_TRACE( "%s", aTest.GetBuffer() );
}
}
#else
@@ -462,7 +462,7 @@ void SvEmbeddedClient::Embedded( BOOL bEmbed )
String aTest( "Client---Embedded---" );
aTest += Owner() ? "Intern" : "Extern: ";
aTest += bEmbed ? "TRUE" : "FALSE";
- OSL_TRACE( aTest.GetBuffer() );
+ OSL_TRACE( "%s", aTest.GetBuffer() );
#endif
if( Owner() )
@@ -487,7 +487,7 @@ void SvEmbeddedClient::PlugIn( BOOL bPlugIn )
String aTest( "Client---PlugIn---" );
aTest += Owner() ? "Intern" : "Extern: ";
aTest += bPlugIn ? "TRUE" : "FALSE";
- OSL_TRACE( aTest.GetBuffer() )
+ OSL_TRACE( "%s", aTest.GetBuffer() )
#else
(void)bPlugIn;
#endif
@@ -585,7 +585,7 @@ void SvEmbeddedClient::Connected( BOOL bConnect )
String aTest( "Client---Connected---" );
aTest += Owner() ? "Intern" : "Extern: ";
aTest += bConnect ? "TRUE" : "FALSE";
- OSL_TRACE( aTest.GetBuffer() )
+ OSL_TRACE( "%s", aTest.GetBuffer() )
#endif
if( !bConnect && HasViewData() )
FreeViewData( pData );
@@ -612,7 +612,7 @@ void SvEmbeddedClient::Opened( BOOL bOpen )
String aTest( "Client---Opened---" );
aTest += Owner() ? "Intern" : "Extern: ";
aTest += bOpen ? "TRUE" : "FALSE";
- OSL_TRACE( aTest.GetBuffer() )
+ OSL_TRACE( "%s", aTest.GetBuffer() )
#else
(void)bOpen;
#endif
diff --git a/binfilter/bf_so3/source/inplace/embobj.cxx b/binfilter/bf_so3/source/inplace/embobj.cxx
index b56fc54..25aefe8 100644
--- a/binfilter/bf_so3/source/inplace/embobj.cxx
+++ b/binfilter/bf_so3/source/inplace/embobj.cxx
@@ -212,7 +212,7 @@ void SvEmbeddedObject::TestMemberObjRef( BOOL /*bFree*/ )
{
ByteString aTest = "\t\tGetClient() == ";
aTest.Append( ByteString::CreateFromInt32( (ULONG)(SvObject *)GetClient() ) );
- OSL_TRACE( aTest.GetBuffer() );
+ OSL_TRACE( "%s", aTest.GetBuffer() );
}
#endif
}
@@ -547,7 +547,7 @@ void SvEmbeddedObject::Embed( BOOL )
String aTest( "Object---Embed---" );
aTest += Owner() ? "Intern" : "Extern: ";
aTest += bEmbed ? "TRUE" : "FALSE";
- OSL_TRACE( aTest.GetBuffer() )
+ OSL_TRACE( "%s", aTest.GetBuffer() )
#endif
}
@@ -595,7 +595,7 @@ void SvEmbeddedObject::PlugIn( BOOL )
String aTest( "Object---PlugIn---" );
aTest += Owner() ? "Intern" : "Extern: ";
aTest += bPlugIn ? "TRUE" : "FALSE";
- OSL_TRACE( aTest.GetBuffer() )
+ OSL_TRACE( "%s", aTest.GetBuffer() )
#endif
}
@@ -712,7 +712,7 @@ void SvEmbeddedObject::Open( BOOL bOpen )
String aTest( "Object---Open---" );
aTest += Owner() ? "Intern" : "Extern: ";
aTest += bOpen ? "TRUE" : "FALSE";
- OSL_TRACE( aTest.GetBuffer() )
+ OSL_TRACE( "%s", aTest.GetBuffer() )
#endif
SendViewChanged();
diff --git a/binfilter/bf_so3/source/inplace/ipclient.cxx b/binfilter/bf_so3/source/inplace/ipclient.cxx
index 1f58af8..fc3410d 100644
--- a/binfilter/bf_so3/source/inplace/ipclient.cxx
+++ b/binfilter/bf_so3/source/inplace/ipclient.cxx
@@ -104,7 +104,7 @@ void SvInPlaceClient::TestMemberObjRef( BOOL bFree )
{
ByteString aTest = "\t\tGetIPObj() == ";
aTest.Append( ByteString::CreateFromInt32( (ULONG)(SvObject *)GetIPObj() ) );
- OSL_TRACE( aTest.GetBuffer() );
+ OSL_TRACE( "%s", aTest.GetBuffer() );
}
#endif
}
diff --git a/binfilter/bf_so3/source/inplace/ipobj.cxx b/binfilter/bf_so3/source/inplace/ipobj.cxx
index b466836..6ac70c7 100644
--- a/binfilter/bf_so3/source/inplace/ipobj.cxx
+++ b/binfilter/bf_so3/source/inplace/ipobj.cxx
@@ -65,7 +65,7 @@ void SvInPlaceObject::TestMemberObjRef( BOOL bFree )
{
ByteString aTest = "\t\tGetIPClient() == ";
aTest.Append( ByteString::CreateFromInt32( (ULONG)(SvObject *)GetIPClient() ) );
- OSL_TRACE( aTest.GetBuffer() );
+ OSL_TRACE( "%s", aTest.GetBuffer() );
}
#endif
}
@@ -80,7 +80,7 @@ void SvInPlaceObject::TestMemberInvariant( BOOL bPrint )
{
ByteString aTest( "\t\tSvInPlaceEnvironment == " );
aTest.Append( ByteString::CreateFromInt32( (ULONG)pIPEnv ) );
- OSL_TRACE( aTest.GetBuffer() );
+ OSL_TRACE( "%s", aTest.GetBuffer() );
}
}
#else
diff --git a/binfilter/bf_so3/source/inplace/protocol.cxx b/binfilter/bf_so3/source/inplace/protocol.cxx
index 7811300..8a9e179 100644
--- a/binfilter/bf_so3/source/inplace/protocol.cxx
+++ b/binfilter/bf_so3/source/inplace/protocol.cxx
@@ -47,7 +47,7 @@ namespace binfilter {
aTS += "( "; \
aTS += bVal ? "TRUE" : "FALSE"; \
aTS += " )"; \
- OSL_TRACE( aTS.GetBuffer() ); \
+ OSL_TRACE( "%s", aTS.GetBuffer() ); \
}
#define DBG_PROTREC(FuncName) \
diff --git a/binfilter/bf_so3/source/misc/iface.cxx b/binfilter/bf_so3/source/misc/iface.cxx
index 2c256ed..40982e1 100644
--- a/binfilter/bf_so3/source/misc/iface.cxx
+++ b/binfilter/bf_so3/source/misc/iface.cxx
@@ -85,13 +85,13 @@ void SvObject::TestMemberInvariant( BOOL /*bPrint*/ )
{
ByteString aTest( "\t\tpClient == " );
aTest += ByteString::CreateFromInt32( (ULONG)pClient );
- OSL_TRACE( aTest.GetBuffer() );
+ OSL_TRACE( "%s", aTest.GetBuffer() );
}
if( Owner() && pService )
{
ByteString aTest( "\t\tpService == " );
aTest += ByteString::CreateFromInt32( (ULONG)pService );
- OSL_TRACE( aTest.GetBuffer() );
+ OSL_TRACE( "%s", aTest.GetBuffer() );
}
#endif
}
diff --git a/binfilter/bf_so3/source/persist/persist.cxx b/binfilter/bf_so3/source/persist/persist.cxx
index 4ce5e86..7f0d418 100644
--- a/binfilter/bf_so3/source/persist/persist.cxx
+++ b/binfilter/bf_so3/source/persist/persist.cxx
@@ -362,7 +362,7 @@ void SvPersist::TestMemberObjRef( BOOL /*bFree*/ )
aTest += ByteString::CreateFromInt32( i );
aTest += " ] == ";
aTest += ByteString::CreateFromInt32( (ULONG)pEle->GetObj() );
- OSL_TRACE( aTest.GetBuffer() );
+ OSL_TRACE( "%s", aTest.GetBuffer() );
}
}
}
@@ -370,7 +370,7 @@ void SvPersist::TestMemberObjRef( BOOL /*bFree*/ )
{
ByteString aTest( "\t\taStorage == " );
aTest += ByteString::CreateFromInt32( (ULONG)&aStorage );
- OSL_TRACE( aTest.GetBuffer() );
+ OSL_TRACE( "%s", aTest.GetBuffer() );
}
}
commit b1fd1741488686279bc35bde4982da0f0cc4eee7
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sat Mar 12 12:07:01 2011 +0100
Use getStr() on OString
diff --git a/filter/source/odfflatxml/OdfFlatXml.cxx b/filter/source/odfflatxml/OdfFlatXml.cxx
index 395fdad..ae80989 100644
--- a/filter/source/odfflatxml/OdfFlatXml.cxx
+++ b/filter/source/odfflatxml/OdfFlatXml.cxx
@@ -167,7 +167,7 @@ OdfFlatXml::importer(
{
OString msg = OUStringToOString(exc.Message,
RTL_TEXTENCODING_ASCII_US);
- OSL_FAIL(msg);
+ OSL_FAIL(msg.getStr());
return sal_False;
}
return sal_True;
commit 739f6e375da4260481d3fd6cd988e243b92e2f39
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sat Mar 12 12:06:23 2011 +0100
Move OSL_ENSURE(0,...) to OSL_FAIL(...)
diff --git a/binfilter/bf_forms/source/component/forms_Columns.cxx b/binfilter/bf_forms/source/component/forms_Columns.cxx
index 13e2dfa..fa3a8d3 100644
--- a/binfilter/bf_forms/source/component/forms_Columns.cxx
+++ b/binfilter/bf_forms/source/component/forms_Columns.cxx
@@ -413,7 +413,7 @@ sal_Bool OGridColumn::convertFastPropertyValue( Any& rConvertedValue, Any& rOldV
}
catch(starlang::IllegalArgumentException&)
{
- OSL_ENSURE(0,"OGridColumn::convertFastPropertyValue: TextAlign must be casted to sal_Int16!");
+ OSL_FAIL("OGridColumn::convertFastPropertyValue: TextAlign must be casted to sal_Int16!");
throw;
}
break;
diff --git a/binfilter/bf_sfx2/source/appl/sfx2_namecont.cxx b/binfilter/bf_sfx2/source/appl/sfx2_namecont.cxx
index fadf6d9..ac7f746 100644
--- a/binfilter/bf_sfx2/source/appl/sfx2_namecont.cxx
+++ b/binfilter/bf_sfx2/source/appl/sfx2_namecont.cxx
@@ -244,14 +244,14 @@ namespace SfxContainer_Impl
/*N*/ mxMSF = ::legacy_binfilters::getLegacyProcessServiceFactory();
/*N*/ if( !mxMSF.is() )
/*N*/ {
-/*N*/ OSL_ENSURE( 0, "### couln't get ProcessServiceFactory\n" );
+/*N*/ OSL_FAIL( "### couln't get ProcessServiceFactory\n" );
/*N*/ }
/*N*/
/*N*/ mxSFI = Reference< XSimpleFileAccess >( mxMSF->createInstance
/*N*/ ( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ucb.SimpleFileAccess" )) ), UNO_QUERY );
/*N*/ if( !mxSFI.is() )
/*N*/ {
-/*N*/ OSL_ENSURE( 0, "### couln't create SimpleFileAccess component\n" );
+/*N*/ OSL_FAIL( "### couln't create SimpleFileAccess component\n" );
/*N*/ }
mxStringSubstitution = Reference< XStringSubstitution >( mxMSF->createInstance
( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.PathSubstitution" )) ), UNO_QUERY );
@@ -354,7 +354,7 @@ namespace SfxContainer_Impl
/*N*/ OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Parser") ) ), UNO_QUERY );
/*N*/ if( !xParser.is() )
/*N*/ {
-/*N*/ OSL_ENSURE( 0, "### couln't create sax parser component\n" );
+/*N*/ OSL_FAIL( "### couln't create sax parser component\n" );
/*N*/ return sal_False;
/*N*/ }
/*N*/
@@ -481,12 +481,12 @@ namespace SfxContainer_Impl
/*N*/ }
/*N*/ catch ( xml::sax::SAXException& e )
/*N*/ {
-/*N*/ OSL_ENSURE( 0, OUStringToOString( e.Message, RTL_TEXTENCODING_ASCII_US ).getStr() );
+/*N*/ OSL_FAIL( OUStringToOString( e.Message, RTL_TEXTENCODING_ASCII_US ).getStr() );
/*N*/ return sal_False;
/*N*/ }
/*N*/ catch ( io::IOException& e )
/*N*/ {
-/*N*/ OSL_ENSURE( 0, OUStringToOString( e.Message, RTL_TEXTENCODING_ASCII_US ).getStr() );
+/*N*/ OSL_FAIL( OUStringToOString( e.Message, RTL_TEXTENCODING_ASCII_US ).getStr() );
/*N*/ return sal_False;
/*N*/ }
/*N*/
@@ -563,7 +563,7 @@ namespace SfxContainer_Impl
/*?*/ xLibraryStor = xLibrariesStor->OpenSotStorage( rLib.aName, STREAM_READ | STREAM_NOCREATE );
/*?*/ if( !xLibraryStor.Is() || xLibraryStor->GetError() != ERRCODE_NONE )
/*?*/ {
-/*?*/ OSL_ENSURE( 0, "### couln't open sub storage for library\n" );
+/*?*/ OSL_FAIL( "### couln't open sub storage for library\n" );
/*?*/ xLibraryStor = NULL;
/*N*/ }
/*N*/ }
@@ -575,7 +575,7 @@ namespace SfxContainer_Impl
/*N*/ sal_Bool bLoaded = implLoadLibraryIndexFile( pImplLib, rLib, xLibraryStor, aIndexFileName );
/*N*/ if( bLoaded && aLibName != rLib.aName )
/*N*/ {
-/*N*/ OSL_ENSURE( 0, "Different library names in library"
+/*N*/ OSL_FAIL( "Different library names in library"
/*N*/ " container and library info files!\n" );
/*N*/ }
/*N*/ }
@@ -872,7 +872,7 @@ void SfxLibraryContainer_Impl::implStoreLibraryIndexFile( SfxLibrary_Impl* pLib,
OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Writer") ) ), UNO_QUERY );
if( !xHandler.is() )
{
- OSL_ENSURE( 0, "### couln't create sax-writer component\n" );
+ OSL_FAIL( "### couln't create sax-writer component\n" );
return;
}
@@ -928,7 +928,7 @@ void SfxLibraryContainer_Impl::implStoreLibraryIndexFile( SfxLibrary_Impl* pLib,
}
if( !xOut.is() )
{
- OSL_ENSURE( 0, "### couln't open output stream\n" );
+ OSL_FAIL( "### couln't open output stream\n" );
return;
}
@@ -949,7 +949,7 @@ void SfxLibraryContainer_Impl::implStoreLibraryIndexFile( SfxLibrary_Impl* pLib,
/*N*/ OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Parser") ) ), UNO_QUERY );
/*N*/ if( !xParser.is() )
/*N*/ {
-/*N*/ OSL_ENSURE( 0, "### couln't create sax parser component\n" );
+/*N*/ OSL_FAIL( "### couln't create sax parser component\n" );
/*N*/ return sal_False;
/*N*/ }
/*N*/
@@ -1000,7 +1000,7 @@ void SfxLibraryContainer_Impl::implStoreLibraryIndexFile( SfxLibrary_Impl* pLib,
/*N*/ }
/*N*/ if( !xInput.is() )
/*N*/ {
-/*N*/ // OSL_ENSURE( 0, "### couln't open input stream\n" );
+/*N*/ // OSL_FAIL( "### couln't open input stream\n" );
/*N*/ return sal_False;
/*N*/ }
/*N*/
@@ -1016,7 +1016,7 @@ void SfxLibraryContainer_Impl::implStoreLibraryIndexFile( SfxLibrary_Impl* pLib,
/*N*/ }
/*N*/ catch( Exception& e )
/*N*/ {
-/*N*/ OSL_ENSURE( 0, "Parsing error\n" );
+/*N*/ OSL_FAIL( "Parsing error\n" );
/*N*/ return sal_False;
/*N*/ }
/*N*/
@@ -1108,7 +1108,7 @@ void SfxLibraryContainer_Impl::implStoreLibraryIndexFile( SfxLibrary_Impl* pLib,
/*?*/ xLibrariesStor = xStorage->OpenUCBStorage( maLibrariesDir, STREAM_WRITE );
/*?*/ if( !xLibrariesStor.Is() || xLibrariesStor->GetError() != ERRCODE_NONE )
/*?*/ {
-/*?*/ OSL_ENSURE( 0, "### couln't create libraries sub storage\n" );
+/*?*/ OSL_FAIL( "### couln't create libraries sub storage\n" );
/*?*/ return;
/*?*/ }
/*?*/
@@ -1150,7 +1150,7 @@ void SfxLibraryContainer_Impl::implStoreLibraryIndexFile( SfxLibrary_Impl* pLib,
xLibraryStor = xLibrariesStor->OpenUCBStorage( rLib.aName, STREAM_WRITE );
if( !xLibraryStor.Is() || xLibraryStor->GetError() != ERRCODE_NONE )
{
- OSL_ENSURE( 0, "### couln't create sub storage for library\n" );
+ OSL_FAIL( "### couln't create sub storage for library\n" );
return;
}
}
@@ -1192,7 +1192,7 @@ void SfxLibraryContainer_Impl::implStoreLibraryIndexFile( SfxLibrary_Impl* pLib,
/*N*/ OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Writer") ) ), UNO_QUERY );
/*N*/ if( !xHandler.is() )
/*N*/ {
-/*N*/ OSL_ENSURE( 0, "### couln't create sax-writer component\n" );
+/*N*/ OSL_FAIL( "### couln't create sax-writer component\n" );
/*N*/ return;
/*N*/ }
/*N*/
@@ -1248,7 +1248,7 @@ void SfxLibraryContainer_Impl::implStoreLibraryIndexFile( SfxLibrary_Impl* pLib,
/*N*/ }
/*N*/ if( !xOut.is() )
/*N*/ {
-/*N*/ OSL_ENSURE( 0, "### couln't open output stream\n" );
+/*N*/ OSL_FAIL( "### couln't open output stream\n" );
/*N*/ return;
/*N*/ }
/*N*/
@@ -1395,7 +1395,7 @@ void SfxLibraryContainer_Impl::implStoreLibraryIndexFile( SfxLibrary_Impl* pLib,
/*?*/ }
/*?*/ if( !xLibraryStor.Is() || xLibraryStor->GetError() != ERRCODE_NONE )
/*?*/ {
-/*?*/ OSL_ENSURE( 0, "### couln't open sub storage for library\n" );
+/*?*/ OSL_FAIL( "### couln't open sub storage for library\n" );
/*?*/ return;
/*?*/ }
/*N*/ }
@@ -1425,7 +1425,7 @@ void SfxLibraryContainer_Impl::implStoreLibraryIndexFile( SfxLibrary_Impl* pLib,
/*?*/
/*?*/ if( !xElementStream.Is() || xElementStream->GetError() != ERRCODE_NONE )
/*?*/ {
-/*?*/ OSL_ENSURE( 0, "### couln't open library element stream\n" );
+/*?*/ OSL_FAIL( "### couln't open library element stream\n" );
/*?*/ return;
/*N*/ }
/*N*/ }
diff --git a/binfilter/bf_sfx2/source/appl/sfx2_scriptcont.cxx b/binfilter/bf_sfx2/source/appl/sfx2_scriptcont.cxx
index 02d69c3..21caf3a 100644
--- a/binfilter/bf_sfx2/source/appl/sfx2_scriptcont.cxx
+++ b/binfilter/bf_sfx2/source/appl/sfx2_scriptcont.cxx
@@ -186,7 +186,7 @@ void SfxScriptLibraryContainer::setLibraryPassword(
OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Writer") ) ), UNO_QUERY );
if( !xHandler.is() )
{
- OSL_ENSURE( 0, "### couln't create sax-writer component\n" );
+ OSL_FAIL( "### couln't create sax-writer component\n" );
return;
}
@@ -210,7 +210,7 @@ void SfxScriptLibraryContainer::setLibraryPassword(
/*N*/ OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Parser") ) ), UNO_QUERY );
/*N*/ if( !xParser.is() )
/*N*/ {
-/*N*/ OSL_ENSURE( 0, "### couln't create sax parser component\n" );
+/*N*/ OSL_FAIL( "### couln't create sax parser component\n" );
/*N*/ return aRetAny;
/*N*/ }
/*N*/
diff --git a/binfilter/bf_sw/source/core/fields/sw_fldbas.cxx b/binfilter/bf_sw/source/core/fields/sw_fldbas.cxx
index 0c94318..1f08514 100644
--- a/binfilter/bf_sw/source/core/fields/sw_fldbas.cxx
+++ b/binfilter/bf_sw/source/core/fields/sw_fldbas.cxx
@@ -211,13 +211,13 @@ void SwField::SetPar2(const String& /*rStr*/)
/*N*/ USHORT SwField::GetSubType() const
/*N*/ {
-/*N*/ // OSL_ENSURE(0, "Sorry Not implemented");
+/*N*/ // OSL_FAIL("Sorry Not implemented");
/*N*/ return 0;
/*N*/ }
void SwField::SetSubType(USHORT /*nType*/)
{
-// OSL_ENSURE(0, "Sorry Not implemented");
+// OSL_FAIL("Sorry Not implemented");
}
/*N*/ BOOL SwField::QueryValue( uno::Any& rVal, BYTE nMId ) const
diff --git a/binfilter/legacysmgr/source/legacy/legacy_binfilters_smgr.cxx b/binfilter/legacysmgr/source/legacy/legacy_binfilters_smgr.cxx
index d977f1b..cb58cf5 100644
--- a/binfilter/legacysmgr/source/legacy/legacy_binfilters_smgr.cxx
+++ b/binfilter/legacysmgr/source/legacy/legacy_binfilters_smgr.cxx
@@ -1099,7 +1099,7 @@ void OServiceManager::initialize( Sequence< Any > const & )
throw (Exception)
{
check_undisposed();
- OSL_ENSURE( 0, "not impl!" );
+ OSL_FAIL( "not impl!" );
}
// XServiceInfo
@@ -1756,12 +1756,12 @@ public:
}
virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (RuntimeException)
{
- OSL_ENSURE( 0, "### unexpected call LegacyServiceManager::supportsService()!" );
+ OSL_FAIL( "### unexpected call LegacyServiceManager::supportsService()!" );
return m_xOfficeMgr_si->supportsService( ServiceName );
}
virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (RuntimeException)
{
- OSL_ENSURE( 0, "### unexpected call LegacyServiceManager::getSupportedServiceNames()!" );
+ OSL_FAIL( "### unexpected call LegacyServiceManager::getSupportedServiceNames()!" );
return m_xOfficeMgr_si->getSupportedServiceNames();
}
@@ -2081,7 +2081,7 @@ void * SAL_CALL legacysmgr_component_getFactory(
OString cstr(
OUStringToOString(
buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US ) );
- OSL_ENSURE( 0, cstr.getStr() );
+ OSL_FAIL( cstr.getStr() );
#endif
}
return 0;
diff --git a/filter/source/odfflatxml/OdfFlatXml.cxx b/filter/source/odfflatxml/OdfFlatXml.cxx
index b072e2e..395fdad 100644
--- a/filter/source/odfflatxml/OdfFlatXml.cxx
+++ b/filter/source/odfflatxml/OdfFlatXml.cxx
@@ -167,7 +167,7 @@ OdfFlatXml::importer(
{
OString msg = OUStringToOString(exc.Message,
RTL_TEXTENCODING_ASCII_US);
- OSL_ENSURE(0, msg);
+ OSL_FAIL(msg);
return sal_False;
}
return sal_True;
diff --git a/filter/source/xsltfilter/XSLTFilter.cxx b/filter/source/xsltfilter/XSLTFilter.cxx
index a1545fa..67c1b53 100644
--- a/filter/source/xsltfilter/XSLTFilter.cxx
+++ b/filter/source/xsltfilter/XSLTFilter.cxx
@@ -467,7 +467,7 @@ m_rServiceFactory(r), m_bTerminated(sal_False), m_bError(sal_False)
#endif
{
// something went wrong
- OSL_ENSURE(0, OUStringToOString(exc.Message, RTL_TEXTENCODING_ASCII_US).getStr());
+ OSL_FAIL(OUStringToOString(exc.Message, RTL_TEXTENCODING_ASCII_US).getStr());
return sal_False;
}
}
commit 1f635676ccfa3bbbaafb98df9bb6de8c51a29b6a
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sat Mar 12 11:43:16 2011 +0100
Move OSL_ENSURE(false,...) to OSL_FAIL(...)
diff --git a/binfilter/bf_forms/source/component/forms_Filter.cxx b/binfilter/bf_forms/source/component/forms_Filter.cxx
index b942218..96c3f24 100644
--- a/binfilter/bf_forms/source/component/forms_Filter.cxx
+++ b/binfilter/bf_forms/source/component/forms_Filter.cxx
@@ -510,7 +510,7 @@ namespace frm
//---------------------------------------------------------------------
sal_Bool SAL_CALL OFilterControl::commit() throw(RuntimeException)
{
- OSL_ENSURE( false, "OFilterControl::commit: dead code!" );
+ OSL_FAIL( "OFilterControl::commit: dead code!" );
return sal_False;
}
diff --git a/binfilter/bf_forms/source/component/forms_errorbroadcaster.cxx b/binfilter/bf_forms/source/component/forms_errorbroadcaster.cxx
index 899b6eb..e961c0f 100644
--- a/binfilter/bf_forms/source/component/forms_errorbroadcaster.cxx
+++ b/binfilter/bf_forms/source/component/forms_errorbroadcaster.cxx
@@ -74,7 +74,7 @@ namespace frm
//------------------------------------------------------------------------------
void SAL_CALL OErrorBroadcaster::onError( const SQLException& /*_rException*/, const ::rtl::OUString& /*_rContextDescription*/ )
{
- OSL_ENSURE( false, "OErrorBroadcaster::onError: dead code!" );
+ OSL_FAIL( "OErrorBroadcaster::onError: dead code!" );
}
//------------------------------------------------------------------------------
diff --git a/binfilter/bf_sch/source/core/sch_SchAddInCollection.cxx b/binfilter/bf_sch/source/core/sch_SchAddInCollection.cxx
index 689e287..ead6dc8 100644
--- a/binfilter/bf_sch/source/core/sch_SchAddInCollection.cxx
+++ b/binfilter/bf_sch/source/core/sch_SchAddInCollection.cxx
@@ -93,8 +93,7 @@ using namespace ::com::sun::star;
/*N*/ }
/*N*/ catch( const uno::Exception& aEx )
/*N*/ {
-/*N*/ OSL_ENSURE( false,
-/*N*/ ::rtl::OUStringToOString(
+/*N*/ OSL_FAIL( ::rtl::OUStringToOString(
/*N*/ ::rtl::OUString(
/*N*/ RTL_CONSTASCII_USTRINGPARAM(
/*N*/ "Couldn't initialize add-in collection: " )) +
diff --git a/binfilter/bf_sfx2/source/appl/sfx2_imestatuswindow.cxx b/binfilter/bf_sfx2/source/appl/sfx2_imestatuswindow.cxx
index 7516dc1..21d9e59 100644
--- a/binfilter/bf_sfx2/source/appl/sfx2_imestatuswindow.cxx
+++ b/binfilter/bf_sfx2/source/appl/sfx2_imestatuswindow.cxx
@@ -69,7 +69,7 @@ void ImeStatusWindow::init()
}
catch (css::uno::Exception &)
{
- OSL_ENSURE(false, "com.sun.star.uno.Exception");
+ OSL_FAIL("com.sun.star.uno.Exception");
// Degrade gracefully and use the VCL-supplied default if no
// configuration is available.
}
@@ -87,7 +87,7 @@ ImeStatusWindow::~ImeStatusWindow()
}
catch (css::uno::Exception &)
{
- OSL_ENSURE(false, "com.sun.star.uno.RuntimeException");
+ OSL_FAIL("com.sun.star.uno.RuntimeException");
}
}
diff --git a/binfilter/bf_svtools/source/config/svt_inetoptions.cxx b/binfilter/bf_svtools/source/config/svt_inetoptions.cxx
index 1e3c4f0..03c3031 100644
--- a/binfilter/bf_svtools/source/config/svt_inetoptions.cxx
+++ b/binfilter/bf_svtools/source/config/svt_inetoptions.cxx
@@ -270,8 +270,7 @@ SvtInetOptions::Impl::Impl():
for (sal_Int32 i = 0; i < ENTRY_COUNT; ++i)
aKeys[i] = m_aEntries[i].m_aName;
if (!EnableNotification(aKeys))
- OSL_ENSURE(false,
- "SvtInetOptions::Impl::Impl(): Bad EnableNotifications()");
+ OSL_FAIL("SvtInetOptions::Impl::Impl(): Bad EnableNotifications()");
}
//============================================================================
diff --git a/binfilter/bf_sw/source/core/doc/sw_docdraw.cxx b/binfilter/bf_sw/source/core/doc/sw_docdraw.cxx
index df84b30..64b40de 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docdraw.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docdraw.cxx
@@ -264,7 +264,7 @@ bool SwDoc::IsVisibleLayerId( const SdrLayerID& _nLayerId )
}
else
{
- OSL_ENSURE( false, "<SwDoc::IsVisibleLayerId(..)> - unknown layer ID." );
+ OSL_FAIL( "<SwDoc::IsVisibleLayerId(..)> - unknown layer ID." );
bRetVal = false;
}
@@ -297,12 +297,12 @@ SdrLayerID SwDoc::GetVisibleLayerIdByInvisibleOne( const SdrLayerID& _nInvisible
_nInvisibleLayerId == GetHellId() ||
_nInvisibleLayerId == GetControlsId() )
{
- OSL_ENSURE( false, "<SwDoc::GetVisibleLayerIdByInvisibleOne(..)> - given layer ID already an invisible one." );
+ OSL_FAIL( "<SwDoc::GetVisibleLayerIdByInvisibleOne(..)> - given layer ID already an invisible one." );
nVisibleLayerId = _nInvisibleLayerId;
}
else
{
- OSL_ENSURE( false, "<SwDoc::GetVisibleLayerIdByInvisibleOne(..)> - given layer ID is unknown." );
+ OSL_FAIL( "<SwDoc::GetVisibleLayerIdByInvisibleOne(..)> - given layer ID is unknown." );
nVisibleLayerId = _nInvisibleLayerId;
}
@@ -335,12 +335,12 @@ SdrLayerID SwDoc::GetInvisibleLayerIdByVisibleOne( const SdrLayerID& _nVisibleLa
_nVisibleLayerId == GetInvisibleHellId() ||
_nVisibleLayerId == GetInvisibleControlsId() )
{
- OSL_ENSURE( false, "<SwDoc::GetInvisibleLayerIdByVisibleOne(..)> - given layer ID already an invisible one." );
+ OSL_FAIL( "<SwDoc::GetInvisibleLayerIdByVisibleOne(..)> - given layer ID already an invisible one." );
nInvisibleLayerId = _nVisibleLayerId;
}
else
{
- OSL_ENSURE( false, "<SwDoc::GetInvisibleLayerIdByVisibleOne(..)> - given layer ID is unknown." );
+ OSL_FAIL( "<SwDoc::GetInvisibleLayerIdByVisibleOne(..)> - given layer ID is unknown." );
nInvisibleLayerId = _nVisibleLayerId;
}
diff --git a/binfilter/bf_sw/source/core/draw/sw_dcontact.cxx b/binfilter/bf_sw/source/core/draw/sw_dcontact.cxx
index 790dd6f..f7faf5f 100644
--- a/binfilter/bf_sw/source/core/draw/sw_dcontact.cxx
+++ b/binfilter/bf_sw/source/core/draw/sw_dcontact.cxx
@@ -917,7 +917,7 @@ void SwDrawContact::ConnectToLayout( const SwFmtAnchor* pAnch )
if ( !GetMaster()->IsInserted() )
{
// debug assert
- OSL_ENSURE( false, "<SwDrawContact::ConnectToLayout(..)> - master drawing object not inserted!?" );
+ OSL_FAIL( "<SwDrawContact::ConnectToLayout(..)> - master drawing object not inserted!?" );
pDrawFrmFmt->GetDoc()->GetDrawModel()->GetPage(0)->
InsertObject( GetMaster(), GetMaster()->GetOrdNumDirect() );
diff --git a/binfilter/bf_sw/source/core/layout/sw_calcmove.cxx b/binfilter/bf_sw/source/core/layout/sw_calcmove.cxx
index e7b3a89..6d6fd2a 100644
--- a/binfilter/bf_sw/source/core/layout/sw_calcmove.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_calcmove.cxx
@@ -1571,7 +1571,7 @@ namespace binfilter {
/*?*/ // doesn't makes sense. Thus, return TRUE.
/*?*/ if ( IsAnFollow( pFrm ) && !pFrm->IsValid() )
/*?*/ {
-/*?*/ OSL_ENSURE( false, "Only a warning for task 108824:/n<SwCntntFrm::_WouldFit(..) - follow not valid!" );
+/*?*/ OSL_FAIL( "Only a warning for task 108824:/n<SwCntntFrm::_WouldFit(..) - follow not valid!" );
/*?*/ return TRUE;
/*?*/ }
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/layout/sw_fly.cxx b/binfilter/bf_sw/source/core/layout/sw_fly.cxx
index 53067a0..216a628 100644
--- a/binfilter/bf_sw/source/core/layout/sw_fly.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_fly.cxx
@@ -1612,8 +1612,7 @@ void SwFrm::AppendVirtDrawObj( SwDrawContact* _pDrawContact,
{
case FLY_AUTO_CNTNT:
{
- OSL_ENSURE( false,
- "<SwFrm::AppendVirtDrawObj(..)> - at character anchored drawing objects aren't supported." );
+ OSL_FAIL( "<SwFrm::AppendVirtDrawObj(..)> - at character anchored drawing objects aren't supported." );
}
break;
case FLY_PAGE:
@@ -1635,7 +1634,7 @@ void SwFrm::AppendVirtDrawObj( SwDrawContact* _pDrawContact,
/*nothing to do*/;
}
break;
- default: OSL_ENSURE( false, "<SwFrm::AppendVirtDrawObj(..) - unknown anchor type." );
+ default: OSL_FAIL( "<SwFrm::AppendVirtDrawObj(..) - unknown anchor type." );
}
//Bei der Seite anmelden; kann sein, dass noch keine da ist - die
diff --git a/binfilter/bf_sw/source/core/text/sw_porfly.cxx b/binfilter/bf_sw/source/core/text/sw_porfly.cxx
index db98096..31877df 100644
--- a/binfilter/bf_sw/source/core/text/sw_porfly.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_porfly.cxx
@@ -353,7 +353,7 @@ namespace binfilter {
/*N*/ pSdrObj = GetDrawContact()->GetDrawObjectByAnchorFrm( rFrm );
/*N*/ if ( !pSdrObj )
/*N*/ {
-/*N*/ OSL_ENSURE( false, "SwFlyCntPortion::SetBase(..) - No drawing object found by <GetDrawContact()->GetDrawObjectByAnchorFrm( rFrm )>" );
+/*N*/ OSL_FAIL( "SwFlyCntPortion::SetBase(..) - No drawing object found by <GetDrawContact()->GetDrawObjectByAnchorFrm( rFrm )>" );
/*N*/ pSdrObj = GetDrawContact()->GetMaster();
/*N*/ }
/*N*/ aBoundRect = pSdrObj->GetBoundRect();
diff --git a/binfilter/bf_sw/source/core/text/sw_txtfly.cxx b/binfilter/bf_sw/source/core/text/sw_txtfly.cxx
index df372d1..eb6268b 100644
--- a/binfilter/bf_sw/source/core/text/sw_txtfly.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_txtfly.cxx
@@ -136,7 +136,7 @@ namespace binfilter {
/*N*/ {
/*N*/ // assert, if no anchor frame found at 'virtual' drawing object
/*N*/ // and return anchor frame of 'master' drawing object.
-/*N*/ OSL_ENSURE( false, "<lcl_TheAnchor(..)> - virtual drawing object with no anchor frame!" );
+/*N*/ OSL_FAIL( "<lcl_TheAnchor(..)> - virtual drawing object with no anchor frame!" );
/*N*/ pRet = pDrawContact->GetAnchor();
/*N*/ }
/*N*/ }
diff --git a/filter/source/msfilter/msocximex.cxx b/filter/source/msfilter/msocximex.cxx
index bb63f65..0986829 100644
--- a/filter/source/msfilter/msocximex.cxx
+++ b/filter/source/msfilter/msocximex.cxx
@@ -198,7 +198,7 @@ GraphicHelper::GraphicHelper( const uno::Reference< frame::XModel >& rxModel )
}
catch( uno::Exception& )
{
- OSL_ENSURE( false, "GraphicHelper::GraphicHelper - cannot get output device info" );
+ OSL_FAIL( "GraphicHelper::GraphicHelper - cannot get output device info" );
}
mfPixelPerHmmX = maDeviceInfo.PixelPerMeterX / 100000.0;
mfPixelPerHmmY = maDeviceInfo.PixelPerMeterY / 100000.0;
diff --git a/oox/source/core/filterbase.cxx b/oox/source/core/filterbase.cxx
index 33b744b..6831c91 100644
--- a/oox/source/core/filterbase.cxx
+++ b/oox/source/core/filterbase.cxx
@@ -551,7 +551,7 @@ void FilterBase::setMediaDescriptor( const Sequence< PropertyValue >& rMediaDesc
switch( mxImpl->meDirection )
{
case FILTERDIRECTION_UNKNOWN:
- OSL_ENSURE( false, "FilterBase::setMediaDescriptor - invalid filter direction" );
+ OSL_FAIL( "FilterBase::setMediaDescriptor - invalid filter direction" );
break;
case FILTERDIRECTION_IMPORT:
mxImpl->maMediaDesc.addInputStream();
diff --git a/oox/source/core/xmlfilterbase.cxx b/oox/source/core/xmlfilterbase.cxx
index aad41b0..956ac60 100644
--- a/oox/source/core/xmlfilterbase.cxx
+++ b/oox/source/core/xmlfilterbase.cxx
@@ -288,7 +288,7 @@ bool XmlFilterBase::importFragment( const ::rtl::Reference< FragmentHandler >& r
}
catch( Exception& )
{
- OSL_ENSURE( false, OStringBuffer( "XmlFilterBase::importFragment - XML parser failed in fragment '" ).
+ OSL_FAIL( OStringBuffer( "XmlFilterBase::importFragment - XML parser failed in fragment '" ).
append( OUStringToOString( aFragmentPath, RTL_TEXTENCODING_ASCII_US ) ).append( '\'' ).getStr() );
}
}
diff --git a/oox/source/drawingml/chart/axisconverter.cxx b/oox/source/drawingml/chart/axisconverter.cxx
index 71ef89f..750ed6c 100644
--- a/oox/source/drawingml/chart/axisconverter.cxx
+++ b/oox/source/drawingml/chart/axisconverter.cxx
@@ -259,7 +259,7 @@ void AxisConverter::convertFromModel( const Reference< XCoordinateSystem >& rxCo
}
break;
default:
- OSL_ENSURE( false, "AxisConverter::convertFromModel - unknown axis type" );
+ OSL_FAIL( "AxisConverter::convertFromModel - unknown axis type" );
}
/* Do not set a value to the Origin member anymore (already done via
@@ -322,7 +322,7 @@ void AxisConverter::convertFromModel( const Reference< XCoordinateSystem >& rxCo
}
catch( Exception& )
{
- OSL_ENSURE( false, "AxisConverter::convertFromModel - cannot insert axis into coordinate system" );
+ OSL_FAIL( "AxisConverter::convertFromModel - cannot insert axis into coordinate system" );
}
}
diff --git a/oox/source/drawingml/chart/chartconverter.cxx b/oox/source/drawingml/chart/chartconverter.cxx
index c84a4f9..f5b601b 100644
--- a/oox/source/drawingml/chart/chartconverter.cxx
+++ b/oox/source/drawingml/chart/chartconverter.cxx
@@ -153,7 +153,7 @@ Reference< XDataSequence > ChartConverter::createDataSequence( const Reference<
}
catch( Exception& )
{
- OSL_ENSURE( false, "ExcelChartConverter::createDataSequence - cannot create data sequence" );
+ OSL_FAIL( "ExcelChartConverter::createDataSequence - cannot create data sequence" );
}
}
diff --git a/oox/source/drawingml/chart/chartdrawingfragment.cxx b/oox/source/drawingml/chart/chartdrawingfragment.cxx
index 14bcce4..e5f3a83 100644
--- a/oox/source/drawingml/chart/chartdrawingfragment.cxx
+++ b/oox/source/drawingml/chart/chartdrawingfragment.cxx
@@ -74,13 +74,13 @@ void ShapeAnchor::setPos( sal_Int32 nElement, sal_Int32 nParentContext, const OU
pAnchorPos = &maTo;
break;
default:
- OSL_ENSURE( false, "ShapeAnchor::setPos - unexpected parent element" );
+ OSL_FAIL( "ShapeAnchor::setPos - unexpected parent element" );
}
if( pAnchorPos ) switch( nElement )
{
case CDR_TOKEN( x ): pAnchorPos->mfX = rValue.toDouble(); break;
case CDR_TOKEN( y ): pAnchorPos->mfY = rValue.toDouble(); break;
- default: OSL_ENSURE( false, "ShapeAnchor::setPos - unexpected element" );
+ default: OSL_FAIL( "ShapeAnchor::setPos - unexpected element" );
}
}
diff --git a/oox/source/drawingml/chart/converterbase.cxx b/oox/source/drawingml/chart/converterbase.cxx
index 7a49a46..deb4801 100644
--- a/oox/source/drawingml/chart/converterbase.cxx
+++ b/oox/source/drawingml/chart/converterbase.cxx
@@ -317,11 +317,11 @@ sal_Int32 lclCalcPosition( sal_Int32 nChartSize, double fPos, sal_Int32 nPosMode
case XML_edge: // absolute start position as factor of chart size
return getLimitedValue< sal_Int32, double >( nChartSize * fPos + 0.5, 0, nChartSize );
case XML_factor: // position relative to object default position
- OSL_ENSURE( false, "lclCalcPosition - relative positioning not supported" );
+ OSL_FAIL( "lclCalcPosition - relative positioning not supported" );
return -1;
};
- OSL_ENSURE( false, "lclCalcPosition - unknown positioning mode" );
+ OSL_FAIL( "lclCalcPosition - unknown positioning mode" );
return -1;
}
@@ -337,7 +337,7 @@ sal_Int32 lclCalcSize( sal_Int32 nPos, sal_Int32 nChartSize, double fSize, sal_I
return nValue - nPos + 1;
};
- OSL_ENSURE( false, "lclCalcSize - unknown size mode" );
+ OSL_FAIL( "lclCalcSize - unknown size mode" );
return -1;
}
diff --git a/oox/source/drawingml/chart/objectformatter.cxx b/oox/source/drawingml/chart/objectformatter.cxx
index bbacd36..8a03052 100644
--- a/oox/source/drawingml/chart/objectformatter.cxx
+++ b/oox/source/drawingml/chart/objectformatter.cxx
@@ -1178,8 +1178,7 @@ void ObjectFormatter::convertNumberFormat( PropertySet& rPropSet, const NumberFo
}
catch( Exception& )
{
- OSL_ENSURE( false,
- OStringBuffer( "ObjectFormatter::convertNumberFormat - cannot create number format '" ).
+ OSL_FAIL( OStringBuffer( "ObjectFormatter::convertNumberFormat - cannot create number format '" ).
append( OUStringToOString( rNumberFormat.maFormatCode, osl_getThreadTextEncoding() ) ).append( '\'' ).getStr() );
}
}
diff --git a/oox/source/drawingml/chart/plotareaconverter.cxx b/oox/source/drawingml/chart/plotareaconverter.cxx
index cbd60ed..82fc546 100644
--- a/oox/source/drawingml/chart/plotareaconverter.cxx
+++ b/oox/source/drawingml/chart/plotareaconverter.cxx
@@ -303,7 +303,7 @@ void WallFloorConverter::convertFromModel( const Reference< XDiagram >& rxDiagra
{
case OBJECTTYPE_FLOOR: aPropSet.set( rxDiagram->getFloor() ); break;
case OBJECTTYPE_WALL: aPropSet.set( rxDiagram->getWall() ); break;
- default: OSL_ENSURE( false, "WallFloorConverter::convertFromModel - invalid object type" );
+ default: OSL_FAIL( "WallFloorConverter::convertFromModel - invalid object type" );
}
if( aPropSet.is() )
getFormatter().convertFrameFormatting( aPropSet, mrModel.mxShapeProp, mrModel.mxPicOptions.getOrCreate(), eObjType );
@@ -440,7 +440,7 @@ void PlotAreaConverter::convertPositionFromModel()
xPositioning->setDiagramPositionIncludingAxes( aDiagramRect );
break;
default:
- OSL_ENSURE( false, "PlotAreaConverter::convertPositionFromModel - unknown positioning target" );
+ OSL_FAIL( "PlotAreaConverter::convertPositionFromModel - unknown positioning target" );
}
}
catch( Exception& )
diff --git a/oox/source/drawingml/chart/seriesconverter.cxx b/oox/source/drawingml/chart/seriesconverter.cxx
index 41f2f1c..9a2db5d 100644
--- a/oox/source/drawingml/chart/seriesconverter.cxx
+++ b/oox/source/drawingml/chart/seriesconverter.cxx
@@ -293,7 +293,7 @@ void ErrorBarConverter::convertFromModel( const Reference< XDataSeries >& rxData
aBarProp.setProperty( PROP_ErrorBarStyle, cssc::ErrorBarStyle::STANDARD_ERROR );
break;
default:
- OSL_ENSURE( false, "ErrorBarConverter::convertFromModel - unknown error bar type" );
+ OSL_FAIL( "ErrorBarConverter::convertFromModel - unknown error bar type" );
xErrorBar.clear();
}
@@ -307,13 +307,13 @@ void ErrorBarConverter::convertFromModel( const Reference< XDataSeries >& rxData
{
case XML_x: aSeriesProp.setProperty( PROP_ErrorBarX, xErrorBar ); break;
case XML_y: aSeriesProp.setProperty( PROP_ErrorBarY, xErrorBar ); break;
- default: OSL_ENSURE( false, "ErrorBarConverter::convertFromModel - invalid error bar direction" );
+ default: OSL_FAIL( "ErrorBarConverter::convertFromModel - invalid error bar direction" );
}
}
}
catch( Exception& )
{
- OSL_ENSURE( false, "ErrorBarConverter::convertFromModel - error while creating error bars" );
+ OSL_FAIL( "ErrorBarConverter::convertFromModel - error while creating error bars" );
}
}
@@ -385,7 +385,7 @@ void TrendlineConverter::convertFromModel( const Reference< XDataSeries >& rxDat
case XML_movingAvg: /* #i66819# moving average trendlines not supported */ break;
case XML_poly: /* #i20819# polynomial trendlines not supported */ break;
case XML_power: aServiceName = CREATE_OUSTRING( "com.sun.star.chart2.PotentialRegressionCurve" ); break;
- default: OSL_ENSURE( false, "TrendlineConverter::convertFromModel - unknown trendline type" );
+ default: OSL_FAIL( "TrendlineConverter::convertFromModel - unknown trendline type" );
}
if( aServiceName.getLength() > 0 )
{
@@ -416,7 +416,7 @@ void TrendlineConverter::convertFromModel( const Reference< XDataSeries >& rxDat
}
catch( Exception& )
{
- OSL_ENSURE( false, "TrendlineConverter::convertFromModel - error while creating trendline" );
+ OSL_FAIL( "TrendlineConverter::convertFromModel - error while creating trendline" );
}
}
diff --git a/oox/source/drawingml/chart/typegroupconverter.cxx b/oox/source/drawingml/chart/typegroupconverter.cxx
index b43b626..baa7fa3 100644
--- a/oox/source/drawingml/chart/typegroupconverter.cxx
+++ b/oox/source/drawingml/chart/typegroupconverter.cxx
@@ -171,7 +171,7 @@ TypeGroupConverter::TypeGroupConverter( const ConverterRoot& rParent, TypeGroupM
case C_TOKEN( stockChart ): ENSURE_AXESCOUNT( 2, 2 ); eTypeId = TYPEID_STOCK; mb3dChart = false; break;
case C_TOKEN( surface3DChart ): ENSURE_AXESCOUNT( 3, 3 ); eTypeId = TYPEID_SURFACE; mb3dChart = true; break;
case C_TOKEN( surfaceChart ): ENSURE_AXESCOUNT( 2, 3 ); eTypeId = TYPEID_SURFACE; mb3dChart = true; break; // 3D bar chart from all surface charts
- default: OSL_ENSURE( false, "TypeGroupConverter::TypeGroupConverter - unknown chart type" );
+ default: OSL_FAIL( "TypeGroupConverter::TypeGroupConverter - unknown chart type" );
#undef ENSURE_AXESCOUNT
}
@@ -444,7 +444,7 @@ void TypeGroupConverter::convertFromModel( const Reference< XDiagram >& rxDiagra
}
catch( Exception& )
{
- OSL_ENSURE( false, "TypeGroupConverter::convertFromModel - cannot add chart type" );
+ OSL_FAIL( "TypeGroupConverter::convertFromModel - cannot add chart type" );
}
}
@@ -506,7 +506,7 @@ void TypeGroupConverter::convertBarGeometry( PropertySet& rPropSet, sal_Int32 nO
case XML_cylinder: nGeom3d = cssc::DataPointGeometry3D::CYLINDER; break;
case XML_pyramid: nGeom3d = cssc::DataPointGeometry3D::PYRAMID; break;
case XML_pyramidToMax: nGeom3d = cssc::DataPointGeometry3D::PYRAMID; break;
- default: OSL_ENSURE( false, "TypeGroupConverter::convertBarGeometry - unknown 3D bar shape type" );
+ default: OSL_FAIL( "TypeGroupConverter::convertBarGeometry - unknown 3D bar shape type" );
}
rPropSet.setProperty( PROP_Geometry3D, nGeom3d );
}
@@ -561,7 +561,7 @@ void TypeGroupConverter::insertDataSeries( const Reference< XChartType >& rxChar
}
catch( Exception& )
{
- OSL_ENSURE( false, "TypeGroupConverter::insertDataSeries - cannot add data series" );
+ OSL_FAIL( "TypeGroupConverter::insertDataSeries - cannot add data series" );
}
}
}
diff --git a/oox/source/drawingml/color.cxx b/oox/source/drawingml/color.cxx
index 618e711..051414d 100644
--- a/oox/source/drawingml/color.cxx
+++ b/oox/source/drawingml/color.cxx
@@ -592,7 +592,7 @@ void Color::toRgb() const
}
break;
default:
- OSL_ENSURE( false, "Color::toRgb - unexpected color mode" );
+ OSL_FAIL( "Color::toRgb - unexpected color mode" );
}
}
@@ -613,7 +613,7 @@ void Color::toCrgb() const
// nothing to do
break;
default:
- OSL_ENSURE( false, "Color::toCrgb - unexpected color mode" );
+ OSL_FAIL( "Color::toCrgb - unexpected color mode" );
}
}
@@ -660,7 +660,7 @@ void Color::toHsl() const
// nothing to do
break;
default:
- OSL_ENSURE( false, "Color::toHsl - unexpected color mode" );
+ OSL_FAIL( "Color::toHsl - unexpected color mode" );
}
}
diff --git a/oox/source/drawingml/lineproperties.cxx b/oox/source/drawingml/lineproperties.cxx
index 69e5ac8..92382c0 100644
--- a/oox/source/drawingml/lineproperties.cxx
+++ b/oox/source/drawingml/lineproperties.cxx
@@ -112,7 +112,7 @@ void lclConvertPresetDash( LineDash& orLineDash, sal_Int32 nPresetDash )
case XML_sysDashDotDot: lclSetDashData( orLineDash, 2, 1, 1, 3, 1 ); break;
default:
- OSL_ENSURE( false, "lclConvertPresetDash - unsupported preset dash" );
+ OSL_FAIL( "lclConvertPresetDash - unsupported preset dash" );
lclSetDashData( orLineDash, 0, 0, 1, 4, 3 );
}
}
@@ -126,7 +126,7 @@ void lclConvertCustomDash( LineDash& orLineDash, const LineProperties::DashStopV
{
if( rCustomDash.empty() )
{
- OSL_ENSURE( false, "lclConvertCustomDash - unexpected empty custom dash" );
+ OSL_FAIL( "lclConvertCustomDash - unexpected empty custom dash" );
lclSetDashData( orLineDash, 0, 0, 1, 4, 3 );
return;
}
diff --git a/oox/source/export/ColorPropertySet.cxx b/oox/source/export/ColorPropertySet.cxx
index c421249..cd00e56 100644
--- a/oox/source/export/ColorPropertySet.cxx
+++ b/oox/source/export/ColorPropertySet.cxx
@@ -161,7 +161,7 @@ void SAL_CALL ColorPropertySet::addPropertyChangeListener( const OUString& /* aP
lang::WrappedTargetException,
uno::RuntimeException)
{
- OSL_ENSURE( false, "Not Implemented" );
+ OSL_FAIL( "Not Implemented" );
return;
}
@@ -170,7 +170,7 @@ void SAL_CALL ColorPropertySet::removePropertyChangeListener( const OUString& /*
lang::WrappedTargetException,
uno::RuntimeException)
{
- OSL_ENSURE( false, "Not Implemented" );
+ OSL_FAIL( "Not Implemented" );
return;
}
@@ -179,7 +179,7 @@ void SAL_CALL ColorPropertySet::addVetoableChangeListener( const OUString& /* Pr
lang::WrappedTargetException,
uno::RuntimeException)
{
- OSL_ENSURE( false, "Not Implemented" );
+ OSL_FAIL( "Not Implemented" );
return;
}
@@ -188,7 +188,7 @@ void SAL_CALL ColorPropertySet::removeVetoableChangeListener( const OUString& /*
lang::WrappedTargetException,
uno::RuntimeException)
{
- OSL_ENSURE( false, "Not Implemented" );
+ OSL_FAIL( "Not Implemented" );
return;
}
diff --git a/oox/source/export/SchXMLSeriesHelper.cxx b/oox/source/export/SchXMLSeriesHelper.cxx
index f780af3..d9a9264 100644
--- a/oox/source/export/SchXMLSeriesHelper.cxx
+++ b/oox/source/export/SchXMLSeriesHelper.cxx
@@ -81,7 +81,7 @@ using ::rtl::OUString;
{
(void)ex; // avoid warning for pro build
- OSL_ENSURE( false, OUStringToOString( OUString(
+ OSL_FAIL( OUStringToOString( OUString(
OUString( RTL_CONSTASCII_USTRINGPARAM( "Exception caught. Type: " )) +
OUString::createFromAscii( typeid( ex ).name()) +
OUString( RTL_CONSTASCII_USTRINGPARAM( ", Message: " )) +
@@ -218,7 +218,7 @@ Reference< chart2::XDataSeries > SchXMLSeriesHelper::getFirstCandleStickSeries(
}
catch( const uno::Exception & )
{
- OSL_ENSURE( false, "Exception caught" );
+ OSL_FAIL( "Exception caught" );
}
return xResult;
}
diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx
index 213fa45..a5ed5a7 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -219,7 +219,7 @@ Reference< chart2::data::XLabeledDataSequence > lcl_getCategories( const Referen
catch( uno::Exception & ex )
{
(void)ex; // avoid warning for pro build
- OSL_ENSURE( false, rtl::OUStringToOString(
+ OSL_FAIL( rtl::OUStringToOString(
OUString( RTL_CONSTASCII_USTRINGPARAM( "Exception caught. Type: " )) +
OUString::createFromAscii( typeid( ex ).name()) +
OUString( RTL_CONSTASCII_USTRINGPARAM( ", Message: " )) +
@@ -337,7 +337,7 @@ bool lcl_isSeriesAttachedToFirstAxis(
catch( uno::Exception & ex )
{
(void)ex; // avoid warning for pro build
- OSL_ENSURE( false, rtl::OUStringToOString(
+ OSL_FAIL( rtl::OUStringToOString(
OUString( RTL_CONSTASCII_USTRINGPARAM( "Exception caught. Type: " )) +
OUString::createFromAscii( typeid( ex ).name()) +
OUString( RTL_CONSTASCII_USTRINGPARAM( ", Message: " )) +
@@ -814,7 +814,7 @@ void ChartExport::InitRangeSegmentationProperties( const Reference< chart2::XCha
catch( uno::Exception & ex )
{
(void)ex; // avoid warning for pro build
- OSL_ENSURE( false, rtl::OUStringToOString(
+ OSL_FAIL( rtl::OUStringToOString(
OUString( RTL_CONSTASCII_USTRINGPARAM( "Exception caught. Type: " )) +
OUString::createFromAscii( typeid( ex ).name()) +
OUString( RTL_CONSTASCII_USTRINGPARAM( ", Message: " )) +
diff --git a/oox/source/helper/binaryinputstream.cxx b/oox/source/helper/binaryinputstream.cxx
index 9c77ced..4549b26 100644
--- a/oox/source/helper/binaryinputstream.cxx
+++ b/oox/source/helper/binaryinputstream.cxx
@@ -204,7 +204,7 @@ void BinaryXInputStream::close()
}
catch( Exception& )
{
- OSL_ENSURE( false, "BinaryXInputStream::close - closing input stream failed" );
+ OSL_FAIL( "BinaryXInputStream::close - closing input stream failed" );
}
}
diff --git a/oox/source/helper/binaryoutputstream.cxx b/oox/source/helper/binaryoutputstream.cxx
index 6711a12..1e97022 100644
--- a/oox/source/helper/binaryoutputstream.cxx
+++ b/oox/source/helper/binaryoutputstream.cxx
@@ -73,7 +73,7 @@ void BinaryXOutputStream::writeData( const StreamDataSequence& rData )
}
catch( Exception& )
{
- OSL_ENSURE( false, "BinaryXOutputStream::writeData - stream read error" );
+ OSL_FAIL( "BinaryXOutputStream::writeData - stream read error" );
}
}
@@ -104,7 +104,7 @@ void BinaryXOutputStream::close()
}
catch( Exception& )
{
- OSL_ENSURE( false, "BinaryXOutputStream::close - closing output stream failed" );
+ OSL_FAIL( "BinaryXOutputStream::close - closing output stream failed" );
}
}
diff --git a/oox/source/helper/binarystreambase.cxx b/oox/source/helper/binarystreambase.cxx
index 93f6919..2570a87 100644
--- a/oox/source/helper/binarystreambase.cxx
+++ b/oox/source/helper/binarystreambase.cxx
@@ -102,7 +102,7 @@ sal_Int64 BinaryXSeekableStream::getLength() const
}
catch( Exception& )
{
- OSL_ENSURE( false, "BinaryXSeekableStream::getLength - exception caught" );
+ OSL_FAIL( "BinaryXSeekableStream::getLength - exception caught" );
}
return -1;
}
@@ -115,7 +115,7 @@ sal_Int64 BinaryXSeekableStream::tell() const
}
catch( Exception& )
{
- OSL_ENSURE( false, "BinaryXSeekableStream::tell - exception caught" );
+ OSL_FAIL( "BinaryXSeekableStream::tell - exception caught" );
}
return -1;
}
diff --git a/oox/source/helper/containerhelper.cxx b/oox/source/helper/containerhelper.cxx
index 7d02ae9..9b1b812 100644
--- a/oox/source/helper/containerhelper.cxx
+++ b/oox/source/helper/containerhelper.cxx
@@ -152,7 +152,7 @@ OUString ContainerHelper::insertByUnusedName(
}
catch( Exception& )
{
- OSL_ENSURE( false, "ContainerHelper::insertByUnusedName - cannot rename old object" );
+ OSL_FAIL( "ContainerHelper::insertByUnusedName - cannot rename old object" );
}
}
diff --git a/oox/source/helper/graphichelper.cxx b/oox/source/helper/graphichelper.cxx
index dd9b63a..1885b13 100644
--- a/oox/source/helper/graphichelper.cxx
+++ b/oox/source/helper/graphichelper.cxx
@@ -141,7 +141,7 @@ GraphicHelper::GraphicHelper( const Reference< XMultiServiceFactory >& rxGlobalF
}
catch( Exception& )
{
- OSL_ENSURE( false, "GraphicHelper::GraphicHelper - cannot get output device info" );
+ OSL_FAIL( "GraphicHelper::GraphicHelper - cannot get output device info" );
}
mfPixelPerHmmX = maDeviceInfo.PixelPerMeterX / 100000.0;
mfPixelPerHmmY = maDeviceInfo.PixelPerMeterY / 100000.0;
@@ -160,13 +160,13 @@ sal_Int32 GraphicHelper::getSystemColor( sal_Int32 nToken, sal_Int32 nDefaultRgb
sal_Int32 GraphicHelper::getSchemeColor( sal_Int32 /*nToken*/ ) const
{
- OSL_ENSURE( false, "GraphicHelper::getSchemeColor - scheme colors not implemented" );
+ OSL_FAIL( "GraphicHelper::getSchemeColor - scheme colors not implemented" );
return API_RGB_TRANSPARENT;
}
sal_Int32 GraphicHelper::getPaletteColor( sal_Int32 /*nPaletteIdx*/ ) const
{
- OSL_ENSURE( false, "GraphicHelper::getPaletteColor - palette colors not implemented" );
+ OSL_FAIL( "GraphicHelper::getPaletteColor - palette colors not implemented" );
return API_RGB_TRANSPARENT;
}
diff --git a/oox/source/helper/propertyset.cxx b/oox/source/helper/propertyset.cxx
index a3c9ee0..00ea76f 100644
--- a/oox/source/helper/propertyset.cxx
+++ b/oox/source/helper/propertyset.cxx
@@ -80,7 +80,7 @@ void PropertySet::getProperties( Sequence< Any >& orValues, const Sequence< OUSt
}
catch( Exception& )
{
- OSL_ENSURE( false, "PropertySet::getProperties - cannot get all property values - fallback to single mode" );
+ OSL_FAIL( "PropertySet::getProperties - cannot get all property values - fallback to single mode" );
}
if( mxPropSet.is() )
@@ -114,7 +114,7 @@ void PropertySet::setProperties( const Sequence< OUString >& rPropNames, const S
}
catch( Exception& )
{
- OSL_ENSURE( false, "PropertySet::setProperties - cannot set all property values, fallback to single mode" );
+ OSL_FAIL( "PropertySet::setProperties - cannot set all property values, fallback to single mode" );
}
if( mxPropSet.is() )
@@ -153,7 +153,7 @@ bool PropertySet::getAnyProperty( Any& orValue, const OUString& rPropName ) cons
}
catch( Exception& )
{
- OSL_ENSURE( false, OStringBuffer( "PropertySet::getAnyProperty - cannot get property \"" ).
+ OSL_FAIL( OStringBuffer( "PropertySet::getAnyProperty - cannot get property \"" ).
append( OUStringToOString( rPropName, RTL_TEXTENCODING_ASCII_US ) ).append( '"' ).getStr() );
}
return bHasValue;
@@ -168,7 +168,7 @@ void PropertySet::setAnyProperty( const OUString& rPropName, const Any& rValue )
}
catch( Exception& )
{
- OSL_ENSURE( false, OStringBuffer( "PropertySet::setAnyProperty - cannot set property \"" ).
+ OSL_FAIL( OStringBuffer( "PropertySet::setAnyProperty - cannot set property \"" ).
append( OUStringToOString( rPropName, RTL_TEXTENCODING_ASCII_US ) ).append( '"' ).getStr() );
}
}
diff --git a/oox/source/helper/zipstorage.cxx b/oox/source/helper/zipstorage.cxx
index 7f320db..33c9aa4 100644
--- a/oox/source/helper/zipstorage.cxx
+++ b/oox/source/helper/zipstorage.cxx
@@ -97,7 +97,7 @@ ZipStorage::ZipStorage(
}
catch( Exception& )
{
- OSL_ENSURE( false, "ZipStorage::ZipStorage - cannot open output storage" );
+ OSL_FAIL( "ZipStorage::ZipStorage - cannot open output storage" );
}
}
diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx
index db2443f..c381050 100644
--- a/oox/source/ole/axcontrol.cxx
+++ b/oox/source/ole/axcontrol.cxx
@@ -480,7 +480,7 @@ void ControlConverter::convertAxPicture( PropertyMap& rPropMap, const StreamData
case AX_PICPOS_BELOWCENTER: nImagePos = AwtImagePos::BelowCenter; break;
case AX_PICPOS_BELOWRIGHT: nImagePos = AwtImagePos::BelowRight; break;
case AX_PICPOS_CENTER: nImagePos = AwtImagePos::Centered; break;
- default: OSL_ENSURE( false, "ControlConverter::convertAxPicture - unknown picture position" );
+ default: OSL_FAIL( "ControlConverter::convertAxPicture - unknown picture position" );
}
rPropMap.setProperty( PROP_ImagePosition, nImagePos );
}
@@ -499,7 +499,7 @@ void ControlConverter::convertAxPicture( PropertyMap& rPropMap, const StreamData
case AX_PICSIZE_CLIP: nScaleMode = AwtScaleMode::None; break;
case AX_PICSIZE_STRETCH: nScaleMode = AwtScaleMode::Anisotropic; break;
case AX_PICSIZE_ZOOM: nScaleMode = AwtScaleMode::Isotropic; break;
- default: OSL_ENSURE( false, "ControlConverter::convertAxPicture - unknown picture size mode" );
+ default: OSL_FAIL( "ControlConverter::convertAxPicture - unknown picture size mode" );
}
rPropMap.setProperty( PROP_ScaleMode, nScaleMode );
}
@@ -538,7 +538,7 @@ void ControlConverter::convertAxOrientation( PropertyMap& rPropMap,
case AX_ORIENTATION_AUTO: bHorizontal = rSize.first > rSize.second; break;
case AX_ORIENTATION_VERTICAL: bHorizontal = false; break;
case AX_ORIENTATION_HORIZONTAL: bHorizontal = true; break;
- default: OSL_ENSURE( false, "ControlConverter::convertAxOrientation - unknown orientation" );
+ default: OSL_FAIL( "ControlConverter::convertAxOrientation - unknown orientation" );
}
convertOrientation( rPropMap, bHorizontal );
}
@@ -575,7 +575,7 @@ OUString ControlModelBase::getServiceName() const
case API_CONTROL_PAGE: return CREATE_OUSTRING( "com.sun.star.awt.UnoPageModel" );
case API_CONTROL_MULTIPAGE: return CREATE_OUSTRING( "com.sun.star.awt.UnoMultiPageModel" );
case API_CONTROL_DIALOG: return CREATE_OUSTRING( "com.sun.star.awt.UnoControlDialogModel" );
- default: OSL_ENSURE( false, "ControlModelBase::getServiceName - no AWT model service supported" );
+ default: OSL_FAIL( "ControlModelBase::getServiceName - no AWT model service supported" );
}
else switch( eCtrlType )
{
@@ -590,7 +590,7 @@ OUString ControlModelBase::getServiceName() const
case API_CONTROL_SPINBUTTON: return CREATE_OUSTRING( "com.sun.star.form.component.SpinButton" );
case API_CONTROL_SCROLLBAR: return CREATE_OUSTRING( "com.sun.star.form.component.ScrollBar" );
case API_CONTROL_GROUPBOX: return CREATE_OUSTRING( "com.sun.star.form.component.GroupBox" );
- default: OSL_ENSURE( false, "ControlModelBase::getServiceName - no form component service supported" );
+ default: OSL_FAIL( "ControlModelBase::getServiceName - no form component service supported" );
}
return OUString();
}
@@ -668,7 +668,7 @@ sal_uInt32 ComCtlModelBase::getDataPartId() const
case 5: return mnDataPartId5;
case 6: return mnDataPartId6;
}
- OSL_ENSURE( false, "ComCtlObjectBase::getDataPartId - unxpected version" );
+ OSL_FAIL( "ComCtlObjectBase::getDataPartId - unxpected version" );
return SAL_MAX_UINT32;
}
@@ -872,7 +872,7 @@ void AxFontDataModel::convertProperties( PropertyMap& rPropMap, const ControlCon
case AX_FONTDATA_LEFT: nAlign = cssa::TextAlign::LEFT; break;
case AX_FONTDATA_RIGHT: nAlign = cssa::TextAlign::RIGHT; break;
case AX_FONTDATA_CENTER: nAlign = cssa::TextAlign::CENTER; break;
- default: OSL_ENSURE( false, "AxFontDataModel::convertProperties - unknown text alignment" );
+ default: OSL_FAIL( "AxFontDataModel::convertProperties - unknown text alignment" );
}
// form controls expect short value
rPropMap.setProperty( PROP_Align, static_cast< sal_Int16 >( nAlign ) );
diff --git a/oox/source/ole/olehelper.cxx b/oox/source/ole/olehelper.cxx
index 185403e..61b7811 100644
--- a/oox/source/ole/olehelper.cxx
+++ b/oox/source/ole/olehelper.cxx
@@ -158,7 +158,7 @@ StdFontInfo::StdFontInfo( const ::rtl::OUString& rName, sal_uInt32 nHeight,
case OLE_COLORTYPE_SYSCOLOR:
return rGraphicHelper.getSystemColor( STATIC_ARRAY_SELECT( spnSystemColors, nOleColor & OLE_SYSTEMCOLOR_MASK, XML_TOKEN_INVALID ), API_RGB_WHITE );
}
- OSL_ENSURE( false, "OleHelper::decodeOleColor - unknown color type" );
+ OSL_FAIL( "OleHelper::decodeOleColor - unknown color type" );
return API_RGB_BLACK;
}
@@ -281,7 +281,7 @@ StdFontInfo::StdFontInfo( const ::rtl::OUString& rName, sal_uInt32 nHeight,
}
else
{
- OSL_ENSURE( false, "OleHelper::importStdHlink - unsupported hyperlink moniker" );
+ OSL_FAIL( "OleHelper::importStdHlink - unsupported hyperlink moniker" );
return false;
}
}
diff --git a/oox/source/ole/olestorage.cxx b/oox/source/ole/olestorage.cxx
index c476320..165128f 100644
--- a/oox/source/ole/olestorage.cxx
+++ b/oox/source/ole/olestorage.cxx
@@ -264,7 +264,7 @@ void OleStorage::initStorage( const Reference< XInputStream >& rxInStream )
}
catch( Exception& )
{
- OSL_ENSURE( false, "OleStorage::initStorage - cannot create temporary copy of input stream" );
+ OSL_FAIL( "OleStorage::initStorage - cannot create temporary copy of input stream" );
}
// create base storage object
@@ -317,7 +317,7 @@ bool OleStorage::implIsStorage() const
Reference< XStorage > OleStorage::implGetXStorage() const
{
- OSL_ENSURE( false, "OleStorage::getXStorage - not implemented" );
+ OSL_FAIL( "OleStorage::getXStorage - not implemented" );
return Reference< XStorage >();
}
diff --git a/oox/source/ole/vbacontrol.cxx b/oox/source/ole/vbacontrol.cxx
index 1630b78..da1ee60 100644
--- a/oox/source/ole/vbacontrol.cxx
+++ b/oox/source/ole/vbacontrol.cxx
@@ -279,7 +279,7 @@ ControlModelRef VbaSiteModel::createControlModel( const AxClassTable& rClassTabl
case VBA_SITE_FRAME: xCtrlModel.reset( new AxFrameModel ); break;
case VBA_SITE_MULTIPAGE: xCtrlModel.reset( new AxMultiPageModel ); break;
case VBA_SITE_FORM: xCtrlModel.reset( new AxFormPageModel ); break;
- default: OSL_ENSURE( false, "VbaSiteModel::createControlModel - unknown type index" );
+ default: OSL_FAIL( "VbaSiteModel::createControlModel - unknown type index" );
}
}
else
@@ -481,7 +481,7 @@ bool VbaFormControl::convertProperties( const Reference< XControlModel >& rxCtrl
}
catch( Exception& )
{
- OSL_ENSURE( false, "VbaFormControl::convertProperties - cannot get control container interface" );
+ OSL_FAIL( "VbaFormControl::convertProperties - cannot get control container interface" );
}
return true;
diff --git a/oox/source/ole/vbamodule.cxx b/oox/source/ole/vbamodule.cxx
index 7ec222e..e2e1d63 100644
--- a/oox/source/ole/vbamodule.cxx
+++ b/oox/source/ole/vbamodule.cxx
@@ -147,7 +147,7 @@ void VbaModule::importDirRecords( BinaryInputStream& rDirStrm )
{
#define OOX_ENSURE_RECORDSIZE( cond ) OSL_ENSURE( cond, "VbaModule::importDirRecords - invalid record size" )
case VBA_ID_MODULENAME:
- OSL_ENSURE( false, "VbaModule::importDirRecords - unexpected MODULENAME record" );
+ OSL_FAIL( "VbaModule::importDirRecords - unexpected MODULENAME record" );
maName = aRecStrm.readCharArrayUC( nRecSize, meTextEnc );
break;
case VBA_ID_MODULENAMEUNICODE:
@@ -191,7 +191,7 @@ void VbaModule::importDirRecords( BinaryInputStream& rDirStrm )
mbPrivate = true;
break;
default:
- OSL_ENSURE( false, "VbaModule::importDirRecords - unknown module record" );
+ OSL_FAIL( "VbaModule::importDirRecords - unknown module record" );
#undef OOX_ENSURE_RECORDSIZE
}
}
@@ -353,7 +353,7 @@ void VbaModule::createModule( const OUString& rVBASourceCode,
}
catch( Exception& )
{
- OSL_ENSURE( false, "VbaModule::createModule - cannot insert module into library" );
+ OSL_FAIL( "VbaModule::createModule - cannot insert module into library" );
}
}
diff --git a/oox/source/ppt/presentationfragmenthandler.cxx b/oox/source/ppt/presentationfragmenthandler.cxx
index 4034af8..eb6ebf8 100644
--- a/oox/source/ppt/presentationfragmenthandler.cxx
+++ b/oox/source/ppt/presentationfragmenthandler.cxx
@@ -286,8 +286,7 @@ void PresentationFragmentHandler::endDocument() throw (SAXException, RuntimeExce
}
catch( uno::Exception& )
{
- OSL_ENSURE( false,
- (rtl::OString("oox::ppt::PresentationFragmentHandler::EndDocument(), "
+ OSL_FAIL( (rtl::OString("oox::ppt::PresentationFragmentHandler::EndDocument(), "
"exception caught: ") +
rtl::OUStringToOString(
comphelper::anyToString( cppu::getCaughtException() ),
diff --git a/oox/source/ppt/slidefragmenthandler.cxx b/oox/source/ppt/slidefragmenthandler.cxx
index 9a6b74a..ae786ef 100644
--- a/oox/source/ppt/slidefragmenthandler.cxx
+++ b/oox/source/ppt/slidefragmenthandler.cxx
@@ -189,8 +189,7 @@ void SAL_CALL SlideFragmentHandler::endDocument( ) throw (::com::sun::star::xml
}
catch( uno::Exception& )
{
- OSL_ENSURE( false,
- (rtl::OString("oox::ppt::SlideFragmentHandler::EndElement(), "
+ OSL_FAIL( (rtl::OString("oox::ppt::SlideFragmentHandler::EndElement(), "
"exception caught: ") +
rtl::OUStringToOString(
comphelper::anyToString( cppu::getCaughtException() ),
diff --git a/oox/source/ppt/slidetransition.cxx b/oox/source/ppt/slidetransition.cxx
index 4c0baea..e0a7721 100644
--- a/oox/source/ppt/slidetransition.cxx
+++ b/oox/source/ppt/slidetransition.cxx
@@ -99,7 +99,7 @@ namespace oox { namespace ppt {
catch( Exception& )
{
// should not happen
- OSL_ENSURE( false, "exception raised" );
+ OSL_FAIL( "exception raised" );
}
}
@@ -116,7 +116,7 @@ namespace oox { namespace ppt {
catch( Exception& )
{
// should not happen
- OSL_ENSURE( false, "exception raised" );
+ OSL_FAIL( "exception raised" );
}
}
diff --git a/oox/source/vml/vmlformatting.cxx b/oox/source/vml/vmlformatting.cxx
index ec4a78a..d3d94a4 100644
--- a/oox/source/vml/vmlformatting.cxx
+++ b/oox/source/vml/vmlformatting.cxx
@@ -102,7 +102,7 @@ bool lclExtractDouble( double& orfValue, sal_Int32& ornEndPos, const OUString& r
if( (nEndPos + 1 == rValue.getLength()) && (rValue[ nEndPos ] == '%') )
return fValue / 100.0;
- OSL_ENSURE( false, "ConversionHelper::decodePercent - unknown measure unit" );
+ OSL_FAIL( "ConversionHelper::decodePercent - unknown measure unit" );
return fDefValue;
}
@@ -116,7 +116,7 @@ bool lclExtractDouble( double& orfValue, sal_Int32& ornEndPos, const OUString& r
// TODO: according to spec, value may contain "auto"
if( rValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "auto" ) ) )
{
- OSL_ENSURE( false, "ConversionHelper::decodeMeasureToEmu - special value 'auto' must be handled by caller" );
+ OSL_FAIL( "ConversionHelper::decodeMeasureToEmu - special value 'auto' must be handled by caller" );
return nRefValue;
}
@@ -160,7 +160,7 @@ bool lclExtractDouble( double& orfValue, sal_Int32& ornEndPos, const OUString& r
}
else if( bDefaultAsPixel || (aUnit.getLength() > 0) ) // default as EMU and no unit -> do nothing
{
- OSL_ENSURE( false, "ConversionHelper::decodeMeasureToEmu - unknown measure unit" );
+ OSL_FAIL( "ConversionHelper::decodeMeasureToEmu - unknown measure unit" );
fValue = nRefValue;
}
return static_cast< sal_Int32 >( fValue + 0.5 );
@@ -281,7 +281,7 @@ void lclGetColor( Color& orDmlColor, const GraphicHelper& rGraphicHelper,
}
}
- OSL_ENSURE( false, OStringBuffer( "lclGetColor - invalid VML color name '" ).
+ OSL_FAIL( OStringBuffer( "lclGetColor - invalid VML color name '" ).
append( OUStringToOString( roVmlColor.get(), RTL_TEXTENCODING_ASCII_US ) ).append( '\'' ).getStr() );
orDmlColor.setSrgbClr( nDefaultRgb );
}
diff --git a/oox/source/xls/addressconverter.cxx b/oox/source/xls/addressconverter.cxx
index 4640584..9483bf9 100644
--- a/oox/source/xls/addressconverter.cxx
+++ b/oox/source/xls/addressconverter.cxx
@@ -774,7 +774,7 @@ void AddressConverter::initializeMaxPos(
}
catch( Exception& )
{
- OSL_ENSURE( false, "AddressConverter::AddressConverter - cannot get sheet limits" );
+ OSL_FAIL( "AddressConverter::AddressConverter - cannot get sheet limits" );
}
}
diff --git a/oox/source/xls/autofiltercontext.cxx b/oox/source/xls/autofiltercontext.cxx
index c60dfd2..0f4558b 100644
--- a/oox/source/xls/autofiltercontext.cxx
+++ b/oox/source/xls/autofiltercontext.cxx
@@ -377,7 +377,7 @@ void OoxAutoFilterContext::setAutoFilter()
Reference< XDatabaseRanges > xDBRanges = getDatabaseRanges();
if ( !xDBRanges.is() )
{
- OSL_ENSURE( false, "OoxAutoFilterContext::setAutoFilter: DBRange empty" );
+ OSL_FAIL( "OoxAutoFilterContext::setAutoFilter: DBRange empty" );
return;
}
@@ -404,7 +404,7 @@ void OoxAutoFilterContext::setAutoFilter()
}
else
{
- OSL_ENSURE(false, "OoxAutoFilterContext::setAutoFilter: descriptor is empty");
+ OSL_FAIL("OoxAutoFilterContext::setAutoFilter: descriptor is empty");
return;
}
@@ -413,7 +413,7 @@ void OoxAutoFilterContext::setAutoFilter()
Reference< XExtendedSheetFilterDescriptor > xExtDescriptor( xDescriptor, UNO_QUERY );
if ( !xExtDescriptor.is() )
{
- OSL_ENSURE(false, "OoxAutoFilterContext::setAutoFilter: extended descriptor is empty");
+ OSL_FAIL("OoxAutoFilterContext::setAutoFilter: extended descriptor is empty");
return;
}
@@ -742,7 +742,7 @@ void OoxAutoFilterContext::importCustomFilter( const AttributeList& rAttribs )
}
break;
default:
- OSL_ENSURE( false, "OoxAutoFilterContext::importCustomFilter: unhandled case" );
+ OSL_FAIL( "OoxAutoFilterContext::importCustomFilter: unhandled case" );
}
}
diff --git a/oox/source/xls/biffcodec.cxx b/oox/source/xls/biffcodec.cxx
index 9483cd4..2998f46 100644
--- a/oox/source/xls/biffcodec.cxx
+++ b/oox/source/xls/biffcodec.cxx
@@ -283,13 +283,13 @@ BiffDecoderRef lclReadFilePassBiff8( BiffInputStream& rStrm )
xDecoder = lclReadFilePass_CryptoApi( rStrm );
break;
default:
- OSL_ENSURE( false, "lclReadFilePassBiff8 - unknown BIFF8 encryption sub mode" );
+ OSL_FAIL( "lclReadFilePassBiff8 - unknown BIFF8 encryption sub mode" );
}
}
break;
default:
- OSL_ENSURE( false, "lclReadFilePassBiff8 - unknown encryption mode" );
+ OSL_FAIL( "lclReadFilePassBiff8 - unknown encryption mode" );
}
return xDecoder;
}
diff --git a/oox/source/xls/biffdetector.cxx b/oox/source/xls/biffdetector.cxx
index fcf6411..ee76f5a 100644
--- a/oox/source/xls/biffdetector.cxx
+++ b/oox/source/xls/biffdetector.cxx
@@ -118,8 +118,7 @@ BiffType BiffDetector::detectStreamBiffVersion( BinaryInputStream& rInStream )
case BIFF_BOF_BIFF4: eBiff = BIFF4; break;
case BIFF_BOF_BIFF5: eBiff = BIFF5; break;
case BIFF_BOF_BIFF8: eBiff = BIFF8; break;
- default: OSL_ENSURE( false,
- OStringBuffer( "lclDetectStreamBiffVersion - unknown BIFF version: 0x" ).
+ default: OSL_FAIL( OStringBuffer( "lclDetectStreamBiffVersion - unknown BIFF version: 0x" ).
append( static_cast< sal_Int32 >( nVersion ), 16 ).getStr() );
}
}
diff --git a/oox/source/xls/biffhelper.cxx b/oox/source/xls/biffhelper.cxx
index f1bdb8d..d9c17c8 100644
--- a/oox/source/xls/biffhelper.cxx
+++ b/oox/source/xls/biffhelper.cxx
@@ -233,7 +233,7 @@ void lclImportImgDataDib( StreamDataSequence& orDataSeq, BiffInputStream& rStrm,
case BIFF_ERR_NAME: nApiError = 525; break;
case BIFF_ERR_NUM: nApiError = 503; break;
case BIFF_ERR_NA: nApiError = 0x7FFF; break;
- default: OSL_ENSURE( false, "BiffHelper::calcDoubleFromError - unknown error code" );
+ default: OSL_FAIL( "BiffHelper::calcDoubleFromError - unknown error code" );
}
DecodedDouble aDecDbl;
::rtl::math::setNan( &aDecDbl.mfValue );
@@ -276,7 +276,7 @@ void lclImportImgDataDib( StreamDataSequence& orDataSeq, BiffInputStream& rStrm,
// case BIFF_IMGDATA_WMF: /* TODO */ break;
case BIFF_IMGDATA_DIB: lclImportImgDataDib( orDataSeq, rStrm, nBytes, eBiff ); break;
// case BIFF_IMGDATA_NATIVE: /* TODO */ break;
- default: OSL_ENSURE( false, "BiffHelper::importImgData - unknown image format" );
+ default: OSL_FAIL( "BiffHelper::importImgData - unknown image format" );
}
}
}
diff --git a/oox/source/xls/condformatbuffer.cxx b/oox/source/xls/condformatbuffer.cxx
index 284609d..8b8247c 100644
--- a/oox/source/xls/condformatbuffer.cxx
+++ b/oox/source/xls/condformatbuffer.cxx
@@ -403,7 +403,7 @@ void CondFormatRule::importCfRule( RecordInputStream& rStrm )
maModel.mnType = XML_iconSet;
break;
default:
- OSL_ENSURE( false, "CondFormatRule::importCfRule - unknown rule type" );
+ OSL_FAIL( "CondFormatRule::importCfRule - unknown rule type" );
}
}
@@ -528,7 +528,7 @@ void CondFormatRule::finalizeImport( const Reference< XSheetConditionalEntries >
aReplaceFormula = CREATE_OUSTRING( "OR(AND(MONTH(#B)=MONTH(TODAY())+1,YEAR(#B)=YEAR(TODAY())),AND(MONTH(#B)=1,MONTH(TODAY())=12,YEAR(#B)=YEAR(TODAY())+1))" );
break;
default:
- OSL_ENSURE( false, "CondFormatRule::finalizeImport - unknown time period type" );
+ OSL_FAIL( "CondFormatRule::finalizeImport - unknown time period type" );
}
break;
case XML_containsBlanks:
@@ -599,7 +599,7 @@ void CondFormatRule::finalizeImport( const Reference< XSheetConditionalEntries >
aReplaceFormula = aReplaceFormula.replaceAt( nStrPos, 2, aComp );
break;
default:
- OSL_ENSURE( false, "CondFormatRule::finalizeImport - unknown placeholder" );
+ OSL_FAIL( "CondFormatRule::finalizeImport - unknown placeholder" );
}
}
diff --git a/oox/source/xls/drawingfragment.cxx b/oox/source/xls/drawingfragment.cxx
index 32e8270..16cddeb 100644
--- a/oox/source/xls/drawingfragment.cxx
+++ b/oox/source/xls/drawingfragment.cxx
@@ -120,7 +120,7 @@ void ShapeAnchor::importAnchor( sal_Int32 nElement, const AttributeList& rAttrib
mnEditAs = rAttribs.getToken( XML_editAs, XML_twoCell );
break;
default:
- OSL_ENSURE( false, "ShapeAnchor::importAnchor - unexpected element" );
+ OSL_FAIL( "ShapeAnchor::importAnchor - unexpected element" );
}
}
@@ -158,7 +158,7 @@ void ShapeAnchor::setCellPos( sal_Int32 nElement, sal_Int32 nParentContext, cons
pAnchorCell = &maTo;
break;
default:
- OSL_ENSURE( false, "ShapeAnchor::setCellPos - unexpected parent element" );
+ OSL_FAIL( "ShapeAnchor::setCellPos - unexpected parent element" );
}
if( pAnchorCell ) switch( nElement )
{
@@ -166,7 +166,7 @@ void ShapeAnchor::setCellPos( sal_Int32 nElement, sal_Int32 nParentContext, cons
case XDR_TOKEN( row ): pAnchorCell->mnRow = rValue.toInt32(); break;
case XDR_TOKEN( colOff ): pAnchorCell->mnColOffset = rValue.toInt64(); break;
case XDR_TOKEN( rowOff ): pAnchorCell->mnRowOffset = rValue.toInt64(); break;
- default: OSL_ENSURE( false, "ShapeAnchor::setCellPos - unexpected element" );
+ default: OSL_FAIL( "ShapeAnchor::setCellPos - unexpected element" );
}
}
@@ -217,7 +217,7 @@ bool ShapeAnchor::isValidAnchor() const
((maFrom.mnRow < maTo.mnRow) || ((maFrom.mnRow == maTo.mnRow) && (maFrom.mnRowOffset < maTo.mnRowOffset)));
break;
case ANCHOR_INVALID:
- OSL_ENSURE( false, "ShapeAnchor::isValidAnchor - invalid anchor" );
+ OSL_FAIL( "ShapeAnchor::isValidAnchor - invalid anchor" );
break;
}
return bValid;
@@ -254,7 +254,7 @@ Rectangle ShapeAnchor::calcApiLocation( const Size& rApiSheetSize, const AnchorS
}
break;
case ANCHOR_INVALID:
- OSL_ENSURE( false, "ShapeAnchor::calcApiLocation - invalid anchor" );
+ OSL_FAIL( "ShapeAnchor::calcApiLocation - invalid anchor" );
break;
}
@@ -346,7 +346,7 @@ Rectangle ShapeAnchor::calcEmuLocation( const AnchorSizeModel& rEmuSheetSize ) c
}
break;
case ANCHOR_INVALID:
- OSL_ENSURE( false, "ShapeAnchor::calcEmuLocation - invalid anchor" );
+ OSL_FAIL( "ShapeAnchor::calcEmuLocation - invalid anchor" );
break;
}
diff --git a/oox/source/xls/excelchartconverter.cxx b/oox/source/xls/excelchartconverter.cxx
index 5b413c1..15f8af0 100644
--- a/oox/source/xls/excelchartconverter.cxx
+++ b/oox/source/xls/excelchartconverter.cxx
@@ -113,7 +113,7 @@ Reference< XDataSequence > ExcelChartConverter::createDataSequence(
}
catch( Exception& )
{
- OSL_ENSURE( false, "ExcelChartConverter::createDataSequence - cannot create data sequence" );
+ OSL_FAIL( "ExcelChartConverter::createDataSequence - cannot create data sequence" );
}
}
return xDataSeq;
diff --git a/oox/source/xls/externallinkbuffer.cxx b/oox/source/xls/externallinkbuffer.cxx
index 1ad79bb..f2abfe2 100644
--- a/oox/source/xls/externallinkbuffer.cxx
+++ b/oox/source/xls/externallinkbuffer.cxx
@@ -385,7 +385,7 @@ bool ExternalName::getDdeLinkData( OUString& orDdeServer, OUString& orDdeTopic,
}
catch( Exception& )
{
- OSL_ENSURE( false, "ExternalName::getDdeLinkData - cannot create DDE link" );
+ OSL_FAIL( "ExternalName::getDdeLinkData - cannot create DDE link" );
}
// get link data from created DDE link
if( mxDdeLink.is() )
@@ -594,7 +594,7 @@ void ExternalLink::importExternalBook( const Relations& rRelations, RecordInputS
}
break;
default:
- OSL_ENSURE( false, "ExternalLink::importExternalBook - unknown link type" );
+ OSL_FAIL( "ExternalLink::importExternalBook - unknown link type" );
}
}
diff --git a/oox/source/xls/externallinkfragment.cxx b/oox/source/xls/externallinkfragment.cxx
index 4296be4..a7ab20f 100644
--- a/oox/source/xls/externallinkfragment.cxx
+++ b/oox/source/xls/externallinkfragment.cxx
@@ -521,7 +521,7 @@ void BiffExternalLinkFragment::importCrn()
mrStrm.skip( 7 );
break;
default:
- OSL_ENSURE( false, "BiffExternalLinkFragment::importCrn - unknown data type" );
+ OSL_FAIL( "BiffExternalLinkFragment::importCrn - unknown data type" );
bLoop = false;
}
}
diff --git a/oox/source/xls/formulabase.cxx b/oox/source/xls/formulabase.cxx
index a3feb10..327d655 100644
--- a/oox/source/xls/formulabase.cxx
+++ b/oox/source/xls/formulabase.cxx
@@ -878,7 +878,7 @@ FunctionProviderImpl::FunctionProviderImpl( FilterType eFilter, BiffType eBiff,
nMaxParam = BIFF_MAX_PARAMCOUNT;
break;
case FILTER_UNKNOWN:
- OSL_ENSURE( false, "FunctionProviderImpl::FunctionProviderImpl - invalid filter type" );
+ OSL_FAIL( "FunctionProviderImpl::FunctionProviderImpl - invalid filter type" );
break;
}
OSL_ENSURE( eBiff != BIFF_UNKNOWN, "FunctionProviderImpl::FunctionProviderImpl - invalid BIFF type" );
@@ -1131,7 +1131,7 @@ OpCodeProviderImpl::OpCodeProviderImpl( const FunctionInfoVector& rFuncInfos,
}
catch( Exception& )
{
- OSL_ENSURE( false, "OpCodeProviderImpl::OpCodeProviderImpl - cannot receive formula opcode mapper" );
+ OSL_FAIL( "OpCodeProviderImpl::OpCodeProviderImpl - cannot receive formula opcode mapper" );
}
}
@@ -1184,8 +1184,7 @@ bool OpCodeProviderImpl::initOpCode( sal_Int32& ornOpCode, const OpCodeEntrySequ
ornOpCode = rEntrySeq[ nSpecialId ].Token.OpCode;
return true;
}
- OSL_ENSURE( false,
- OStringBuffer( "OpCodeProviderImpl::initOpCode - opcode for special offset " ).
+ OSL_FAIL( OStringBuffer( "OpCodeProviderImpl::initOpCode - opcode for special offset " ).
append( nSpecialId ).append( " not found" ).getStr() );
return false;
}
@@ -1205,8 +1204,7 @@ bool OpCodeProviderImpl::initOpCode( sal_Int32& ornOpCode, const ApiTokenMap& rT
}
return true;
}
- OSL_ENSURE( false,
- OStringBuffer( "OpCodeProviderImpl::initOpCode - opcode for \"" ).
+ OSL_FAIL( OStringBuffer( "OpCodeProviderImpl::initOpCode - opcode for \"" ).
append( OUStringToOString( rOdfName, RTL_TEXTENCODING_ASCII_US ) ).
append( "\" not found" ).getStr() );
return false;
diff --git a/oox/source/xls/formulaparser.cxx b/oox/source/xls/formulaparser.cxx
index 99cbcd2..890fa43 100644
--- a/oox/source/xls/formulaparser.cxx
+++ b/oox/source/xls/formulaparser.cxx
@@ -587,17 +587,17 @@ FormulaParserImpl::FormulaParserImpl( const FormulaParser& rParent ) :
void FormulaParserImpl::importOoxFormula( FormulaContext&, const OUString& )
{
- OSL_ENSURE( false, "FormulaParserImpl::importOoxFormula - not implemented" );
+ OSL_FAIL( "FormulaParserImpl::importOoxFormula - not implemented" );
}
void FormulaParserImpl::importOobFormula( FormulaContext&, RecordInputStream& )
{
- OSL_ENSURE( false, "FormulaParserImpl::importOobFormula - not implemented" );
+ OSL_FAIL( "FormulaParserImpl::importOobFormula - not implemented" );
}
void FormulaParserImpl::importBiffFormula( FormulaContext&, BiffInputStream&, const sal_uInt16* )
{
- OSL_ENSURE( false, "FormulaParserImpl::importBiffFormula - not implemented" );
+ OSL_FAIL( "FormulaParserImpl::importBiffFormula - not implemented" );
}
void FormulaParserImpl::setFormula( FormulaContext& rContext, const ApiTokenSequence& rTokens )
@@ -1637,7 +1637,7 @@ bool OoxFormulaParserImpl::importArrayToken( RecordInputStream& rStrm )
rStrm.skip( 3 );
break;
default:
- OSL_ENSURE( false, "OoxFormulaParserImpl::importArrayToken - unknown data type" );
+ OSL_FAIL( "OoxFormulaParserImpl::importArrayToken - unknown data type" );
appendRawToken( OPCODE_PUSH ) <<= BiffHelper::calcDoubleFromError( BIFF_ERR_NA );
}
}
@@ -2359,7 +2359,7 @@ bool BiffFormulaParserImpl::importArrayToken( BiffInputStream& rStrm )
rStrm.skip( 7 );
break;
default:
- OSL_ENSURE( false, "BiffFormulaParserImpl::importArrayToken - unknown data type" );
+ OSL_FAIL( "BiffFormulaParserImpl::importArrayToken - unknown data type" );
appendRawToken( OPCODE_PUSH ) <<= BiffHelper::calcDoubleFromError( BIFF_ERR_NA );
}
}
diff --git a/oox/source/xls/numberformatsbuffer.cxx b/oox/source/xls/numberformatsbuffer.cxx
index 3343fe1..fa00c68 100644
--- a/oox/source/xls/numberformatsbuffer.cxx
+++ b/oox/source/xls/numberformatsbuffer.cxx
@@ -1840,8 +1840,7 @@ sal_Int32 lclCreatePredefinedFormat( const Reference< XNumberFormats >& rxNumFmt
}
catch( Exception& )
{
- OSL_ENSURE( false,
- OStringBuffer( "lclCreatePredefinedFormat - cannot create predefined number format " ).
+ OSL_FAIL( OStringBuffer( "lclCreatePredefinedFormat - cannot create predefined number format " ).
append( OString::valueOf( static_cast< sal_Int32 >( nPredefId ) ) ).getStr() );
}
return nIndex;
@@ -1865,8 +1864,7 @@ sal_Int32 lclCreateFormat( const Reference< XNumberFormats >& rxNumFmts,
}
else
{
- OSL_ENSURE( false,
- OStringBuffer( "lclCreateFormat - cannot create number format '" ).
+ OSL_FAIL( OStringBuffer( "lclCreateFormat - cannot create number format '" ).
append( OUStringToOString( rFmtCode, osl_getThreadTextEncoding() ) ).
append( '\'' ).getStr() );
}
@@ -1978,7 +1976,7 @@ NumberFormatsBuffer::NumberFormatsBuffer( const WorkbookHelper& rHelper ) :
}
catch( Exception& )
{
- OSL_ENSURE( false, "NumberFormatsBuffer::NumberFormatsBuffer - cannot get system locale" );
+ OSL_FAIL( "NumberFormatsBuffer::NumberFormatsBuffer - cannot get system locale" );
}
// create built-in formats for current locale
diff --git a/oox/source/xls/pagesettings.cxx b/oox/source/xls/pagesettings.cxx
index e98e53e..b81e630 100644
--- a/oox/source/xls/pagesettings.cxx
+++ b/oox/source/xls/pagesettings.cxx
@@ -927,8 +927,7 @@ Reference< XTextContent > HeaderFooterParser::createField( const OUString& rServ
}
catch( Exception& )
{
- OSL_ENSURE( false,
- OStringBuffer( "HeaderFooterParser::createField - error while creating text field \"" ).
+ OSL_FAIL( OStringBuffer( "HeaderFooterParser::createField - error while creating text field \"" ).
append( OUStringToOString( rServiceName, RTL_TEXTENCODING_ASCII_US ) ).
append( '"' ).getStr() );
}
diff --git a/oox/source/xls/pivotcachebuffer.cxx b/oox/source/xls/pivotcachebuffer.cxx
index 4fd82ce..6739375 100644
--- a/oox/source/xls/pivotcachebuffer.cxx
+++ b/oox/source/xls/pivotcachebuffer.cxx
@@ -317,7 +317,7 @@ OUString PivotCacheItem::getName() const
case XML_b: return OUString::valueOf( static_cast< sal_Bool >( maValue.get< bool >() ) ); // !TODO
case XML_e: return OUString(); // !TODO
}
- OSL_ENSURE( false, "PivotCacheItem::getName - invalid data type" );
+ OSL_FAIL( "PivotCacheItem::getName - invalid data type" );
return OUString();
}
@@ -339,7 +339,7 @@ void PivotCacheItemList::importItem( sal_Int32 nElement, const AttributeList& rA
case XLS_TOKEN( d ): rItem.readDate( rAttribs ); break;
case XLS_TOKEN( b ): rItem.readBool( rAttribs ); break;
case XLS_TOKEN( e ): rItem.readError( rAttribs, getUnitConverter() ); break;
- default: OSL_ENSURE( false, "PivotCacheItemList::importItem - unknown element type" );
+ default: OSL_FAIL( "PivotCacheItemList::importItem - unknown element type" );
}
}
@@ -366,7 +366,7 @@ void PivotCacheItemList::importItem( sal_Int32 nRecId, RecordInputStream& rStrm
case OOBIN_ID_PCITEMA_BOOL: rItem.readBool( rStrm ); break;
case OOBIN_ID_PCITEM_ERROR:
case OOBIN_ID_PCITEMA_ERROR: rItem.readError( rStrm ); break;
- default: OSL_ENSURE( false, "PivotCacheItemList::importItem - unknown record type" );
+ default: OSL_FAIL( "PivotCacheItemList::importItem - unknown record type" );
}
}
@@ -425,7 +425,7 @@ void PivotCacheItemList::importArray( RecordInputStream& rStrm )
case OOBIN_PCITEM_ARRAY_ERROR: createItem().readError( rStrm ); break;
case OOBIN_PCITEM_ARRAY_DATE: createItem().readDate( rStrm ); break;
default:
- OSL_ENSURE( false, "PivotCacheItemList::importArray - unknown data type" );
+ OSL_FAIL( "PivotCacheItemList::importArray - unknown data type" );
nIdx = nCount;
}
}
@@ -809,7 +809,7 @@ OUString PivotCacheField::createDateGroupField( const Reference< XDataPilotField
case XML_hours: aGroupInfo.GroupBy = HOURS; break;
case XML_minutes: aGroupInfo.GroupBy = MINUTES; break;
case XML_seconds: aGroupInfo.GroupBy = SECONDS; break;
- default: OSL_ENSURE( false, "PivotCacheField::convertRangeGrouping - unknown date/time interval" );
+ default: OSL_FAIL( "PivotCacheField::convertRangeGrouping - unknown date/time interval" );
}
try
@@ -996,7 +996,7 @@ void PivotCacheField::writeItemToSourceDataCell( WorksheetHelper& rSheetHelper,
case XML_d: rSheetHelper.setDateTimeCell( xCell, rItem.getValue().get< DateTime >() ); break;
case XML_b: rSheetHelper.setBooleanCell( xCell, rItem.getValue().get< bool >() ); break;
case XML_e: rSheetHelper.setErrorCell( xCell, static_cast< sal_uInt8 >( rItem.getValue().get< sal_Int32 >() ) ); break;
- default: OSL_ENSURE( false, "PivotCacheField::writeItemToSourceDataCell - unexpected item data type" );
+ default: OSL_FAIL( "PivotCacheField::writeItemToSourceDataCell - unexpected item data type" );
}
}
}
@@ -1529,7 +1529,7 @@ PivotCache* PivotCacheBuffer::importPivotCacheFragment( sal_Int32 nCacheId )
}
case FILTER_UNKNOWN:
- OSL_ENSURE( false, "PivotCacheBuffer::importPivotCacheFragment - unknown filter type" );
+ OSL_FAIL( "PivotCacheBuffer::importPivotCacheFragment - unknown filter type" );
}
return 0;
}
diff --git a/oox/source/xls/pivotcachefragment.cxx b/oox/source/xls/pivotcachefragment.cxx
index 4023ec3..c3c240f 100644
--- a/oox/source/xls/pivotcachefragment.cxx
+++ b/oox/source/xls/pivotcachefragment.cxx
@@ -249,7 +249,7 @@ ContextHandlerRef OoxPivotCacheRecordsFragment::onCreateContext( sal_Int32 nElem
case XLS_TOKEN( b ): aItem.readBool( rAttribs ); break;
case XLS_TOKEN( e ): aItem.readError( rAttribs, getUnitConverter() ); break;
case XLS_TOKEN( x ): aItem.readIndex( rAttribs ); break;
- default: OSL_ENSURE( false, "OoxPivotCacheRecordsFragment::onCreateContext - unexpected element" );
+ default: OSL_FAIL( "OoxPivotCacheRecordsFragment::onCreateContext - unexpected element" );
}
mrPivotCache.writeSourceDataCell( *this, mnCol, mnRow, aItem );
++mnCol;
@@ -319,7 +319,7 @@ void OoxPivotCacheRecordsFragment::importPCRecordItem( sal_Int32 nRecId, RecordI
case OOBIN_ID_PCITEM_BOOL: aItem.readBool( rStrm ); break;
case OOBIN_ID_PCITEM_ERROR: aItem.readError( rStrm ); break;
case OOBIN_ID_PCITEM_INDEX: aItem.readIndex( rStrm ); break;
- default: OSL_ENSURE( false, "OoxPivotCacheRecordsFragment::importPCRecordItem - unexpected record" );
+ default: OSL_FAIL( "OoxPivotCacheRecordsFragment::importPCRecordItem - unexpected record" );
}
mrPivotCache.writeSourceDataCell( *this, mnCol, mnRow, aItem );
++mnCol;
diff --git a/oox/source/xls/pivottablebuffer.cxx b/oox/source/xls/pivottablebuffer.cxx
index 1d5e869..64154c7 100644
--- a/oox/source/xls/pivottablebuffer.cxx
+++ b/oox/source/xls/pivottablebuffer.cxx
@@ -694,7 +694,7 @@ void PivotTableField::convertDataField( const PTDataFieldModel& rDataField )
case XML_stdDevp: eAggFunc = GeneralFunction_STDEVP; break;
case XML_var: eAggFunc = GeneralFunction_VAR; break;
case XML_varp: eAggFunc = GeneralFunction_VARP; break;
- default: OSL_ENSURE( false, "PivotTableField::convertDataField - unknown aggregation function" );
+ default: OSL_FAIL( "PivotTableField::convertDataField - unknown aggregation function" );
}
aPropSet.setProperty( PROP_Function, eAggFunc );
@@ -1423,7 +1423,7 @@ void PivotTable::finalizeImport()
}
catch( Exception& )
{
- OSL_ENSURE( false, "PivotTable::finalizeImport - exception while creating the DataPilot table" );
+ OSL_FAIL( "PivotTable::finalizeImport - exception while creating the DataPilot table" );
}
}
}
diff --git a/oox/source/xls/sheetdatacontext.cxx b/oox/source/xls/sheetdatacontext.cxx
index 67cc80c..def9774 100644
--- a/oox/source/xls/sheetdatacontext.cxx
+++ b/oox/source/xls/sheetdatacontext.cxx
@@ -253,7 +253,7 @@ void OoxSheetDataContext::onEndElement( const OUString& rChars )
break;
default:
- OSL_ENSURE( false, "OoxSheetDataContext::onEndElement - unknown formula type" );
+ OSL_FAIL( "OoxSheetDataContext::onEndElement - unknown formula type" );
}
}
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list