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

[Rohan Kumar]

 toolkit/source/awt/vclxaccessiblecomponent.cxx        |    2 -
 toolkit/source/controls/controlmodelcontainerbase.cxx |   30 ------------------
 2 files changed, 1 insertion(+), 31 deletions(-)

New commits:
commit f3d454647ae5f0398ce3b38a71ed525bc16c3722
Author: Rohan Kumar <rohankanojia420 at gmail.com>
Date:   Fri Mar 11 19:00:31 2016 +0530

    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/23074
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Björn Michaelsen <bjoern.michaelsen at canonical.com>

diff --git a/toolkit/source/awt/vclxaccessiblecomponent.cxx b/toolkit/source/awt/vclxaccessiblecomponent.cxx
index b7a89fa..c182d56 100644
--- a/toolkit/source/awt/vclxaccessiblecomponent.cxx
+++ b/toolkit/source/awt/vclxaccessiblecomponent.cxx
@@ -628,7 +628,7 @@ OUString VCLXAccessibleComponent::getAccessibleName(  ) throw (uno::RuntimeExcep
     if ( GetWindow() )
     {
         aName = GetWindow()->GetAccessibleName();
-#if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 0
         aName += " (Type = ";
         aName += OUString::number(static_cast<sal_Int32>(GetWindow()->GetType()));
         aName += ")";
diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx b/toolkit/source/controls/controlmodelcontainerbase.cxx
index be6c1f9..56475ff 100644
--- a/toolkit/source/controls/controlmodelcontainerbase.cxx
+++ b/toolkit/source/controls/controlmodelcontainerbase.cxx
@@ -949,9 +949,6 @@ void ControlModelContainerBase::implUpdateGroupStructure()
     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
 
-#if OSL_DEBUG_LEVEL > 1
-    ::std::vector< OUString > aCurrentGroupLabels;
-#endif
 
     for ( ; pControlModels != pControlModelsEnd; ++pControlModels )
     {
@@ -981,13 +978,6 @@ void ControlModelContainerBase::implUpdateGroupStructure()
                 // new state: looking for further members
                 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;
 
@@ -997,9 +987,6 @@ void ControlModelContainerBase::implUpdateGroupStructure()
                 {   // no radio button -> the group is done
                     aCurrentGroup = maGroups.end();
                     eState = eLookingForGroup;
-#if OSL_DEBUG_LEVEL > 1
-                    aCurrentGroupLabels.clear();
-#endif
                     continue;
                 }
 
@@ -1014,22 +1001,12 @@ void ControlModelContainerBase::implUpdateGroupStructure()
                     // state still is eExpandingGroup - we're looking for further elements
                     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;
                 }
 
                 // it's a radio button, but on a different page
                 // -> we open a new group for it
 
-#if OSL_DEBUG_LEVEL > 1
-                aCurrentGroupLabels.clear();
-#endif
 
                 // open a new group
                 size_t nGroups = maGroups.size();
@@ -1042,13 +1019,6 @@ void ControlModelContainerBase::implUpdateGroupStructure()
 
                 // state is the same: we still are looking for further elements of the current group
                 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;
         }