Kaydet (Commit) d8db205e authored tarafından Ariel Constenla-Haile's avatar Ariel Constenla-Haile Kaydeden (comit) Caolán McNamara

Resolves: #i124706# Consider the toolbar alignment...

when executing the PopupMenu

(cherry picked from commit 46d6cabf)

Conflicts:
	framework/source/uielement/popuptoolbarcontroller.cxx

Change-Id: Icfccdd35c1849ea00a1ea706aedac25de794bbf6
üst 42dd5615
......@@ -187,10 +187,13 @@ PopupMenuToolbarController::createPopupWindow()
return xRet;
pToolBox->SetItemDown( m_nToolBoxId, true );
WindowAlign eAlign( pToolBox->GetAlign() );
sal_uInt16 nId = m_xPopupMenu->execute(
css::uno::Reference< css::awt::XWindowPeer >( getParent(), css::uno::UNO_QUERY ),
VCLUnoHelper::ConvertToAWTRect( pToolBox->GetItemRect( m_nToolBoxId ) ),
css::awt::PopupMenuDirection::EXECUTE_DEFAULT );
( eAlign == WINDOWALIGN_TOP || eAlign == WINDOWALIGN_BOTTOM ) ?
css::awt::PopupMenuDirection::EXECUTE_DOWN :
css::awt::PopupMenuDirection::EXECUTE_RIGHT );
pToolBox->SetItemDown( m_nToolBoxId, false );
if ( nId )
......
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