summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkrishna keshav <princy.krishnakeshav@gmail.com>2016-06-09 17:18:22 +0530
committerStephan Bergmann <sbergman@redhat.com>2016-06-13 11:57:03 +0000
commit46e372a6015033fabf1b2ac1bb46dec993b25178 (patch)
treea368433f64901cbbe60d5e3a29a7ff893d3c50e6
parente89c0e4fb783bd36d5f5fea154ee8608e542dae4 (diff)
tdf#43157 Clean up DBG_ASSERT
Change-Id: I2a7d5d507a875e555441a9d30d54e638e5dea026 Reviewed-on: https://gerrit.libreoffice.org/26099 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com>
-rw-r--r--extensions/source/bibliography/formcontrolcontainer.cxx9
1 files changed, 4 insertions, 5 deletions
diff --git a/extensions/source/bibliography/formcontrolcontainer.cxx b/extensions/source/bibliography/formcontrolcontainer.cxx
index 523a42128d1a..b042a66c4a6d 100644
--- a/extensions/source/bibliography/formcontrolcontainer.cxx
+++ b/extensions/source/bibliography/formcontrolcontainer.cxx
@@ -23,7 +23,6 @@
#include <algorithm>
#include <functional>
-
namespace bib
{
@@ -41,7 +40,7 @@ namespace bib
FormControlContainer::~FormControlContainer( )
{
- DBG_ASSERT( !isFormConnected(), "FormControlContainer::~FormControlContainer: you should disconnect in your derived class!" );
+ SAL_WARN_IF( isFormConnected(), "extensions.biblio", "FormControlContainer::~FormControlContainer: you should disconnect in your derived class!" );
if ( isFormConnected() )
disconnectForm();
}
@@ -49,7 +48,7 @@ namespace bib
void FormControlContainer::disconnectForm()
{
::osl::MutexGuard aGuard( m_aMutex );
- DBG_ASSERT( isFormConnected(), "FormControlContainer::connectForm: not connected!" );
+ SAL_WARN_IF( !isFormConnected(), "extensions.biblio", "FormControlContainer::connectForm: not connected!" );
if ( isFormConnected() )
{
m_pFormAdapter->dispose();
@@ -60,9 +59,9 @@ namespace bib
void FormControlContainer::connectForm( const Reference< XLoadable >& _rxForm )
{
- DBG_ASSERT( !isFormConnected(), "FormControlContainer::connectForm: already connected!" );
+ SAL_WARN_IF( isFormConnected(), "extensions.biblio", "FormControlContainer::connectForm: already connected!" );
- DBG_ASSERT( _rxForm.is(), "FormControlContainer::connectForm: invalid form!" );
+ SAL_WARN_IF( !_rxForm.is(), "extensions.biblio", "FormControlContainer::connectForm: invalid form!" );
if ( !isFormConnected() && _rxForm.is() )
{
m_pFormAdapter = new OLoadListenerAdapter( _rxForm );