diff options
| author | Rohan Kumar <rohankanojia420@gmail.com> | 2016-03-07 22:19:36 +0530 |
|---|---|---|
| committer | Björn Michaelsen <bjoern.michaelsen@canonical.com> | 2016-04-05 10:15:45 +0000 |
| commit | 901d04d3965ed73696586de06c6890e79299f266 (patch) | |
| tree | ca85db3688d3a440c56c804f9875ed2040ac8e4d /svx/source/form | |
| parent | d6411207bd83b34b4d6c6fd68cd41d3005228b05 (diff) | |
tdf#91794 remove OSL_DEBUG_LEVEL > 1 conditionals
I replaced OSL_DEBUG_LEVEL > 1 with OSL_DEBUG_LEVEL > 0 in order
to reduce debug levels. In some places i also used SAL_INFO(..)
and SAL_WARN(..) statements to replace their deprecated OSL_
counterparts
Change-Id: I73ecc20ffd654501b16820e3bf748f1bcbcdab79
Reviewed-on: https://gerrit.libreoffice.org/23004
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Diffstat (limited to 'svx/source/form')
| -rw-r--r-- | svx/source/form/formcontroller.cxx | 4 | ||||
| -rw-r--r-- | svx/source/form/navigatortree.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx index 7f41de76e9a3..b3a7843b004b 100644 --- a/svx/source/form/formcontroller.cxx +++ b/svx/source/form/formcontroller.cxx @@ -1653,10 +1653,10 @@ void FormController::focusGained(const FocusEvent& e) throw( RuntimeException, s ) { // check the old control if the content is ok -#if OSL_DEBUG_LEVEL > 1 +#if OSL_DEBUG_LEVEL > 0 Reference< XBoundControl > xLockingTest(m_xCurrentControl, UNO_QUERY); sal_Bool bControlIsLocked = xLockingTest.is() && xLockingTest->getLock(); - OSL_ENSURE(!bControlIsLocked, "FormController::Gained: I'm modified and the current control is locked ? How this ?"); + assert(!bControlIsLocked && "FormController::Gained: I'm modified and the current control is locked ? How this ?"); // normalerweise sollte ein gelocktes Control nicht modified sein, also muss wohl mein bModified aus einem anderen Kontext // gesetzt worden sein, was ich nicht verstehen wuerde ... #endif diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index 7dd87ee081b3..df668154c8ec 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -985,13 +985,13 @@ namespace svxform // copy properties form old control to new one Reference< XPropertySet > xCurrent(pControls[i], UNO_QUERY); -#if (OSL_DEBUG_LEVEL > 1) +#if (OSL_DEBUG_LEVEL > 0) // check whether it is a hidden control sal_Int16 nClassId = ::comphelper::getINT16(xCurrent->getPropertyValue(FM_PROP_CLASSID)); OSL_ENSURE(nClassId == FormComponentType::HIDDENCONTROL, "NavigatorTree::implExecuteDataTransfer: invalid control in drop list !"); // if SVX_FM_HIDDEN_CONTROLS-format exists, the sequence // should only contain hidden controls -#endif // (OSL_DEBUG_LEVEL > 1) +#endif // (OSL_DEBUG_LEVEL > 0) Reference< XPropertySetInfo > xPropInfo( xCurrent->getPropertySetInfo()); Sequence< Property> seqAllCurrentProps = xPropInfo->getProperties(); Property* pAllCurrentProps = seqAllCurrentProps.getArray(); |