strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

slidecopy: set the WB_DIALOGCONTROL and WB_CHILDLDGCTRL bits both at the generic panel anchor window, and the panel window provided by the XToolPanel

Browse source
This commit is contained in:
Frank Schoenheit [fs] 2010-05-05 22:26:58 +02:00
parent 4335aa34a1
commit 45bf9199f5
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
svtools/source/toolpanel/toolpaneldeck.cxx
View file

@ -79,7 +79,7 @@ namespace svt
public:
ToolPanelDeck_Impl( ToolPanelDeck& i_rDeck )
:m_rDeck( i_rDeck )
,m_aPanelAnchor( &i_rDeck )
,m_aPanelAnchor( &i_rDeck, WB_DIALOGCONTROL | WB_CHILDDLGCTRL )
,m_aPanels()
,m_pDummyPanel( new DummyPanel )
,m_pLayouter()

13
svtools/source/uno/treecontrolpeer.cxx
View file

@ -196,7 +196,9 @@ void TreeControlPeer::addEntry( UnoTreeListEntry* pEntry )
mpTreeNodeMap = new TreeNodeMap();
}
(*mpTreeNodeMap)[ pEntry->mxNode ] = pEntry;
const Reference< XTreeNode > xNormalizedNode( pEntry->mxNode, UNO_QUERY );
(*mpTreeNodeMap)[ xNormalizedNode ] = pEntry;
OSL_TRACE( "tree: adding %p => %p", xNormalizedNode.get(), pEntry );
}
}
@ -206,10 +208,14 @@ void TreeControlPeer::removeEntry( UnoTreeListEntry* pEntry )
{
if( mpTreeNodeMap && pEntry && pEntry->mxNode.is() )
{
TreeNodeMap::iterator aIter( mpTreeNodeMap->find( pEntry->mxNode ) );
const Reference< XTreeNode > xNormalizedNode( pEntry->mxNode, UNO_QUERY );
TreeNodeMap::iterator aIter( mpTreeNodeMap->find( xNormalizedNode ) );
if( aIter != mpTreeNodeMap->end() )
{
OSL_TRACE( "tree: removing %p => %p", xNormalizedNode.get(), pEntry );
mpTreeNodeMap->erase( aIter );
}
}
}
// --------------------------------------------------------------------
@ -218,7 +224,8 @@ UnoTreeListEntry* TreeControlPeer::getEntry( const Reference< XTreeNode >& xNode
{
if( mpTreeNodeMap )
{
TreeNodeMap::iterator aIter( mpTreeNodeMap->find( xNode ) );
const Reference< XTreeNode > xNormalizedNode( xNode, UNO_QUERY );
TreeNodeMap::iterator aIter( mpTreeNodeMap->find( xNormalizedNode ) );
if( aIter != mpTreeNodeMap->end() )
return (*aIter).second;
}