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

[Tsutomu Uchino]

 basctl/source/basicide/baside2b.cxx |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 15d2655fb68254f39c59b97a7ca7713d12b0f1fa
Author: Tsutomu Uchino <hanya at apache.org>
Date:   Mon Jan 12 14:39:39 2015 +0000

    Resolves: #i120772# do not ignore last three properties...
    
    when special properties not found in watching window
    
    (cherry picked from commit 8815f3f3fbb3632cccbbf8476f4c40c9bda8eb6e)
    
    Conflicts:
    	basctl/source/basicide/baside2b.cxx
    
    Change-Id: I6069d55b9f894846a7b4d81b981cf4523b444753

diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index be7e740..31721b1 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -2162,9 +2162,16 @@ void WatchTreeListBox::RequestingChildren( SvTreeListEntry * pParent )
         createAllObjectProperties( pObj );
         SbxArray* pProps = pObj->GetProperties();
         sal_uInt16 nPropCount = pProps->Count();
+        if ( nPropCount >= 3 &&
+             pProps->Get( nPropCount -1 )->GetName().equalsIgnoreAsciiCase( "Dbg_Methods" ) &&
+             pProps->Get( nPropCount -2 )->GetName().equalsIgnoreAsciiCase( "Dbg_Properties" ) &&
+             pProps->Get( nPropCount -3 )->GetName().equalsIgnoreAsciiCase( "Dbg_SupportedInterfaces" ) )
+        {
+            nPropCount -= 3;
+        }
         pItem->maMemberList.reserve(nPropCount);
 
-        for( sal_uInt16 i = 0 ; i < nPropCount - 3 ; i++ )
+        for( sal_uInt16 i = 0 ; i < nPropCount ; ++i )
         {
             SbxVariable* pVar = pProps->Get( i );