fdo#43157 : clean up OSL_POSTCOND

Conflicts:
	include/sal/log-areas.dox

Change-Id: I770b8b9fb82f873ccb88dc26ac05206f703ddf33
Reviewed-on: https://gerrit.libreoffice.org/8805
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

9 files changed, 14 insertions, 16 deletions

diff --git a/chart2/source/tools/NumberFormatterWrapper.cxx b/chart2/source/tools/NumberFormatterWrapper.cxx
index 4994215d58ab..f543f27528b1 100644
--- a/chart2/source/tools/NumberFormatterWrapper.cxx
+++ b/chart2/source/tools/NumberFormatterWrapper.cxx
@@ -62,7 +62,7 @@ NumberFormatterWrapper::NumberFormatterWrapper( const uno::Reference< util::XNum
     SvNumberFormatsSupplierObj* pSupplierObj = SvNumberFormatsSupplierObj::getImplementation( xSupplier );
     if( pSupplierObj )
         m_pNumberFormatter = pSupplierObj->GetNumberFormatter();
-    OSL_POSTCOND(m_pNumberFormatter,"need a numberformatter");
+    SAL_WARN_IF(!m_pNumberFormatter,"chart2.tools","need a numberformatter");
 }
 
 NumberFormatterWrapper::~NumberFormatterWrapper()
diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index 79e1e28b89fe..10271929de5b 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -145,7 +145,7 @@ VSeriesPlotter::VSeriesPlotter( const uno::Reference<XChartType>& xChartTypeMode
         , m_pExplicitCategoriesProvider(0)
         , m_bPointsWereSkipped(false)
 {
-    OSL_POSTCOND(m_xChartTypeModel.is(),"no XChartType available in view, fallback to default values may be wrong");
+    SAL_WARN_IF(!m_xChartTypeModel.is(),"chart2","no XChartType available in view, fallback to default values may be wrong");
 }
 
 VSeriesPlotter::~VSeriesPlotter()
diff --git a/forms/source/xforms/datatypes.cxx b/forms/source/xforms/datatypes.cxx
index 94e8ed5635eb..1aa59d29204c 100644
--- a/forms/source/xforms/datatypes.cxx
+++ b/forms/source/xforms/datatypes.cxx
@@ -111,7 +111,7 @@ namespace xforms
 
 #define SET_PROPERTY( propertyid, value, member ) \
     setFastPropertyValue( PROPERTY_ID_##propertyid, makeAny( value ) ); \
-    OSL_POSTCOND( member == value, "OXSDDataType::setFoo: inconsistency!" );
+    SAL_WARN_IF( member != value, "forms.misc", "OXSDDataType::setFoo: inconsistency!" );
 
 
     OUString SAL_CALL OXSDDataType::getName(  ) throw (RuntimeException, std::exception)
diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index f8a29673e095..0508fb43cb7a 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -60,6 +60,7 @@ certain functionality.
 @li @c chart2
 @li @c chart2.areachart
 @li @c chart2.opengl
+@li @c chart2.tools
 
 @section connectivity
 
@@ -288,6 +289,7 @@ certain functionality.
 
 @section svx
 
+@li @c svx
 @li @c svx.dialog
 @li @c svx.fmcomp
 @li @c svx.form
@@ -443,11 +445,6 @@ certain functionality.
 @li @c dbaccess.ui
 @li @c dbaccess.ui.OGeneralPage
 
-@section svx
-
-@li @c svx
-@li @c svx.fmcmop
-
 @section avmedia
 
 @li @c avmedia
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 8416d5560086..e12f92d0c094 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -4282,7 +4282,7 @@ Reference< frame::XController2 > SAL_CALL SfxBaseModel::createViewController(
 
     // determine the ViewFrame belonging to the given XFrame
     SfxViewFrame* pViewFrame = FindOrCreateViewFrame_Impl( i_rFrame, aViewCreationGuard );
-    OSL_POSTCOND( pViewFrame, "SfxBaseModel::createViewController: no frame?" );
+    SAL_WARN_IF( !pViewFrame , "sfx.doc", "SfxBaseModel::createViewController: no frame?" );
 
     // delegate to SFX' view factory
     pViewFrame->GetBindings().ENTERREGISTRATIONS();
diff --git a/svx/source/form/delayedevent.cxx b/svx/source/form/delayedevent.cxx
index 1ce234505027..0a226d24a010 100644
--- a/svx/source/form/delayedevent.cxx
+++ b/svx/source/form/delayedevent.cxx
@@ -20,7 +20,6 @@
 
 #include "delayedevent.hxx"
 
-#include <osl/diagnose.h>
 #include <vcl/svapp.hxx>
 
 
@@ -35,7 +34,7 @@ namespace svxform
     void DelayedEvent::Call( void* _pArg )
     {
         CancelPendingCall();
-        OSL_POSTCOND( m_nEventId == 0, "DelayedEvent::Call: CancelPendingCall did not work!" );
+        SAL_WARN_IF( m_nEventId != 0, "svx.form", "DelayedEvent::Call: CancelPendingCall did not work!" );
 
         m_nEventId = Application::PostUserEvent( LINK( this, DelayedEvent, OnCall ), _pArg );
     }
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 8ec0324ee6b7..9980f7946da6 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -1485,10 +1485,12 @@ void FmXFormShell::ExecuteSearch()
     m_aSearchForms.swap( aEmpty );
     ::std::vector< OUString > aContextNames;
     impl_collectFormSearchContexts_nothrow( m_pShell->GetCurPage()->GetForms(), OUString(), m_aSearchForms, aContextNames );
-    OSL_POSTCOND( m_aSearchForms.size() == aContextNames.size(),
-        "FmXFormShell::ExecuteSearch: nonsense!" );
+
     if ( m_aSearchForms.size() != aContextNames.size() )
+    {
+        SAL_WARN ( "svx.form", "FmXFormShell::ExecuteSearch: nonsense!" );
         return;
+    }
 
     // filter out the forms which do not contain valid controls at all
     {
diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx
index 2230c80c8ec0..33b4f185d9f9 100644
--- a/svx/source/form/fmtextcontrolshell.cxx
+++ b/svx/source/form/fmtextcontrolshell.cxx
@@ -1006,7 +1006,7 @@ namespace svx
                     bDisable |= true;
                     break;
                 }
-                OSL_POSTCOND( !bNeedSelection || bNeedTextComponent, "FmTextControlShell::GetTextAttributeState: bNeedSelection should imply bNeedTextComponent!" );
+                SAL_WARN_IF( bNeedSelection && !bNeedTextComponent, "svx.form", "FmTextControlShell::GetTextAttributeState: bNeedSelection should imply bNeedTextComponent!" );
 
                 if ( !bDisable && bNeedWriteableControl )
                     bDisable |= !IsActiveControl( ) || m_bActiveControlIsReadOnly;
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index 51f273166044..4910d26e890e 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -1030,8 +1030,8 @@ void SAL_CALL FormController::removeDisjunctiveTerm( ::sal_Int32 _Term ) throw (
     if ( _Term < m_nCurrentFilterPosition )
         --m_nCurrentFilterPosition;
 
-    OSL_POSTCOND( ( m_nCurrentFilterPosition < 0 ) == ( m_aFilterRows.empty() ),
-        "FormController::removeDisjunctiveTerm: inconsistency!" );
+    SAL_WARN_IF( !( ( m_nCurrentFilterPosition < 0 ) != ( m_aFilterRows.empty() ) ),
+        "svx.form", "FormController::removeDisjunctiveTerm: inconsistency!" );
 
     // update the texts in the filter controls
     impl_setTextOnAllFilter_throw();