diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-04-23 10:34:59 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-23 10:34:59 +0100 |
| commit | 6cf375618e0fec7d2c45e1a1b59474839dace584 (patch) | |
| tree | f7584f5df10dbfdb0abc3d0ed1d123f7d61e39e7 | |
| parent | 89ec9424b27e602fe668b1d5e77a5d3a6a909f82 (diff) | |
Clarify assertion, and add missing disposeAndClear.
Change-Id: Ief9bdc8607e60c684696525bff095d193483f23e
| -rw-r--r-- | svtools/source/table/tablecontrol_impl.cxx | 1 | ||||
| -rw-r--r-- | sw/source/core/doc/DocumentDeviceManager.cxx | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/svtools/source/table/tablecontrol_impl.cxx b/svtools/source/table/tablecontrol_impl.cxx index de845d198601..8d55e46bb314 100644 --- a/svtools/source/table/tablecontrol_impl.cxx +++ b/svtools/source/table/tablecontrol_impl.cxx @@ -264,6 +264,7 @@ namespace svt { namespace table m_pVScroll.disposeAndClear(); m_pHScroll.disposeAndClear(); m_pScrollCorner.disposeAndClear(); + m_pDataWindow.disposeAndClear(); DELETEZ( m_pTableFunctionSet ); DELETEZ( m_pSelEngine ); } diff --git a/sw/source/core/doc/DocumentDeviceManager.cxx b/sw/source/core/doc/DocumentDeviceManager.cxx index 59ebd29b6d05..6da2747e8689 100644 --- a/sw/source/core/doc/DocumentDeviceManager.cxx +++ b/sw/source/core/doc/DocumentDeviceManager.cxx @@ -65,7 +65,7 @@ SfxPrinter* DocumentDeviceManager::getPrinter(/*[in]*/ bool bCreate ) const void DocumentDeviceManager::setPrinter(/*[in]*/ SfxPrinter *pP,/*[in]*/ bool bDeleteOld,/*[in]*/ bool bCallPrtDataChanged ) { - assert ( !!pP && !pP->isDisposed() ); + assert ( !pP || !pP->isDisposed() ); if ( pP != mpPrt ) { if ( bDeleteOld ) |