[Libreoffice-commits] core.git: extensions/source

[krishna keshav]

 extensions/source/bibliography/formcontrolcontainer.cxx |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

New commits:
commit 46e372a6015033fabf1b2ac1bb46dec993b25178
Author: krishna keshav <princy.krishnakeshav at gmail.com>
Date:   Thu Jun 9 17:18:22 2016 +0530

    tdf#43157 Clean up DBG_ASSERT
    
    Change-Id: I2a7d5d507a875e555441a9d30d54e638e5dea026
    Reviewed-on: https://gerrit.libreoffice.org/26099
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
    Tested-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/extensions/source/bibliography/formcontrolcontainer.cxx b/extensions/source/bibliography/formcontrolcontainer.cxx
index 523a421..b042a66 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 );