[Libreoffice-commits] .: 22 commits - chart2/source sccomp/source sc/inc sc/source
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Sun Mar 13 08:43:58 PDT 2011
chart2/source/controller/accessibility/AccessibleBase.cxx | 2
chart2/source/controller/accessibility/AccessibleTextHelper.cxx | 16 +++---
chart2/source/controller/chartapiwrapper/AreaWrapper.cxx | 6 +-
chart2/source/controller/chartapiwrapper/AxisWrapper.cxx | 4 -
chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx | 4 -
chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx | 14 ++---
chart2/source/controller/chartapiwrapper/TitleWrapper.cxx | 2
chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx | 14 ++---
chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx | 6 +-
chart2/source/controller/dialogs/ChartTypeDialogController.cxx | 2
chart2/source/controller/dialogs/DataBrowserModel.cxx | 2
chart2/source/controller/dialogs/DialogModel.cxx | 2
chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx | 10 ++--
chart2/source/controller/dialogs/res_ErrorBar.cxx | 2
chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx | 2
chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx | 8 +--
chart2/source/controller/dialogs/tp_RangeChooser.cxx | 2
chart2/source/controller/dialogs/tp_Scale.cxx | 2
chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx | 2
chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx | 4 -
chart2/source/controller/itemsetwrapper/ItemConverter.cxx | 10 ++--
chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx | 2
chart2/source/controller/main/ControllerCommandDispatch.cxx | 2
chart2/source/controller/main/UndoManager.cxx | 2
chart2/source/inc/macros.hxx | 2
chart2/source/model/filter/XMLFilter.cxx | 10 ++--
chart2/source/model/main/Axis.cxx | 2
chart2/source/model/main/ChartModel.cxx | 2
chart2/source/model/main/ChartModel_Persistence.cxx | 4 -
chart2/source/model/main/Diagram.cxx | 2
chart2/source/model/template/BubbleChartType.cxx | 2
chart2/source/model/template/ChartType.cxx | 2
chart2/source/model/template/ChartTypeManager.cxx | 2
chart2/source/model/template/ColumnLineChartTypeTemplate.cxx | 2
chart2/source/model/template/PieChartType.cxx | 2
chart2/source/model/template/ScatterChartType.cxx | 2
chart2/source/tools/ChartTypeHelper.cxx | 4 -
chart2/source/tools/CommonConverters.cxx | 2
chart2/source/tools/OPropertySet.cxx | 6 +-
chart2/source/tools/RegressionCurveHelper.cxx | 6 +-
chart2/source/tools/TitleHelper.cxx | 4 -
chart2/source/tools/UncachedDataSequence.cxx | 4 -
chart2/source/tools/WrappedPropertySet.cxx | 14 ++---
chart2/source/view/charttypes/VSeriesPlotter.cxx | 4 -
chart2/source/view/main/ChartView.cxx | 10 ++--
chart2/source/view/main/Clipping.cxx | 2
sc/inc/dpglobal.hxx | 6 --
sc/source/core/data/attarray.cxx | 14 ++---
sc/source/core/data/cell2.cxx | 2
sc/source/core/data/dpsave.cxx | 24 +++++-----
sc/source/core/data/dptablecache.cxx | 8 +--
sc/source/core/data/dptabres.cxx | 11 ++--
sc/source/core/data/funcdesc.cxx | 6 +-
sc/source/core/tool/address.cxx | 4 -
sc/source/core/tool/compiler.cxx | 2
sc/source/core/tool/interpr1.cxx | 2
sc/source/core/tool/parclass.cxx | 7 +-
sc/source/core/tool/token.cxx | 9 ++-
sc/source/filter/excel/xechart.cxx | 4 -
sc/source/filter/excel/xeescher.cxx | 4 -
sc/source/filter/excel/xicontent.cxx | 4 -
sc/source/filter/excel/xiescher.cxx | 8 +--
sc/source/filter/excel/xipivot.cxx | 2
sc/source/filter/excel/xistream.cxx | 2
sc/source/filter/excel/xlpivot.cxx | 4 -
sc/source/filter/excel/xlroot.cxx | 2
sc/source/filter/excel/xlstyle.cxx | 4 -
sc/source/filter/excel/xltools.cxx | 4 -
sc/source/filter/starcalc/scflt.cxx | 2
sc/source/filter/xml/xmlstyli.cxx | 2
sc/source/filter/xml/xmlwrap.cxx | 11 ++--
sc/source/ui/Accessibility/DrawModelBroadcaster.cxx | 3 -
sc/source/ui/dbgui/pvlaydlg.cxx | 2
sc/source/ui/docshell/docsh3.cxx | 2
sc/source/ui/unoobj/chart2uno.cxx | 24 +++++-----
sc/source/ui/unoobj/styleuno.cxx | 14 ++---
sc/source/ui/unoobj/tokenuno.cxx | 2
sccomp/source/solver/solver.cxx | 2
78 files changed, 204 insertions(+), 205 deletions(-)
New commits:
commit d4adf84cf3072c85274fdc154e936bf206fd6808
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sat Mar 12 14:11:51 2011 +0100
OSL_TRACE: Use format string for GetBuffer()
diff --git a/sc/source/core/data/dptablecache.cxx b/sc/source/core/data/dptablecache.cxx
index 0cb6872..36edcbe 100644
--- a/sc/source/core/data/dptablecache.cxx
+++ b/sc/source/core/data/dptablecache.cxx
@@ -281,7 +281,7 @@ sal_Int32 ScDPItemData::Compare( const ScDPItemData& rA,
void ScDPItemData::dump() const
{
OSL_TRACE( "Numberformat= %o", nNumFormat );
- OSL_TRACE( aString.GetBuffer() );
+ OSL_TRACE( "%s", aString.GetBuffer() );
OSL_TRACE( "fValue= %f", fValue );
OSL_TRACE( "mbFlag= %d", mbFlag);
}
diff --git a/sc/source/core/data/dptabres.cxx b/sc/source/core/data/dptabres.cxx
index e4386cc..46a2a87 100644
--- a/sc/source/core/data/dptabres.cxx
+++ b/sc/source/core/data/dptabres.cxx
@@ -2985,7 +2985,7 @@ bool ScDPResultDimension::IsValidEntry( const vector< SCROW >& aMembers ) const
#if OSL_DEBUG_LEVEL > 1
ByteString strTemp ("IsValidEntry: Member not found, DimName = " );
strTemp += ByteString( GetName(), RTL_TEXTENCODING_UTF8 );
- OSL_TRACE( strTemp.GetBuffer() );
+ OSL_TRACE( "%s", strTemp.GetBuffer() );
#endif
return false;
}
commit 867c2afe6c4617bfdb3e0325c6448aa3f4dfdfd2
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sat Mar 12 12:04:51 2011 +0100
Move OSL_ENSURE(0,...) to OSL_FAIL(...)
diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx
index 2ad5dfa..b575956 100644
--- a/chart2/source/model/filter/XMLFilter.cxx
+++ b/chart2/source/model/filter/XMLFilter.cxx
@@ -551,7 +551,7 @@ sal_Int32 XMLFilter::impl_ImportStream(
}
catch(uno::Exception&)
{
- OSL_ENSURE(0,"Exception caught!");
+ OSL_FAIL("Exception caught!");
}
}
xParser->setDocumentHandler( xDocHandler );
@@ -649,7 +649,7 @@ sal_Int32 XMLFilter::impl_Export(
}
catch(uno::Exception&)
{
- OSL_ENSURE(0,"Exception caught!");
+ OSL_FAIL("Exception caught!");
}
}
diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx
index 7fa436f..e9fc9fe 100644
--- a/sc/source/ui/unoobj/styleuno.cxx
+++ b/sc/source/ui/unoobj/styleuno.cxx
@@ -1024,13 +1024,13 @@ sal_Bool SAL_CALL ScStyleFamilyObj::hasByName( const rtl::OUString& aName )
uno::Reference< beans::XPropertySetInfo > SAL_CALL ScStyleFamilyObj::getPropertySetInfo( ) throw (uno::RuntimeException)
{
- OSL_ENSURE( 0, "###unexpected!" );
+ OSL_FAIL( "###unexpected!" );
return uno::Reference< beans::XPropertySetInfo >();
}
void SAL_CALL ScStyleFamilyObj::setPropertyValue( const ::rtl::OUString&, const uno::Any& ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
{
- OSL_ENSURE( 0, "###unexpected!" );
+ OSL_FAIL( "###unexpected!" );
}
uno::Any SAL_CALL ScStyleFamilyObj::getPropertyValue( const ::rtl::OUString& sPropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
@@ -1048,7 +1048,7 @@ uno::Any SAL_CALL ScStyleFamilyObj::getPropertyValue( const ::rtl::OUString& sPr
case SFX_STYLE_FAMILY_PAGE:
nResId = STR_STYLE_FAMILY_PAGE; break;
default:
- OSL_ENSURE( 0, "ScStyleFamilyObj::getPropertyValue(): invalid family" );
+ OSL_FAIL( "ScStyleFamilyObj::getPropertyValue(): invalid family" );
}
if ( nResId > 0 )
{
@@ -1066,22 +1066,22 @@ uno::Any SAL_CALL ScStyleFamilyObj::getPropertyValue( const ::rtl::OUString& sPr
void SAL_CALL ScStyleFamilyObj::addPropertyChangeListener( const ::rtl::OUString&, const uno::Reference< beans::XPropertyChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
- OSL_ENSURE( 0, "###unexpected!" );
+ OSL_FAIL( "###unexpected!" );
}
void SAL_CALL ScStyleFamilyObj::removePropertyChangeListener( const ::rtl::OUString&, const uno::Reference< beans::XPropertyChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
- OSL_ENSURE( 0, "###unexpected!" );
+ OSL_FAIL( "###unexpected!" );
}
void SAL_CALL ScStyleFamilyObj::addVetoableChangeListener( const ::rtl::OUString&, const uno::Reference< beans::XVetoableChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
- OSL_ENSURE( 0, "###unexpected!" );
+ OSL_FAIL( "###unexpected!" );
}
void SAL_CALL ScStyleFamilyObj::removeVetoableChangeListener( const ::rtl::OUString&, const uno::Reference< beans::XVetoableChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
- OSL_ENSURE( 0, "###unexpected!" );
+ OSL_FAIL( "###unexpected!" );
}
//------------------------------------------------------------------------
commit 4d29882f77d5fc81daf18517bda988871ee5f652
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sat Mar 12 11:28:41 2011 +0100
Move OSL_ENSURE(false,...) to OSL_FAIL(...)
diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx b/chart2/source/controller/accessibility/AccessibleBase.cxx
index eecc210..8747c18 100644
--- a/chart2/source/controller/accessibility/AccessibleBase.cxx
+++ b/chart2/source/controller/accessibility/AccessibleBase.cxx
@@ -395,7 +395,7 @@ awt::Point AccessibleBase::GetUpperLeftOnScreen() const
aResult = pParent->GetUpperLeftOnScreen();
}
else
- OSL_ENSURE( false, "Default position used is probably incorrect." );
+ OSL_FAIL( "Default position used is probably incorrect." );
}
return aResult;
diff --git a/chart2/source/controller/accessibility/AccessibleTextHelper.cxx b/chart2/source/controller/accessibility/AccessibleTextHelper.cxx
index c1b8523..161d2ee 100644
--- a/chart2/source/controller/accessibility/AccessibleTextHelper.cxx
+++ b/chart2/source/controller/accessibility/AccessibleTextHelper.cxx
@@ -139,49 +139,49 @@ Reference< XAccessible > SAL_CALL AccessibleTextHelper::getAccessibleChild( ::sa
Reference< XAccessible > SAL_CALL AccessibleTextHelper::getAccessibleParent()
throw (uno::RuntimeException)
{
- OSL_ENSURE( false, "Not implemented in this helper" );
+ OSL_FAIL( "Not implemented in this helper" );
return Reference< XAccessible >();
}
::sal_Int32 SAL_CALL AccessibleTextHelper::getAccessibleIndexInParent()
throw (uno::RuntimeException)
{
- OSL_ENSURE( false, "Not implemented in this helper" );
+ OSL_FAIL( "Not implemented in this helper" );
return -1;
}
::sal_Int16 SAL_CALL AccessibleTextHelper::getAccessibleRole()
throw (uno::RuntimeException)
{
- OSL_ENSURE( false, "Not implemented in this helper" );
+ OSL_FAIL( "Not implemented in this helper" );
return AccessibleRole::UNKNOWN;
}
OUString SAL_CALL AccessibleTextHelper::getAccessibleDescription()
throw (uno::RuntimeException)
{
- OSL_ENSURE( false, "Not implemented in this helper" );
+ OSL_FAIL( "Not implemented in this helper" );
return OUString();
}
OUString SAL_CALL AccessibleTextHelper::getAccessibleName()
throw (uno::RuntimeException)
{
- OSL_ENSURE( false, "Not implemented in this helper" );
+ OSL_FAIL( "Not implemented in this helper" );
return OUString();
}
Reference< XAccessibleRelationSet > SAL_CALL AccessibleTextHelper::getAccessibleRelationSet()
throw (uno::RuntimeException)
{
- OSL_ENSURE( false, "Not implemented in this helper" );
+ OSL_FAIL( "Not implemented in this helper" );
return Reference< XAccessibleRelationSet >();
}
Reference< XAccessibleStateSet > SAL_CALL AccessibleTextHelper::getAccessibleStateSet()
throw (uno::RuntimeException)
{
- OSL_ENSURE( false, "Not implemented in this helper" );
+ OSL_FAIL( "Not implemented in this helper" );
return Reference< XAccessibleStateSet >();
}
@@ -189,7 +189,7 @@ lang::Locale SAL_CALL AccessibleTextHelper::getLocale()
throw (IllegalAccessibleComponentStateException,
uno::RuntimeException)
{
- OSL_ENSURE( false, "Not implemented in this helper" );
+ OSL_FAIL( "Not implemented in this helper" );
return lang::Locale();
}
diff --git a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx
index b376976..957a070 100644
--- a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx
@@ -110,7 +110,7 @@ awt::Point SAL_CALL AreaWrapper::getPosition()
void SAL_CALL AreaWrapper::setPosition( const awt::Point& /*aPosition*/ )
throw (uno::RuntimeException)
{
- OSL_ENSURE( false, "trying to set position of chart area" );
+ OSL_FAIL( "trying to set position of chart area" );
}
awt::Size SAL_CALL AreaWrapper::getSize()
@@ -123,7 +123,7 @@ void SAL_CALL AreaWrapper::setSize( const awt::Size& /*aSize*/ )
throw (beans::PropertyVetoException,
uno::RuntimeException)
{
- OSL_ENSURE( false, "trying to set size of chart area" );
+ OSL_FAIL( "trying to set size of chart area" );
}
// ____ XShapeDescriptor (base of XShape) ____
@@ -166,7 +166,7 @@ Reference< beans::XPropertySet > AreaWrapper::getInnerPropertySet()
Reference< chart2::XChartDocument > xChartDoc( m_spChart2ModelContact->getChart2Document() );
if( xChartDoc.is() )
return xChartDoc->getPageBackground();
- OSL_ENSURE(false,"AreaWrapper::getInnerPropertySet() is NULL");
+ OSL_FAIL("AreaWrapper::getInnerPropertySet() is NULL");
return 0;
}
diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
index 0423efb..0f429e3 100644
--- a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
@@ -382,7 +382,7 @@ awt::Point SAL_CALL AxisWrapper::getPosition()
void SAL_CALL AxisWrapper::setPosition( const awt::Point& /*aPosition*/ )
throw (uno::RuntimeException)
{
- OSL_ENSURE( false, "trying to set position of Axis" );
+ OSL_FAIL( "trying to set position of Axis" );
}
awt::Size SAL_CALL AxisWrapper::getSize()
@@ -396,7 +396,7 @@ void SAL_CALL AxisWrapper::setSize( const awt::Size& /*aSize*/ )
throw (beans::PropertyVetoException,
uno::RuntimeException)
{
- OSL_ENSURE( false, "trying to set size of Axis" );
+ OSL_FAIL( "trying to set size of Axis" );
}
// ____ XShapeDescriptor (base of XShape) ____
diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
index 6e94705..d9ab10c 100644
--- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
@@ -563,7 +563,7 @@ OUString lcl_getDiagramType( const OUString & rTemplateServiceName )
if( aName.indexOf( C2U("Line") ) != -1 || aName.indexOf( C2U("Symbol") ) != -1 )
return C2U( "com.sun.star.chart.LineDiagram" );
- OSL_ENSURE( false, "unknown template" );
+ OSL_FAIL( "unknown template" );
}
return OUString();
@@ -1349,7 +1349,7 @@ WrappedStackingProperty::WrappedStackingProperty( StackMode eStackMode, ::boost:
m_aOuterName = C2U( "Deep" );
break;
default:
- OSL_ENSURE( false, "unexpected stack mode" );
+ OSL_FAIL( "unexpected stack mode" );
break;
}
}
diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
index 9bda2c5..16aa607 100644
--- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
@@ -235,22 +235,22 @@ uno::Any SAL_CALL MinMaxLineWrapper::getPropertyValue( const ::rtl::OUString& rP
void SAL_CALL MinMaxLineWrapper::addPropertyChangeListener( const ::rtl::OUString& /*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ )
throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
- OSL_ENSURE(false,"not implemented");
+ OSL_FAIL("not implemented");
}
void SAL_CALL MinMaxLineWrapper::removePropertyChangeListener( const ::rtl::OUString& /*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*aListener*/ )
throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
- OSL_ENSURE(false,"not implemented");
+ OSL_FAIL("not implemented");
}
void SAL_CALL MinMaxLineWrapper::addVetoableChangeListener( const ::rtl::OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ )
throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
- OSL_ENSURE(false,"not implemented");
+ OSL_FAIL("not implemented");
}
void SAL_CALL MinMaxLineWrapper::removeVetoableChangeListener( const ::rtl::OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ )
throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
- OSL_ENSURE(false,"not implemented");
+ OSL_FAIL("not implemented");
}
//XMultiPropertySet
@@ -293,20 +293,20 @@ void SAL_CALL MinMaxLineWrapper::addPropertiesChangeListener(
const uno::Reference< beans::XPropertiesChangeListener >& /* xListener */ )
throw (uno::RuntimeException)
{
- OSL_ENSURE(false,"not implemented");
+ OSL_FAIL("not implemented");
}
void SAL_CALL MinMaxLineWrapper::removePropertiesChangeListener(
const uno::Reference< beans::XPropertiesChangeListener >& /* xListener */ )
throw (uno::RuntimeException)
{
- OSL_ENSURE(false,"not implemented");
+ OSL_FAIL("not implemented");
}
void SAL_CALL MinMaxLineWrapper::firePropertiesChangeEvent(
const uno::Sequence< ::rtl::OUString >& /* aPropertyNames */,
const uno::Reference< beans::XPropertiesChangeListener >& /* xListener */ )
throw (uno::RuntimeException)
{
- OSL_ENSURE(false,"not implemented");
+ OSL_FAIL("not implemented");
}
//XPropertyState
diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
index 4a2dec9..9bf7126 100644
--- a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
@@ -263,7 +263,7 @@ void SAL_CALL TitleWrapper::setSize( const awt::Size& /*aSize*/ )
throw (beans::PropertyVetoException,
uno::RuntimeException)
{
- OSL_ENSURE( false, "trying to set size of title" );
+ OSL_FAIL( "trying to set size of title" );
}
// ____ XShapeDescriptor (base of XShape) ____
diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
index 3f3c22f..9e5afd1 100644
--- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
@@ -207,22 +207,22 @@ uno::Any SAL_CALL UpDownBarWrapper::getPropertyValue( const ::rtl::OUString& rPr
void SAL_CALL UpDownBarWrapper::addPropertyChangeListener( const ::rtl::OUString& /*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ )
throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
- OSL_ENSURE(false,"not implemented");
+ OSL_FAIL("not implemented");
}
void SAL_CALL UpDownBarWrapper::removePropertyChangeListener( const ::rtl::OUString& /*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*aListener*/ )
throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
- OSL_ENSURE(false,"not implemented");
+ OSL_FAIL("not implemented");
}
void SAL_CALL UpDownBarWrapper::addVetoableChangeListener( const ::rtl::OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ )
throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
- OSL_ENSURE(false,"not implemented");
+ OSL_FAIL("not implemented");
}
void SAL_CALL UpDownBarWrapper::removeVetoableChangeListener( const ::rtl::OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ )
throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
- OSL_ENSURE(false,"not implemented");
+ OSL_FAIL("not implemented");
}
//XMultiPropertySet
@@ -263,17 +263,17 @@ uno::Sequence< uno::Any > SAL_CALL UpDownBarWrapper::getPropertyValues( const un
void SAL_CALL UpDownBarWrapper::addPropertiesChangeListener( const uno::Sequence< ::rtl::OUString >& /* aPropertyNames */, const uno::Reference< beans::XPropertiesChangeListener >& /* xListener */ )
throw (uno::RuntimeException)
{
- OSL_ENSURE(false,"not implemented");
+ OSL_FAIL("not implemented");
}
void SAL_CALL UpDownBarWrapper::removePropertiesChangeListener( const uno::Reference< beans::XPropertiesChangeListener >& /* xListener */ )
throw (uno::RuntimeException)
{
- OSL_ENSURE(false,"not implemented");
+ OSL_FAIL("not implemented");
}
void SAL_CALL UpDownBarWrapper::firePropertiesChangeEvent( const uno::Sequence< ::rtl::OUString >& /* aPropertyNames */, const uno::Reference< beans::XPropertiesChangeListener >& /* xListener */ )
throw (uno::RuntimeException)
{
- OSL_ENSURE(false,"not implemented");
+ OSL_FAIL("not implemented");
}
//XPropertyState
diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx
index 2a72dae..8ac6ba6 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx
@@ -99,7 +99,7 @@ WrappedScaleProperty::WrappedScaleProperty( tScaleProperty eScaleProperty
m_aOuterName = C2U("ReverseDirection");
break;
default:
- OSL_ENSURE(false,"unknown scale property");
+ OSL_FAIL("unknown scale property");
break;
}
}
@@ -300,7 +300,7 @@ void WrappedScaleProperty::setPropertyValue( tScaleProperty eScaleProperty, cons
}
default:
{
- OSL_ENSURE(false,"unknown scale property");
+ OSL_FAIL("unknown scale property");
break;
}
}
@@ -499,7 +499,7 @@ Any WrappedScaleProperty::getPropertyValue( tScaleProperty eScaleProperty, const
}
default:
{
- OSL_ENSURE(false,"unknown scale property");
+ OSL_FAIL("unknown scale property");
break;
}
}
diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
index e8984a0..1e336a9 100644
--- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
+++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
@@ -269,7 +269,7 @@ rtl::OUString ChartTypeDialogController::getServiceNameForParameter( const Chart
return (*aIter).first;
}
- OSL_ENSURE( false, "ChartType not implemented yet - use fallback to similar type" );
+ OSL_FAIL( "ChartType not implemented yet - use fallback to similar type" );
for( sal_Int32 nMatchPrecision=1; nMatchPrecision<8; nMatchPrecision++ )
{
for( aIter = rMap.begin(); aIter != aEnd; ++aIter )
diff --git a/chart2/source/controller/dialogs/DataBrowserModel.cxx b/chart2/source/controller/dialogs/DataBrowserModel.cxx
index c580d32..3561bea 100644
--- a/chart2/source/controller/dialogs/DataBrowserModel.cxx
+++ b/chart2/source/controller/dialogs/DataBrowserModel.cxx
@@ -441,7 +441,7 @@ void DataBrowserModel::insertComplexCategoryLevel( sal_Int32 nAfterColumnIndex )
if(nAfterColumnIndex<0)
{
- OSL_ENSURE( false, "wrong index for category level insertion" );
+ OSL_FAIL( "wrong index for category level insertion" );
return;
}
diff --git a/chart2/source/controller/dialogs/DialogModel.cxx b/chart2/source/controller/dialogs/DialogModel.cxx
index 4680726..73cf05c 100644
--- a/chart2/source/controller/dialogs/DialogModel.cxx
+++ b/chart2/source/controller/dialogs/DialogModel.cxx
@@ -689,7 +689,7 @@ bool DialogModel::setData(
if( ! xDataProvider.is() ||
! m_xTemplate.is() )
{
- OSL_ENSURE( false, "Model objects missing" );
+ OSL_FAIL( "Model objects missing" );
return false;
}
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
index 799b263..37dfd72 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
@@ -320,7 +320,7 @@ void SAL_CALL CreationWizardUnoDlg::disposing()
uno::Reference< beans::XPropertySetInfo > SAL_CALL CreationWizardUnoDlg::getPropertySetInfo()
throw (uno::RuntimeException)
{
- OSL_ENSURE(false,"not implemented");
+ OSL_FAIL("not implemented");
return 0;
}
@@ -404,25 +404,25 @@ void SAL_CALL CreationWizardUnoDlg::addPropertyChangeListener(
const ::rtl::OUString& /* aPropertyName */, const uno::Reference< beans::XPropertyChangeListener >& /* xListener */ )
throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
- OSL_ENSURE(false,"not implemented");
+ OSL_FAIL("not implemented");
}
void SAL_CALL CreationWizardUnoDlg::removePropertyChangeListener(
const ::rtl::OUString& /* aPropertyName */, const uno::Reference< beans::XPropertyChangeListener >& /* aListener */ )
throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
- OSL_ENSURE(false,"not implemented");
+ OSL_FAIL("not implemented");
}
void SAL_CALL CreationWizardUnoDlg::addVetoableChangeListener( const ::rtl::OUString& /* PropertyName */, const uno::Reference< beans::XVetoableChangeListener >& /* aListener */ )
throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
- OSL_ENSURE(false,"not implemented");
+ OSL_FAIL("not implemented");
}
void SAL_CALL CreationWizardUnoDlg::removeVetoableChangeListener( const ::rtl::OUString& /* PropertyName */, const uno::Reference< beans::XVetoableChangeListener >& /* aListener */ )
throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
- OSL_ENSURE(false,"not implemented");
+ OSL_FAIL("not implemented");
}
//.............................................................................
diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx b/chart2/source/controller/dialogs/res_ErrorBar.cxx
index 1cd1104..da60335 100644
--- a/chart2/source/controller/dialogs/res_ErrorBar.cxx
+++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx
@@ -395,7 +395,7 @@ IMPL_LINK( ErrorBarResources, CategoryChosen, void *, )
}
else
{
- OSL_ENSURE( false, "Unknown category chosen" );
+ OSL_FAIL( "Unknown category chosen" );
m_bErrorKindUnique = false;
}
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
index 92eb971..a1f62d9 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
@@ -317,7 +317,7 @@ IMPL_LINK( ThreeD_SceneAppearance_TabPage, SelectSchemeHdl, void*, EMPTYARG )
ThreeDHelper::setScheme( xDiagram, ThreeDLookScheme_Simple );
else
{
- OSL_ENSURE( false, "Invalid Entry selected" );
+ OSL_FAIL( "Invalid Entry selected" );
}
}
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
index 5e5fca1..f2f4115 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
@@ -204,7 +204,7 @@ namespace
catch( const uno::Exception & ex )
{
(void)(ex); // no warning in non-debug builds
- OSL_ENSURE( false, ::rtl::OUStringToOString(
+ OSL_FAIL( ::rtl::OUStringToOString(
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Property Exception caught. Message: " )) +
ex.Message, RTL_TEXTENCODING_ASCII_US ).getStr());
}
@@ -236,7 +236,7 @@ namespace
catch( const uno::Exception & ex )
{
(void)(ex); // no warning in non-debug builds
- OSL_ENSURE( false, ::rtl::OUStringToOString(
+ OSL_FAIL( ::rtl::OUStringToOString(
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Property Exception caught. Message: " )) +
ex.Message, RTL_TEXTENCODING_ASCII_US ).getStr());
}
@@ -255,7 +255,7 @@ namespace
catch( const uno::Exception & ex )
{
(void)(ex); // no warning in non-debug builds
- OSL_ENSURE( false, ::rtl::OUStringToOString(
+ OSL_FAIL( ::rtl::OUStringToOString(
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Property Exception caught. Message: " )) +
ex.Message, RTL_TEXTENCODING_ASCII_US ).getStr());
}
@@ -275,7 +275,7 @@ namespace
catch( const uno::Exception & ex )
{
(void)(ex); // no warning in non-debug builds
- OSL_ENSURE( false, ::rtl::OUStringToOString(
+ OSL_FAIL( ::rtl::OUStringToOString(
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Property Exception caught. Message: " )) +
ex.Message, RTL_TEXTENCODING_ASCII_US ).getStr());
}
diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.cxx b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
index 236c5d0..90220b7 100644
--- a/chart2/source/controller/dialogs/tp_RangeChooser.cxx
+++ b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
@@ -246,7 +246,7 @@ void RangeChooserTabPage::changeDialogModelAccordingToControls()
m_xCurrentChartTypeTemplate.set( m_pTemplateProvider->getCurrentTemplate());
if( !m_xCurrentChartTypeTemplate.is())
{
- OSL_ENSURE( false, "Need a template to change data source" );
+ OSL_FAIL( "Need a template to change data source" );
return;
}
}
diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx
index 1d98cfe..9781d24 100644
--- a/chart2/source/controller/dialogs/tp_Scale.cxx
+++ b/chart2/source/controller/dialogs/tp_Scale.cxx
@@ -352,7 +352,7 @@ int ScaleTabPage::DeactivatePage(SfxItemSet* pItemSet)
nIndex = static_cast< sal_uInt32 >( static_cast< const SfxInt32Item* >(pPoolItem)->GetValue());
else
{
- OSL_ENSURE( false, "Using Standard Language" );
+ OSL_FAIL( "Using Standard Language" );
}
Edit* pEdit = NULL;
diff --git a/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx b/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx
index 905bfbf..805c9f9 100644
--- a/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx
@@ -205,7 +205,7 @@ bool ErrorBarItemConverter::ApplySpecialItem(
case SCHATTR_STAT_PERCENT:
case SCHATTR_STAT_BIGERROR:
{
- OSL_ENSURE( false, "Deprectaed item" );
+ OSL_FAIL( "Deprectaed item" );
uno::Reference< beans::XPropertySet > xErrorBarProp( GetPropertySet());
double fValue =
diff --git a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
index 4d29b74..b7231f5 100644
--- a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
@@ -733,7 +733,7 @@ bool GraphicPropertyItemConverter::ApplySpecialItem(
}
else
{
- OSL_ENSURE( false, "Wrong type in Transparency Any" );
+ OSL_FAIL( "Wrong type in Transparency Any" );
}
}
}
@@ -778,7 +778,7 @@ bool GraphicPropertyItemConverter::ApplySpecialItem(
}
else
{
- OSL_ENSURE( false, "Wrong type in Transparency Any" );
+ OSL_FAIL( "Wrong type in Transparency Any" );
}
}
}
diff --git a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
index 2132c66..5651687 100644
--- a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
@@ -143,7 +143,7 @@ void ItemConverter::FillItemSet( SfxItemSet & rOutItemSet ) const
catch( beans::UnknownPropertyException &ex )
{
delete pItem;
- OSL_ENSURE( false,
+ OSL_FAIL(
::rtl::OUStringToOString(
ex.Message +
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
@@ -175,14 +175,14 @@ void ItemConverter::FillSpecialItem(
USHORT /*nWhichId*/, SfxItemSet & /*rOutItemSet*/ ) const
throw( uno::Exception )
{
- OSL_ENSURE( false, "ItemConverter: Unhandled special item found!" );
+ OSL_FAIL( "ItemConverter: Unhandled special item found!" );
}
bool ItemConverter::ApplySpecialItem(
USHORT /*nWhichId*/, const SfxItemSet & /*rItemSet*/ )
throw( uno::Exception )
{
- OSL_ENSURE( false, "ItemConverter: Unhandled special item found!" );
+ OSL_FAIL( "ItemConverter: Unhandled special item found!" );
return false;
}
@@ -214,7 +214,7 @@ bool ItemConverter::ApplyItemSet( const SfxItemSet & rItemSet )
}
catch( beans::UnknownPropertyException &ex )
{
- OSL_ENSURE( false,
+ OSL_FAIL(
::rtl::OUStringToOString(
ex.Message +
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
@@ -223,7 +223,7 @@ bool ItemConverter::ApplyItemSet( const SfxItemSet & rItemSet )
}
catch( uno::Exception &ex )
{
- OSL_ENSURE( false, ::rtl::OUStringToOString(
+ OSL_FAIL( ::rtl::OUStringToOString(
ex.Message, RTL_TEXTENCODING_ASCII_US ).getStr());
}
}
diff --git a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
index 07df2b1..fa5a75d 100644
--- a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
@@ -304,7 +304,7 @@ bool StatisticsItemConverter::ApplySpecialItem(
case SCHATTR_STAT_PERCENT:
case SCHATTR_STAT_BIGERROR:
{
- OSL_ENSURE( false, "Deprectaed item" );
+ OSL_FAIL( "Deprectaed item" );
uno::Reference< beans::XPropertySet > xErrorBarProp(
lcl_GetYErrorBar( GetPropertySet()));
bool bOldHasErrorBar = xErrorBarProp.is();
diff --git a/chart2/source/controller/main/ControllerCommandDispatch.cxx b/chart2/source/controller/main/ControllerCommandDispatch.cxx
index a58c531..4d5ebf9 100644
--- a/chart2/source/controller/main/ControllerCommandDispatch.cxx
+++ b/chart2/source/controller/main/ControllerCommandDispatch.cxx
@@ -690,7 +690,7 @@ bool ControllerCommandDispatch::commandAvailable( const OUString & rCommand )
::std::map< OUString, bool >::const_iterator aIt( m_aCommandAvailability.find( rCommand ));
if( aIt != m_aCommandAvailability.end())
return aIt->second;
- OSL_ENSURE( false, "commandAvailable: command not in availability map" );
+ OSL_FAIL( "commandAvailable: command not in availability map" );
return false;
}
diff --git a/chart2/source/controller/main/UndoManager.cxx b/chart2/source/controller/main/UndoManager.cxx
index 4975c0a..07a5133 100644
--- a/chart2/source/controller/main/UndoManager.cxx
+++ b/chart2/source/controller/main/UndoManager.cxx
@@ -204,7 +204,7 @@ void UndoManager::impl_undoRedo(
}
else
{
- OSL_ENSURE( false, "Can't Undo/Redo" );
+ OSL_FAIL( "Can't Undo/Redo" );
}
}
diff --git a/chart2/source/inc/macros.hxx b/chart2/source/inc/macros.hxx
index 315b930..48bd167 100644
--- a/chart2/source/inc/macros.hxx
+++ b/chart2/source/inc/macros.hxx
@@ -38,7 +38,7 @@
*/
#if OSL_DEBUG_LEVEL > 0
#define ASSERT_EXCEPTION(ex) \
- OSL_ENSURE( false, ::rtl::OUStringToOString( \
+ OSL_FAIL( ::rtl::OUStringToOString( \
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Exception caught. Type: " )) +\
::rtl::OUString::createFromAscii( typeid( ex ).name()) +\
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ", Message: " )) +\
diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx
index f70bd44..2ad5dfa 100644
--- a/chart2/source/model/filter/XMLFilter.cxx
+++ b/chart2/source/model/filter/XMLFilter.cxx
@@ -285,7 +285,7 @@ sal_Bool SAL_CALL XMLFilter::filter(
}
else
{
- OSL_ENSURE( false, "filter() called with no document set" );
+ OSL_FAIL( "filter() called with no document set" );
}
return bResult;
@@ -346,7 +346,7 @@ sal_Int32 XMLFilter::impl_Import(
Reference< lang::XServiceInfo > xServInfo( xDocumentComp, uno::UNO_QUERY_THROW );
if( ! xServInfo->supportsService( C2U( "com.sun.star.chart2.ChartDocument" )))
{
- OSL_ENSURE( false, "Import: No ChartDocument" );
+ OSL_FAIL( "Import: No ChartDocument" );
return ERRCODE_SFX_GENERAL;
}
@@ -604,7 +604,7 @@ sal_Int32 XMLFilter::impl_Export(
Reference< lang::XServiceInfo > xServInfo( xDocumentComp, uno::UNO_QUERY_THROW );
if( ! xServInfo->supportsService( C2U( "com.sun.star.chart2.ChartDocument" )))
{
- OSL_ENSURE( false, "Export: No ChartDocument" );
+ OSL_FAIL( "Export: No ChartDocument" );
return ERRCODE_SFX_GENERAL;
}
diff --git a/chart2/source/model/main/Axis.cxx b/chart2/source/model/main/Axis.cxx
index afd8a83..f68011b 100644
--- a/chart2/source/model/main/Axis.cxx
+++ b/chart2/source/model/main/Axis.cxx
@@ -463,7 +463,7 @@ Sequence< Reference< beans::XPropertySet > > SAL_CALL Axis::getSubGridProperties
Sequence< Reference< beans::XPropertySet > > SAL_CALL Axis::getSubTickProperties()
throw (uno::RuntimeException)
{
- OSL_ENSURE( false, "Not implemented yet" );
+ OSL_FAIL( "Not implemented yet" );
return Sequence< Reference< beans::XPropertySet > >();
}
diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx
index 4d8765e..2fd7315 100644
--- a/chart2/source/model/main/ChartModel.cxx
+++ b/chart2/source/model/main/ChartModel.cxx
@@ -1034,7 +1034,7 @@ void SAL_CALL ChartModel::setVisualAreaSize( ::sal_Int64 nAspect, const awt::Siz
}
else
{
- OSL_ENSURE( false, "setVisualAreaSize: Aspect not implemented yet.");
+ OSL_FAIL( "setVisualAreaSize: Aspect not implemented yet.");
}
}
diff --git a/chart2/source/model/main/ChartModel_Persistence.cxx b/chart2/source/model/main/ChartModel_Persistence.cxx
index 7b55b02..861c25a 100644
--- a/chart2/source/model/main/ChartModel_Persistence.cxx
+++ b/chart2/source/model/main/ChartModel_Persistence.cxx
@@ -374,7 +374,7 @@ void ChartModel::impl_store(
}
else
{
- OSL_ENSURE( false, "No filter" );
+ OSL_FAIL( "No filter" );
}
setModified( sal_False );
@@ -605,7 +605,7 @@ void ChartModel::impl_load(
}
else
{
- OSL_ENSURE( false, "loadFromStorage cannot create filter" );
+ OSL_FAIL( "loadFromStorage cannot create filter" );
}
if( xStorage.is() )
diff --git a/chart2/source/model/main/Diagram.cxx b/chart2/source/model/main/Diagram.cxx
index eb58b1c..f080aae 100644
--- a/chart2/source/model/main/Diagram.cxx
+++ b/chart2/source/model/main/Diagram.cxx
@@ -456,7 +456,7 @@ void SAL_CALL Diagram::addCoordinateSystem(
if( m_aCoordSystems.size()>=1 )
{
- OSL_ENSURE( false, "more than one coordinatesystem is not supported yet by the fileformat" );
+ OSL_FAIL( "more than one coordinatesystem is not supported yet by the fileformat" );
return;
}
m_aCoordSystems.push_back( aCoordSys );
diff --git a/chart2/source/model/template/BubbleChartType.cxx b/chart2/source/model/template/BubbleChartType.cxx
index 7eef337..f4455d6 100644
--- a/chart2/source/model/template/BubbleChartType.cxx
+++ b/chart2/source/model/template/BubbleChartType.cxx
@@ -125,7 +125,7 @@ Reference< chart2::XCoordinateSystem > SAL_CALL
Reference< chart2::XAxis > xAxis( xResult->getAxisByDimension( i, MAIN_AXIS_INDEX ) );
if( !xAxis.is() )
{
- OSL_ENSURE(false,"a created coordinate system should have an axis for each dimension");
+ OSL_FAIL("a created coordinate system should have an axis for each dimension");
continue;
}
diff --git a/chart2/source/model/template/ChartType.cxx b/chart2/source/model/template/ChartType.cxx
index a1f1d60..6e08037 100644
--- a/chart2/source/model/template/ChartType.cxx
+++ b/chart2/source/model/template/ChartType.cxx
@@ -98,7 +98,7 @@ Reference< chart2::XCoordinateSystem > SAL_CALL
Reference< chart2::XAxis > xAxis( xResult->getAxisByDimension( i, MAIN_AXIS_INDEX ) );
if( !xAxis.is() )
{
- OSL_ENSURE(false,"a created coordinate system should have an axis for each dimension");
+ OSL_FAIL("a created coordinate system should have an axis for each dimension");
continue;
}
diff --git a/chart2/source/model/template/ChartTypeManager.cxx b/chart2/source/model/template/ChartTypeManager.cxx
index e7280cc..0c43669 100644
--- a/chart2/source/model/template/ChartTypeManager.cxx
+++ b/chart2/source/model/template/ChartTypeManager.cxx
@@ -563,7 +563,7 @@ uno::Reference< uno::XInterface > SAL_CALL ChartTypeManager::createInstanceWithA
throw (uno::Exception,
uno::RuntimeException)
{
- OSL_ENSURE( false, "createInstanceWithArguments: No arguments supported" );
+ OSL_FAIL( "createInstanceWithArguments: No arguments supported" );
return createInstance( ServiceSpecifier );
}
diff --git a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
index 4f1ee78..0838d65 100644
--- a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
+++ b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
@@ -423,7 +423,7 @@ Reference< XDataInterpreter > SAL_CALL ColumnLineChartTypeTemplate::getDataInter
else
{
//todo...
- OSL_ENSURE( false, "number of lines may not be valid anymore in the datainterpreter" );
+ OSL_FAIL( "number of lines may not be valid anymore in the datainterpreter" );
}
diff --git a/chart2/source/model/template/PieChartType.cxx b/chart2/source/model/template/PieChartType.cxx
index 1dcf295..20f1de1 100644
--- a/chart2/source/model/template/PieChartType.cxx
+++ b/chart2/source/model/template/PieChartType.cxx
@@ -146,7 +146,7 @@ Reference< chart2::XCoordinateSystem > SAL_CALL
Reference< chart2::XAxis > xAxis( xResult->getAxisByDimension( i, MAIN_AXIS_INDEX ) );
if( !xAxis.is() )
{
- OSL_ENSURE(false,"a created coordinate system should have an axis for each dimension");
+ OSL_FAIL("a created coordinate system should have an axis for each dimension");
continue;
}
diff --git a/chart2/source/model/template/ScatterChartType.cxx b/chart2/source/model/template/ScatterChartType.cxx
index f2bb0bc..38b7916 100644
--- a/chart2/source/model/template/ScatterChartType.cxx
+++ b/chart2/source/model/template/ScatterChartType.cxx
@@ -169,7 +169,7 @@ Reference< chart2::XCoordinateSystem > SAL_CALL
Reference< chart2::XAxis > xAxis( xResult->getAxisByDimension( i, MAIN_AXIS_INDEX ) );
if( !xAxis.is() )
{
- OSL_ENSURE(false,"a created coordinate system should have an axis for each dimension");
+ OSL_FAIL("a created coordinate system should have an axis for each dimension");
continue;
}
diff --git a/chart2/source/tools/ChartTypeHelper.cxx b/chart2/source/tools/ChartTypeHelper.cxx
index 5c740ed..a5870b0 100644
--- a/chart2/source/tools/ChartTypeHelper.cxx
+++ b/chart2/source/tools/ChartTypeHelper.cxx
@@ -360,7 +360,7 @@ uno::Sequence < sal_Int32 > ChartTypeHelper::getSupportedLabelPlacements( const
}
else
{
- OSL_ENSURE( false, "unknown charttype" );
+ OSL_FAIL( "unknown charttype" );
}
return aRet;
@@ -614,7 +614,7 @@ uno::Sequence < sal_Int32 > ChartTypeHelper::getSupportedMissingValueTreatments(
}
else
{
- OSL_ENSURE( false, "unknown charttype" );
+ OSL_FAIL( "unknown charttype" );
}
return aRet;
diff --git a/chart2/source/tools/CommonConverters.cxx b/chart2/source/tools/CommonConverters.cxx
index 0a73dfe..c507eea 100644
--- a/chart2/source/tools/CommonConverters.cxx
+++ b/chart2/source/tools/CommonConverters.cxx
@@ -166,7 +166,7 @@ void AddPointToPoly( drawing::PolyPolygonShape3D& rPoly, const drawing::Position
{
if(nPolygonIndex<0)
{
- OSL_ENSURE( false, "The polygon index needs to be > 0");
+ OSL_FAIL( "The polygon index needs to be > 0");
nPolygonIndex=0;
}
diff --git a/chart2/source/tools/OPropertySet.cxx b/chart2/source/tools/OPropertySet.cxx
index 46d249b..6444369 100644
--- a/chart2/source/tools/OPropertySet.cxx
+++ b/chart2/source/tools/OPropertySet.cxx
@@ -365,14 +365,14 @@ void SAL_CALL OPropertySet::getFastPropertyValue
}
else
{
- OSL_ENSURE( false, "HandleCheck: Handle not found in Style" );
+ OSL_FAIL( "HandleCheck: Handle not found in Style" );
}
}
else
- OSL_ENSURE( false, "HandleCheck: Invalid XPropertySetInfo returned" );
+ OSL_FAIL( "HandleCheck: Invalid XPropertySetInfo returned" );
}
else
- OSL_ENSURE( false, "HandleCheck: XPropertySet not supported" );
+ OSL_FAIL( "HandleCheck: XPropertySet not supported" );
}
#endif
rValue = xStylePropSet->getFastPropertyValue( nHandle );
diff --git a/chart2/source/tools/RegressionCurveHelper.cxx b/chart2/source/tools/RegressionCurveHelper.cxx
index 4abbf46..e06a0ee 100644
--- a/chart2/source/tools/RegressionCurveHelper.cxx
+++ b/chart2/source/tools/RegressionCurveHelper.cxx
@@ -76,7 +76,7 @@ OUString lcl_getServiceNameForType( ::chart::RegressionCurveHelper::tRegressionT
aServiceName = C2U( "com.sun.star.chart2.PotentialRegressionCurve" );
break;
default:
- OSL_ENSURE(false,"unknown regression curve type - use linear instead");
+ OSL_FAIL("unknown regression curve type - use linear instead");
aServiceName = C2U( "com.sun.star.chart2.LinearRegressionCurve" );
break;
}
@@ -372,7 +372,7 @@ void RegressionCurveHelper::addRegressionCurve(
if( eType == REGRESSION_TYPE_NONE )
{
- OSL_ENSURE(false,"don't create a regression curve of type none");
+ OSL_FAIL("don't create a regression curve of type none");
return;
}
@@ -609,7 +609,7 @@ OUString RegressionCurveHelper::getUINameForRegressionCurve( const Reference< XR
if( aServiceName.equalsAsciiL(
RTL_CONSTASCII_STRINGPARAM( "com.sun.star.chart2.MeanValueRegressionCurve" )))
{
- OSL_ENSURE( false, "Meanvalue lines in legend not supported" );
+ OSL_FAIL( "Meanvalue lines in legend not supported" );
aResult = OUString();
// aResult = ::chart::SchResId::getResString( STR_OBJECT_AVERAGE_LINE );
}
diff --git a/chart2/source/tools/TitleHelper.cxx b/chart2/source/tools/TitleHelper.cxx
index 966bde0..0467793 100644
--- a/chart2/source/tools/TitleHelper.cxx
+++ b/chart2/source/tools/TitleHelper.cxx
@@ -93,7 +93,7 @@ uno::Reference< XTitled > lcl_getTitleParentFromDiagram(
case TitleHelper::MAIN_TITLE:
default:
- OSL_ENSURE( false, "Unsupported Title-Type requested" );
+ OSL_FAIL( "Unsupported Title-Type requested" );
break;
}
@@ -125,7 +125,7 @@ uno::Reference< XTitled > lcl_getTitleParent( TitleHelper::eTitleType nTitleInde
xResult.set( lcl_getTitleParentFromDiagram( nTitleIndex, xDiagram ));
break;
default:
- OSL_ENSURE( false, "Unsupported Title-Type requested" );
+ OSL_FAIL( "Unsupported Title-Type requested" );
break;
}
diff --git a/chart2/source/tools/UncachedDataSequence.cxx b/chart2/source/tools/UncachedDataSequence.cxx
index f1010db..fad583f 100644
--- a/chart2/source/tools/UncachedDataSequence.cxx
+++ b/chart2/source/tools/UncachedDataSequence.cxx
@@ -266,7 +266,7 @@ void SAL_CALL UncachedDataSequence::replaceByIndex( ::sal_Int32 Index, const uno
::sal_Int32 SAL_CALL UncachedDataSequence::getCount()
throw (uno::RuntimeException)
{
- OSL_ENSURE( false, "Implement!" );
+ OSL_FAIL( "Implement!" );
return 0;
}
@@ -275,7 +275,7 @@ uno::Any SAL_CALL UncachedDataSequence::getByIndex( ::sal_Int32 )
lang::WrappedTargetException,
uno::RuntimeException)
{
- OSL_ENSURE( false, "Implement!" );
+ OSL_FAIL( "Implement!" );
return uno::Any();
}
diff --git a/chart2/source/tools/WrappedPropertySet.cxx b/chart2/source/tools/WrappedPropertySet.cxx
index dc4c689..eb761a2 100644
--- a/chart2/source/tools/WrappedPropertySet.cxx
+++ b/chart2/source/tools/WrappedPropertySet.cxx
@@ -142,7 +142,7 @@ void SAL_CALL WrappedPropertySet::setPropertyValue( const OUString& rPropertyNam
}
catch( uno::Exception& ex )
{
- OSL_ENSURE(false,"invalid exception caught in WrappedPropertySet::setPropertyValue");
+ OSL_FAIL("invalid exception caught in WrappedPropertySet::setPropertyValue");
lang::WrappedTargetException aWrappedException;
aWrappedException.TargetException = uno::makeAny( ex );
throw aWrappedException;
@@ -183,7 +183,7 @@ Any SAL_CALL WrappedPropertySet::getPropertyValue( const OUString& rPropertyName
}
catch( uno::Exception& ex )
{
- OSL_ENSURE(false,"invalid exception caught in WrappedPropertySet::setPropertyValue");
+ OSL_FAIL("invalid exception caught in WrappedPropertySet::setPropertyValue");
lang::WrappedTargetException aWrappedException;
aWrappedException.TargetException = uno::makeAny( ex );
throw aWrappedException;
@@ -299,19 +299,19 @@ Sequence< Any > SAL_CALL WrappedPropertySet::getPropertyValues( const Sequence<
void SAL_CALL WrappedPropertySet::addPropertiesChangeListener( const Sequence< OUString >& /* rNameSeq */, const Reference< beans::XPropertiesChangeListener >& /* xListener */ )
throw (uno::RuntimeException)
{
- OSL_ENSURE(false,"not implemented yet");
+ OSL_FAIL("not implemented yet");
//todo
}
void SAL_CALL WrappedPropertySet::removePropertiesChangeListener( const Reference< beans::XPropertiesChangeListener >& /* xListener */ )
throw (uno::RuntimeException)
{
- OSL_ENSURE(false,"not implemented yet");
+ OSL_FAIL("not implemented yet");
//todo
}
void SAL_CALL WrappedPropertySet::firePropertiesChangeEvent( const Sequence< OUString >& /* rNameSeq */, const Reference< beans::XPropertiesChangeListener >& /* xListener */ )
throw (uno::RuntimeException)
{
- OSL_ENSURE(false,"not implemented yet");
+ OSL_FAIL("not implemented yet");
//todo
}
@@ -466,13 +466,13 @@ tWrappedPropertyMap& WrappedPropertySet::getWrappedPropertyMap()
if( nHandle == -1 )
{
- OSL_ENSURE( false, "missing property in property list" );
+ OSL_FAIL( "missing property in property list" );
delete pProperty;//we are owner or the created WrappedProperties
}
else if( m_pWrappedPropertyMap->find( nHandle ) != m_pWrappedPropertyMap->end() )
{
//duplicate Wrapped property
- OSL_ENSURE( false, "duplicate Wrapped property" );
+ OSL_FAIL( "duplicate Wrapped property" );
delete pProperty;//we are owner or the created WrappedProperties
}
else
diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index fc1fdde..2732754 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -229,7 +229,7 @@ void VSeriesPlotter::addSeries( VDataSeries* pSeries, sal_Int32 zSlot, sal_Int32
{
//move all existing series in the xSlot to next slot
//@todo
- OSL_ENSURE( false, "Not implemented yet");
+ OSL_FAIL( "Not implemented yet");
}
else if( ySlot == -1 || ySlot >= nYSlotCount)
{
@@ -242,7 +242,7 @@ void VSeriesPlotter::addSeries( VDataSeries* pSeries, sal_Int32 zSlot, sal_Int32
//insert at given y and x position
//@todo
- OSL_ENSURE( false, "Not implemented yet");
+ OSL_FAIL( "Not implemented yet");
}
}
}
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index 204ba0b..1b2c868 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -2936,7 +2936,7 @@ void SAL_CALL ChartView::update() throw (uno::RuntimeException)
Reference< beans::XPropertySetInfo > SAL_CALL ChartView::getPropertySetInfo()
throw (uno::RuntimeException)
{
- OSL_ENSURE(false,"not implemented");
+ OSL_FAIL("not implemented");
return 0;
}
@@ -3012,25 +3012,25 @@ void SAL_CALL ChartView::addPropertyChangeListener(
const ::rtl::OUString& /* aPropertyName */, const Reference< beans::XPropertyChangeListener >& /* xListener */ )
throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
- OSL_ENSURE(false,"not implemented");
+ OSL_FAIL("not implemented");
}
void SAL_CALL ChartView::removePropertyChangeListener(
const ::rtl::OUString& /* aPropertyName */, const Reference< beans::XPropertyChangeListener >& /* aListener */ )
throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
- OSL_ENSURE(false,"not implemented");
+ OSL_FAIL("not implemented");
}
void SAL_CALL ChartView::addVetoableChangeListener( const ::rtl::OUString& /* PropertyName */, const Reference< beans::XVetoableChangeListener >& /* aListener */ )
throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
- OSL_ENSURE(false,"not implemented");
+ OSL_FAIL("not implemented");
}
void SAL_CALL ChartView::removeVetoableChangeListener( const ::rtl::OUString& /* PropertyName */, const Reference< beans::XVetoableChangeListener >& /* aListener */ )
throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
- OSL_ENSURE(false,"not implemented");
+ OSL_FAIL("not implemented");
}
// ____ XMultiServiceFactory ____
diff --git a/chart2/source/view/main/Clipping.cxx b/chart2/source/view/main/Clipping.cxx
index e23501e..de22884 100644
--- a/chart2/source/view/main/Clipping.cxx
+++ b/chart2/source/view/main/Clipping.cxx
@@ -165,7 +165,7 @@ void lcl_addPointToPoly( drawing::PolyPolygonShape3D& rPoly
{
if(nPolygonIndex<0)
{
- OSL_ENSURE( false, "The polygon index needs to be > 0");
+ OSL_FAIL( "The polygon index needs to be > 0");
nPolygonIndex=0;
}
diff --git a/sc/source/core/data/cell2.cxx b/sc/source/core/data/cell2.cxx
index 06f53dc..c9764b5 100644
--- a/sc/source/core/data/cell2.cxx
+++ b/sc/source/core/data/cell2.cxx
@@ -460,7 +460,7 @@ lcl_refListFormsOneRange(
}
else
{
- OSL_ENSURE(false, "lcl_checkRangeDimensions shouldn't allow that!");
+ OSL_FAIL( "lcl_checkRangeDimensions shouldn't allow that!");
aWhich = lcl_GetRow; // initialize to avoid warning
}
// Sort the references by start of range
diff --git a/sc/source/core/tool/parclass.cxx b/sc/source/core/tool/parclass.cxx
index c411ea9..5d59278 100644
--- a/sc/source/core/tool/parclass.cxx
+++ b/sc/source/core/tool/parclass.cxx
@@ -422,7 +422,7 @@ void ScParameterClassification::MergeArgumentsFromFunctionResource()
aBuf.append(rtl::OUStringToOString(*(pDesc->pFuncName), RTL_TEXTENCODING_UTF8));
aBuf.append(": ");
aBuf.append(nArgs);
- OSL_ENSURE(false, aBuf.getStr());
+ OSL_FAIL( aBuf.getStr());
nArgs = CommonData::nMaxParams;
pRun->aData.bRepeatLast = true;
}
diff --git a/sc/source/filter/excel/xechart.cxx b/sc/source/filter/excel/xechart.cxx
index db14db2..3e7ba75 100644
--- a/sc/source/filter/excel/xechart.cxx
+++ b/sc/source/filter/excel/xechart.cxx
@@ -2277,7 +2277,7 @@ void XclExpChLegend::Convert( const ScfPropertySet& rPropSet )
}
catch( Exception& )
{
- OSL_ENSURE( false, "XclExpChLegend::Convert - cannot get legend shape" );
+ OSL_FAIL( "XclExpChLegend::Convert - cannot get legend shape" );
maData.mnDockMode = EXC_CHLEGEND_RIGHT;
}
}
@@ -2292,7 +2292,7 @@ void XclExpChLegend::Convert( const ScfPropertySet& rPropSet )
case cssc2::LegendPosition_PAGE_START: maData.mnDockMode = EXC_CHLEGEND_TOP; break;
case cssc2::LegendPosition_PAGE_END: maData.mnDockMode = EXC_CHLEGEND_BOTTOM; break;
default:
- OSL_ENSURE( false, "XclExpChLegend::Convert - unrecognized legend position" );
+ OSL_FAIL( "XclExpChLegend::Convert - unrecognized legend position" );
maData.mnDockMode = EXC_CHLEGEND_RIGHT;
}
}
diff --git a/sc/source/filter/excel/xeescher.cxx b/sc/source/filter/excel/xeescher.cxx
index e26a0b3..d1c5f9c 100644
--- a/sc/source/filter/excel/xeescher.cxx
+++ b/sc/source/filter/excel/xeescher.cxx
@@ -251,12 +251,12 @@ void XclExpDffAnchorBase::WriteData( EscherEx& rEscherEx, const Rectangle& rRect
void XclExpDffAnchorBase::ImplSetFlags( const SdrObject& )
{
- OSL_ENSURE( false, "XclExpDffAnchorBase::ImplSetFlags - not implemented" );
+ OSL_FAIL( "XclExpDffAnchorBase::ImplSetFlags - not implemented" );
}
void XclExpDffAnchorBase::ImplCalcAnchorRect( const Rectangle&, MapUnit )
{
- OSL_ENSURE( false, "XclExpDffAnchorBase::ImplCalcAnchorRect - not implemented" );
+ OSL_FAIL( "XclExpDffAnchorBase::ImplCalcAnchorRect - not implemented" );
}
// ----------------------------------------------------------------------------
diff --git a/sc/source/filter/excel/xlroot.cxx b/sc/source/filter/excel/xlroot.cxx
index e54914d..df79e03 100644
--- a/sc/source/filter/excel/xlroot.cxx
+++ b/sc/source/filter/excel/xlroot.cxx
@@ -159,7 +159,7 @@ XclRootData::XclRootData( XclBiff eBiff, SfxMedium& rMedium,
}
catch( Exception& )
{
- OSL_ENSURE( false, "XclRootData::XclRootData - cannot get output device info" );
+ OSL_FAIL( "XclRootData::XclRootData - cannot get output device info" );
}
}
diff --git a/sc/source/filter/xml/xmlstyli.cxx b/sc/source/filter/xml/xmlstyli.cxx
index bf8478a..93f341a 100644
--- a/sc/source/filter/xml/xmlstyli.cxx
+++ b/sc/source/filter/xml/xmlstyli.cxx
@@ -394,7 +394,7 @@ void XMLTableStyleContext::SetFormula( uno::Sequence< beans::PropertyValue >& rP
lclAppendProperty( rProps, OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_GRAMMAR2 ) ), nGrammar );
break;
default:
- OSL_ENSURE( false, "XMLTableStyleContext::SetFormula - invalid formula index" );
+ OSL_FAIL( "XMLTableStyleContext::SetFormula - invalid formula index" );
}
}
diff --git a/sc/source/ui/dbgui/pvlaydlg.cxx b/sc/source/ui/dbgui/pvlaydlg.cxx
index 95aa824..35d142a 100644
--- a/sc/source/ui/dbgui/pvlaydlg.cxx
+++ b/sc/source/ui/dbgui/pvlaydlg.cxx
@@ -1445,7 +1445,7 @@ void ScDPLayoutDlg::UpdateSrcRange()
inSheet.SetRangeName(aSrcStr);
break;
default:
- OSL_ENSURE(false, "Unknown source type.");
+ OSL_FAIL( "Unknown source type.");
return;
}
diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx
index 5dd9517..20c9a3c 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -2114,7 +2114,7 @@ void SAL_CALL ScChart2DataProvider::addPropertyChangeListener(
throw( beans::UnknownPropertyException,
lang::WrappedTargetException, uno::RuntimeException)
{
- OSL_ENSURE( false, "Not yet implemented" );
+ OSL_FAIL( "Not yet implemented" );
}
@@ -2124,7 +2124,7 @@ void SAL_CALL ScChart2DataProvider::removePropertyChangeListener(
throw( beans::UnknownPropertyException,
lang::WrappedTargetException, uno::RuntimeException)
{
- OSL_ENSURE( false, "Not yet implemented" );
+ OSL_FAIL( "Not yet implemented" );
}
@@ -2134,7 +2134,7 @@ void SAL_CALL ScChart2DataProvider::addVetoableChangeListener(
throw( beans::UnknownPropertyException,
lang::WrappedTargetException, uno::RuntimeException)
{
- OSL_ENSURE( false, "Not yet implemented" );
+ OSL_FAIL( "Not yet implemented" );
}
@@ -2144,7 +2144,7 @@ void SAL_CALL ScChart2DataProvider::removeVetoableChangeListener(
throw( beans::UnknownPropertyException,
lang::WrappedTargetException, uno::RuntimeException)
{
- OSL_ENSURE( false, "Not yet implemented" );
+ OSL_FAIL( "Not yet implemented" );
}
// DataSource ================================================================
@@ -3387,7 +3387,7 @@ void SAL_CALL ScChart2DataSequence::addPropertyChangeListener(
lang::WrappedTargetException, uno::RuntimeException)
{
// FIXME: real implementation
- OSL_ENSURE( false, "Not yet implemented" );
+ OSL_FAIL( "Not yet implemented" );
}
@@ -3398,7 +3398,7 @@ void SAL_CALL ScChart2DataSequence::removePropertyChangeListener(
lang::WrappedTargetException, uno::RuntimeException)
{
// FIXME: real implementation
- OSL_ENSURE( false, "Not yet implemented" );
+ OSL_FAIL( "Not yet implemented" );
}
@@ -3409,7 +3409,7 @@ void SAL_CALL ScChart2DataSequence::addVetoableChangeListener(
lang::WrappedTargetException, uno::RuntimeException)
{
// FIXME: real implementation
- OSL_ENSURE( false, "Not yet implemented" );
+ OSL_FAIL( "Not yet implemented" );
}
@@ -3420,7 +3420,7 @@ void SAL_CALL ScChart2DataSequence::removeVetoableChangeListener(
lang::WrappedTargetException, uno::RuntimeException)
{
// FIXME: real implementation
- OSL_ENSURE( false, "Not yet implemented" );
+ OSL_FAIL( "Not yet implemented" );
}
void ScChart2DataSequence::setDataChangedHint(bool b)
@@ -3661,7 +3661,7 @@ void SAL_CALL ScChart2EmptyDataSequence::addPropertyChangeListener(
lang::WrappedTargetException, uno::RuntimeException)
{
// FIXME: real implementation
- OSL_ENSURE( false, "Not yet implemented" );
+ OSL_FAIL( "Not yet implemented" );
}
@@ -3672,7 +3672,7 @@ void SAL_CALL ScChart2EmptyDataSequence::removePropertyChangeListener(
lang::WrappedTargetException, uno::RuntimeException)
{
// FIXME: real implementation
- OSL_ENSURE( false, "Not yet implemented" );
+ OSL_FAIL( "Not yet implemented" );
}
@@ -3683,7 +3683,7 @@ void SAL_CALL ScChart2EmptyDataSequence::addVetoableChangeListener(
lang::WrappedTargetException, uno::RuntimeException)
{
// FIXME: real implementation
- OSL_ENSURE( false, "Not yet implemented" );
+ OSL_FAIL( "Not yet implemented" );
}
@@ -3694,7 +3694,7 @@ void SAL_CALL ScChart2EmptyDataSequence::removeVetoableChangeListener(
lang::WrappedTargetException, uno::RuntimeException)
{
// FIXME: real implementation
- OSL_ENSURE( false, "Not yet implemented" );
+ OSL_FAIL( "Not yet implemented" );
}
#endif
diff --git a/sccomp/source/solver/solver.cxx b/sccomp/source/solver/solver.cxx
index 30de925..f0b3377 100644
--- a/sccomp/source/solver/solver.cxx
+++ b/sccomp/source/solver/solver.cxx
@@ -470,7 +470,7 @@ void SAL_CALL SolverComponent::solve() throw(uno::RuntimeException)
case sheet::SolverConstraintOperator_GREATER_EQUAL: nConstrType = GE; break;
case sheet::SolverConstraintOperator_EQUAL: nConstrType = EQ; break;
default:
- OSL_ENSURE( false, "unexpected enum type" );
+ OSL_FAIL( "unexpected enum type" );
}
add_constraint( lp, pValues, nConstrType, fRightValue );
commit cf18b025f3658578e4fbd2c5db92818574bdecf2
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Fri Mar 11 12:45:16 2011 +0100
Add missing osl/diagnose.h
diff --git a/sc/source/core/tool/parclass.cxx b/sc/source/core/tool/parclass.cxx
index 14bcd9c..c411ea9 100644
--- a/sc/source/core/tool/parclass.cxx
+++ b/sc/source/core/tool/parclass.cxx
@@ -38,6 +38,7 @@
#include "funcdesc.hxx"
#include <unotools/charclass.hxx>
#include <tools/debug.hxx>
+#include <osl/diagnose.h>
#include <sal/macros.h>
#include <string.h>
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index aea416e..ff8b1c1 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -39,6 +39,7 @@
#include <string.h>
#include <tools/mempool.hxx>
#include <tools/debug.hxx>
+#include <osl/diagnose.h>
#include "token.hxx"
#include "tokenarray.hxx"
diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx
index 4709f36..67d3b89 100644
--- a/sc/source/filter/xml/xmlwrap.cxx
+++ b/sc/source/filter/xml/xmlwrap.cxx
@@ -34,6 +34,7 @@
#include <sfx2/docfile.hxx>
#include <sfx2/objsh.hxx>
#include <tools/debug.hxx>
+#include <osl/diagnose.h>
#include <comphelper/processfactory.hxx>
#include <unotools/streamwrap.hxx>
#include <svx/xmlgrhlp.hxx>
diff --git a/sc/source/ui/Accessibility/DrawModelBroadcaster.cxx b/sc/source/ui/Accessibility/DrawModelBroadcaster.cxx
index 2e148dc..eefdf7d 100644
--- a/sc/source/ui/Accessibility/DrawModelBroadcaster.cxx
+++ b/sc/source/ui/Accessibility/DrawModelBroadcaster.cxx
@@ -32,6 +32,7 @@
#include <svx/svdmodel.hxx>
#include <svx/unomod.hxx>
#include <tools/debug.hxx>
+#include <osl/diagnose.h>
using namespace ::com::sun::star;
commit 925889a2a460d14e47a7875316bbdf973dd3cbbe
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Thu Mar 10 21:13:27 2011 +0100
Use OSL_DEBUG_LEVEL 2 and add osl/diagnose.h include
diff --git a/sc/source/core/data/dptabres.cxx b/sc/source/core/data/dptabres.cxx
index ef0e814..e4386cc 100644
--- a/sc/source/core/data/dptabres.cxx
+++ b/sc/source/core/data/dptabres.cxx
@@ -34,6 +34,7 @@
// INCLUDE ---------------------------------------------------------------
#include <tools/debug.hxx>
+#include <osl/diagnose.h>
#include <rtl/math.hxx>
#include "dptabdat.hxx"
@@ -2882,7 +2883,7 @@ void ScDPResultDimension::LateInitFrom( LateInitParams& rParams/* const vector<S
{
ResultMembers* pMembers = pResultData->GetDimResultMembers(nDimSource, pThisDim, pThisLevel);
bLateInitAllMembers = pMembers->IsHasHideDetailsMembers();
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
OSL_TRACE( "%s", aDimensionName.GetBuffer() );
if ( pMembers->IsHasHideDetailsMembers() )
OSL_TRACE( "HasHideDetailsMembers" );
@@ -2981,7 +2982,7 @@ bool ScDPResultDimension::IsValidEntry( const vector< SCROW >& aMembers ) const
const ScDPResultMember* pMember = FindMember( aMembers[0] );
if ( NULL != pMember )
return pMember->IsValidEntry( aMembers );
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
ByteString strTemp ("IsValidEntry: Member not found, DimName = " );
strTemp += ByteString( GetName(), RTL_TEXTENCODING_UTF8 );
OSL_TRACE( strTemp.GetBuffer() );
commit 075c0c48dfd2957e2e2cb0157df6404b30c21d71
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Thu Mar 10 21:12:56 2011 +0100
Use OSL_DEBUG_LEVEL 2
diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx
index da09447..57fb2f4 100644
--- a/sc/source/core/data/attarray.cxx
+++ b/sc/source/core/data/attarray.cxx
@@ -78,7 +78,7 @@ ScAttrArray::ScAttrArray( SCCOL nNewCol, SCTAB nNewTab, ScDocument* pDoc ) :
ScAttrArray::~ScAttrArray()
{
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
TestData();
#endif
@@ -93,7 +93,7 @@ ScAttrArray::~ScAttrArray()
}
//------------------------------------------------------------------------
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
void ScAttrArray::TestData() const
{
@@ -494,7 +494,7 @@ void ScAttrArray::SetPatternArea(SCROW nStartRow, SCROW nEndRow, const ScPattern
}
}
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
TestData();
#endif
}
@@ -569,7 +569,7 @@ void ScAttrArray::ApplyStyleArea( SCROW nStartRow, SCROW nEndRow, ScStyleSheet*
pDocument->SetStreamValid(nTab, FALSE);
}
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
TestData();
#endif
}
@@ -723,7 +723,7 @@ void ScAttrArray::ApplyLineStyleArea( SCROW nStartRow, SCROW nEndRow,
void ScAttrArray::ApplyCacheArea( SCROW nStartRow, SCROW nEndRow, SfxItemPoolCache* pCache, ScEditDataArray* pDataArray )
{
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
TestData();
#endif
@@ -805,7 +805,7 @@ void ScAttrArray::ApplyCacheArea( SCROW nStartRow, SCROW nEndRow, SfxItemPoolCac
pDocument->SetStreamValid(nTab, FALSE);
}
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
TestData();
#endif
}
commit 24d2ab88ba71a8345084fada02422b9670403488
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Thu Mar 10 19:53:05 2011 +0100
Fix build: Use format string literals
diff --git a/sc/source/core/data/dpsave.cxx b/sc/source/core/data/dpsave.cxx
index 29ae642..7097233 100644
--- a/sc/source/core/data/dpsave.cxx
+++ b/sc/source/core/data/dpsave.cxx
@@ -1082,7 +1082,7 @@ void ScDPSaveData::WriteToSource( const uno::Reference<sheet::XDimensionsSupplie
{
rtl::OUString aName = iter->GetName();
- OSL_TRACE( iter->GetName().getStr() );
+ OSL_TRACE( "%s", aName.getStr() );
bool bData = iter->IsDataLayout();
@@ -1272,7 +1272,7 @@ void ScDPSaveData::Refresh( const uno::Reference<sheet::XDimensionsSupplier>& xS
deletedDims.push_back( aName );
iter = aDimList.erase(iter);
OSL_TRACE( "\n Remove dim: \t" );
- OSL_TRACE( aName.getStr() );
+ OSL_TRACE( "%s", aName.getStr() );
}
}
@@ -1313,7 +1313,7 @@ void ScDPSaveDimension::Refresh( const com::sun::star::uno::Reference<
return;
if ( pSelectedPage )
{//check pSelected page
- OSL_TRACE( *pSelectedPage.getStr() );
+ OSL_TRACE( "%s", ::rtl::OUString(*pSelectedPage).getStr() );
if ( pCache->GetIdByItemData( nSrcDim, *pSelectedPage ) == -1 )
{
delete pSelectedPage;
@@ -1351,7 +1351,7 @@ void ScDPSaveDimension::Refresh( const com::sun::star::uno::Reference<
if( pReferenceValue->ReferenceItemType == DataPilotFieldReferenceItemType::NAMED )
{
const ::rtl::OUString& sReferenceFieldName = pReferenceValue->ReferenceField;
- OSL_TRACE( sReferenceFieldName.getStr() );
+ OSL_TRACE( "%s", sReferenceFieldName.getStr() );
SCCOL nRefDim = pCache->GetDimensionIndex( sReferenceFieldName );
bool bValid = true;
if ( nRefDim == -1 )
@@ -1359,7 +1359,7 @@ void ScDPSaveDimension::Refresh( const com::sun::star::uno::Reference<
else if ( pReferenceValue->ReferenceType != sheet::DataPilotFieldReferenceType::RUNNING_TOTAL )
{ //running total has not reference item
const ::rtl::OUString& sReferenceItemName = pReferenceValue->ReferenceItemName;
- OSL_TRACE( sReferenceItemName.getStr() );
+ OSL_TRACE( "%s", sReferenceItemName.getStr() );
if ( pCache->GetIdByItemData( nRefDim, sReferenceItemName ) == -1 )
bValid = false;
}
diff --git a/sc/source/core/data/dptabres.cxx b/sc/source/core/data/dptabres.cxx
index c4a00a4..ef0e814 100644
--- a/sc/source/core/data/dptabres.cxx
+++ b/sc/source/core/data/dptabres.cxx
@@ -2883,7 +2883,7 @@ void ScDPResultDimension::LateInitFrom( LateInitParams& rParams/* const vector<S
ResultMembers* pMembers = pResultData->GetDimResultMembers(nDimSource, pThisDim, pThisLevel);
bLateInitAllMembers = pMembers->IsHasHideDetailsMembers();
#ifdef DBG_UTIL
- OSL_TRACE( aDimensionName.GetBuffer() )
+ OSL_TRACE( "%s", aDimensionName.GetBuffer() );
if ( pMembers->IsHasHideDetailsMembers() )
OSL_TRACE( "HasHideDetailsMembers" );
#endif
commit 7bee9a9d9c4737813b034c21e5d4c378f2987b65
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Mar 8 22:13:48 2011 +0100
Move DBG_TRACE to OSL_TRACE
diff --git a/sc/source/core/data/dpsave.cxx b/sc/source/core/data/dpsave.cxx
index a8a8468..29ae642 100644
--- a/sc/source/core/data/dpsave.cxx
+++ b/sc/source/core/data/dpsave.cxx
@@ -1379,7 +1379,7 @@ void ScDPSaveDimension::Refresh( const com::sun::star::uno::Reference<
{ //check sortinfo
if ( pSortInfo->Mode == DataPilotFieldSortMode::DATA )
{
- DBG_TRACE( "\n DataPilotFieldSortMode::DATA \n" );
+ OSL_TRACE( "\n DataPilotFieldSortMode::DATA \n" );
const ::rtl::OUString& sFieldDimName = pSortInfo->Field;
std::list<rtl::OUString>::const_iterator iter = std::find( deletedDims.begin(), deletedDims.end(), sFieldDimName );
if ( iter != deletedDims.end() && pCache->GetDimensionIndex( sFieldDimName ) == -1 )
commit eb2042ebc66bbbb2e8bdc7588466277d8c7ae309
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Mar 8 22:12:54 2011 +0100
Move DBG_TRACE to OSL_TRACE for strings GetBuffer()
diff --git a/sc/source/core/data/dptabres.cxx b/sc/source/core/data/dptabres.cxx
index 3711132..c4a00a4 100644
--- a/sc/source/core/data/dptabres.cxx
+++ b/sc/source/core/data/dptabres.cxx
@@ -2984,7 +2984,7 @@ bool ScDPResultDimension::IsValidEntry( const vector< SCROW >& aMembers ) const
#ifdef DBG_UTIL
ByteString strTemp ("IsValidEntry: Member not found, DimName = " );
strTemp += ByteString( GetName(), RTL_TEXTENCODING_UTF8 );
- DBG_TRACE( strTemp.GetBuffer() );
+ OSL_TRACE( strTemp.GetBuffer() );
#endif
return false;
}
commit 065f286c60713eefd52028163f95a1aa5e2b3f76
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Mar 8 22:10:18 2011 +0100
Remove unused DBG_TRACESTR macro
diff --git a/sc/inc/dpglobal.hxx b/sc/inc/dpglobal.hxx
index 7005a4f..172a501 100644
--- a/sc/inc/dpglobal.hxx
+++ b/sc/inc/dpglobal.hxx
@@ -93,12 +93,6 @@
#define DP_PROP_FILTER "Filter"
#define DP_PROP_POSITION "Position"
-#define DBG_TRACESTR( x ) \
- {\
- ByteString aTemp( x , RTL_TEXTENCODING_UTF8 ); \
- DBG_TRACE( aTemp.GetBuffer() );\
- }
-
class TypedStrData;
class ScDPObject;
class ScDPInfoWnd;
commit 4f51c384d23fad63b3639cba3295d7bea2acf1ca
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Mar 8 22:08:17 2011 +0100
DBG_TRACESTR to OSL_TRACE for O*String
diff --git a/sc/source/core/data/dpsave.cxx b/sc/source/core/data/dpsave.cxx
index c626ae6..a8a8468 100644
--- a/sc/source/core/data/dpsave.cxx
+++ b/sc/source/core/data/dpsave.cxx
@@ -1082,7 +1082,7 @@ void ScDPSaveData::WriteToSource( const uno::Reference<sheet::XDimensionsSupplie
{
rtl::OUString aName = iter->GetName();
- DBG_TRACESTR(String(iter->GetName()));
+ OSL_TRACE( iter->GetName().getStr() );
bool bData = iter->IsDataLayout();
@@ -1313,7 +1313,7 @@ void ScDPSaveDimension::Refresh( const com::sun::star::uno::Reference<
return;
if ( pSelectedPage )
{//check pSelected page
- DBG_TRACESTR( String(*pSelectedPage) );
+ OSL_TRACE( *pSelectedPage.getStr() );
if ( pCache->GetIdByItemData( nSrcDim, *pSelectedPage ) == -1 )
{
delete pSelectedPage;
@@ -1351,7 +1351,7 @@ void ScDPSaveDimension::Refresh( const com::sun::star::uno::Reference<
if( pReferenceValue->ReferenceItemType == DataPilotFieldReferenceItemType::NAMED )
{
const ::rtl::OUString& sReferenceFieldName = pReferenceValue->ReferenceField;
- DBG_TRACESTR( String(sReferenceFieldName) );
+ OSL_TRACE( sReferenceFieldName.getStr() );
SCCOL nRefDim = pCache->GetDimensionIndex( sReferenceFieldName );
bool bValid = true;
if ( nRefDim == -1 )
@@ -1359,7 +1359,7 @@ void ScDPSaveDimension::Refresh( const com::sun::star::uno::Reference<
else if ( pReferenceValue->ReferenceType != sheet::DataPilotFieldReferenceType::RUNNING_TOTAL )
{ //running total has not reference item
const ::rtl::OUString& sReferenceItemName = pReferenceValue->ReferenceItemName;
- DBG_TRACESTR( String(sReferenceItemName) );
+ OSL_TRACE( sReferenceItemName.getStr() );
if ( pCache->GetIdByItemData( nRefDim, sReferenceItemName ) == -1 )
bValid = false;
}
commit dcb409a040b80ba9f422dd78f04ffa78f23a9222
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Mar 8 21:59:25 2011 +0100
DBG_TRACESTR to OSL_TRACE for String
diff --git a/sc/source/core/data/dptablecache.cxx b/sc/source/core/data/dptablecache.cxx
index 411f395..0cb6872 100644
--- a/sc/source/core/data/dptablecache.cxx
+++ b/sc/source/core/data/dptablecache.cxx
@@ -281,7 +281,7 @@ sal_Int32 ScDPItemData::Compare( const ScDPItemData& rA,
void ScDPItemData::dump() const
{
OSL_TRACE( "Numberformat= %o", nNumFormat );
- DBG_TRACESTR(aString );
+ OSL_TRACE( aString.GetBuffer() );
OSL_TRACE( "fValue= %f", fValue );
OSL_TRACE( "mbFlag= %d", mbFlag);
}
diff --git a/sc/source/core/data/dptabres.cxx b/sc/source/core/data/dptabres.cxx
index 85f9a48..3711132 100644
--- a/sc/source/core/data/dptabres.cxx
+++ b/sc/source/core/data/dptabres.cxx
@@ -2883,7 +2883,7 @@ void ScDPResultDimension::LateInitFrom( LateInitParams& rParams/* const vector<S
ResultMembers* pMembers = pResultData->GetDimResultMembers(nDimSource, pThisDim, pThisLevel);
bLateInitAllMembers = pMembers->IsHasHideDetailsMembers();
#ifdef DBG_UTIL
- DBG_TRACESTR( aDimensionName )
+ OSL_TRACE( aDimensionName.GetBuffer() )
if ( pMembers->IsHasHideDetailsMembers() )
OSL_TRACE( "HasHideDetailsMembers" );
#endif
commit 38628d63963e6b7c0245857d954c9c83e8d1c9ff
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Mar 8 14:43:59 2011 +0100
Move DBG_TRACESTR to OSL_TRACE for a OUString
diff --git a/sc/source/core/data/dpsave.cxx b/sc/source/core/data/dpsave.cxx
index f635926..c626ae6 100644
--- a/sc/source/core/data/dpsave.cxx
+++ b/sc/source/core/data/dpsave.cxx
@@ -1272,7 +1272,7 @@ void ScDPSaveData::Refresh( const uno::Reference<sheet::XDimensionsSupplier>& xS
deletedDims.push_back( aName );
iter = aDimList.erase(iter);
OSL_TRACE( "\n Remove dim: \t" );
- DBG_TRACESTR( String( aName ) );
+ OSL_TRACE( aName.getStr() );
}
}
commit 84f9c27fb739f03a41b57224958fa30fa6a90540
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Mar 8 13:48:44 2011 +0100
Move DBG_TRACE to OSL_TRACE
diff --git a/sc/source/core/data/dpsave.cxx b/sc/source/core/data/dpsave.cxx
index df7c9b9..f635926 100644
--- a/sc/source/core/data/dpsave.cxx
+++ b/sc/source/core/data/dpsave.cxx
@@ -1073,7 +1073,7 @@ void ScDPSaveData::WriteToSource( const uno::Reference<sheet::XDimensionsSupplie
// reset all orientations
//! "forgetSettings" or similar at source ?????
//! reset all duplicated dimensions, or reuse them below !!!
- DBG_TRACE( "ScDPSaveData::WriteToSource" );
+ OSL_TRACE( "ScDPSaveData::WriteToSource" );
lcl_ResetOrient( xSource );
@@ -1271,7 +1271,7 @@ void ScDPSaveData::Refresh( const uno::Reference<sheet::XDimensionsSupplier>& xS
{
deletedDims.push_back( aName );
iter = aDimList.erase(iter);
- DBG_TRACE( "\n Remove dim: \t" );
+ OSL_TRACE( "\n Remove dim: \t" );
DBG_TRACESTR( String( aName ) );
}
@@ -1328,16 +1328,16 @@ void ScDPSaveDimension::Refresh( const com::sun::star::uno::Reference<
switch( pReferenceValue->ReferenceType)
{
case sheet::DataPilotFieldReferenceType::ITEM_PERCENTAGE: //both
- DBG_TRACE( "\n sheet::DataPilotFieldReferenceType::ITEM_PERCENTAGE \n" );
+ OSL_TRACE( "\n sheet::DataPilotFieldReferenceType::ITEM_PERCENTAGE \n" );
break;
case sheet::DataPilotFieldReferenceType::ITEM_DIFFERENCE: //both
- DBG_TRACE( "\n sheet::DataPilotFieldReferenceType::ITEM_DIFFERENCE \n" );
+ OSL_TRACE( "\n sheet::DataPilotFieldReferenceType::ITEM_DIFFERENCE \n" );
break;
case sheet::DataPilotFieldReferenceType::ITEM_PERCENTAGE_DIFFERENCE: //both
- DBG_TRACE( "\n sheet::DataPilotFieldReferenceType::ITEM_PERCENTAGE_DIFFERENCE \n" );
+ OSL_TRACE( "\n sheet::DataPilotFieldReferenceType::ITEM_PERCENTAGE_DIFFERENCE \n" );
break;
case sheet::DataPilotFieldReferenceType::RUNNING_TOTAL:
- DBG_TRACE( "\n sheet::DataPilotFieldReferenceType::RUNNING_TOTAL \n" ); //enable name
+ OSL_TRACE( "\n sheet::DataPilotFieldReferenceType::RUNNING_TOTAL \n" ); //enable name
break;
}
#endif
diff --git a/sc/source/core/data/dptabres.cxx b/sc/source/core/data/dptabres.cxx
index 9a34ee7..85f9a48 100644
--- a/sc/source/core/data/dptabres.cxx
+++ b/sc/source/core/data/dptabres.cxx
@@ -2885,7 +2885,7 @@ void ScDPResultDimension::LateInitFrom( LateInitParams& rParams/* const vector<S
#ifdef DBG_UTIL
DBG_TRACESTR( aDimensionName )
if ( pMembers->IsHasHideDetailsMembers() )
- DBG_TRACE ( "HasHideDetailsMembers" );
+ OSL_TRACE( "HasHideDetailsMembers" );
#endif
pMembers->SetHasHideDetailsMembers( FALSE );
}
commit 9c735bcc9e195f0197af5fa83ee6de731558841d
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Mar 7 13:12:12 2011 +0100
Move DBG_TRACE1 to OSL_TRACE
diff --git a/sc/source/core/data/dptablecache.cxx b/sc/source/core/data/dptablecache.cxx
index 2bf2dd0..411f395 100644
--- a/sc/source/core/data/dptablecache.cxx
+++ b/sc/source/core/data/dptablecache.cxx
@@ -280,10 +280,10 @@ sal_Int32 ScDPItemData::Compare( const ScDPItemData& rA,
#if OSL_DEBUG_LEVEL > 1
void ScDPItemData::dump() const
{
- DBG_TRACE1( "Numberformat= %o", nNumFormat );
+ OSL_TRACE( "Numberformat= %o", nNumFormat );
DBG_TRACESTR(aString );
- DBG_TRACE1( "fValue= %f", fValue );
- DBG_TRACE1( "mbFlag= %d", mbFlag);
+ OSL_TRACE( "fValue= %f", fValue );
+ OSL_TRACE( "mbFlag= %d", mbFlag);
}
#endif
commit 78a8c540f55d19c24871ca49bf32c7a3e371b9bc
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Mar 7 11:34:54 2011 +0100
Move #ifdef DBG_UTIL to #if OSL_DEBUG_LEVEL > 1 for OSL_TRACE
diff --git a/sc/source/core/tool/parclass.cxx b/sc/source/core/tool/parclass.cxx
index 29bf204..14bcd9c 100644
--- a/sc/source/core/tool/parclass.cxx
+++ b/sc/source/core/tool/parclass.cxx
@@ -226,7 +226,7 @@ void ScParameterClassification::Init()
else
{
RunData* pRun = &pData[ pRaw->eOp ];
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
if ( pRun->aData.nParam[0] != Unknown )
{
OSL_TRACE( "already assigned: %d", pRaw->eOp);
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 6b954b3..aea416e 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -347,7 +347,7 @@ ScRawToken* ScRawToken::Clone() const
FormulaToken* ScRawToken::CreateToken() const
{
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
#define IF_NOT_OPCODE_ERROR(o,c) if (eOp!=o) OSL_TRACE( #c "::ctor: OpCode %d lost, converted to " #o "; maybe inherit from FormulaToken instead!", int(eOp))
#else
#define IF_NOT_OPCODE_ERROR(o,c)
commit 68d309f065bc534b9eab504339f8bbdbf4bbf197
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sat Mar 5 13:08:54 2011 +0100
Move DBG_ERROR1 to OSL_TRACE for a macro
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 5136869..6b954b3 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -348,7 +348,7 @@ ScRawToken* ScRawToken::Clone() const
FormulaToken* ScRawToken::CreateToken() const
{
#ifdef DBG_UTIL
-#define IF_NOT_OPCODE_ERROR(o,c) if (eOp!=o) DBG_ERROR1( #c "::ctor: OpCode %d lost, converted to " #o "; maybe inherit from FormulaToken instead!", int(eOp))
+#define IF_NOT_OPCODE_ERROR(o,c) if (eOp!=o) OSL_TRACE( #c "::ctor: OpCode %d lost, converted to " #o "; maybe inherit from FormulaToken instead!", int(eOp))
#else
#define IF_NOT_OPCODE_ERROR(o,c)
#endif
commit 6137cd3ac2ee14a0b01487a1c5d29c3df5474963
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sat Mar 5 13:05:28 2011 +0100
Move DBG_ERROR3 to OSL_TRACE
diff --git a/sc/source/core/data/funcdesc.cxx b/sc/source/core/data/funcdesc.cxx
index c4cb2d6..97d3e90 100644
--- a/sc/source/core/data/funcdesc.cxx
+++ b/sc/source/core/data/funcdesc.cxx
@@ -836,7 +836,7 @@ ScFuncRes::ScFuncRes( ResId &aRes, ScFuncDesc* pDesc, bool & rbSuppressed )
{
if (nSuppressed > nArgs)
{
- DBG_ERROR3( "ScFuncRes: suppressed parameters count mismatch on OpCode %u: suppressed %d > params %d",
+ OSL_TRACE( "ScFuncRes: suppressed parameters count mismatch on OpCode %u: suppressed %d > params %d",
aRes.GetId(), (int)nSuppressed, (int)nArgs);
nSuppressed = nArgs; // sanitize
}
@@ -847,7 +847,7 @@ ScFuncRes::ScFuncRes( ResId &aRes, ScFuncDesc* pDesc, bool & rbSuppressed )
{
if (pDesc->nArgCount >= VAR_ARGS && nParam == nArgs-1)
{
- DBG_ERROR3( "ScFuncRes: VAR_ARGS parameters can't be suppressed, on OpCode %u: param %d == arg %d-1",
+ OSL_TRACE( "ScFuncRes: VAR_ARGS parameters can't be suppressed, on OpCode %u: param %d == arg %d-1",
aRes.GetId(), (int)nParam, (int)nArgs);
}
else
@@ -858,7 +858,7 @@ ScFuncRes::ScFuncRes( ResId &aRes, ScFuncDesc* pDesc, bool & rbSuppressed )
}
else
{
- DBG_ERROR3( "ScFuncRes: suppressed parameter exceeds count on OpCode %u: param %d >= args %d",
+ OSL_TRACE( "ScFuncRes: suppressed parameter exceeds count on OpCode %u: param %d >= args %d",
aRes.GetId(), (int)nParam, (int)nArgs);
}
}
commit cb3d213cb5a563b6894f924c2e87a2d9cdf73508
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sat Mar 5 13:02:43 2011 +0100
Move DBG_ERROR2 to OSL_TRACE
diff --git a/sc/source/core/tool/address.cxx b/sc/source/core/tool/address.cxx
index bfb7597..472e543 100644
--- a/sc/source/core/tool/address.cxx
+++ b/sc/source/core/tool/address.cxx
@@ -396,7 +396,7 @@ const sal_Unicode* ScRange::Parse_XL_Header(
}
break;
default:
- DBG_ERROR2( "ScRange::Parse_XL_Header: unhandled ExternalLinkType %d for index %d",
+ OSL_TRACE( "ScRange::Parse_XL_Header: unhandled ExternalLinkType %d for index %d",
rInfo.Type, i);
return NULL;
}
diff --git a/sc/source/filter/excel/xltools.cxx b/sc/source/filter/excel/xltools.cxx
index f250e67..fd03e71 100644
--- a/sc/source/filter/excel/xltools.cxx
+++ b/sc/source/filter/excel/xltools.cxx
@@ -434,7 +434,7 @@ rtl_TextEncoding XclTools::GetTextEncoding( sal_uInt16 nCodePage )
const XclCodePageEntry* pEntry = ::std::find_if( pCodePageTable, pCodePageTableEnd, XclCodePageEntry_CPPred( nCodePage ) );
if( pEntry == pCodePageTableEnd )
{
- DBG_ERROR2( "XclTools::GetTextEncoding - unknown code page: 0x%04hX (%d)", nCodePage, nCodePage );
+ OSL_TRACE( "XclTools::GetTextEncoding - unknown code page: 0x%04hX (%d)", nCodePage, nCodePage );
return RTL_TEXTENCODING_DONTKNOW;
}
return pEntry->meTextEnc;
commit 2b69c6dfeb8417a9a58041f9a4255041fe74544f
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Fri Mar 4 21:30:47 2011 +0100
Move DBG_ERROR1 to OSL_TRACE
diff --git a/sc/source/core/tool/address.cxx b/sc/source/core/tool/address.cxx
index cc0a92a..bfb7597 100644
--- a/sc/source/core/tool/address.cxx
+++ b/sc/source/core/tool/address.cxx
@@ -389,7 +389,7 @@ const sal_Unicode* ScRange::Parse_XL_Header(
rtl::OUString aStr;
if (!(rInfo.Data >>= aStr))
{
- DBG_ERROR1( "ScRange::Parse_XL_Header: Data type mismatch for ExternalLinkInfo %d", i);
+ OSL_TRACE( "ScRange::Parse_XL_Header: Data type mismatch for ExternalLinkInfo %d", i);
return NULL;
}
rExternDocName = aStr;
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 27b63c0..809da69 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -1042,7 +1042,7 @@ struct ConventionOOO_A1 : public Convention_A1
pRefMgr->getAllCachedTableNames(nFileId, aTabNames);
if (aTabNames.empty())
{
- DBG_ERROR1( "ConventionOOO_A1::makeExternalRefStrImpl: no sheet names for document ID %s", nFileId);
+ OSL_TRACE( "ConventionOOO_A1::makeExternalRefStrImpl: no sheet names for document ID %s", nFileId);
}
if (!lcl_getLastTabName(aLastTabName, rTabName, aTabNames, aRef))
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 8e370d6..a859649 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -997,7 +997,7 @@ ScMatrixRef ScInterpreter::QueryMat( const ScMatrixRef& pMat, ScCompareOptions&
break;
default:
SetError( errIllegalArgument);
- DBG_ERROR1( "ScInterpreter::QueryMat: unhandled comparison operator: %d", (int)rOptions.aQueryEntry.eOp);
+ OSL_TRACE( "ScInterpreter::QueryMat: unhandled comparison operator: %d", (int)rOptions.aQueryEntry.eOp);
}
return pResultMatrix;
}
diff --git a/sc/source/core/tool/parclass.cxx b/sc/source/core/tool/parclass.cxx
index b882da1..29bf204 100644
--- a/sc/source/core/tool/parclass.cxx
+++ b/sc/source/core/tool/parclass.cxx
@@ -229,7 +229,7 @@ void ScParameterClassification::Init()
#ifdef DBG_UTIL
if ( pRun->aData.nParam[0] != Unknown )
{
- DBG_ERROR1( "already assigned: %d", pRaw->eOp);
+ OSL_TRACE( "already assigned: %d", pRaw->eOp);
}
#endif
memcpy( &(pRun->aData), &(pRaw->aData), sizeof(CommonData));
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 687f910..5136869 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -333,7 +333,7 @@ ScRawToken* ScRawToken::Clone() const
case svExternalName: n += sizeof(extname); break;
default:
{
- DBG_ERROR1( "unknown ScRawToken::Clone() type %d", int(eType));
+ OSL_TRACE( "unknown ScRawToken::Clone() type %d", int(eType));
}
}
p = (ScRawToken*) new BYTE[ n ];
@@ -409,7 +409,7 @@ FormulaToken* ScRawToken::CreateToken() const
return new FormulaUnknownToken( eOp );
default:
{
- DBG_ERROR1( "unknown ScRawToken::CreateToken() type %d", int(GetType()));
+ OSL_TRACE( "unknown ScRawToken::CreateToken() type %d", int(GetType()));
return new FormulaUnknownToken( ocBad );
}
}
diff --git a/sc/source/filter/excel/xicontent.cxx b/sc/source/filter/excel/xicontent.cxx
index 1d53236..4e3111d 100644
--- a/sc/source/filter/excel/xicontent.cxx
+++ b/sc/source/filter/excel/xicontent.cxx
@@ -539,7 +539,7 @@ void XclImpCondFormat::ReadCF( XclImpStream& rStrm )
case EXC_CF_CMP_GREATER_EQUAL: eMode = SC_COND_EQGREATER; break;
case EXC_CF_CMP_LESS_EQUAL: eMode = SC_COND_EQLESS; break;
default:
- DBG_ERROR1( "XclImpCondFormat::ReadCF - unknown CF comparison 0x%02hX", nOperator );
+ OSL_TRACE( "XclImpCondFormat::ReadCF - unknown CF comparison 0x%02hX", nOperator );
}
}
break;
@@ -549,7 +549,7 @@ void XclImpCondFormat::ReadCF( XclImpStream& rStrm )
break;
default:
- DBG_ERROR1( "XclImpCondFormat::ReadCF - unknown CF mode 0x%02hX", nType );
+ OSL_TRACE( "XclImpCondFormat::ReadCF - unknown CF mode 0x%02hX", nType );
return;
}
diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx
index b8c6b2b..01cbb31 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -235,7 +235,7 @@ XclImpDrawObjRef XclImpDrawObjBase::ReadObj3( const XclImpRoot& rRoot, XclImpStr
case EXC_OBJTYPE_BUTTON: xDrawObj.reset( new XclImpButtonObj( rRoot ) ); break;
case EXC_OBJTYPE_PICTURE: xDrawObj.reset( new XclImpPictureObj( rRoot ) ); break;
default:
- DBG_ERROR1( "XclImpDrawObjBase::ReadObj3 - unknown object type 0x%04hX", nObjType );
+ OSL_TRACE( "XclImpDrawObjBase::ReadObj3 - unknown object type 0x%04hX", nObjType );
rRoot.GetTracer().TraceUnsupportedObjects();
xDrawObj.reset( new XclImpPhObj( rRoot ) );
}
@@ -268,7 +268,7 @@ XclImpDrawObjRef XclImpDrawObjBase::ReadObj4( const XclImpRoot& rRoot, XclImpStr
case EXC_OBJTYPE_PICTURE: xDrawObj.reset( new XclImpPictureObj( rRoot ) ); break;
case EXC_OBJTYPE_POLYGON: xDrawObj.reset( new XclImpPolygonObj( rRoot ) ); break;
default:
- DBG_ERROR1( "XclImpDrawObjBase::ReadObj4 - unknown object type 0x%04hX", nObjType );
+ OSL_TRACE( "XclImpDrawObjBase::ReadObj4 - unknown object type 0x%04hX", nObjType );
rRoot.GetTracer().TraceUnsupportedObjects();
xDrawObj.reset( new XclImpPhObj( rRoot ) );
}
@@ -311,7 +311,7 @@ XclImpDrawObjRef XclImpDrawObjBase::ReadObj5( const XclImpRoot& rRoot, XclImpStr
case EXC_OBJTYPE_GROUPBOX: xDrawObj.reset( new XclImpGroupBoxObj( rRoot ) ); break;
case EXC_OBJTYPE_DROPDOWN: xDrawObj.reset( new XclImpDropDownObj( rRoot ) ); break;
default:
- DBG_ERROR1( "XclImpDrawObjBase::ReadObj5 - unknown object type 0x%04hX", nObjType );
+ OSL_TRACE( "XclImpDrawObjBase::ReadObj5 - unknown object type 0x%04hX", nObjType );
rRoot.GetTracer().TraceUnsupportedObjects();
xDrawObj.reset( new XclImpPhObj( rRoot ) );
}
@@ -369,7 +369,7 @@ XclImpDrawObjRef XclImpDrawObjBase::ReadObj8( const XclImpRoot& rRoot, XclImpStr
case EXC_OBJTYPE_NOTE: xDrawObj.reset( new XclImpNoteObj( rRoot ) ); break;
default:
- DBG_ERROR1( "XclImpDrawObjBase::ReadObj8 - unknown object type 0x%04hX", nObjType );
+ OSL_TRACE( "XclImpDrawObjBase::ReadObj8 - unknown object type 0x%04hX", nObjType );
rRoot.GetTracer().TraceUnsupportedObjects();
xDrawObj.reset( new XclImpPhObj( rRoot ) );
}
diff --git a/sc/source/filter/excel/xipivot.cxx b/sc/source/filter/excel/xipivot.cxx
index d69dca3..d47d5ad 100644
--- a/sc/source/filter/excel/xipivot.cxx
+++ b/sc/source/filter/excel/xipivot.cxx
@@ -845,7 +845,7 @@ void XclImpPivotCache::ReadPivotCacheStream( XclImpStream& rStrm )
break;
default:
- DBG_ERROR1( "XclImpPivotCache::ReadPivotCacheStream - unknown record 0x%04hX", aPCStrm.GetRecId() );
+ OSL_TRACE( "XclImpPivotCache::ReadPivotCacheStream - unknown record 0x%04hX", aPCStrm.GetRecId() );
}
}
diff --git a/sc/source/filter/excel/xistream.cxx b/sc/source/filter/excel/xistream.cxx
index 830b0e6..8cf839d 100644
--- a/sc/source/filter/excel/xistream.cxx
+++ b/sc/source/filter/excel/xistream.cxx
@@ -348,7 +348,7 @@ XclBiff XclImpStream::DetectBiffVersion( SvStream& rStrm )
case EXC_BOF_BIFF4: eBiff = EXC_BIFF4; break;
case EXC_BOF_BIFF5: eBiff = EXC_BIFF5; break;
case EXC_BOF_BIFF8: eBiff = EXC_BIFF8; break;
- default: DBG_ERROR1( "XclImpStream::DetectBiffVersion - unknown BIFF version: 0x%04hX", nVersion );
+ default: OSL_TRACE( "XclImpStream::DetectBiffVersion - unknown BIFF version: 0x%04hX", nVersion );
}
}
break;
diff --git a/sc/source/filter/excel/xlpivot.cxx b/sc/source/filter/excel/xlpivot.cxx
index 480baab..219f4a8 100644
--- a/sc/source/filter/excel/xlpivot.cxx
+++ b/sc/source/filter/excel/xlpivot.cxx
@@ -230,7 +230,7 @@ sal_Int32 XclPCNumGroupInfo::GetScDateType() const
case EXC_SXNUMGROUP_TYPE_MONTH: nScType = ScDPGroupBy::MONTHS; break;
case EXC_SXNUMGROUP_TYPE_QUART: nScType = ScDPGroupBy::QUARTERS; break;
case EXC_SXNUMGROUP_TYPE_YEAR: nScType = ScDPGroupBy::YEARS; break;
- default: DBG_ERROR1( "XclPCNumGroupInfo::GetScDateType - unexpected date type %d", GetXclDataType() );
+ default: OSL_TRACE( "XclPCNumGroupInfo::GetScDateType - unexpected date type %d", GetXclDataType() );
}
return nScType;
}
@@ -247,7 +247,7 @@ void XclPCNumGroupInfo::SetScDateType( sal_Int32 nScType )
case ScDPGroupBy::MONTHS: nXclType = EXC_SXNUMGROUP_TYPE_MONTH; break;
case ScDPGroupBy::QUARTERS: nXclType = EXC_SXNUMGROUP_TYPE_QUART; break;
case ScDPGroupBy::YEARS: nXclType = EXC_SXNUMGROUP_TYPE_YEAR; break;
- default: DBG_ERROR1( "XclPCNumGroupInfo::SetScDateType - unexpected date type %d", nScType );
+ default: OSL_TRACE( "XclPCNumGroupInfo::SetScDateType - unexpected date type %d", nScType );
}
SetXclDataType( nXclType );
}
diff --git a/sc/source/filter/excel/xlstyle.cxx b/sc/source/filter/excel/xlstyle.cxx
index ebc0162..46c82f3 100644
--- a/sc/source/filter/excel/xlstyle.cxx
+++ b/sc/source/filter/excel/xlstyle.cxx
@@ -152,7 +152,7 @@ ColorData XclDefaultPalette::GetDefColorData( sal_uInt16 nXclIndex ) const
case EXC_COLOR_NOTETEXT: nColor = mnNoteText; break;
case EXC_COLOR_FONTAUTO: nColor = COL_AUTO; break;
default:
- DBG_ERROR1( "XclDefaultPalette::GetDefColorData - unknown default color index: %d", nXclIndex );
+ OSL_TRACE( "XclDefaultPalette::GetDefColorData - unknown default color index: %d", nXclIndex );
nColor = COL_AUTO;
}
return nColor;
@@ -1515,7 +1515,7 @@ void XclNumFmtBuffer::InsertBuiltinFormats()
// language not supported
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list