[Libreoffice-commits] core.git: 46 commits - accessibility/source avmedia/source basegfx/source basic/source canvas/source chart2/source connectivity/source cppcanvas/source cppuhelper/source cppu/source editeng/source fpicker/source framework/source i18npool/source include/canvas include/salhelper io/source io/test javaunohelper/source jvmfwk/plugins jvmfwk/source package/source pyuno/source registry/tools salhelper/source sax/test sdext/source sfx2/source slideshow/source smoketest/smoketest.cxx stoc/source stoc/test store/source svl/source svtools/source svx/source tools/source ucb/source unotest/source unotools/source unoxml/source uui/source vcl/osx vcl/source vcl/unx writerperfect/inc writerperfect/source xmlhelp/source xmloff/source xmlscript/source xmlscript/test
Chris Sherlock
chris.sherlock79 at gmail.com
Sun May 7 02:24:55 UTC 2017
accessibility/source/extended/accessiblelistbox.cxx | 2
avmedia/source/gstreamer/gstplayer.cxx | 2
avmedia/source/quicktime/player.mm | 2
basegfx/source/range/b2drangeclipper.cxx | 2
basic/source/classes/sbunoobj.cxx | 8
basic/source/runtime/dllmgr-x64.cxx | 26 +-
basic/source/runtime/dllmgr-x86.cxx | 26 +-
basic/source/uno/dlgcont.cxx | 2
canvas/source/cairo/cairo_canvashelper.cxx | 2
canvas/source/opengl/ogl_canvashelper.cxx | 2
chart2/source/controller/accessibility/AccessibleBase.cxx | 8
chart2/source/controller/accessibility/AccessibleChartElement.cxx | 2
chart2/source/controller/accessibility/AccessibleChartShape.cxx | 2
chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx | 6
chart2/source/controller/chartapiwrapper/TitleWrapper.cxx | 8
chart2/source/controller/dialogs/DataBrowser.cxx | 4
chart2/source/controller/dialogs/DataBrowserModel.cxx | 10 -
chart2/source/controller/dialogs/DialogModel.cxx | 4
chart2/source/controller/dialogs/dlg_DataSource.cxx | 4
chart2/source/controller/dialogs/dlg_ObjectProperties.cxx | 4
chart2/source/controller/dialogs/res_ErrorBar.cxx | 12 -
chart2/source/controller/dialogs/tp_DataSource.cxx | 4
chart2/source/controller/drawinglayer/DrawViewWrapper.cxx | 4
chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx | 4
chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx | 2
chart2/source/controller/itemsetwrapper/ItemConverter.cxx | 8
chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx | 10 -
chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx | 8
chart2/source/controller/main/ChartController_Properties.cxx | 2
chart2/source/controller/main/ChartController_Tools.cxx | 4
chart2/source/controller/main/ChartController_Window.cxx | 2
chart2/source/controller/main/ChartModelClone.cxx | 2
chart2/source/controller/main/CommandDispatch.cxx | 2
chart2/source/controller/main/ControllerCommandDispatch.cxx | 6
chart2/source/controller/main/ObjectHierarchy.cxx | 6
chart2/source/controller/main/StatusBarCommandDispatch.cxx | 2
chart2/source/model/main/Axis.cxx | 4
chart2/source/model/main/BaseCoordinateSystem.cxx | 4
chart2/source/model/main/ChartModel_Persistence.cxx | 2
chart2/source/model/main/DataPoint.cxx | 2
chart2/source/model/main/DataSeries.cxx | 2
chart2/source/model/template/BubbleDataInterpreter.cxx | 4
chart2/source/model/template/CandleStickChartType.cxx | 2
chart2/source/model/template/ChartTypeManager.cxx | 2
chart2/source/model/template/ChartTypeTemplate.cxx | 8
chart2/source/model/template/ColumnLineChartTypeTemplate.cxx | 2
chart2/source/model/template/ColumnLineDataInterpreter.cxx | 2
chart2/source/model/template/DataInterpreter.cxx | 4
chart2/source/model/template/StockChartTypeTemplate.cxx | 2
chart2/source/model/template/StockDataInterpreter.cxx | 14 -
chart2/source/model/template/XYDataInterpreter.cxx | 4
chart2/source/tools/AxisHelper.cxx | 4
chart2/source/tools/CachedDataSequence.cxx | 6
chart2/source/tools/CharacterProperties.cxx | 2
chart2/source/tools/CommonConverters.cxx | 2
chart2/source/tools/ConfigColorScheme.cxx | 2
chart2/source/tools/DiagramHelper.cxx | 22 +-
chart2/source/tools/InternalData.cxx | 8
chart2/source/tools/InternalDataProvider.cxx | 8
chart2/source/tools/MeanValueRegressionCurveCalculator.cxx | 2
chart2/source/tools/PropertyHelper.cxx | 4
chart2/source/tools/RelativePositionHelper.cxx | 2
chart2/source/tools/ResourceManager.cxx | 2
chart2/source/tools/StatisticsHelper.cxx | 2
chart2/source/view/charttypes/Splines.cxx | 4
chart2/source/view/charttypes/VSeriesPlotter.cxx | 6
chart2/source/view/main/ChartView.cxx | 10 -
chart2/source/view/main/VLegend.cxx | 2
connectivity/source/commontools/dbtools.cxx | 2
connectivity/source/cpool/ZPoolCollection.cxx | 2
connectivity/source/drivers/dbase/DIndex.cxx | 2
connectivity/source/drivers/dbase/DTable.cxx | 4
connectivity/source/drivers/firebird/Driver.cxx | 2
connectivity/source/drivers/flat/ETable.cxx | 2
connectivity/source/drivers/jdbc/JConnection.cxx | 2
connectivity/source/drivers/kab/KStatement.cxx | 4
connectivity/source/drivers/kab/kfields.cxx | 2
connectivity/source/drivers/macab/MacabStatement.cxx | 4
connectivity/source/drivers/postgresql/pq_xcontainer.cxx | 2
connectivity/source/parse/sqlnode.cxx | 2
cppcanvas/source/mtfrenderer/emfpfont.cxx | 2
cppcanvas/source/mtfrenderer/emfplus.cxx | 2
cppcanvas/source/mtfrenderer/emfpstringformat.cxx | 2
cppu/source/AffineBridge/AffineBridge.cxx | 14 -
cppu/source/LogBridge/LogBridge.cxx | 8
cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx | 4
cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx | 2
cppu/source/threadpool/current.cxx | 14 -
cppu/source/threadpool/jobqueue.cxx | 2
cppu/source/threadpool/thread.cxx | 2
cppu/source/threadpool/threadident.cxx | 8
cppu/source/threadpool/threadpool.cxx | 14 -
cppu/source/typelib/typelib.cxx | 68 +++----
cppu/source/uno/assign.hxx | 2
cppu/source/uno/cascade_mapping.cxx | 2
cppu/source/uno/constr.hxx | 2
cppu/source/uno/copy.hxx | 8
cppu/source/uno/destr.hxx | 2
cppu/source/uno/eq.hxx | 4
cppu/source/uno/lbenv.cxx | 14 -
cppu/source/uno/lbmap.cxx | 10 -
cppu/source/uno/sequence.cxx | 14 -
cppuhelper/source/component.cxx | 2
cppuhelper/source/component_context.cxx | 6
cppuhelper/source/exc_thrower.cxx | 10 -
cppuhelper/source/implbase.cxx | 4
cppuhelper/source/interfacecontainer.cxx | 8
cppuhelper/source/tdmgr.cxx | 14 -
cppuhelper/source/weak.cxx | 10 -
editeng/source/outliner/paralist.cxx | 2
fpicker/source/aqua/resourceprovider.mm | 2
framework/source/accelerators/presethandler.cxx | 2
framework/source/recording/dispatchrecorder.cxx | 2
framework/source/services/ContextChangeEventMultiplexer.cxx | 2
framework/source/uielement/toolbarmanager.cxx | 6
i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx | 6
i18npool/source/localedata/localedata.cxx | 8
include/canvas/base/spritecanvasbase.hxx | 8
include/salhelper/refobj.hxx | 2
io/source/acceptor/acc_pipe.cxx | 2
io/source/stm/omark.cxx | 4
io/test/stm/datatest.cxx | 24 +-
io/test/stm/marktest.cxx | 8
io/test/testconnection.cxx | 6
javaunohelper/source/bootstrap.cxx | 4
jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx | 4
jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx | 12 -
jvmfwk/plugins/sunmajor/pluginlib/util.cxx | 8
jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx | 4
jvmfwk/source/elements.cxx | 6
jvmfwk/source/framework.cxx | 6
jvmfwk/source/fwkbase.cxx | 6
package/source/zipapi/Deflater.cxx | 2
pyuno/source/module/pyuno_module.cxx | 2
pyuno/source/module/pyuno_runtime.cxx | 2
registry/tools/fileurl.cxx | 6
salhelper/source/simplereferenceobject.cxx | 3
salhelper/source/timer.cxx | 16 -
sax/test/sax/testsax.cxx | 8
sdext/source/pdfimport/tree/imagecontainer.cxx | 2
sdext/source/pdfimport/wrapper/wrapper.cxx | 8
sdext/source/presenter/PresenterAccessibility.cxx | 6
sdext/source/presenter/PresenterBitmapContainer.cxx | 8
sdext/source/presenter/PresenterButton.cxx | 4
sdext/source/presenter/PresenterCanvasHelper.cxx | 2
sdext/source/presenter/PresenterConfigurationAccess.cxx | 4
sdext/source/presenter/PresenterController.cxx | 6
sdext/source/presenter/PresenterHelpView.cxx | 2
sdext/source/presenter/PresenterNotesView.cxx | 8
sdext/source/presenter/PresenterPaneBase.cxx | 12 -
sdext/source/presenter/PresenterPaneBorderPainter.cxx | 8
sdext/source/presenter/PresenterPaneContainer.cxx | 4
sdext/source/presenter/PresenterPaneFactory.cxx | 4
sdext/source/presenter/PresenterProtocolHandler.cxx | 2
sdext/source/presenter/PresenterScreen.cxx | 14 -
sdext/source/presenter/PresenterScrollBar.cxx | 12 -
sdext/source/presenter/PresenterSlidePreview.cxx | 2
sdext/source/presenter/PresenterSlideSorter.cxx | 18 -
sdext/source/presenter/PresenterSpritePane.cxx | 4
sdext/source/presenter/PresenterTextView.cxx | 4
sdext/source/presenter/PresenterTheme.cxx | 6
sdext/source/presenter/PresenterToolBar.cxx | 40 ++--
sdext/source/presenter/PresenterViewFactory.cxx | 2
sdext/source/presenter/PresenterWindowManager.cxx | 6
sfx2/source/appl/appuno.cxx | 2
sfx2/source/appl/shutdownicon.cxx | 2
sfx2/source/dialog/mailmodel.cxx | 6
sfx2/source/dialog/templdlg.cxx | 2
sfx2/source/sidebar/DeckLayouter.cxx | 8
sfx2/source/sidebar/DeckTitleBar.cxx | 2
sfx2/source/sidebar/PanelTitleBar.cxx | 2
sfx2/source/sidebar/SidebarController.cxx | 2
sfx2/source/sidebar/SidebarDockingWindow.cxx | 4
sfx2/source/sidebar/TabBar.cxx | 2
sfx2/source/sidebar/Theme.cxx | 16 -
sfx2/source/sidebar/TitleBar.cxx | 2
sfx2/source/toolbox/tbxitem.cxx | 4
sfx2/source/view/viewsh.cxx | 4
slideshow/source/engine/activities/activitybase.cxx | 2
slideshow/source/engine/animationnodes/basecontainernode.cxx | 6
slideshow/source/engine/animationnodes/basenode.cxx | 10 -
slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx | 4
slideshow/source/engine/delayevent.cxx | 2
slideshow/source/engine/effectrewinder.cxx | 10 -
slideshow/source/engine/eventmultiplexer.cxx | 2
slideshow/source/engine/pointersymbol.cxx | 2
slideshow/source/engine/rehearsetimingsactivity.cxx | 4
slideshow/source/engine/screenupdater.cxx | 4
slideshow/source/engine/shapes/drawinglayeranimation.cxx | 4
slideshow/source/engine/shapes/drawshape.cxx | 10 -
slideshow/source/engine/slide/layer.cxx | 4
slideshow/source/engine/slide/layermanager.cxx | 34 +--
slideshow/source/engine/slideshowimpl.cxx | 8
slideshow/source/engine/slideview.cxx | 2
slideshow/source/engine/transitions/slidechangebase.cxx | 4
slideshow/source/engine/transitions/snakewipe.cxx | 2
slideshow/source/engine/waitsymbol.cxx | 2
smoketest/smoketest.cxx | 4
stoc/source/corereflection/crefl.cxx | 2
stoc/source/corereflection/criface.cxx | 6
stoc/source/implementationregistration/implreg.cxx | 2
stoc/source/implementationregistration/mergekeys.cxx | 2
stoc/source/invocation_adapterfactory/iafactory.cxx | 14 -
stoc/source/javavm/javavm.cxx | 8
stoc/source/proxy_factory/proxyfac.cxx | 16 -
stoc/source/security/access_controller.cxx | 12 -
stoc/source/security/file_policy.cxx | 2
stoc/source/servicemanager/servicemanager.cxx | 6
stoc/source/uriproc/UriReference.cxx | 10 -
stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx | 2
stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx | 4
stoc/test/tdmanager/testtdmanager.cxx | 2
stoc/test/testconv.cxx | 6
stoc/test/testcorefl.cxx | 4
stoc/test/testiadapter.cxx | 12 -
stoc/test/testproxyfac.cxx | 30 +--
stoc/test/testregistry.cxx | 94 +++++-----
stoc/test/testsmgr2.cxx | 4
store/source/storbios.cxx | 2
store/source/store.cxx | 4
svl/source/config/itemholder2.cxx | 2
svl/source/misc/strmadpt.cxx | 2
svl/source/misc/urihelper.cxx | 6
svtools/source/config/itemholder2.cxx | 2
svtools/source/control/toolbarmenu.cxx | 4
svtools/source/dialogs/colrdlg.cxx | 2
svtools/source/uno/toolboxcontroller.cxx | 2
svtools/source/uno/treecontrolpeer.cxx | 6
svx/source/accessibility/ChildrenManagerImpl.cxx | 2
svx/source/dialog/SpellDialogChildWindow.cxx | 2
svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx | 2
svx/source/sdr/properties/attributeproperties.cxx | 4
svx/source/sidebar/area/AreaPropertyPanelBase.cxx | 2
svx/source/svdraw/charthelper.cxx | 2
svx/source/svdraw/svditer.cxx | 2
svx/source/svdraw/svdmrkv.cxx | 2
svx/source/svdraw/svdoole2.cxx | 4
svx/source/svdraw/svdpage.cxx | 34 +--
svx/source/unodraw/unoshcol.cxx | 2
svx/source/xml/xmlgrhlp.cxx | 2
svx/source/xoutdev/xtable.cxx | 2
tools/source/fsys/urlobj.cxx | 6
ucb/source/core/ucb.cxx | 2
ucb/source/regexp/regexp.cxx | 6
ucb/source/ucp/file/filtask.cxx | 6
ucb/source/ucp/tdoc/tdoc_storage.cxx | 2
ucb/source/ucp/webdav-neon/DAVSessionFactory.cxx | 2
ucb/source/ucp/webdav-neon/NeonSession.cxx | 2
unotest/source/cpp/getargument.cxx | 2
unotools/source/config/bootstrap.cxx | 14 -
unotools/source/config/confignode.cxx | 2
unoxml/source/dom/attr.cxx | 6
unoxml/source/dom/document.cxx | 6
unoxml/source/dom/node.cxx | 4
uui/source/iahndl-errorhandler.cxx | 2
vcl/osx/HtmlFmtFlt.cxx | 2
vcl/osx/a11ywrapper.mm | 2
vcl/source/gdi/pdfwriter_impl2.cxx | 4
vcl/source/gdi/pngread.cxx | 2
vcl/source/gdi/regband.cxx | 4
vcl/source/gdi/region.cxx | 4
vcl/source/gdi/regionband.cxx | 2
vcl/source/image/ImplImageTree.cxx | 6
vcl/source/window/EnumContext.cxx | 2
vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx | 42 ++--
vcl/unx/gtk/fpicker/SalGtkPicker.cxx | 6
vcl/unx/kde/UnxFilePicker.cxx | 4
writerperfect/inc/ImportFilter.hxx | 2
writerperfect/source/calc/MSWorksCalcImportFilter.cxx | 2
writerperfect/source/writer/WordPerfectImportFilter.cxx | 2
xmlhelp/source/cxxhelp/provider/db.hxx | 2
xmloff/source/chart/SchXMLChartContext.cxx | 6
xmloff/source/chart/SchXMLExport.cxx | 2
xmloff/source/core/attrlist.cxx | 6
xmlscript/source/xml_helper/xml_element.cxx | 6
xmlscript/source/xmldlg_imexp/imp_share.hxx | 4
xmlscript/source/xmldlg_imexp/xmldlg_export.cxx | 4
xmlscript/source/xmldlg_imexp/xmldlg_import.cxx | 8
xmlscript/test/imexp.cxx | 6
279 files changed, 849 insertions(+), 848 deletions(-)
New commits:
commit 2b1737f648024328390bf44c4f2c614e748a92fd
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date: Sun May 7 11:52:37 2017 +1000
tdf#43157: convert svx module away from OSL_ASSERT to assert
Change-Id: I3d76e4237a1c8a389244fab6e8f546d818b77d9a
diff --git a/svx/source/accessibility/ChildrenManagerImpl.cxx b/svx/source/accessibility/ChildrenManagerImpl.cxx
index c4b72ffd70ff..b2df3d9d338e 100644
--- a/svx/source/accessibility/ChildrenManagerImpl.cxx
+++ b/svx/source/accessibility/ChildrenManagerImpl.cxx
@@ -279,7 +279,7 @@ void ChildrenManagerImpl::CreateListOfVisibleShapes (
{
SolarMutexGuard g;
- OSL_ASSERT (maShapeTreeInfo.GetViewForwarder() != nullptr);
+ assert (maShapeTreeInfo.GetViewForwarder() != nullptr);
tools::Rectangle aVisibleArea = maShapeTreeInfo.GetViewForwarder()->GetVisibleArea();
diff --git a/svx/source/dialog/SpellDialogChildWindow.cxx b/svx/source/dialog/SpellDialogChildWindow.cxx
index 4e1c4eda1cc8..8789df25471d 100644
--- a/svx/source/dialog/SpellDialogChildWindow.cxx
+++ b/svx/source/dialog/SpellDialogChildWindow.cxx
@@ -52,7 +52,7 @@ SfxBindings& SpellDialogChildWindow::GetBindings() const
void SpellDialogChildWindow::InvalidateSpellDialog()
{
- OSL_ASSERT (m_xAbstractSpellDialog);
+ assert (m_xAbstractSpellDialog);
if (m_xAbstractSpellDialog)
m_xAbstractSpellDialog->Invalidate();
}
diff --git a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx
index 943775beed68..eefc491c4f98 100644
--- a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx
@@ -52,7 +52,7 @@ namespace
}
catch(const uno::Exception&)
{
- OSL_ASSERT(false);
+ assert(false);
}
}
diff --git a/svx/source/sdr/properties/attributeproperties.cxx b/svx/source/sdr/properties/attributeproperties.cxx
index d18959eb4ca1..299b07342814 100644
--- a/svx/source/sdr/properties/attributeproperties.cxx
+++ b/svx/source/sdr/properties/attributeproperties.cxx
@@ -243,7 +243,7 @@ namespace sdr
void AttributeProperties::MoveToItemPool(SfxItemPool* pSrcPool, SfxItemPool* pDestPool, SdrModel* pNewModel)
{
- OSL_ASSERT(pNewModel!=nullptr);
+ assert(pNewModel!=nullptr);
if(pSrcPool && pDestPool && (pSrcPool != pDestPool))
{
@@ -282,7 +282,7 @@ namespace sdr
// name or use the default.
// Look up the style in the new document.
- OSL_ASSERT(pNewModel->GetStyleSheetPool() != nullptr);
+ assert(pNewModel->GetStyleSheetPool() != nullptr);
SfxStyleSheet* pNewStyleSheet = dynamic_cast<SfxStyleSheet*>(
pNewModel->GetStyleSheetPool()->Find(
pStySheet->GetName(),
diff --git a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
index 90140dfdb894..fb20ed71b68b 100644
--- a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
+++ b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
@@ -1273,7 +1273,7 @@ IMPL_LINK( AreaPropertyPanelBase, ClickTrGrHdl_Impl, ToolBox*, pToolBox, void )
if (!mxTrGrPopup)
mxTrGrPopup = VclPtr<AreaTransparencyGradientPopup>::Create(*this);
mxTrGrPopup->Rearrange(mpFloatTransparenceItem.get());
- OSL_ASSERT( pToolBox->GetItemCommand(pToolBox->GetCurItemId()) == UNO_SIDEBARGRADIENT);
+ assert( pToolBox->GetItemCommand(pToolBox->GetCurItemId()) == UNO_SIDEBARGRADIENT);
mxTrGrPopup->StartPopupMode(pToolBox, FloatWinPopupFlags::GrabFocus);
}
diff --git a/svx/source/svdraw/charthelper.cxx b/svx/source/svdraw/charthelper.cxx
index 255c0c03832b..afef03cde2d0 100644
--- a/svx/source/svdraw/charthelper.cxx
+++ b/svx/source/svdraw/charthelper.cxx
@@ -50,7 +50,7 @@ bool ChartHelper::isGL3DDiagram( const css::uno::Reference<css::chart2::XDiagram
//iterate through all chart types in the current coordinate system
uno::Reference<chart2::XChartTypeContainer> xChartTypeContainer(xCooSys, uno::UNO_QUERY);
- OSL_ASSERT( xChartTypeContainer.is());
+ assert( xChartTypeContainer.is());
if( !xChartTypeContainer.is() )
continue;
diff --git a/svx/source/svdraw/svditer.cxx b/svx/source/svdraw/svditer.cxx
index a8e56773ff8c..100b1204792e 100644
--- a/svx/source/svdraw/svditer.cxx
+++ b/svx/source/svdraw/svditer.cxx
@@ -65,7 +65,7 @@ void SdrObjListIter::ImpProcessObjectList(const SdrObjList& rObjList, SdrIterMod
{
SdrObject* pObj = bUseZOrder ?
rObjList.GetObj( nIdx ) : rObjList.GetObjectForNavigationPosition( nIdx );
- OSL_ASSERT( pObj != nullptr );
+ assert( pObj != nullptr );
if( pObj )
ImpProcessObj( pObj, eMode, bUseZOrder );
}
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index 478b0cbb65b7..9b87685a8883 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -1394,7 +1394,7 @@ bool SdrMarkView::MarkNextObj(bool bPrev)
if (nMarkCount!=0) {
nChgMarkNum=bPrev ? 0 : nMarkCount-1;
SdrMark* pM=GetSdrMarkByIndex(nChgMarkNum);
- OSL_ASSERT(pM!=nullptr);
+ assert(pM!=nullptr);
if (pM->GetMarkedSdrObj() != nullptr)
nSearchObjNum = pM->GetMarkedSdrObj()->GetNavigationPosition();
}
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index b331d5d848d7..60d718e3b27f 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -1585,7 +1585,7 @@ void SdrOle2Obj::ImpSetVisAreaSize()
GetObjRef();
if (mpImpl->mxObjRef.is())
{
- OSL_ASSERT( pModel );
+ assert( pModel );
sal_Int64 nMiscStatus = mpImpl->mxObjRef->getStatus( GetAspect() );
// the client is required to get access to scaling
@@ -1650,7 +1650,7 @@ void SdrOle2Obj::ImpSetVisAreaSize()
// make the new object area known to the client
// compared to the "else" branch aRect might have been changed by the object and no additional scaling was applied
- // WHY this -> OSL_ASSERT( pClient );
+ // WHY this -> assert( pClient );
if( pClient )
pClient->SetObjArea(maRect);
diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx
index 83281d013a74..0fdc54dffdba 100644
--- a/svx/source/svdraw/svdpage.cxx
+++ b/svx/source/svdraw/svdpage.cxx
@@ -395,7 +395,7 @@ SdrObject* SdrObjList::NbcRemoveObject(size_t nObjNum)
{
if (nObjNum >= maList.size())
{
- OSL_ASSERT(nObjNum<maList.size());
+ assert(nObjNum<maList.size());
return nullptr;
}
@@ -426,7 +426,7 @@ SdrObject* SdrObjList::RemoveObject(size_t nObjNum)
{
if (nObjNum >= maList.size())
{
- OSL_ASSERT(nObjNum<maList.size());
+ assert(nObjNum<maList.size());
return nullptr;
}
@@ -473,8 +473,8 @@ SdrObject* SdrObjList::NbcReplaceObject(SdrObject* pNewObj, size_t nObjNum)
{
if (nObjNum >= maList.size() || pNewObj == nullptr)
{
- OSL_ASSERT(nObjNum<maList.size());
- OSL_ASSERT(pNewObj!=nullptr);
+ assert(nObjNum<maList.size());
+ assert(pNewObj!=nullptr);
return nullptr;
}
@@ -508,12 +508,12 @@ SdrObject* SdrObjList::ReplaceObject(SdrObject* pNewObj, size_t nObjNum)
{
if (nObjNum >= maList.size())
{
- OSL_ASSERT(nObjNum<maList.size());
+ assert(nObjNum<maList.size());
return nullptr;
}
if (pNewObj == nullptr)
{
- OSL_ASSERT(pNewObj!=nullptr);
+ assert(pNewObj!=nullptr);
return nullptr;
}
@@ -562,8 +562,8 @@ SdrObject* SdrObjList::SetObjectOrdNum(size_t nOldObjNum, size_t nNewObjNum)
{
if (nOldObjNum >= maList.size() || nNewObjNum >= maList.size())
{
- OSL_ASSERT(nOldObjNum<maList.size());
- OSL_ASSERT(nNewObjNum<maList.size());
+ assert(nOldObjNum<maList.size());
+ assert(nNewObjNum<maList.size());
return nullptr;
}
@@ -675,7 +675,7 @@ SdrObject* SdrObjList::GetObj(size_t nNum) const
{
if (nNum >= maList.size())
{
- OSL_ASSERT(nNum<maList.size());
+ assert(nNum<maList.size());
return nullptr;
}
else
@@ -768,8 +768,8 @@ void SdrObjList::SetObjectNavigationPosition (
maList.end(),
mxNavigationOrder->begin());
}
- OSL_ASSERT(mxNavigationOrder.get()!=nullptr);
- OSL_ASSERT( mxNavigationOrder->size() == maList.size());
+ assert(mxNavigationOrder.get()!=nullptr);
+ assert( mxNavigationOrder->size() == maList.size());
SdrObjectWeakRef aReference (&rObject);
@@ -815,7 +815,7 @@ SdrObject* SdrObjList::GetObjectForNavigationPosition (const sal_uInt32 nNavigat
// index is correct and look up the object in mxNavigationOrder.
if (nNavigationPosition >= mxNavigationOrder->size())
{
- OSL_ASSERT(nNavigationPosition < mxNavigationOrder->size());
+ assert(nNavigationPosition < mxNavigationOrder->size());
}
else
return (*mxNavigationOrder)[nNavigationPosition].get();
@@ -826,7 +826,7 @@ SdrObject* SdrObjList::GetObjectForNavigationPosition (const sal_uInt32 nNavigat
// instead.
if (nNavigationPosition >= maList.size())
{
- OSL_ASSERT(nNavigationPosition < maList.size());
+ assert(nNavigationPosition < maList.size());
}
else
return maList[nNavigationPosition];
@@ -893,7 +893,7 @@ void SdrObjList::InsertObjectIntoContainer (
SdrObject& rObject,
const sal_uInt32 nInsertPosition)
{
- OSL_ASSERT(nInsertPosition<=maList.size());
+ assert(nInsertPosition<=maList.size());
// Update the navigation positions.
if (HasObjectNavigationOrder())
@@ -921,7 +921,7 @@ void SdrObjList::ReplaceObjectInContainer (
{
if (nObjectPosition >= maList.size())
{
- OSL_ASSERT(nObjectPosition<maList.size());
+ assert(nObjectPosition<maList.size());
return;
}
@@ -931,7 +931,7 @@ void SdrObjList::ReplaceObjectInContainer (
// A user defined position of the object that is to be replaced is
// not transferred to the new object so erase the former and append
// the later object from/to the navigation order.
- OSL_ASSERT(nObjectPosition < maList.size());
+ assert(nObjectPosition < maList.size());
SdrObjectWeakRef aReference (maList[nObjectPosition]);
WeakSdrObjectContainerType::iterator iObject (::std::find(
mxNavigationOrder->begin(),
@@ -955,7 +955,7 @@ void SdrObjList::RemoveObjectFromContainer (
{
if (nObjectPosition >= maList.size())
{
- OSL_ASSERT(nObjectPosition<maList.size());
+ assert(nObjectPosition<maList.size());
return;
}
diff --git a/svx/source/unodraw/unoshcol.cxx b/svx/source/unodraw/unoshcol.cxx
index 607f155ed8ee..af53d625e724 100644
--- a/svx/source/unodraw/unoshcol.cxx
+++ b/svx/source/unodraw/unoshcol.cxx
@@ -109,7 +109,7 @@ void SvxShapeCollection::release() throw()
}
// only the alive ref holds the object
- OSL_ASSERT( m_refCount == 1 );
+ assert( m_refCount == 1 );
// destroy the object if xHoldAlive decrement the refcount to 0
return;
}
diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx
index 3946bb94c3c0..553e0849acea 100644
--- a/svx/source/xml/xmlgrhlp.cxx
+++ b/svx/source/xml/xmlgrhlp.cxx
@@ -980,7 +980,7 @@ SvXMLGraphicImportExportHelper::SvXMLGraphicImportExportHelper( SvXMLGraphicHelp
void SAL_CALL SvXMLGraphicImportExportHelper::disposing()
{
Reference< XComponent > xComp( m_xGraphicObjectResolver, UNO_QUERY );
- OSL_ASSERT( xComp.is());
+ assert( xComp.is());
if( xComp.is())
xComp->dispose();
// m_xBinaryStreamResolver is a reference to the same object => don't call
diff --git a/svx/source/xoutdev/xtable.cxx b/svx/source/xoutdev/xtable.cxx
index e80016640775..bd1f551f7fed 100644
--- a/svx/source/xoutdev/xtable.cxx
+++ b/svx/source/xoutdev/xtable.cxx
@@ -360,7 +360,7 @@ XPropertyListRef XPropertyList::CreatePropertyList( XPropertyListType aType,
OSL_FAIL("unknown xproperty type");
break;
}
- OSL_ASSERT( !pRet.is() || pRet->meType == aType );
+ assert( !pRet.is() || pRet->meType == aType );
return pRet;
}
commit c3c5c16849d1dfc9503b10a35f076907e8ccabb1
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date: Sun May 7 11:28:51 2017 +1000
tdf#43157: convert connectivity module away from OSL_ASSERT to assert
Change-Id: I1f1296836b07df6e147c8be845486ac4acd15abd
diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx
index a63e1cd6ffe7..14a6d93ef334 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -1987,7 +1987,7 @@ void release(oslInterlockedCount& _refCount,
}
// only the alive ref holds the object
- OSL_ASSERT( _refCount == 1 );
+ assert( _refCount == 1 );
// release the parent in the ~
if (xParent.is())
diff --git a/connectivity/source/cpool/ZPoolCollection.cxx b/connectivity/source/cpool/ZPoolCollection.cxx
index 22ac35d02d9f..ce33cb7dde00 100644
--- a/connectivity/source/cpool/ZPoolCollection.cxx
+++ b/connectivity/source/cpool/ZPoolCollection.cxx
@@ -317,7 +317,7 @@ OConnectionPool* OPoolCollection::getConnectionPool(const OUString& _sImplName,
Reference< XInterface > OPoolCollection::createWithProvider(const Reference< XMultiServiceFactory >& _rxConfProvider,
const OUString& _rPath)
{
- OSL_ASSERT(_rxConfProvider.is());
+ assert(_rxConfProvider.is());
Sequence< Any > args(1);
args[0] <<= NamedValue( "nodepath", makeAny(_rPath));
Reference< XInterface > xInterface(
diff --git a/connectivity/source/drivers/dbase/DIndex.cxx b/connectivity/source/drivers/dbase/DIndex.cxx
index 283700649dea..c1a8c3e7da2c 100644
--- a/connectivity/source/drivers/dbase/DIndex.cxx
+++ b/connectivity/source/drivers/dbase/DIndex.cxx
@@ -199,7 +199,7 @@ bool ODbaseIndex::ConvertToKey(ONDXKey* rKey, sal_uInt32 nRec, const ORowSetValu
}
catch (Exception&)
{
- OSL_ASSERT(false);
+ assert(false);
return false;
}
return true;
diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx
index 8a343a3404a9..b1a5949af405 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -658,7 +658,7 @@ OUString ODbaseTable::getEntry(OConnection* _pConnection,const OUString& _sName
}
catch(const Exception&)
{
- OSL_ASSERT(false);
+ assert(false);
}
return sURL;
}
@@ -2564,7 +2564,7 @@ void ODbaseTable::copyData(ODbaseTable* _pNewTable,sal_Int32 _nPos)
}
else
{
- OSL_ASSERT(false);
+ assert(false);
}
} // for(sal_uInt32 nRowPos = 0; nRowPos < m_aHeader.db_anz;++nRowPos)
}
diff --git a/connectivity/source/drivers/firebird/Driver.cxx b/connectivity/source/drivers/firebird/Driver.cxx
index 9fe66357e010..af4cabf2f4dd 100644
--- a/connectivity/source/drivers/firebird/Driver.cxx
+++ b/connectivity/source/drivers/firebird/Driver.cxx
@@ -274,7 +274,7 @@ namespace connectivity
_pObject->dispose();
// only the alive ref holds the object
- OSL_ASSERT( _refCount == 1 );
+ assert( _refCount == 1 );
// release the parent in the ~
if (xParent.is())
diff --git a/connectivity/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx
index 06ae56b2fea7..31e44ca95f20 100644
--- a/connectivity/source/drivers/flat/ETable.cxx
+++ b/connectivity/source/drivers/flat/ETable.cxx
@@ -486,7 +486,7 @@ OUString OFlatTable::getEntry()
}
catch(const Exception&)
{
- OSL_ASSERT(false);
+ assert(false);
}
return sURL;
}
diff --git a/connectivity/source/drivers/jdbc/JConnection.cxx b/connectivity/source/drivers/jdbc/JConnection.cxx
index fce0c21ccd8e..0dca4e127767 100644
--- a/connectivity/source/drivers/jdbc/JConnection.cxx
+++ b/connectivity/source/drivers/jdbc/JConnection.cxx
@@ -130,7 +130,7 @@ bool loadClass(
OUString const & classPath, OUString const & name,
LocalRef< jobject > * classLoaderPtr, LocalRef< jclass > * classPtr)
{
- OSL_ASSERT(classLoaderPtr != nullptr);
+ assert(classLoaderPtr != nullptr);
// For any jweak entries still present in the map upon destruction,
// DeleteWeakGlobalRef is not called (which is a leak):
ClassMapData * d =
diff --git a/connectivity/source/drivers/kab/KStatement.cxx b/connectivity/source/drivers/kab/KStatement.cxx
index eb80ca6590a7..e3050a50da81 100644
--- a/connectivity/source/drivers/kab/KStatement.cxx
+++ b/connectivity/source/drivers/kab/KStatement.cxx
@@ -222,7 +222,7 @@ KabCondition *KabCommonStatement::analyseWhereClause(const OSQLParseNode *pParse
lcl_throwError(STR_QUERY_TOO_COMPLEX);
// Unreachable:
- OSL_ASSERT(false);
+ assert(false);
return nullptr;
}
@@ -268,7 +268,7 @@ KabOrder *KabCommonStatement::analyseOrderByClause(const OSQLParseNode *pParseNo
}
lcl_throwError(STR_QUERY_TOO_COMPLEX);
// Unreachable:
- OSL_ASSERT(false);
+ assert(false);
return nullptr;
}
diff --git a/connectivity/source/drivers/kab/kfields.cxx b/connectivity/source/drivers/kab/kfields.cxx
index e86ea64efa4d..b9c036670fc9 100644
--- a/connectivity/source/drivers/kab/kfields.cxx
+++ b/connectivity/source/drivers/kab/kfields.cxx
@@ -79,7 +79,7 @@ sal_uInt32 findKabField(const OUString& columnName)
) );
::dbtools::throwGenericSQLException(sError,nullptr);
// Unreachable:
- OSL_ASSERT(false);
+ assert(false);
return 0;
}
diff --git a/connectivity/source/drivers/macab/MacabStatement.cxx b/connectivity/source/drivers/macab/MacabStatement.cxx
index 721bbe36c087..cac20fa7e341 100644
--- a/connectivity/source/drivers/macab/MacabStatement.cxx
+++ b/connectivity/source/drivers/macab/MacabStatement.cxx
@@ -222,7 +222,7 @@ MacabCondition *MacabCommonStatement::analyseWhereClause(const OSQLParseNode *pP
}
impl_throwError(STR_QUERY_TOO_COMPLEX);
// Unreachable:
- OSL_ASSERT(false);
+ assert(false);
return nullptr;
}
@@ -268,7 +268,7 @@ MacabOrder *MacabCommonStatement::analyseOrderByClause(const OSQLParseNode *pPar
}
impl_throwError(STR_QUERY_TOO_COMPLEX);
// Unreachable:
- OSL_ASSERT(false);
+ assert(false);
return nullptr;
}
diff --git a/connectivity/source/drivers/postgresql/pq_xcontainer.cxx b/connectivity/source/drivers/postgresql/pq_xcontainer.cxx
index 122efca9e511..d3fcf9e2d026 100644
--- a/connectivity/source/drivers/postgresql/pq_xcontainer.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xcontainer.cxx
@@ -155,7 +155,7 @@ Any Container::getByName( const OUString& aName )
"Element " + aName + " unknown in " + m_type + "-Container",
*this );
}
- OSL_ASSERT( ii->second >= 0 && ii->second < (int)m_values.size() );
+ assert( ii->second >= 0 && ii->second < (int)m_values.size() );
return m_values[ ii->second ];
}
diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx
index b2f1d43a05d9..8130cff131b1 100644
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -1186,7 +1186,7 @@ OSQLParseNode* OSQLParser::predicateTree(OUString& rErrorMessage, const OUString
}
catch ( Exception& )
{
- OSL_ASSERT(false);
+ assert(false);
}
if (m_nFormatKey && m_xFormatter.is())
commit 6ffc3cf9e54ab92f2e7811f5e0ff0c9609c65f3a
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date: Sun May 7 11:16:44 2017 +1000
tdf#43157: convert slideshow module away from OSL_ASSERT to assert
Change-Id: I6a067922bd701387172d94713ec05fc3313de19c
diff --git a/slideshow/source/engine/activities/activitybase.cxx b/slideshow/source/engine/activities/activitybase.cxx
index 31b6854091f3..aee2b31e5b66 100644
--- a/slideshow/source/engine/activities/activitybase.cxx
+++ b/slideshow/source/engine/activities/activitybase.cxx
@@ -78,7 +78,7 @@ namespace slideshow
if( !isActive() )
return false; // no, early exit.
- OSL_ASSERT( ! mbFirstPerformCall );
+ assert( ! mbFirstPerformCall );
return true;
}
diff --git a/slideshow/source/engine/animationnodes/basecontainernode.cxx b/slideshow/source/engine/animationnodes/basecontainernode.cxx
index 83f72a96b457..d293a2ca4a79 100644
--- a/slideshow/source/engine/animationnodes/basecontainernode.cxx
+++ b/slideshow/source/engine/animationnodes/basecontainernode.cxx
@@ -119,10 +119,10 @@ bool BaseContainerNode::isChildNode( AnimationNodeSharedPtr const& pNode ) const
bool BaseContainerNode::notifyDeactivatedChild(
AnimationNodeSharedPtr const& pChildNode )
{
- OSL_ASSERT( pChildNode->getState() == FROZEN ||
+ assert( pChildNode->getState() == FROZEN ||
pChildNode->getState() == ENDED );
// early exit on invalid nodes
- OSL_ASSERT( getState() != INVALID );
+ assert( getState() != INVALID );
if( getState() == INVALID )
return false;
@@ -132,7 +132,7 @@ bool BaseContainerNode::notifyDeactivatedChild(
}
std::size_t const nSize = maChildren.size();
- OSL_ASSERT( mnFinishedChildren < nSize );
+ assert( mnFinishedChildren < nSize );
++mnFinishedChildren;
bool bFinished = (mnFinishedChildren >= nSize);
diff --git a/slideshow/source/engine/animationnodes/basenode.cxx b/slideshow/source/engine/animationnodes/basenode.cxx
index 7a7f63518c32..6d1ea6a1b441 100644
--- a/slideshow/source/engine/animationnodes/basenode.cxx
+++ b/slideshow/source/engine/animationnodes/basenode.cxx
@@ -301,7 +301,7 @@ public:
void clear() {
if (meToState != INVALID) {
- OSL_ASSERT( (mpNode->meCurrentStateTransition & meToState) != 0 );
+ assert( (mpNode->meCurrentStateTransition & meToState) != 0 );
mpNode->meCurrentStateTransition &= ~meToState;
meToState = INVALID;
}
@@ -432,7 +432,7 @@ bool BaseNode::resolve()
if (! checkValidNode())
return false;
- OSL_ASSERT( meCurrState != RESOLVED );
+ assert( meCurrState != RESOLVED );
if (inStateOrTransition( RESOLVED ))
return true;
@@ -495,7 +495,7 @@ void BaseNode::activate()
if (! checkValidNode())
return;
- OSL_ASSERT( meCurrState != ACTIVE );
+ assert( meCurrState != ACTIVE );
if (inStateOrTransition( ACTIVE ))
return;
@@ -551,7 +551,7 @@ void BaseNode::deactivate()
if (inStateOrTransition( ENDED | FROZEN ) || !checkValidNode())
return;
- if (isTransition( meCurrState, FROZEN, false /* no OSL_ASSERT */ )) {
+ if (isTransition( meCurrState, FROZEN, false /* no assert */ )) {
// do transition to FROZEN:
StateTransition st(this);
if (st.enter( FROZEN, StateTransition::FORCE )) {
@@ -612,7 +612,7 @@ void BaseNode::end()
void BaseNode::notifyDeactivating( const AnimationNodeSharedPtr& rNotifier )
{
(void) rNotifier; // avoid warning
- OSL_ASSERT( rNotifier->getState() == FROZEN ||
+ assert( rNotifier->getState() == FROZEN ||
rNotifier->getState() == ENDED );
// TODO(F1): for end sync functionality, this might indeed be used some day
}
diff --git a/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx b/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx
index 68bda1a56999..aec8432e1a0b 100644
--- a/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx
+++ b/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx
@@ -113,9 +113,9 @@ void SequentialTimeContainer::notifyDeactivating(
if (notifyDeactivatedChild( rNotifier ))
return;
- OSL_ASSERT( mnFinishedChildren < maChildren.size() );
+ assert( mnFinishedChildren < maChildren.size() );
AnimationNodeSharedPtr const& pNextChild = maChildren[mnFinishedChildren];
- OSL_ASSERT( pNextChild->getState() == UNRESOLVED );
+ assert( pNextChild->getState() == UNRESOLVED );
if (! resolveChild( pNextChild )) {
// could not resolve child - since we risk to
diff --git a/slideshow/source/engine/delayevent.cxx b/slideshow/source/engine/delayevent.cxx
index 78dd0350d4ba..131630488288 100644
--- a/slideshow/source/engine/delayevent.cxx
+++ b/slideshow/source/engine/delayevent.cxx
@@ -26,7 +26,7 @@ namespace internal {
bool Delay::fire()
{
- OSL_ASSERT( isCharged() );
+ assert( isCharged() );
if (isCharged()) {
mbWasFired = true;
maFunc();
diff --git a/slideshow/source/engine/effectrewinder.cxx b/slideshow/source/engine/effectrewinder.cxx
index 96ba0e048281..a318d9c2d9b7 100644
--- a/slideshow/source/engine/effectrewinder.cxx
+++ b/slideshow/source/engine/effectrewinder.cxx
@@ -164,7 +164,7 @@ bool EffectRewinder::rewind (
// Do not allow nested rewinds.
if (mpAsynchronousRewindEvent)
{
- OSL_ASSERT( ! mpAsynchronousRewindEvent);
+ assert( ! mpAsynchronousRewindEvent);
return false;
}
@@ -177,7 +177,7 @@ bool EffectRewinder::rewind (
{
if ( ! rPreviousSlideFunctor)
{
- OSL_ASSERT(rPreviousSlideFunctor);
+ assert(rPreviousSlideFunctor);
return false;
}
@@ -216,7 +216,7 @@ void EffectRewinder::skipAllMainSequenceEffects()
// Do not allow nested rewinds.
if (mpAsynchronousRewindEvent)
{
- OSL_ASSERT(!mpAsynchronousRewindEvent);
+ assert(!mpAsynchronousRewindEvent);
return;
}
@@ -330,7 +330,7 @@ void EffectRewinder::asynchronousRewind (
const bool bRedisplayCurrentSlide,
const std::function<void ()>& rSlideRewindFunctor)
{
- OSL_ASSERT(mpAsynchronousRewindEvent);
+ assert(mpAsynchronousRewindEvent);
if (bRedisplayCurrentSlide)
{
@@ -372,7 +372,7 @@ void EffectRewinder::asynchronousRewind (
void EffectRewinder::asynchronousRewindToPreviousSlide (
const ::std::function<void ()>& rSlideRewindFunctor)
{
- OSL_ASSERT(mpAsynchronousRewindEvent);
+ assert(mpAsynchronousRewindEvent);
mpAsynchronousRewindEvent.reset();
rSlideRewindFunctor();
diff --git a/slideshow/source/engine/eventmultiplexer.cxx b/slideshow/source/engine/eventmultiplexer.cxx
index c707af32e91e..ffe37a16d266 100644
--- a/slideshow/source/engine/eventmultiplexer.cxx
+++ b/slideshow/source/engine/eventmultiplexer.cxx
@@ -411,7 +411,7 @@ void EventMultiplexerImpl::forEachView( XSlideShowViewFunc pViewMethod )
}
else
{
- OSL_ASSERT(xView.is());
+ assert(xView.is());
}
}
}
diff --git a/slideshow/source/engine/pointersymbol.cxx b/slideshow/source/engine/pointersymbol.cxx
index 2b50addcd71c..6f53bbd7e272 100644
--- a/slideshow/source/engine/pointersymbol.cxx
+++ b/slideshow/source/engine/pointersymbol.cxx
@@ -155,7 +155,7 @@ void PointerSymbol::viewChanged( const UnoViewSharedPtr& rView )
( const ViewsVecT::value_type& cp )
{ return rView == cp.first; } ) );
- OSL_ASSERT( aModifiedEntry != maViews.end() );
+ assert( aModifiedEntry != maViews.end() );
if( aModifiedEntry == maViews.end() )
return;
diff --git a/slideshow/source/engine/rehearsetimingsactivity.cxx b/slideshow/source/engine/rehearsetimingsactivity.cxx
index 861edc70144e..c3945fe8b0b3 100644
--- a/slideshow/source/engine/rehearsetimingsactivity.cxx
+++ b/slideshow/source/engine/rehearsetimingsactivity.cxx
@@ -371,7 +371,7 @@ void RehearseTimingsActivity::viewChanged( const UnoViewSharedPtr& rView )
{ return rView == cp.first; } )
);
- OSL_ASSERT( aModifiedEntry != maViews.end() );
+ assert( aModifiedEntry != maViews.end() );
if( aModifiedEntry == maViews.end() )
return;
@@ -467,7 +467,7 @@ void RehearseTimingsActivity::paint( cppcanvas::CanvasSharedPtr const & canvas )
cppcanvas::VCLFactory::createRenderer(
canvas, metaFile, cppcanvas::Renderer::Parameters() ) );
const bool succ = renderer->draw();
- OSL_ASSERT( succ );
+ assert( succ );
(void)succ;
}
diff --git a/slideshow/source/engine/screenupdater.cxx b/slideshow/source/engine/screenupdater.cxx
index 597da9daf600..5616f8e1ac4c 100644
--- a/slideshow/source/engine/screenupdater.cxx
+++ b/slideshow/source/engine/screenupdater.cxx
@@ -198,12 +198,12 @@ namespace internal
void ScreenUpdater::lockUpdates()
{
++mpImpl->mnLockCount;
- OSL_ASSERT(mpImpl->mnLockCount>0);
+ assert(mpImpl->mnLockCount>0);
}
void ScreenUpdater::unlockUpdates()
{
- OSL_ASSERT(mpImpl->mnLockCount>0);
+ assert(mpImpl->mnLockCount>0);
if (mpImpl->mnLockCount > 0)
{
--mpImpl->mnLockCount;
diff --git a/slideshow/source/engine/shapes/drawinglayeranimation.cxx b/slideshow/source/engine/shapes/drawinglayeranimation.cxx
index d4941f8300cf..7fdbc2f3a8fb 100644
--- a/slideshow/source/engine/shapes/drawinglayeranimation.cxx
+++ b/slideshow/source/engine/shapes/drawinglayeranimation.cxx
@@ -581,7 +581,7 @@ sal_uInt32 ActivityImpl::ImpRegisterAgainScrollTextMixerState(sal_uInt32 nTime)
void ActivityImpl::updateShapeAttributes(
double fTime, basegfx::B2DRectangle const& parentBounds )
{
- OSL_ASSERT( meAnimKind != drawing::TextAnimationKind_NONE );
+ assert( meAnimKind != drawing::TextAnimationKind_NONE );
if( meAnimKind == drawing::TextAnimationKind_NONE )
return;
@@ -780,7 +780,7 @@ ActivityImpl::ActivityImpl(
uno::Reference<beans::XPropertySet> const xProps( xShape, uno::UNO_QUERY_THROW );
getPropertyValue( meAnimKind, xProps, "TextAnimationKind" );
- OSL_ASSERT( meAnimKind != drawing::TextAnimationKind_NONE );
+ assert( meAnimKind != drawing::TextAnimationKind_NONE );
mbAlternate = (meAnimKind == drawing::TextAnimationKind_ALTERNATE);
mbScrollIn = (meAnimKind == drawing::TextAnimationKind_SLIDE);
diff --git a/slideshow/source/engine/shapes/drawshape.cxx b/slideshow/source/engine/shapes/drawshape.cxx
index 98f1cae40ac7..dfb7b89b892d 100644
--- a/slideshow/source/engine/shapes/drawshape.cxx
+++ b/slideshow/source/engine/shapes/drawshape.cxx
@@ -525,7 +525,7 @@ namespace slideshow
if( pShape->hasIntrinsicAnimation() )
{
- OSL_ASSERT( pShape->maAnimationFrames.empty() );
+ assert( pShape->maAnimationFrames.empty() );
if( pShape->getNumberOfTreeNodes(
DocTreeNode::NodeType::LogicalParagraph) > 0 )
{
@@ -557,7 +557,7 @@ namespace slideshow
if( pShape->hasIntrinsicAnimation() )
{
- OSL_ASSERT( !pShape->maAnimationFrames.empty() );
+ assert( !pShape->maAnimationFrames.empty() );
std::vector<double> aTimeout;
std::transform(
@@ -900,7 +900,7 @@ namespace slideshow
maHyperlinkIndices.pop_back();
maHyperlinkRegions.pop_back();
}
- OSL_ASSERT( maHyperlinkIndices.size() == maHyperlinkRegions.size());
+ assert( maHyperlinkIndices.size() == maHyperlinkRegions.size());
}
bool DrawShape::hasHyperlinks() const
@@ -910,7 +910,7 @@ namespace slideshow
HyperlinkArea::HyperlinkRegions DrawShape::getHyperlinkRegions() const
{
- OSL_ASSERT( !maViewShapes.empty() );
+ assert( !maViewShapes.empty() );
if( !isVisible() )
return HyperlinkArea::HyperlinkRegions();
@@ -934,7 +934,7 @@ namespace slideshow
pViewShape->getRenderer(
pCanvas, mpCurrMtf, mpAttributeLayer ) );
- OSL_ASSERT( pRenderer );
+ assert( pRenderer );
if (pRenderer)
{
diff --git a/slideshow/source/engine/slide/layer.cxx b/slideshow/source/engine/slide/layer.cxx
index 0aa3352192a8..5229d1190d69 100644
--- a/slideshow/source/engine/slide/layer.cxx
+++ b/slideshow/source/engine/slide/layer.cxx
@@ -56,7 +56,7 @@ namespace slideshow
ViewLayerSharedPtr Layer::addView( const ViewSharedPtr& rNewView )
{
- OSL_ASSERT( rNewView );
+ assert( rNewView );
ViewEntryVector::iterator aIter;
const ViewEntryVector::iterator aEnd( maViewEntries.end() );
@@ -87,7 +87,7 @@ namespace slideshow
ViewLayerSharedPtr Layer::removeView( const ViewSharedPtr& rView )
{
- OSL_ASSERT( rView );
+ assert( rView );
ViewEntryVector::iterator aIter;
const ViewEntryVector::iterator aEnd( maViewEntries.end() );
diff --git a/slideshow/source/engine/slide/layermanager.cxx b/slideshow/source/engine/slide/layermanager.cxx
index e3c024398f6f..0ccbb62e5562 100644
--- a/slideshow/source/engine/slide/layermanager.cxx
+++ b/slideshow/source/engine/slide/layermanager.cxx
@@ -134,13 +134,13 @@ namespace slideshow
mbActive = false;
// only background layer left
- OSL_ASSERT( maLayers.size() == 1 && maLayers.front()->isBackgroundLayer() );
+ assert( maLayers.size() == 1 && maLayers.front()->isBackgroundLayer() );
}
void LayerManager::viewAdded( const UnoViewSharedPtr& rView )
{
// view must be member of mrViews container
- OSL_ASSERT( std::find(mrViews.begin(),
+ assert( std::find(mrViews.begin(),
mrViews.end(),
rView) != mrViews.end() );
@@ -164,7 +164,7 @@ namespace slideshow
void LayerManager::viewRemoved( const UnoViewSharedPtr& rView )
{
// view must not be member of mrViews container anymore
- OSL_ASSERT( std::find(mrViews.begin(),
+ assert( std::find(mrViews.begin(),
mrViews.end(),
rView) == mrViews.end() );
@@ -186,7 +186,7 @@ namespace slideshow
(void)rView;
// view must be member of mrViews container
- OSL_ASSERT( std::find(mrViews.begin(),
+ assert( std::find(mrViews.begin(),
mrViews.end(),
rView) != mrViews.end() );
@@ -212,7 +212,7 @@ namespace slideshow
void LayerManager::addShape( const ShapeSharedPtr& rShape )
{
- OSL_ASSERT( !maLayers.empty() ); // always at least background layer
+ assert( !maLayers.empty() ); // always at least background layer
ENSURE_OR_THROW( rShape, "LayerManager::addShape(): invalid Shape" );
// add shape to XShape hash map
@@ -237,12 +237,12 @@ namespace slideshow
void LayerManager::implAddShape( const ShapeSharedPtr& rShape )
{
- OSL_ASSERT( !maLayers.empty() ); // always at least background layer
+ assert( !maLayers.empty() ); // always at least background layer
ENSURE_OR_THROW( rShape, "LayerManager::implAddShape(): invalid Shape" );
LayerShapeMap::value_type aValue (rShape, LayerWeakPtr());
- OSL_ASSERT( maAllShapes.find(rShape) == maAllShapes.end() ); // shape must not be added already
+ assert( maAllShapes.find(rShape) == maAllShapes.end() ); // shape must not be added already
mbLayerAssociationDirty = true;
if( mbDisableAnimationZOrder )
@@ -258,7 +258,7 @@ namespace slideshow
void LayerManager::implRemoveShape( const ShapeSharedPtr& rShape )
{
- OSL_ASSERT( !maLayers.empty() ); // always at least background layer
+ assert( !maLayers.empty() ); // always at least background layer
ENSURE_OR_THROW( rShape, "LayerManager::implRemoveShape(): invalid Shape" );
const LayerShapeMap::iterator aShapeEntry( maAllShapes.find(rShape) );
@@ -307,7 +307,7 @@ namespace slideshow
AttributableShapeSharedPtr LayerManager::getSubsetShape( const AttributableShapeSharedPtr& rOrigShape,
const DocTreeNode& rTreeNode )
{
- OSL_ASSERT( !maLayers.empty() ); // always at least background layer
+ assert( !maLayers.empty() ); // always at least background layer
AttributableShapeSharedPtr pSubset;
@@ -338,11 +338,11 @@ namespace slideshow
void LayerManager::revokeSubset( const AttributableShapeSharedPtr& rOrigShape,
const AttributableShapeSharedPtr& rSubsetShape )
{
- OSL_ASSERT( !maLayers.empty() ); // always at least background layer
+ assert( !maLayers.empty() ); // always at least background layer
if( rOrigShape->revokeSubset( rSubsetShape ) )
{
- OSL_ASSERT( maAllShapes.find(rSubsetShape) != maAllShapes.end() );
+ assert( maAllShapes.find(rSubsetShape) != maAllShapes.end() );
implRemoveShape( rSubsetShape );
@@ -355,7 +355,7 @@ namespace slideshow
void LayerManager::enterAnimationMode( const AnimatableShapeSharedPtr& rShape )
{
- OSL_ASSERT( !maLayers.empty() ); // always at least background layer
+ assert( !maLayers.empty() ); // always at least background layer
ENSURE_OR_THROW( rShape, "LayerManager::enterAnimationMode(): invalid Shape" );
const bool bPrevAnimState( rShape->isBackgroundDetached() );
@@ -638,7 +638,7 @@ namespace slideshow
void LayerManager::addUpdateArea( ShapeSharedPtr const& rShape )
{
- OSL_ASSERT( !maLayers.empty() ); // always at least background layer
+ assert( !maLayers.empty() ); // always at least background layer
ENSURE_OR_THROW( rShape, "LayerManager::addUpdateArea(): invalid Shape" );
const LayerShapeMap::const_iterator aShapeEntry( maAllShapes.find(rShape) );
@@ -682,7 +682,7 @@ namespace slideshow
LayerSharedPtr LayerManager::createForegroundLayer() const
{
- OSL_ASSERT( mbActive );
+ assert( mbActive );
LayerSharedPtr pLayer( Layer::createLayer() );
@@ -696,8 +696,8 @@ namespace slideshow
void LayerManager::updateShapeLayers( bool bBackgroundLayerPainted )
{
- OSL_ASSERT( !maLayers.empty() ); // always at least background layer
- OSL_ASSERT( mbActive );
+ assert( !maLayers.empty() ); // always at least background layer
+ assert( mbActive );
// do we need to process shapes?
if( !mbLayerAssociationDirty )
@@ -762,7 +762,7 @@ namespace slideshow
}
}
- OSL_ASSERT( maLayers.size() == aWeakLayers.size() );
+ assert( maLayers.size() == aWeakLayers.size() );
// note: using indices here, since vector::insert
// above invalidates iterators
diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx
index 8e8023e0146f..571725304e4b 100644
--- a/slideshow/source/engine/slideshowimpl.cxx
+++ b/slideshow/source/engine/slideshowimpl.cxx
@@ -923,7 +923,7 @@ SlideSharedPtr SlideShowImpl::makeSlide(
void SlideShowImpl::requestWaitSymbol()
{
++mnWaitSymbolRequestCount;
- OSL_ASSERT(mnWaitSymbolRequestCount>0);
+ assert(mnWaitSymbolRequestCount>0);
if (mnWaitSymbolRequestCount == 1)
{
@@ -940,7 +940,7 @@ void SlideShowImpl::requestWaitSymbol()
void SlideShowImpl::releaseWaitSymbol()
{
--mnWaitSymbolRequestCount;
- OSL_ASSERT(mnWaitSymbolRequestCount>=0);
+ assert(mnWaitSymbolRequestCount>=0);
if (mnWaitSymbolRequestCount == 0)
{
@@ -1099,7 +1099,7 @@ void SlideShowImpl::displaySlide(
else
mpCurrentSlide = makeSlide( xSlide, xDrawPages, xRootNode );
- OSL_ASSERT( mpCurrentSlide );
+ assert( mpCurrentSlide );
if (mpCurrentSlide)
{
basegfx::B2DSize oldSlideSize;
@@ -2279,7 +2279,7 @@ void SlideShowImpl::notifySlideEnded (const bool bReverse)
// save time at current drawpage:
uno::Reference<beans::XPropertySet> xPropSet(
mpCurrentSlide->getXDrawPage(), uno::UNO_QUERY );
- OSL_ASSERT( xPropSet.is() );
+ assert( xPropSet.is() );
if (xPropSet.is())
{
xPropSet->setPropertyValue(
diff --git a/slideshow/source/engine/slideview.cxx b/slideshow/source/engine/slideview.cxx
index 4d13d8b1d05f..9620ab7b4c08 100644
--- a/slideshow/source/engine/slideview.cxx
+++ b/slideshow/source/engine/slideview.cxx
@@ -1021,7 +1021,7 @@ void SlideView::disposing( lang::EventObject const& evt )
if (mxView.is())
{
- OSL_ASSERT( evt.Source == mxView );
+ assert( evt.Source == mxView );
mxView.clear();
}
diff --git a/slideshow/source/engine/transitions/slidechangebase.cxx b/slideshow/source/engine/transitions/slidechangebase.cxx
index cdc1d22134c8..1f10a158c2f7 100644
--- a/slideshow/source/engine/transitions/slidechangebase.cxx
+++ b/slideshow/source/engine/transitions/slidechangebase.cxx
@@ -308,7 +308,7 @@ bool SlideChangeBase::operator()( double nValue )
// between different canvases!
// render the content
- OSL_ASSERT( getLeavingBitmap( rViewEntry ) );
+ assert( getLeavingBitmap( rViewEntry ) );
if( getLeavingBitmap( rViewEntry ) )
getLeavingBitmap( rViewEntry )->draw( pOutContentCanvas );
}
@@ -430,7 +430,7 @@ void SlideChangeBase::viewChanged( const UnoViewSharedPtr& rView )
[rView]( const ViewEntry& rViewEntry )
{ return rView == rViewEntry.getView(); } ) );
- OSL_ASSERT( aModifiedEntry != maViewData.end() );
+ assert( aModifiedEntry != maViewData.end() );
if( aModifiedEntry == maViewData.end() )
return;
diff --git a/slideshow/source/engine/transitions/snakewipe.cxx b/slideshow/source/engine/transitions/snakewipe.cxx
index 99b34d5d3af6..c38623780081 100644
--- a/slideshow/source/engine/transitions/snakewipe.cxx
+++ b/slideshow/source/engine/transitions/snakewipe.cxx
@@ -196,7 +196,7 @@ SnakeWipe::SnakeWipe( sal_Int32 nElements, bool diagonal, bool flipOnYAxis )
::basegfx::B2DPolyPolygon res;
if (m_diagonal)
{
- OSL_ASSERT( m_opposite );
+ assert( m_opposite );
::basegfx::B2DPolyPolygon half(
calcHalfDiagonalSnake( t, false /* out */ ) );
// flip on x axis and rotate 90 degrees:
diff --git a/slideshow/source/engine/waitsymbol.cxx b/slideshow/source/engine/waitsymbol.cxx
index e278d609c464..eea386f32284 100644
--- a/slideshow/source/engine/waitsymbol.cxx
+++ b/slideshow/source/engine/waitsymbol.cxx
@@ -159,7 +159,7 @@ void WaitSymbol::viewChanged( const UnoViewSharedPtr& rView )
( const ViewsVecT::value_type& cp )
{ return rView == cp.first; } ) );
- OSL_ASSERT( aModifiedEntry != maViews.end() );
+ assert( aModifiedEntry != maViews.end() );
if( aModifiedEntry == maViews.end() )
return;
commit ff76c90fb40c4246a835686ca0b4db8fe6b7dbd1
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date: Sun May 7 10:29:59 2017 +1000
tdf#43157: convert avmedia module away from OSL_ASSERT to assert
Change-Id: Ie484788019f11299c4e4796268507b9b16b7fd4a
diff --git a/avmedia/source/gstreamer/gstplayer.cxx b/avmedia/source/gstreamer/gstplayer.cxx
index 26b712441692..8383d3f3cae6 100644
--- a/avmedia/source/gstreamer/gstplayer.cxx
+++ b/avmedia/source/gstreamer/gstplayer.cxx
@@ -910,7 +910,7 @@ uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( co
rArguments[ 2 ] >>= pIntPtr;
SystemChildWindow *pParentWindow = reinterpret_cast< SystemChildWindow* >( pIntPtr );
const SystemEnvData* pEnvData = pParentWindow ? pParentWindow->GetSystemData() : nullptr;
- OSL_ASSERT(pEnvData);
+ assert(pEnvData);
if (pEnvData)
{
#if defined(ENABLE_GTKSINK)
diff --git a/avmedia/source/quicktime/player.mm b/avmedia/source/quicktime/player.mm
index d1c44306834f..b5fe12db1a39 100644
--- a/avmedia/source/quicktime/player.mm
+++ b/avmedia/source/quicktime/player.mm
@@ -56,7 +56,7 @@ Player::~Player()
QTMovie* Player::getMovie()
{
- OSL_ASSERT( mpMovie );
+ assert( mpMovie );
return mpMovie;
}
commit 0483e756e99d7762151fd529f073f6cf24474613
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date: Sun May 7 10:25:51 2017 +1000
tdf#43157: convert writerperfect module away from OSL_ASSERT to assert
Change-Id: I5db174ea899229151327a471fb0e18d643830542
diff --git a/writerperfect/inc/ImportFilter.hxx b/writerperfect/inc/ImportFilter.hxx
index 092ae9cc9289..210321b4121e 100644
--- a/writerperfect/inc/ImportFilter.hxx
+++ b/writerperfect/inc/ImportFilter.hxx
@@ -73,7 +73,7 @@ public:
aDescriptor[utl::MediaDescriptor::PROP_INPUTSTREAM()] >>= xInputStream;
if (!xInputStream.is())
{
- OSL_ASSERT(false);
+ assert(false);
return false;
}
diff --git a/writerperfect/source/calc/MSWorksCalcImportFilter.cxx b/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
index 11881202ad28..ebda55e1cbb2 100644
--- a/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
+++ b/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
@@ -277,7 +277,7 @@ sal_Bool MSWorksCalcImportFilter::filter(const css::uno::Sequence< css::beans::P
if (!getXContext().is() || !xInputStream.is())
{
- OSL_ASSERT(false);
+ assert(false);
return false;
}
diff --git a/writerperfect/source/writer/WordPerfectImportFilter.cxx b/writerperfect/source/writer/WordPerfectImportFilter.cxx
index 68c2a5cc8dd1..f8cdf779f847 100644
--- a/writerperfect/source/writer/WordPerfectImportFilter.cxx
+++ b/writerperfect/source/writer/WordPerfectImportFilter.cxx
@@ -97,7 +97,7 @@ bool SAL_CALL WordPerfectImportFilter::importImpl(const Sequence< css::beans::Pr
}
if (!xInputStream.is())
{
- OSL_ASSERT(false);
+ assert(false);
return false;
}
commit bbbb81b4c5380bb8bd8ba035177c5de59eb667bb
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date: Sun May 7 10:20:12 2017 +1000
tdf#43157: convert editeng module away from OSL_ASSERT to assert
Change-Id: Iad5ad8ce11be2fbafd50f46e68947e10752bd609
diff --git a/editeng/source/outliner/paralist.cxx b/editeng/source/outliner/paralist.cxx
index 61251922d3bc..708989afda38 100644
--- a/editeng/source/outliner/paralist.cxx
+++ b/editeng/source/outliner/paralist.cxx
@@ -145,7 +145,7 @@ void ParagraphList::Remove( sal_Int32 nPara )
void ParagraphList::MoveParagraphs( sal_Int32 nStart, sal_Int32 nDest, sal_Int32 _nCount )
{
- OSL_ASSERT(static_cast<size_t>(nStart) < maEntries.size() && static_cast<size_t>(nDest) < maEntries.size());
+ assert(static_cast<size_t>(nStart) < maEntries.size() && static_cast<size_t>(nDest) < maEntries.size());
if ( (( nDest < nStart ) || ( nDest >= ( nStart + _nCount ) )) && nStart >= 0 && nDest >= 0 && _nCount >= 0 )
{
commit 33f1e7eaf99c75327bde64109739ae3e052e40eb
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date: Sun May 7 10:17:50 2017 +1000
tdf#43157: convert package module away from OSL_ASSERT to assert
Change-Id: I74f11a025cd1f8d361c26bac70ffdbd382e5129c
diff --git a/package/source/zipapi/Deflater.cxx b/package/source/zipapi/Deflater.cxx
index e1694d293ca9..9caf28f7bdc4 100644
--- a/package/source/zipapi/Deflater.cxx
+++ b/package/source/zipapi/Deflater.cxx
@@ -110,7 +110,7 @@ void SAL_CALL Deflater::finish( )
}
sal_Int32 SAL_CALL Deflater::doDeflateSegment( uno::Sequence< sal_Int8 >& rBuffer, sal_Int32 nNewOffset, sal_Int32 nNewLength )
{
- OSL_ASSERT( !(nNewOffset < 0 || nNewLength < 0 || nNewOffset + nNewLength > rBuffer.getLength()));
+ assert( !(nNewOffset < 0 || nNewLength < 0 || nNewOffset + nNewLength > rBuffer.getLength()));
return doDeflateBytes(rBuffer, nNewOffset, nNewLength);
}
sal_Int64 SAL_CALL Deflater::getTotalIn( )
commit 9cf1ea364ae57ae3e27fef0896d9552fe9e83e1a
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date: Sun May 7 10:13:21 2017 +1000
tdf#43157: convert xmloff module away from OSL_ASSERT to assert
Change-Id: I7eb36a11a7de5f7cf35ce97b59c8b461b64385a7
diff --git a/unoxml/source/dom/attr.cxx b/unoxml/source/dom/attr.cxx
index 39cb53230c9a..64ccfd51e276 100644
--- a/unoxml/source/dom/attr.cxx
+++ b/unoxml/source/dom/attr.cxx
@@ -217,7 +217,7 @@ namespace DOM
if (!m_aNodePtr) { return; }
if (m_pNamespace.get()) {
- OSL_ASSERT(!m_aNodePtr->parent);
+ assert(!m_aNodePtr->parent);
m_pNamespace->second =
OUStringToOString(prefix, RTL_TEXTENCODING_UTF8);
} else {
@@ -232,7 +232,7 @@ namespace DOM
if (!m_aNodePtr) { return OUString(); }
if (m_pNamespace.get()) {
- OSL_ASSERT(!m_aNodePtr->parent);
+ assert(!m_aNodePtr->parent);
OUString const ret(OStringToOUString(
m_pNamespace->second, RTL_TEXTENCODING_UTF8));
return ret;
@@ -248,7 +248,7 @@ namespace DOM
if (!m_aNodePtr) { return OUString(); }
if (m_pNamespace.get()) {
- OSL_ASSERT(!m_aNodePtr->parent);
+ assert(!m_aNodePtr->parent);
OUString const ret(OStringToOUString(
m_pNamespace->first, RTL_TEXTENCODING_UTF8));
return ret;
diff --git a/unoxml/source/dom/document.cxx b/unoxml/source/dom/document.cxx
index b9c167ee2486..77ccebffa426 100644
--- a/unoxml/source/dom/document.cxx
+++ b/unoxml/source/dom/document.cxx
@@ -173,7 +173,7 @@ namespace DOM
if (xNode.is())
{
::rtl::Reference<CNode> ret(i->second.second);
- OSL_ASSERT(ret.is());
+ assert(ret.is());
return ret;
}
}
@@ -265,7 +265,7 @@ namespace DOM
::std::make_pair(WeakReference<XNode>(pCNode.get()),
pCNode.get()))
).second;
- OSL_ASSERT(bInserted);
+ assert(bInserted);
if (!bInserted) {
// if insertion failed, delete new instance and return null
return nullptr;
@@ -939,7 +939,7 @@ namespace DOM
{
::osl::MutexGuard const g(m_rMutex);
- OSL_ASSERT(nullptr != m_aNodePtr);
+ assert(nullptr != m_aNodePtr);
if (nullptr == m_aNodePtr) {
return nullptr;
}
diff --git a/unoxml/source/dom/node.cxx b/unoxml/source/dom/node.cxx
index 2d191b5cd997..85e47daede05 100644
--- a/unoxml/source/dom/node.cxx
+++ b/unoxml/source/dom/node.cxx
@@ -141,7 +141,7 @@ namespace DOM
? &const_cast<CDocument&>(rDocument) : nullptr )
, m_rMutex(const_cast< ::osl::Mutex & >(rMutex))
{
- OSL_ASSERT(m_aNodePtr);
+ assert(m_aNodePtr);
}
void CNode::invalidate()
@@ -181,7 +181,7 @@ namespace DOM
CDocument & CNode::GetOwnerDocument()
{
- OSL_ASSERT(m_xDocument.is());
+ assert(m_xDocument.is());
return *m_xDocument; // needs overriding in CDocument!
}
diff --git a/xmloff/source/chart/SchXMLChartContext.cxx b/xmloff/source/chart/SchXMLChartContext.cxx
index 8e264843e2dd..13797e9c92e9 100644
--- a/xmloff/source/chart/SchXMLChartContext.cxx
+++ b/xmloff/source/chart/SchXMLChartContext.cxx
@@ -972,7 +972,7 @@ void SchXMLChartContext::EndElement()
void SchXMLChartContext::MergeSeriesForStockChart()
{
- OSL_ASSERT( mbIsStockChart );
+ assert( mbIsStockChart );
try
{
uno::Reference< chart::XChartDocument > xOldDoc( mrImportHelper.GetChartDocument());
@@ -1009,7 +1009,7 @@ void SchXMLChartContext::MergeSeriesForStockChart()
const sal_Int32 nSeriesCount( aSeriesSeq.getLength());
const sal_Int32 nSeriesPerCandleStick = bHasJapaneseCandlestick ? 4: 3;
sal_Int32 nCandleStickCount = nSeriesCount / nSeriesPerCandleStick;
- OSL_ASSERT( nSeriesPerCandleStick * nCandleStickCount == nSeriesCount );
+ assert( nSeriesPerCandleStick * nCandleStickCount == nSeriesCount );
uno::Sequence< uno::Reference< chart2::XDataSeries > > aNewSeries( nCandleStickCount );
for( sal_Int32 i=0; i<nCandleStickCount; ++i )
{
@@ -1120,7 +1120,7 @@ SvXMLImportContext* SchXMLChartContext::CreateChildContext(
{
if( !msColTrans.isEmpty() )
{
- OSL_ASSERT( msRowTrans.isEmpty() );
+ assert( msRowTrans.isEmpty() );
pTableContext->setColumnPermutation( lcl_getNumberSequenceFromString( msColTrans, true ));
msColTrans.clear();
}
diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx
index 35f4a3ffd0be..2ef90c0afe79 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -2896,7 +2896,7 @@ void SchXMLExportHelper_Impl::exportRegressionCurve(
const awt::Size& rPageSize,
bool bExportContent )
{
- OSL_ASSERT( mxExpPropMapper.is());
+ assert( mxExpPropMapper.is());
std::vector< XMLPropertyState > aPropertyStates;
std::vector< XMLPropertyState > aEquationPropertyStates;
diff --git a/xmloff/source/core/attrlist.cxx b/xmloff/source/core/attrlist.cxx
index 4cd94a6d768b..ac59cb9f1409 100644
--- a/xmloff/source/core/attrlist.cxx
+++ b/xmloff/source/core/attrlist.cxx
@@ -160,7 +160,7 @@ void SvXMLAttributeList::Clear()
{
m_pImpl->vecAttribute.clear();
- OSL_ASSERT( ! getLength() );
+ assert( ! getLength() );
}
void SvXMLAttributeList::RemoveAttribute( const OUString& sName )
@@ -177,7 +177,7 @@ void SvXMLAttributeList::RemoveAttribute( const OUString& sName )
void SvXMLAttributeList::AppendAttributeList( const uno::Reference< css::xml::sax::XAttributeList > &r )
{
- OSL_ASSERT( r.is() );
+ assert( r.is() );
sal_Int16 nMax = r->getLength();
SvXMLAttributeList_Impl::size_type nTotalSize =
@@ -190,7 +190,7 @@ void SvXMLAttributeList::AppendAttributeList( const uno::Reference< css::xml::sa
r->getValueByIndex( i )));
}
- OSL_ASSERT( nTotalSize == (SvXMLAttributeList_Impl::size_type)getLength());
+ assert( nTotalSize == (SvXMLAttributeList_Impl::size_type)getLength());
}
void SvXMLAttributeList::SetValueByIndex( sal_Int16 i,
commit 74fa31e12355a45476458d0e6f907894bf4793cd
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date: Sun May 7 10:02:47 2017 +1000
tdf#43157: convert sfx2 module away from OSL_ASSERT to assert
Change-Id: I3facbef60a0d629db8f3028dd1b9f38e8f17e83e
diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx
index d7bc5ff8d7b9..ac5a16aa92c2 100644
--- a/sfx2/source/appl/appuno.cxx
+++ b/sfx2/source/appl/appuno.cxx
@@ -296,7 +296,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert
return;
}
- OSL_ASSERT(nCount > 0);
+ assert(nCount > 0);
#ifdef DBG_UTIL
// detect parameters that don't match to any formal argument or one of its members
diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx
index f6a537ec72bb..82e68a9e4af5 100644
--- a/sfx2/source/appl/shutdownicon.cxx
+++ b/sfx2/source/appl/shutdownicon.cxx
@@ -535,7 +535,7 @@ void ShutdownIcon::terminateDesktop()
ShutdownIcon* ShutdownIcon::getInstance()
{
- OSL_ASSERT( pShutdownIcon );
+ assert( pShutdownIcon );
return pShutdownIcon;
}
diff --git a/sfx2/source/dialog/mailmodel.cxx b/sfx2/source/dialog/mailmodel.cxx
index ac01c0fc6e6f..385a6552030b 100644
--- a/sfx2/source/dialog/mailmodel.cxx
+++ b/sfx2/source/dialog/mailmodel.cxx
@@ -305,7 +305,7 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat(
bool bPrivateProtocol = ( aFileObj.GetProtocol() == INetProtocol::PrivSoffice );
bHasLocation = !aLocation.isEmpty() && !bPrivateProtocol;
- OSL_ASSERT( !bPrivateProtocol );
+ assert( !bPrivateProtocol );
}
if ( !rType.isEmpty() )
bStoreTo = true;
@@ -464,8 +464,8 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat(
if ( aFileName.isEmpty() )
return eRet;
- OSL_ASSERT( !aFilterName.isEmpty() );
- OSL_ASSERT( !aFileName.isEmpty() );
+ assert( !aFilterName.isEmpty() );
+ assert( !aFileName.isEmpty() );
// Creates a temporary directory to store a predefined file into it.
// This makes it possible to store the file for "send document as e-mail"
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index b2a323aa6fe7..5fb7e5c78050 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -341,7 +341,7 @@ SfxTemplatePanelControl::SfxTemplatePanelControl(SfxBindings* pBindings, vcl::Wi
, pImpl(new SfxTemplateDialog_Impl(pBindings, this))
, mpBindings(pBindings)
{
- OSL_ASSERT(mpBindings!=nullptr);
+ assert(mpBindings!=nullptr);
SetStyle(GetStyle() & ~WB_DOCKABLE);
}
diff --git a/sfx2/source/sidebar/DeckLayouter.cxx b/sfx2/source/sidebar/DeckLayouter.cxx
index 5a37474148c5..1721fd1b405e 100644
--- a/sfx2/source/sidebar/DeckLayouter.cxx
+++ b/sfx2/source/sidebar/DeckLayouter.cxx
@@ -302,7 +302,7 @@ sal_Int32 PlacePanels (
nPanelHeight = iItem->maLayoutSize.Preferred;
break;
default:
- OSL_ASSERT(false);
+ assert(false);
break;
}
@@ -453,7 +453,7 @@ void DistributeHeights (
if (nRemainingHeightToDistribute == 0)
return;
- OSL_ASSERT(nRemainingHeightToDistribute > 0);
+ assert(nRemainingHeightToDistribute > 0);
// It is possible that not all of the height could be distributed
// because of Maximum heights being smaller than expected.
@@ -480,7 +480,7 @@ void DistributeHeights (
}
}
- OSL_ASSERT(nRemainingHeightToDistribute==0);
+ assert(nRemainingHeightToDistribute==0);
}
tools::Rectangle PlaceDeckTitle (
@@ -542,7 +542,7 @@ void SetupVerticalScrollBar(
const sal_Int32 nContentHeight,
const sal_Int32 nVisibleHeight)
{
- OSL_ASSERT(nContentHeight > nVisibleHeight);
+ assert(nContentHeight > nVisibleHeight);
rVerticalScrollBar.SetRangeMin(0);
rVerticalScrollBar.SetRangeMax(nContentHeight-1);
diff --git a/sfx2/source/sidebar/DeckTitleBar.cxx b/sfx2/source/sidebar/DeckTitleBar.cxx
index fe4d0b2aae6e..2f67fb100117 100644
--- a/sfx2/source/sidebar/DeckTitleBar.cxx
+++ b/sfx2/source/sidebar/DeckTitleBar.cxx
@@ -44,7 +44,7 @@ DeckTitleBar::DeckTitleBar (const OUString& rsTitle,
, maCloserAction(rCloserAction)
, mbIsCloserVisible(false)
{
- OSL_ASSERT(pParentWindow != nullptr);
+ assert(pParentWindow != nullptr);
if (maCloserAction)
SetCloserVisible(true);
diff --git a/sfx2/source/sidebar/PanelTitleBar.cxx b/sfx2/source/sidebar/PanelTitleBar.cxx
index fcb5e8f0ff6a..e46f001f3459 100644
--- a/sfx2/source/sidebar/PanelTitleBar.cxx
+++ b/sfx2/source/sidebar/PanelTitleBar.cxx
@@ -49,7 +49,7 @@ PanelTitleBar::PanelTitleBar(const OUString& rsTitle,
mxFrame(),
msMoreOptionsCommand()
{
- OSL_ASSERT(mpPanel != nullptr);
+ assert(mpPanel != nullptr);
#ifdef DEBUG
SetText(OUString("PanelTitleBar"));
diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx
index b21be2dfbc05..f3b83bda9d1c 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -336,7 +336,7 @@ void SidebarController::NotifyResize()
{
if (!mpTabBar)
{
- OSL_ASSERT(mpTabBar!=nullptr);
+ assert(mpTabBar!=nullptr);
return;
}
diff --git a/sfx2/source/sidebar/SidebarDockingWindow.cxx b/sfx2/source/sidebar/SidebarDockingWindow.cxx
index 84a2834e5a34..e350f1e52166 100644
--- a/sfx2/source/sidebar/SidebarDockingWindow.cxx
+++ b/sfx2/source/sidebar/SidebarDockingWindow.cxx
@@ -37,8 +37,8 @@ SidebarDockingWindow::SidebarDockingWindow(SfxBindings* pSfxBindings, SidebarChi
// Get the XFrame from the bindings.
if (pSfxBindings==nullptr || pSfxBindings->GetDispatcher()==nullptr)
{
- OSL_ASSERT(pSfxBindings!=nullptr);
- OSL_ASSERT(pSfxBindings->GetDispatcher()!=nullptr);
+ assert(pSfxBindings!=nullptr);
+ assert(pSfxBindings->GetDispatcher()!=nullptr);
}
else
{
diff --git a/sfx2/source/sidebar/TabBar.cxx b/sfx2/source/sidebar/TabBar.cxx
index 7d4ee1419ef0..4e6830f8c6f6 100644
--- a/sfx2/source/sidebar/TabBar.cxx
+++ b/sfx2/source/sidebar/TabBar.cxx
@@ -122,7 +122,7 @@ void TabBar::SetDecks(const ResourceManager::DeckContextDescriptorContainer& rDe
std::shared_ptr<DeckDescriptor> xDescriptor = pParentSidebarController->GetResourceManager()->GetDeckDescriptor(iDeck->msId);
if (xDescriptor == nullptr)
{
- OSL_ASSERT(xDescriptor!=nullptr);
+ assert(xDescriptor!=nullptr);
continue;
}
diff --git a/sfx2/source/sidebar/Theme.cxx b/sfx2/source/sidebar/Theme.cxx
index 2b29083f5bd9..db73bc21e273 100644
--- a/sfx2/source/sidebar/Theme.cxx
+++ b/sfx2/source/sidebar/Theme.cxx
@@ -61,7 +61,7 @@ Theme::~Theme()
Image Theme::GetImage (const ThemeItem eItem)
{
const PropertyType eType (GetPropertyType(eItem));
- OSL_ASSERT(eType==PT_Image);
+ assert(eType==PT_Image);
const sal_Int32 nIndex (GetIndex(eItem, eType));
const Theme& rTheme (GetCurrentTheme());
return rTheme.maImages[nIndex];
@@ -70,7 +70,7 @@ Image Theme::GetImage (const ThemeItem eItem)
Color Theme::GetColor (const ThemeItem eItem)
{
const PropertyType eType (GetPropertyType(eItem));
- OSL_ASSERT(eType==PT_Color || eType==PT_Paint);
+ assert(eType==PT_Color || eType==PT_Paint);
const sal_Int32 nIndex (GetIndex(eItem, eType));
const Theme& rTheme (GetCurrentTheme());
if (eType == PT_Color)
@@ -84,7 +84,7 @@ Color Theme::GetColor (const ThemeItem eItem)
const Paint& Theme::GetPaint (const ThemeItem eItem)
{
const PropertyType eType (GetPropertyType(eItem));
- OSL_ASSERT(eType==PT_Paint);
+ assert(eType==PT_Paint);
const sal_Int32 nIndex (GetIndex(eItem, eType));
const Theme& rTheme (GetCurrentTheme());
return rTheme.maPaints[nIndex];
@@ -98,7 +98,7 @@ const Wallpaper Theme::GetWallpaper (const ThemeItem eItem)
sal_Int32 Theme::GetInteger (const ThemeItem eItem)
{
const PropertyType eType (GetPropertyType(eItem));
- OSL_ASSERT(eType==PT_Integer);
+ assert(eType==PT_Integer);
const sal_Int32 nIndex (GetIndex(eItem, eType));
const Theme& rTheme (GetCurrentTheme());
return rTheme.maIntegers[nIndex];
@@ -107,7 +107,7 @@ sal_Int32 Theme::GetInteger (const ThemeItem eItem)
bool Theme::GetBoolean (const ThemeItem eItem)
{
const PropertyType eType (GetPropertyType(eItem));
- OSL_ASSERT(eType==PT_Boolean);
+ assert(eType==PT_Boolean);
const sal_Int32 nIndex (GetIndex(eItem, eType));
const Theme& rTheme (GetCurrentTheme());
return rTheme.maBooleans[nIndex];
@@ -337,7 +337,7 @@ void Theme::UpdateTheme()
catch(beans::UnknownPropertyException& rException)
{
SAL_WARN("sfx", "unknown property: " << rException.Message);
- OSL_ASSERT(false);
+ assert(false);
}
}
@@ -884,7 +884,7 @@ sal_Int32 Theme::GetIndex (const ThemeItem eItem, const PropertyType eType)
return eItem - Bool_Rect_-1;
default:
- OSL_ASSERT(false);
+ assert(false);
return 0;
}
}
@@ -1049,7 +1049,7 @@ void Theme::ProcessNewValue (
break;
}
case PT_Invalid:
- OSL_ASSERT(eType != PT_Invalid);
+ assert(eType != PT_Invalid);
throw RuntimeException();
}
}
diff --git a/sfx2/source/sidebar/TitleBar.cxx b/sfx2/source/sidebar/TitleBar.cxx
index 22433123cd4c..e03f382bc246 100644
--- a/sfx2/source/sidebar/TitleBar.cxx
+++ b/sfx2/source/sidebar/TitleBar.cxx
@@ -167,7 +167,7 @@ void TitleBar::PaintFocus(vcl::RenderContext& rRenderContext, const tools::Recta
IMPL_LINK(TitleBar, SelectionHandler, ToolBox*, pToolBox, void)
{
(void)pToolBox;
- OSL_ASSERT(maToolBox.get()==pToolBox);
+ assert(maToolBox.get()==pToolBox);
const sal_uInt16 nItemId (maToolBox->GetHighlightItemId());
HandleToolBoxItemClick(nItemId);
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index 5aed453f2392..74ee50a7f3e8 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
@@ -104,7 +104,7 @@ SFX_IMPL_TOOLBOX_CONTROL_ARG(SfxToolBoxControl, SfxStringItem, true);
static vcl::Window* GetTopMostParentSystemWindow( vcl::Window* pWindow )
{
- OSL_ASSERT( pWindow );
+ assert( pWindow );
if ( pWindow )
{
// ->manually search topmost system window
@@ -118,7 +118,7 @@ static vcl::Window* GetTopMostParentSystemWindow( vcl::Window* pWindow )
pWindow = pWindow->GetParent();
}
pWindow = pTopMostSysWin;
- OSL_ASSERT( pWindow );
+ assert( pWindow );
return pWindow;
}
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index dfb636d2e3a9..c73877ff5b57 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -633,8 +633,8 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq )
aFileName = aFObj.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DecodeMechanism::NONE );
}
- OSL_ASSERT( !aFilterName.isEmpty() );
- OSL_ASSERT( !aFileName.isEmpty() );
+ assert( !aFilterName.isEmpty() );
+ assert( !aFileName.isEmpty() );
// Creates a temporary directory to store our predefined file into it.
::utl::TempFile aTempDir( nullptr, true );
commit 6c9fb88fc097ff42cb6a0e26dad84f535ea69edf
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date: Sun May 7 09:57:24 2017 +1000
tdf#43157: convert sax module away from OSL_ASSERT to assert
Change-Id: Ie9e5a123e69269a2ea193923d4d130a947f2388d
diff --git a/sax/test/sax/testsax.cxx b/sax/test/sax/testsax.cxx
index 6b382befdab0..904ad48fadcc 100644
--- a/sax/test/sax/testsax.cxx
+++ b/sax/test/sax/testsax.cxx
@@ -196,12 +196,12 @@ Reference < XInputStream > createStreamFromSequence(
{
Reference < XInterface > xOutStreamService =
xSMgr->createInstance("com.sun.star.io.Pipe");
- OSL_ASSERT( xOutStreamService.is() );
+ assert( xOutStreamService.is() );
Reference< XOutputStream > rOutStream( xOutStreamService , UNO_QUERY );
- OSL_ASSERT( rOutStream.is() );
+ assert( rOutStream.is() );
Reference< XInputStream > rInStream( xOutStreamService , UNO_QUERY );
- OSL_ASSERT( rInStream.is() );
+ assert( rInStream.is() );
rOutStream->writeBytes( seqBytes );
rOutStream->flush();
@@ -314,7 +314,7 @@ public:
virtual void SAL_CALL endElement(const OUString& aName) throw (SAXException,RuntimeException)
{
- OSL_ASSERT( m_iLevel );
+ assert( m_iLevel );
m_iLevel --;
if( m_bPrint ) {
int i;
commit ddce1e22fbdd3256c304541ac0470bb2c2a82ed1
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date: Sun May 7 09:54:46 2017 +1000
tdf#43157: convert framework module away from OSL_ASSERT to assert
Change-Id: Iac0093a2a69d53c91c827ebba01fcdb5353e9b96
diff --git a/framework/source/accelerators/presethandler.cxx b/framework/source/accelerators/presethandler.cxx
index 62ba06b9fe14..d1d094d0b3b1 100644
--- a/framework/source/accelerators/presethandler.cxx
+++ b/framework/source/accelerators/presethandler.cxx
@@ -170,7 +170,7 @@ void lcl_throwCorruptedUIConfigurationException(
{
css::uno::Exception e;
bool ok = (exception >>= e);
- OSL_ASSERT(ok); (void) ok; // avoid warnings
+ assert(ok); (void) ok; // avoid warnings
throw css::configuration::CorruptedUIConfigurationException(
lcl_getLocalizedMessage(id),
css::uno::Reference< css::uno::XInterface >(),
diff --git a/framework/source/recording/dispatchrecorder.cxx b/framework/source/recording/dispatchrecorder.cxx
index b8b9c3f47bd7..6d69d002541a 100644
--- a/framework/source/recording/dispatchrecorder.cxx
+++ b/framework/source/recording/dispatchrecorder.cxx
@@ -78,7 +78,7 @@ Sequence< Any > make_seq_out_of_struct(
}
typelib_TypeDescription * pTD = nullptr;
TYPELIB_DANGER_GET( &pTD, type.getTypeLibType() );
- OSL_ASSERT( pTD );
+ assert( pTD );
if (! pTD)
{
throw RuntimeException(
diff --git a/framework/source/services/ContextChangeEventMultiplexer.cxx b/framework/source/services/ContextChangeEventMultiplexer.cxx
index 1171aebc87d7..0c9f372e039c 100644
--- a/framework/source/services/ContextChangeEventMultiplexer.cxx
+++ b/framework/source/services/ContextChangeEventMultiplexer.cxx
@@ -317,7 +317,7 @@ void SAL_CALL ContextChangeEventMultiplexer::disposing ( const css::lang::EventO
if (iDescriptor == maListeners.end())
{
- OSL_ASSERT(iDescriptor != maListeners.end());
+ assert(iDescriptor != maListeners.end());
return;
}
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index 2ab500e34b04..3b936d92ff8f 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -148,7 +148,7 @@ ToolBarManager::ToolBarManager( const Reference< XComponentContext >& rxContext,
m_xContext( rxContext ),
m_sIconTheme( SvtMiscOptions().GetIconTheme() )
{
- OSL_ASSERT( m_xContext.is() );
+ assert( m_xContext.is() );
vcl::Window* pWindow = m_pToolBar;
while ( pWindow && !pWindow->IsSystemWindow() )
@@ -204,12 +204,12 @@ ToolBarManager::~ToolBarManager()
{
assert(!m_aAsyncUpdateControllersTimer.IsActive());
assert(!m_pToolBar); // must be disposed by ToolbarLayoutManager
- OSL_ASSERT( !m_bAddedToTaskPaneList );
+ assert( !m_bAddedToTaskPaneList );
}
void ToolBarManager::Destroy()
{
- OSL_ASSERT( m_pToolBar != nullptr );
+ assert( m_pToolBar != nullptr );
SolarMutexGuard g;
if ( m_bAddedToTaskPaneList )
{
commit bbd2d2c116158613ec690bdadca7abe59af88860
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date: Sun May 7 09:39:49 2017 +1000
tdf#43157: convert cppcanvas module away from OSL_ASSERT to assert
Change-Id: I1db04c35cc004a33b0d2586f9eb1d21bc545eb81
diff --git a/cppcanvas/source/mtfrenderer/emfpfont.cxx b/cppcanvas/source/mtfrenderer/emfpfont.cxx
index 2df7981e6ab6..f618719ade35 100755
--- a/cppcanvas/source/mtfrenderer/emfpfont.cxx
+++ b/cppcanvas/source/mtfrenderer/emfpfont.cxx
@@ -51,7 +51,7 @@ namespace cppcanvas
s.ReadUInt32(header).ReadFloat(emSize).ReadUInt32(sizeUnit).ReadInt32(fontFlags).ReadUInt32(reserved).ReadUInt32(length);
- OSL_ASSERT((header >> 12) == 0xdbc01);
+ assert((header >> 12) == 0xdbc01);
SAL_INFO("cppcanvas.emf", "EMF+\tfont\nEMF+\theader: 0x" << std::hex << (header >> 12) << " version: 0x" << (header & 0x1fff) << " size: " << std::dec << emSize << " unit: 0x" << std::hex << sizeUnit << std::dec);
SAL_INFO("cppcanvas.emf", "EMF+\tflags: 0x" << std::hex << fontFlags << " reserved: 0x" << reserved << " length: 0x" << std::hex << length << std::dec);
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx
index 4d4bfb528d61..6d264b5806ac 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -440,7 +440,7 @@ namespace cppcanvas
int length = aStartColor.getLength ();
uno::Sequence< double > aColor (length);
- OSL_ASSERT (length == aEndColor.getLength());
+ assert (length == aEndColor.getLength());
for (int i = 0; i < brush->blendPoints; i++) {
aStops[i] = brush->blendPositions [i];
diff --git a/cppcanvas/source/mtfrenderer/emfpstringformat.cxx b/cppcanvas/source/mtfrenderer/emfpstringformat.cxx
index 01bbb4aae874..d23c0173daab 100755
--- a/cppcanvas/source/mtfrenderer/emfpstringformat.cxx
+++ b/cppcanvas/source/mtfrenderer/emfpstringformat.cxx
@@ -52,7 +52,7 @@ namespace cppcanvas
s.ReadFloat(firstTabOffset).ReadInt32(hotkeyPrefix).ReadFloat(leadingMargin).ReadFloat(trailingMargin).ReadFloat(tracking);
s.ReadInt32(trimming).ReadInt32(tabStopCount).ReadInt32(rangeCount);
- OSL_ASSERT((header >> 12) == 0xdbc01);
+ assert((header >> 12) == 0xdbc01);
SAL_INFO("cppcanvas.emf", "EMF+\t string format\nEMF+\theader: 0x" << std::hex << (header >> 12) << " version: 0x" << (header & 0x1fff) << " StringFormatFlags: " << std::dec << stringFormatFlags << " Language: " << language);
SAL_INFO("cppcanvas.emf", "EMF+\t StringAlignment: " << stringAlignment << " LineAlign: " << lineAlign << " DigitSubstitution: " << digitSubstitution << " DigitLanguage: " << digitLanguage);
commit b8fc5aee3c1c2e7966ae12c32db8c481d95715a6
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date: Sun May 7 09:37:20 2017 +1000
tdf#43157: convert most of canvas codebase away from OSL_ASSERT to assert
Change-Id: Ie6a5942dcac62a0bc3b589ff0b82922b313f88a8
diff --git a/canvas/source/cairo/cairo_canvashelper.cxx b/canvas/source/cairo/cairo_canvashelper.cxx
index a27f69ba1085..337089031dce 100644
--- a/canvas/source/cairo/cairo_canvashelper.cxx
+++ b/canvas/source/cairo/cairo_canvashelper.cxx
@@ -663,7 +663,7 @@ namespace cairocanvas
{
int i;
- OSL_ASSERT( rColors.getLength() == rStops.getLength() );
+ assert( rColors.getLength() == rStops.getLength() );
for( i = 0; i < rColors.getLength(); i++ )
{
diff --git a/canvas/source/opengl/ogl_canvashelper.cxx b/canvas/source/opengl/ogl_canvashelper.cxx
index d2edda651e4f..349e989bfd2b 100644
--- a/canvas/source/opengl/ogl_canvashelper.cxx
+++ b/canvas/source/opengl/ogl_canvashelper.cxx
@@ -193,7 +193,7 @@ namespace oglcanvas
for( sal_Int32 i=0; i<nNumCols; ++i )
*pCurrCol++ = rHelper.getDevice()->getDeviceColorSpace()->convertToARGB(rValues.maColors[i])[0];
- OSL_ASSERT(nNumCols == rValues.maStops.getLength());
+ assert(nNumCols == rValues.maStops.getLength());
switch( rValues.meType )
{
diff --git a/include/canvas/base/spritecanvasbase.hxx b/include/canvas/base/spritecanvasbase.hxx
index 044a279c061e..bd229af5288e 100644
--- a/include/canvas/base/spritecanvasbase.hxx
+++ b/include/canvas/base/spritecanvasbase.hxx
@@ -139,7 +139,7 @@ namespace canvas
// SpriteSurface
virtual void showSprite( const Sprite::Reference& rSprite ) override
{
- OSL_ASSERT( rSprite.is() );
+ assert( rSprite.is() );
typename BaseType::MutexType aGuard( BaseType::m_aMutex );
@@ -148,7 +148,7 @@ namespace canvas
virtual void hideSprite( const Sprite::Reference& rSprite ) override
{
- OSL_ASSERT( rSprite.is() );
+ assert( rSprite.is() );
typename BaseType::MutexType aGuard( BaseType::m_aMutex );
@@ -160,7 +160,7 @@ namespace canvas
const ::basegfx::B2DPoint& rNewPos,
const ::basegfx::B2DVector& rSpriteSize ) override
{
- OSL_ASSERT( rSprite.is() );
+ assert( rSprite.is() );
typename BaseType::MutexType aGuard( BaseType::m_aMutex );
@@ -171,7 +171,7 @@ namespace canvas
const ::basegfx::B2DPoint& rPos,
const ::basegfx::B2DRange& rUpdateArea ) override
{
- OSL_ASSERT( rSprite.is() );
+ assert( rSprite.is() );
typename BaseType::MutexType aGuard( BaseType::m_aMutex );
commit 4aca4ce101398443b2cfee8fdf18bae8e6c3892a
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date: Sun May 7 09:34:24 2017 +1000
tdf#43157: convert OS X fpicker codebase away from OSL_ASSERT to assert
Change-Id: I3e04db9ffb82f591dcff9b91eb915cf059a9b312
diff --git a/fpicker/source/aqua/resourceprovider.mm b/fpicker/source/aqua/resourceprovider.mm
index f1c9023a1cfd..a350bfe2f10e 100644
--- a/fpicker/source/aqua/resourceprovider.mm
+++ b/fpicker/source/aqua/resourceprovider.mm
@@ -131,7 +131,7 @@ public:
try
{
- OSL_ASSERT( m_ResMgr && m_OtherResMgr );
+ assert( m_ResMgr && m_OtherResMgr );
// translate the control id to a resource id
sal_Int16 aResId = CtrlIdToResId( aId );
commit f67ddc8a5d235887a092554157285b149c17750b
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date: Sun May 7 09:32:36 2017 +1000
tdf#43157: convert accessibility module away from OSL_ASSERT to assert
Change-Id: I2472601216309d30c70e0e455ab096b5150640e8
diff --git a/accessibility/source/extended/accessiblelistbox.cxx b/accessibility/source/extended/accessiblelistbox.cxx
index dd96005ee3dd..67b2526eee62 100644
--- a/accessibility/source/extended/accessiblelistbox.cxx
+++ b/accessibility/source/extended/accessiblelistbox.cxx
@@ -156,7 +156,7 @@ namespace accessibility
MAP_ENTRY::iterator mi = m_mapEntry.find(pEntry);
if(mi != m_mapEntry.end())
{
- OSL_ASSERT(mi->second.get() != nullptr);
+ assert(mi->second.get() != nullptr);
m_xFocusedChild = mi->second;
}
else
commit f7e9d0804cd06dc4870be5cc23e76b696442f1c4
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date: Sun May 7 09:30:42 2017 +1000
tdf#43157: convert uui module away from OSL_ASSERT to assert
Change-Id: I8aefdc3172578535fde5ea6b86b80af7a017e5e8
diff --git a/uui/source/iahndl-errorhandler.cxx b/uui/source/iahndl-errorhandler.cxx
index 3e90c6ebdb36..c08cf067419e 100644
--- a/uui/source/iahndl-errorhandler.cxx
+++ b/uui/source/iahndl-errorhandler.cxx
@@ -92,7 +92,7 @@ executeErrorDialog(
break;
default:
- OSL_ASSERT(false);
+ assert(false);
break;
}
}
commit 6b3b0b85f96008a7bf4211edd25e4b96118e3c4f
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date: Sun May 7 09:29:23 2017 +1000
tdf#43157: convert basic module away from OSL_ASSERT to assert
Change-Id: Idfd05d410ad3d76c3699492d98e1284a21f5f7d6
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index fdfcb75ccf5c..5ebf732eabe9 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -754,7 +754,7 @@ void unoToSbxValue( SbxVariable* pVar, const Any& aValue )
typelib_TypeDescription * pTD = nullptr;
aType.getDescription( &pTD );
- OSL_ASSERT( pTD && pTD->eTypeClass == typelib_TypeClass_SEQUENCE );
+ assert( pTD && pTD->eTypeClass == typelib_TypeClass_SEQUENCE );
Type aElementType( reinterpret_cast<typelib_IndirectTypeDescription *>(pTD)->pType );
::typelib_typedescription_release( pTD );
@@ -1321,7 +1321,7 @@ Any sbxToUnoValue( const SbxValue* pVar, const Type& rType, Property* pUnoProper
OUString aClassName = xIdlTargetClass->getName();
typelib_TypeDescription * pSeqTD = nullptr;
typelib_typedescription_getByName( &pSeqTD, aClassName.pData );
- OSL_ASSERT( pSeqTD );
+ assert( pSeqTD );
Type aElemType( reinterpret_cast<typelib_IndirectTypeDescription *>(pSeqTD)->pType );
// convert all array member and register them
@@ -1362,7 +1362,7 @@ Any sbxToUnoValue( const SbxValue* pVar, const Type& rType, Property* pUnoProper
{
OUString aTypeName = aCurType.getTypeName();
typelib_typedescription_getByName( &pSeqTD, aTypeName.pData );
- OSL_ASSERT( pSeqTD );
+ assert( pSeqTD );
if( pSeqTD->eTypeClass == typelib_TypeClass_SEQUENCE )
{
aCurType = Type( reinterpret_cast<typelib_IndirectTypeDescription *>(pSeqTD)->pType );
@@ -4605,7 +4605,7 @@ bool SbModule::createCOMWrapperForIface( Any& o_rRetAny, SbClassModuleObject* pP
}
while( pParentBasic == nullptr && pCurObject != nullptr );
- OSL_ASSERT( pParentBasic != nullptr );
+ assert( pParentBasic != nullptr );
registerComponentToBeDisposedForBasic( xComponent, pParentBasic );
}
diff --git a/basic/source/runtime/dllmgr-x64.cxx b/basic/source/runtime/dllmgr-x64.cxx
index 4c8a0409a635..d88f0ecdb589 100644
--- a/basic/source/runtime/dllmgr-x64.cxx
+++ b/basic/source/runtime/dllmgr-x64.cxx
@@ -50,7 +50,7 @@ using namespace css;
Missing support for functions returning structs (see TODO in call()).
Missing support for additional data types (64 bit integers, Any, ...; would
- trigger OSL_ASSERT(false) in various switches).
+ trigger assert(false) in various switches).
It is assumed that the variables passed into SbiDllMgr::Call to represent
the arguments and return value have types that exactly match the Declare
@@ -143,7 +143,7 @@ template< typename T > void add(
}
std::size_t alignment(SbxVariable * variable) {
- OSL_ASSERT(variable != nullptr);
+ assert(variable != nullptr);
if ((variable->GetType() & SbxARRAY) == 0) {
switch (variable->GetType()) {
case SbxINTEGER:
@@ -168,7 +168,7 @@ std::size_t alignment(SbxVariable * variable) {
case SbxBYTE:
return 1;
default:
- OSL_ASSERT(false);
+ assert(false);
return 1;
}
} else {
@@ -190,7 +190,7 @@ SbError marshal(
SbError marshalString(
SbxVariable * variable, bool special, MarshalData & data, void ** buffer)
{
- OSL_ASSERT(variable != nullptr && buffer != nullptr);
+ assert(variable != nullptr && buffer != nullptr);
OString str;
SbError e = convert(variable->GetOUString(), &str);
if (e != ERRCODE_NONE) {
@@ -207,7 +207,7 @@ SbError marshalStruct(
SbxVariable * variable, std::vector< char > & blob, std::size_t offset,
MarshalData & data)
{
- OSL_ASSERT(variable != nullptr);
+ assert(variable != nullptr);
SbxArray * props = dynamic_cast<SbxObject*>( variable->GetObject() )->
GetProperties();
for (sal_uInt16 i = 0; i < props->Count(); ++i) {
@@ -223,7 +223,7 @@ SbError marshalArray(
SbxVariable * variable, std::vector< char > & blob, std::size_t offset,
MarshalData & data)
{
- OSL_ASSERT(variable != nullptr);
+ assert(variable != nullptr);
SbxDimArray * arr = dynamic_cast<SbxDimArray*>( variable->GetObject() );
int dims = arr->GetDims();
std::vector< sal_Int32 > low(dims);
@@ -255,7 +255,7 @@ SbError marshal(
bool outer, SbxVariable * variable, bool special,
std::vector< char > & blob, std::size_t offset, MarshalData & data)
{
- OSL_ASSERT(variable != nullptr);
+ assert(variable != nullptr);
if (!(variable->GetFlags() & SbxFlagBits::Reference)) {
if ((variable->GetType() & SbxARRAY) == 0) {
switch (variable->GetType()) {
@@ -297,7 +297,7 @@ SbError marshal(
add(blob, variable->GetByte(), outer ? 8 : 1, offset);
break;
default:
- OSL_ASSERT(false);
+ assert(false);
break;
}
} else {
@@ -344,7 +344,7 @@ SbError marshal(
break;
}
default:
- OSL_ASSERT(false);
+ assert(false);
break;
}
} else {
@@ -370,7 +370,7 @@ template< typename T > T read(void const ** pointer) {
}
void const * unmarshal(SbxVariable * variable, void const * data) {
- OSL_ASSERT(variable != nullptr);
+ assert(variable != nullptr);
if ((variable->GetType() & SbxARRAY) == 0) {
switch (variable->GetType()) {
case SbxINTEGER:
@@ -408,7 +408,7 @@ void const * unmarshal(SbxVariable * variable, void const * data) {
variable->PutByte(read< sal_uInt8 >(&data));
break;
default:
- OSL_ASSERT(false);
+ assert(false);
break;
}
} else {
@@ -596,7 +596,7 @@ SbError call(
result.PutByte(static_cast< sal_uInt8 >(iRetVal));
break;
default:
- OSL_ASSERT(false);
+ assert(false);
break;
}
for (int i = 1; i < (arguments == nullptr ? 0 : arguments->Count()); ++i) {
@@ -621,7 +621,7 @@ SbError call(
SbError getProcData(HMODULE handle, OUString const & name, ProcData * proc)
{
- OSL_ASSERT(proc != nullptr);
+ assert(proc != nullptr);
if (name.getLength() != 0 && name[0] == '@') { //TODO: "@" vs. "#"???
sal_Int32 n = name.copy(1).toInt32(); //TODO: handle bad input
if (n <= 0 || n > 0xFFFF) {
diff --git a/basic/source/runtime/dllmgr-x86.cxx b/basic/source/runtime/dllmgr-x86.cxx
index 7cc4c91a8552..6108e1c8c59a 100644
--- a/basic/source/runtime/dllmgr-x86.cxx
+++ b/basic/source/runtime/dllmgr-x86.cxx
@@ -51,7 +51,7 @@ using namespace css::uno;
Missing support for functions returning structs (see TODO in call()).
Missing support for additional data types (64 bit integers, Any, ...; would
- trigger OSL_ASSERT(false) in various switches).
+ trigger assert(false) in various switches).
It is assumed that the variables passed into SbiDllMgr::Call to represent
the arguments and return value have types that exactly match the Declare
@@ -151,7 +151,7 @@ template< typename T > void add(
}
std::size_t alignment(SbxVariable * variable) {
- OSL_ASSERT(variable != 0);
+ assert(variable != 0);
if ((variable->GetType() & SbxARRAY) == 0) {
switch (variable->GetType()) {
case SbxINTEGER:
@@ -176,7 +176,7 @@ std::size_t alignment(SbxVariable * variable) {
case SbxBYTE:
return 1;
default:
- OSL_ASSERT(false);
+ assert(false);
return 1;
}
} else {
@@ -198,7 +198,7 @@ SbError marshal(
SbError marshalString(
SbxVariable * variable, bool special, MarshalData & data, void ** buffer)
{
- OSL_ASSERT(variable != 0 && buffer != 0);
+ assert(variable != 0 && buffer != 0);
OString str;
SbError e = convert(variable->GetOUString(), &str);
if (e != ERRCODE_NONE) {
@@ -216,7 +216,7 @@ SbError marshalStruct(
SbxVariable * variable, std::vector< char > & blob, std::size_t offset,
MarshalData & data)
{
- OSL_ASSERT(variable != 0);
+ assert(variable != 0);
SbxArray * props = dynamic_cast<SbxObject*>( variable->GetObject() )->
GetProperties();
for (sal_uInt16 i = 0; i < props->Count(); ++i) {
@@ -232,7 +232,7 @@ SbError marshalArray(
SbxVariable * variable, std::vector< char > & blob, std::size_t offset,
MarshalData & data)
{
- OSL_ASSERT(variable != 0);
+ assert(variable != 0);
SbxDimArray * arr = dynamic_cast<SbxDimArray*>( variable->GetObject() );
int dims = arr->GetDims();
std::vector< sal_Int32 > low(dims);
@@ -264,7 +264,7 @@ SbError marshal(
bool outer, SbxVariable * variable, bool special,
std::vector< char > & blob, std::size_t offset, MarshalData & data)
{
- OSL_ASSERT(variable != 0);
+ assert(variable != 0);
SbxDataType eVarType = variable->GetType();
bool bByVal = !(variable->GetFlags() & SbxFlagBits::Reference);
@@ -312,7 +312,7 @@ SbError marshal(
add(blob, variable->GetByte(), outer ? 4 : 1, offset);
break;
default:
- OSL_ASSERT(false);
+ assert(false);
break;
}
} else {
@@ -359,7 +359,7 @@ SbError marshal(
break;
}
default:
- OSL_ASSERT(false);
+ assert(false);
break;
}
} else {
@@ -385,7 +385,7 @@ template< typename T > T read(void const ** pointer) {
}
void const * unmarshal(SbxVariable * variable, void const * data) {
- OSL_ASSERT(variable != 0);
+ assert(variable != 0);
if ((variable->GetType() & SbxARRAY) == 0) {
switch (variable->GetType()) {
case SbxINTEGER:
@@ -423,7 +423,7 @@ void const * unmarshal(SbxVariable * variable, void const * data) {
variable->PutByte(read< sal_uInt8 >(&data));
break;
default:
- OSL_ASSERT(false);
+ assert(false);
break;
}
} else {
@@ -550,7 +550,7 @@ SbError call(
DllMgr_call32(proc.proc, address(stack), stack.size())));
break;
default:
- OSL_ASSERT(false);
+ assert(false);
break;
}
for (sal_uInt16 i = 1; i < (arguments == 0 ? 0 : arguments->Count()); ++i) {
@@ -575,7 +575,7 @@ SbError call(
SbError getProcData(HMODULE handle, OUString const & name, ProcData * proc)
{
- OSL_ASSERT(proc != 0);
+ assert(proc != 0);
if ( !name.isEmpty() && name[0] == '@' ) { //TODO: "@" vs. "#"???
sal_Int32 n = name.copy(1).toInt32(); //TODO: handle bad input
if (n <= 0 || n > 0xFFFF) {
diff --git a/basic/source/uno/dlgcont.cxx b/basic/source/uno/dlgcont.cxx
index 201f873c4742..0cb6b4bbd076 100644
--- a/basic/source/uno/dlgcont.cxx
+++ b/basic/source/uno/dlgcont.cxx
@@ -206,7 +206,7 @@ void SfxDialogLibraryContainer::storeLibrariesToStorage( const uno::Reference< e
{
// if we cannot get the version then the
// Oasis2OOoTransformer will not be used
- OSL_ASSERT(false);
+ assert(false);
}
}
commit 0bb166a280f9f04a77e7b934525395c652285fb1
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date: Sun May 7 09:27:13 2017 +1000
tdf#43157: convert smoketest codebase away from OSL_ASSERT to assert
Change-Id: I2e53755583de7a89d4d3ebae190ed73fb059a715
diff --git a/smoketest/smoketest.cxx b/smoketest/smoketest.cxx
index 4db733bb0cd2..a097dd282a18 100644
--- a/smoketest/smoketest.cxx
+++ b/smoketest/smoketest.cxx
@@ -71,7 +71,7 @@ class Listener:
public cppu::WeakImplHelper< css::frame::XDispatchResultListener >
{
public:
- explicit Listener(Result * result): result_(result) { OSL_ASSERT(result != nullptr); }
+ explicit Listener(Result * result): result_(result) { assert(result != nullptr); }
private:
virtual void SAL_CALL disposing(css::lang::EventObject const &) override {}
@@ -100,7 +100,7 @@ public:
listener):
dispatch_(dispatch), url_(url), arguments_(arguments),
listener_(listener)
- { OSL_ASSERT(dispatch.is()); }
+ { assert(dispatch.is()); }
private:
virtual void SAL_CALL notify(css::uno::Any const &) override
commit 19ad058856ad2e2994409cf3b0b142a8a72e4c6b
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date: Sun May 7 09:25:45 2017 +1000
tdf#43157: convert svtools codebase away from OSL_ASSERT to assert
Change-Id: Ib22caa642b6d7afd0b54e8a6d6e4961d416df3ee
diff --git a/svtools/source/config/itemholder2.cxx b/svtools/source/config/itemholder2.cxx
index 638120cf1515..bf55780dde80 100644
--- a/svtools/source/config/itemholder2.cxx
+++ b/svtools/source/config/itemholder2.cxx
@@ -162,7 +162,7 @@ void ItemHolder2::impl_newItem(TItemInfo& rItem)
break;
default:
- OSL_ASSERT(false);
+ assert(false);
break;
}
}
diff --git a/svtools/source/control/toolbarmenu.cxx b/svtools/source/control/toolbarmenu.cxx
index 92d23b77f701..69b02388ff98 100644
--- a/svtools/source/control/toolbarmenu.cxx
+++ b/svtools/source/control/toolbarmenu.cxx
@@ -46,7 +46,7 @@ namespace svtools {
static vcl::Window* GetTopMostParentSystemWindow( vcl::Window* pWindow )
{
- OSL_ASSERT( pWindow );
+ assert( pWindow );
if ( pWindow )
{
// ->manually search topmost system window
@@ -60,7 +60,7 @@ static vcl::Window* GetTopMostParentSystemWindow( vcl::Window* pWindow )
pWindow = pWindow->GetParent();
}
pWindow = pTopMostSysWin;
- OSL_ASSERT( pWindow );
+ assert( pWindow );
return pWindow;
}
diff --git a/svtools/source/dialogs/colrdlg.cxx b/svtools/source/dialogs/colrdlg.cxx
index fb315dc7ea18..066d508c4b4b 100644
--- a/svtools/source/dialogs/colrdlg.cxx
+++ b/svtools/source/dialogs/colrdlg.cxx
@@ -101,7 +101,7 @@ short SvColorDialog::Execute()
}
catch(Exception&)
{
- OSL_ASSERT(false);
+ assert(false);
}
return ret;
diff --git a/svtools/source/uno/toolboxcontroller.cxx b/svtools/source/uno/toolboxcontroller.cxx
index 4d802f1d7763..5376dcf3aea0 100644
--- a/svtools/source/uno/toolboxcontroller.cxx
+++ b/svtools/source/uno/toolboxcontroller.cxx
@@ -63,7 +63,7 @@ ToolboxController::ToolboxController(
, m_aCommandURL( aCommandURL )
, m_aListenerContainer( m_aMutex )
{
- OSL_ASSERT( m_xContext.is() );
+ assert( m_xContext.is() );
registerProperty( TOOLBARCONTROLLER_PROPNAME_SUPPORTSVISIBLE,
TOOLBARCONTROLLER_PROPHANDLE_SUPPORTSVISIBLE,
css::beans::PropertyAttribute::TRANSIENT | css::beans::PropertyAttribute::READONLY,
diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx
index a0e0853a79fe..36b33ff23824 100644
--- a/svtools/source/uno/treecontrolpeer.cxx
+++ b/svtools/source/uno/treecontrolpeer.cxx
@@ -517,7 +517,7 @@ Any SAL_CALL TreeControlPeer::getSelection()
--nSelectionCount;
}
- OSL_ASSERT( (pEntry == nullptr) && (nSelectionCount == 0) );
+ assert( (pEntry == nullptr) && (nSelectionCount == 0) );
aRet <<= aSelection;
}
@@ -618,7 +618,7 @@ Reference< XEnumeration > SAL_CALL TreeControlPeer::createSelectionEnumeration()
--nSelectionCount;
}
- OSL_ASSERT( (pEntry == nullptr) && (nSelectionCount == 0) );
+ assert( (pEntry == nullptr) && (nSelectionCount == 0) );
return Reference< XEnumeration >( new TreeSelectionEnumeration( aSelection ) );
}
@@ -641,7 +641,7 @@ Reference< XEnumeration > SAL_CALL TreeControlPeer::createReverseSelectionEnumer
--nSelectionCount;
}
- OSL_ASSERT( (pEntry == nullptr) && (nSelectionCount == 0) );
+ assert( (pEntry == nullptr) && (nSelectionCount == 0) );
return Reference< XEnumeration >( new TreeSelectionEnumeration( aSelection ) );
}
commit 6fa4b7e0cc96cb621ac034fb1d2bc1ea649ff8f2
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date: Sun May 7 09:12:57 2017 +1000
tdf#43157: convert xmlhelp codebase away from OSL_ASSERT to assert
Change-Id: I84fc0f1a39a47e357e8132b92665ea18501df92e
diff --git a/xmlhelp/source/cxxhelp/provider/db.hxx b/xmlhelp/source/cxxhelp/provider/db.hxx
index 9343280b5299..771fc76abe6e 100644
--- a/xmlhelp/source/cxxhelp/provider/db.hxx
+++ b/xmlhelp/source/cxxhelp/provider/db.hxx
@@ -79,7 +79,7 @@ namespace helpdatafileproxy {
, m_nItRead( -1 )
, m_iItPos( -1 )
{
- OSL_ASSERT(comphelper::isFileUrl(rFileURL));
+ assert(comphelper::isFileUrl(rFileURL));
}
~Hdf()
{ releaseHashMap(); }
commit 17ecba5a723e94161b752af504a28b068645f476
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date: Sun May 7 09:10:37 2017 +1000
tdf#43157: convert sdext codebase away from OSL_ASSERT to assert
Change-Id: If60f3585f202aabf42582239840aa87c96ae7842
diff --git a/sdext/source/pdfimport/tree/imagecontainer.cxx b/sdext/source/pdfimport/tree/imagecontainer.cxx
index b44ef77db127..0bc8c605c0b7 100644
--- a/sdext/source/pdfimport/tree/imagecontainer.cxx
+++ b/sdext/source/pdfimport/tree/imagecontainer.cxx
@@ -114,7 +114,7 @@ ImageId ImageContainer::addImage( const uno::Sequence<beans::PropertyValue>& xBi
void ImageContainer::writeBase64EncodedStream( ImageId nId, EmitContext& rContext )
{
- OSL_ASSERT( nId >= 0 && nId < ImageId( m_aImages.size()) );
+ assert( nId >= 0 && nId < ImageId( m_aImages.size()) );
const uno::Sequence<beans::PropertyValue>& rEntry( m_aImages[nId] );
diff --git a/sdext/source/pdfimport/wrapper/wrapper.cxx b/sdext/source/pdfimport/wrapper/wrapper.cxx
index cdbcd2ddb6eb..25391e80d9bf 100644
--- a/sdext/source/pdfimport/wrapper/wrapper.cxx
+++ b/sdext/source/pdfimport/wrapper/wrapper.cxx
@@ -826,7 +826,7 @@ void Parser::parseLine( const OString& rLine )
const OString& rCmd = readNextToken();
const hash_entry* pEntry = PdfKeywordHash::in_word_set( rCmd.getStr(),
rCmd.getLength() );
- OSL_ASSERT(pEntry);
+ assert(pEntry);
switch( pEntry->eKey )
{
case CLIPPATH:
@@ -1017,7 +1017,7 @@ bool xpdf_ImportFromFile( const OUString& rURL,
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list