From 2cca46d54846b0cd7769b9287f17632a4258256d Mon Sep 17 00:00:00 2001 From: Luboš Luňák Date: Fri, 12 Jul 2013 18:12:34 +0200 Subject: PCH for more libraries Change-Id: I6f9a1969605e0016b11157ddb5754ac77fd3966b --- framework/source/dispatch/menudispatcher.cxx | 2 +- .../source/uiconfiguration/windowstateconfiguration.cxx | 2 ++ framework/source/uielement/generictoolbarcontroller.cxx | 2 +- .../source/uielement/togglebuttontoolbarcontroller.cxx | 2 +- framework/source/uielement/toolbarmanager.cxx | 16 ++++++++-------- 5 files changed, 13 insertions(+), 11 deletions(-) (limited to 'framework/source') diff --git a/framework/source/dispatch/menudispatcher.cxx b/framework/source/dispatch/menudispatcher.cxx index 6518d5fed2e4..1c00f2bc7b08 100644 --- a/framework/source/dispatch/menudispatcher.cxx +++ b/framework/source/dispatch/menudispatcher.cxx @@ -265,7 +265,7 @@ void MenuDispatcher::impl_setAccelerators( Menu* pMenu, const Accelerator& aAcce for ( sal_uInt16 nPos = 0; nPos < pMenu->GetItemCount(); ++nPos ) { sal_uInt16 nId = pMenu->GetItemId(nPos); - PopupMenu* pPopup = pMenu->GetPopupMenu(nId); + ::PopupMenu* pPopup = pMenu->GetPopupMenu(nId); if ( pPopup ) impl_setAccelerators( (Menu *)pPopup, aAccel ); else if ( nId && !pMenu->GetPopupMenu(nId)) diff --git a/framework/source/uiconfiguration/windowstateconfiguration.cxx b/framework/source/uiconfiguration/windowstateconfiguration.cxx index 6f426bc69d12..c357e85cb6ae 100644 --- a/framework/source/uiconfiguration/windowstateconfiguration.cxx +++ b/framework/source/uiconfiguration/windowstateconfiguration.cxx @@ -52,6 +52,8 @@ using namespace com::sun::star::container; using namespace ::com::sun::star::frame; using namespace ::com::sun::star::ui; +#undef WINDOWSTATE_MASK_POS + //_________________________________________________________________________________________________________________ // Namespace //_________________________________________________________________________________________________________________ diff --git a/framework/source/uielement/generictoolbarcontroller.cxx b/framework/source/uielement/generictoolbarcontroller.cxx index fc6ad416e93f..386fda57385f 100644 --- a/framework/source/uielement/generictoolbarcontroller.cxx +++ b/framework/source/uielement/generictoolbarcontroller.cxx @@ -324,7 +324,7 @@ MenuToolbarController::~MenuToolbarController() } -class Toolbarmenu : public PopupMenu +class Toolbarmenu : public ::PopupMenu { public: Toolbarmenu(); diff --git a/framework/source/uielement/togglebuttontoolbarcontroller.cxx b/framework/source/uielement/togglebuttontoolbarcontroller.cxx index 9a766a14b48f..8b7c899e7ab8 100644 --- a/framework/source/uielement/togglebuttontoolbarcontroller.cxx +++ b/framework/source/uielement/togglebuttontoolbarcontroller.cxx @@ -112,7 +112,7 @@ throw (::com::sun::star::uno::RuntimeException) ( m_eStyle == STYLE_TOGGLE_DROPDOWNBUTTON )) { // create popup menu - PopupMenu aPopup; + ::PopupMenu aPopup; const sal_uInt32 nCount = m_aDropdownMenuList.size(); for ( sal_uInt32 i = 0; i < nCount; i++ ) { diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index 5f1637b516d0..7d22760eed31 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -1619,11 +1619,11 @@ void ToolBarManager::ImplClearPopupMenu( ToolBox *pToolBar ) if ( m_bDisposed ) return; - PopupMenu *pMenu = pToolBar->GetMenu(); + ::PopupMenu *pMenu = pToolBar->GetMenu(); // remove config entries from menu, so we have a clean menu to start with // remove submenu first - PopupMenu* pItemMenu = pMenu->GetPopupMenu( 1 ); + ::PopupMenu* pItemMenu = pMenu->GetPopupMenu( 1 ); if( pItemMenu ) { pItemMenu->Clear(); @@ -1692,12 +1692,12 @@ bool ToolBarManager::MenuItemAllowed( sal_uInt16 ) const return true; } -PopupMenu * ToolBarManager::GetToolBarCustomMenu(ToolBox* pToolBar) +::PopupMenu * ToolBarManager::GetToolBarCustomMenu(ToolBox* pToolBar) { // update the list of hidden tool items first pToolBar->UpdateCustomMenu(); - PopupMenu *pMenu = pToolBar->GetMenu(); + ::PopupMenu *pMenu = pToolBar->GetMenu(); // remove all entries before inserting new ones ImplClearPopupMenu( pToolBar ); // No config menu entries if command ".uno:ConfigureDialog" is not enabled @@ -1717,12 +1717,12 @@ PopupMenu * ToolBarManager::GetToolBarCustomMenu(ToolBox* pToolBar) // popup menu for quick customization sal_Bool bHideDisabledEntries = !SvtMenuOptions().IsEntryHidingEnabled(); - PopupMenu aPopupMenu( FwkResId( POPUPMENU_TOOLBAR_QUICKCUSTOMIZATION )); + ::PopupMenu aPopupMenu( FwkResId( POPUPMENU_TOOLBAR_QUICKCUSTOMIZATION )); if ( m_pToolBar->IsCustomize() ) { sal_uInt16 nPos( 0 ); - PopupMenu* pItemMenu( aPopupMenu.GetPopupMenu( 1 )); + ::PopupMenu* pItemMenu( aPopupMenu.GetPopupMenu( 1 )); sal_Bool bIsFloating( sal_False ); @@ -1794,7 +1794,7 @@ PopupMenu * ToolBarManager::GetToolBarCustomMenu(ToolBox* pToolBar) if( aPopupMenu.GetPopupMenu( 1 ) ) { // create an own submenu to avoid auto-delete when resource menu is deleted - PopupMenu *pItemMenu = new PopupMenu(); + ::PopupMenu *pItemMenu = new ::PopupMenu(); for( i=0; i< aPopupMenu.GetPopupMenu( 1 )->GetItemCount(); i++) pItemMenu->CopyItem( *aPopupMenu.GetPopupMenu( 1 ), i, MENU_APPEND ); @@ -1817,7 +1817,7 @@ IMPL_LINK( ToolBarManager, Command, CommandEvent*, pCmdEvt ) if ( pCmdEvt->GetCommand() != COMMAND_CONTEXTMENU ) return 0; - PopupMenu * pMenu = GetToolBarCustomMenu(m_pToolBar); + ::PopupMenu * pMenu = GetToolBarCustomMenu(m_pToolBar); if (pMenu) { // make sure all disabled entries will be shown -- cgit