Kaydet (Commit) f3d45464 authored tarafından Rohan Kumar's avatar Rohan Kumar Kaydeden (comit) Björn Michaelsen

tdf#91794 remove OSL_DEBUG_LEVEL > 1 conditionals

I replaced OSL_DEBUG_LEVEL > 1 conditionals to OSL_DEBUG_LEVEL > 0
as suggested in easy hack

Change-Id: Ie852e95992bb8b0c49f2d01348ed598dfc26a39a
Reviewed-on: https://gerrit.libreoffice.org/23074Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarBjörn Michaelsen <bjoern.michaelsen@canonical.com>
üst eda24592
...@@ -628,7 +628,7 @@ OUString VCLXAccessibleComponent::getAccessibleName( ) throw (uno::RuntimeExcep ...@@ -628,7 +628,7 @@ OUString VCLXAccessibleComponent::getAccessibleName( ) throw (uno::RuntimeExcep
if ( GetWindow() ) if ( GetWindow() )
{ {
aName = GetWindow()->GetAccessibleName(); aName = GetWindow()->GetAccessibleName();
#if OSL_DEBUG_LEVEL > 1 #if OSL_DEBUG_LEVEL > 0
aName += " (Type = "; aName += " (Type = ";
aName += OUString::number(static_cast<sal_Int32>(GetWindow()->GetType())); aName += OUString::number(static_cast<sal_Int32>(GetWindow()->GetType()));
aName += ")"; aName += ")";
......
...@@ -949,9 +949,6 @@ void ControlModelContainerBase::implUpdateGroupStructure() ...@@ -949,9 +949,6 @@ void ControlModelContainerBase::implUpdateGroupStructure()
AllGroups::iterator aCurrentGroup = maGroups.end(); // the group which we're currently building AllGroups::iterator aCurrentGroup = maGroups.end(); // the group which we're currently building
sal_Int32 nCurrentGroupStep = -1; // the step which all controls of the current group belong to sal_Int32 nCurrentGroupStep = -1; // the step which all controls of the current group belong to
#if OSL_DEBUG_LEVEL > 1
::std::vector< OUString > aCurrentGroupLabels;
#endif
for ( ; pControlModels != pControlModelsEnd; ++pControlModels ) for ( ; pControlModels != pControlModelsEnd; ++pControlModels )
{ {
...@@ -981,13 +978,6 @@ void ControlModelContainerBase::implUpdateGroupStructure() ...@@ -981,13 +978,6 @@ void ControlModelContainerBase::implUpdateGroupStructure()
// new state: looking for further members // new state: looking for further members
eState = eExpandingGroup; eState = eExpandingGroup;
#if OSL_DEBUG_LEVEL > 1
Reference< XPropertySet > xModelProps( *pControlModels, UNO_QUERY );
OUString sLabel;
if ( xModelProps.is() && xModelProps->getPropertySetInfo().is() && xModelProps->getPropertySetInfo()->hasPropertyByName("Label") )
xModelProps->getPropertyValue("Label") >>= sLabel;
aCurrentGroupLabels.push_back( sLabel );
#endif
} }
break; break;
...@@ -997,9 +987,6 @@ void ControlModelContainerBase::implUpdateGroupStructure() ...@@ -997,9 +987,6 @@ void ControlModelContainerBase::implUpdateGroupStructure()
{ // no radio button -> the group is done { // no radio button -> the group is done
aCurrentGroup = maGroups.end(); aCurrentGroup = maGroups.end();
eState = eLookingForGroup; eState = eLookingForGroup;
#if OSL_DEBUG_LEVEL > 1
aCurrentGroupLabels.clear();
#endif
continue; continue;
} }
...@@ -1014,22 +1001,12 @@ void ControlModelContainerBase::implUpdateGroupStructure() ...@@ -1014,22 +1001,12 @@ void ControlModelContainerBase::implUpdateGroupStructure()
// state still is eExpandingGroup - we're looking for further elements // state still is eExpandingGroup - we're looking for further elements
eState = eExpandingGroup; eState = eExpandingGroup;
#if OSL_DEBUG_LEVEL > 1
Reference< XPropertySet > xModelProps( *pControlModels, UNO_QUERY );
OUString sLabel;
if ( xModelProps.is() && xModelProps->getPropertySetInfo().is() && xModelProps->getPropertySetInfo()->hasPropertyByName("Label") )
xModelProps->getPropertyValue("Label") >>= sLabel;
aCurrentGroupLabels.push_back( sLabel );
#endif
continue; continue;
} }
// it's a radio button, but on a different page // it's a radio button, but on a different page
// -> we open a new group for it // -> we open a new group for it
#if OSL_DEBUG_LEVEL > 1
aCurrentGroupLabels.clear();
#endif
// open a new group // open a new group
size_t nGroups = maGroups.size(); size_t nGroups = maGroups.size();
...@@ -1042,13 +1019,6 @@ void ControlModelContainerBase::implUpdateGroupStructure() ...@@ -1042,13 +1019,6 @@ void ControlModelContainerBase::implUpdateGroupStructure()
// state is the same: we still are looking for further elements of the current group // state is the same: we still are looking for further elements of the current group
eState = eExpandingGroup; eState = eExpandingGroup;
#if OSL_DEBUG_LEVEL > 1
Reference< XPropertySet > xModelProps( *pControlModels, UNO_QUERY );
OUString sLabel;
if ( xModelProps.is() && xModelProps->getPropertySetInfo().is() && xModelProps->getPropertySetInfo()->hasPropertyByName("Label") )
xModelProps->getPropertyValue("Label") >>= sLabel;
aCurrentGroupLabels.push_back( sLabel );
#endif
} }
break; break;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment