summaryrefslogtreecommitdiff
path: root/sfx2/source/menu/virtmenu.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sfx2/source/menu/virtmenu.cxx')
-rw-r--r--sfx2/source/menu/virtmenu.cxx73
1 files changed, 22 insertions, 51 deletions
diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx
index 8876f3c0ef..8bfe435712 100644
--- a/sfx2/source/menu/virtmenu.cxx
+++ b/sfx2/source/menu/virtmenu.cxx
@@ -1,10 +1,11 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* This file is part of OpenOffice.org.
*
@@ -62,9 +63,7 @@
#include <sfx2/objsh.hxx>
#include <framework/addonsoptions.hxx>
-#ifndef __FRAMEWORK_CLASSES_ADDONMENUS_HXX_
#include <framework/addonmenu.hxx>
-#endif
#include <framework/menuconfiguration.hxx>
using namespace ::com::sun::star::container;
@@ -135,21 +134,21 @@ void SfxMenuImageControl_Impl::Update()
static Image RetrieveAddOnImage( Reference< com::sun::star::frame::XFrame >& rFrame,
const rtl::OUString& aImageId,
const rtl::OUString& aURL,
- BOOL bBigImage,
- BOOL bHiContrast )
+ BOOL bBigImage
+)
{
Image aImage;
if ( aImageId.getLength() > 0 )
{
- aImage = GetImage( rFrame, aImageId, bBigImage, bHiContrast );
+ aImage = GetImage( rFrame, aImageId, bBigImage );
if ( !!aImage )
return aImage;
}
- aImage = GetImage( rFrame, aURL, bBigImage, bHiContrast );
+ aImage = GetImage( rFrame, aURL, bBigImage );
if ( !aImage )
- aImage = framework::AddonsOptions().GetImageFromURL( aURL, bBigImage, bHiContrast );
+ aImage = framework::AddonsOptions().GetImageFromURL( aURL, bBigImage );
return aImage;
}
@@ -196,13 +195,12 @@ SfxVirtualMenu::SfxVirtualMenu( USHORT nOwnId,
SfxVirtualMenu* pOwnParent, Menu& rMenu, BOOL bWithHelp,
SfxBindings &rBindings, BOOL bOLEServer, BOOL bRes, BOOL bIsAddonMenu ):
pItems(0),
- pImageControl(0),
+ pImageControl(0),
pBindings(&rBindings),
pResMgr(0),
pAutoDeactivate(0),
nLocks(0),
bHelpInitialized( bWithHelp ),
- bWasHighContrast( FALSE ),
bIsAddonPopupMenu( bIsAddonMenu )
{
DBG_MEMTEST();
@@ -238,7 +236,6 @@ SfxVirtualMenu::SfxVirtualMenu( Menu *pStarViewMenu, BOOL bWithHelp,
pAutoDeactivate(0),
nLocks(0),
bHelpInitialized( bWithHelp ),
- bWasHighContrast( FALSE ),
bIsAddonPopupMenu( bIsAddonMenu )
{
DBG_MEMTEST();
@@ -324,14 +321,6 @@ SfxVirtualMenu::~SfxVirtualMenu()
DBG_ASSERT( !nLocks, "destroying active menu" );
}
//--------------------------------------------------------------------
-
-BOOL SfxVirtualMenu::IsHiContrastMode() const
-{
- const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
- return rSettings.GetHighContrastMode();
-}
-
-//--------------------------------------------------------------------
// internal: creates the virtual menu from the pSVMenu
void SfxVirtualMenu::CreateFromSVMenu()
@@ -396,9 +385,6 @@ void SfxVirtualMenu::CreateFromSVMenu()
pBindings->ENTERREGISTRATIONS(); ++nLocks;
pImageControl = new SfxMenuImageControl_Impl( SID_IMAGE_ORIENTATION, *pBindings, this );
- // Update high contrast state
- bWasHighContrast = IsHiContrastMode();
-
USHORT nSVPos = 0;
for ( USHORT nPos=0; nPos<nCount; ++nPos, ++nSVPos )
{
@@ -439,7 +425,7 @@ void SfxVirtualMenu::CreateFromSVMenu()
{
rtl::OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" ));
aSlotURL += rtl::OUString::valueOf( sal_Int32( nSlotId ));
- Image aImage = GetImage( xFrame, aSlotURL, FALSE, bWasHighContrast );
+ Image aImage = GetImage( xFrame, aSlotURL, FALSE );
pSVMenu->SetItemImage( nSlotId, aImage );
}
}
@@ -536,13 +522,13 @@ void SfxVirtualMenu::CreateFromSVMenu()
if ( pMenuAttributes )
aImageId = pMenuAttributes->aImageId; // Retrieve image id from menu attributes
- aImage = RetrieveAddOnImage( xFrame, aImageId, aCmd, FALSE, bWasHighContrast );
+ aImage = RetrieveAddOnImage( xFrame, aImageId, aCmd, FALSE );
}
else
{
rtl::OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" ));
aSlotURL += rtl::OUString::valueOf( sal_Int32( nSlotId ));
- aImage = GetImage( xFrame, aSlotURL, FALSE, bWasHighContrast );
+ aImage = GetImage( xFrame, aSlotURL, FALSE );
}
if ( !!aImage )
@@ -620,13 +606,13 @@ IMPL_LINK( SfxVirtualMenu, SettingsChanged, void*, EMPTYARG )
if ( pMenuAttributes )
aImageId = pMenuAttributes->aImageId; // Retrieve image id from menu attributes
- pSVMenu->SetItemImage( nSlotId, RetrieveAddOnImage( xFrame, aImageId, aCmd, FALSE, bIsHiContrastMode ));
+ pSVMenu->SetItemImage( nSlotId, RetrieveAddOnImage( xFrame, aImageId, aCmd, FALSE ));
}
else
{
rtl::OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" ));
aSlotURL += rtl::OUString::valueOf( sal_Int32( nSlotId ));
- pSVMenu->SetItemImage( nSlotId, GetImage( xFrame, aSlotURL, FALSE, bWasHighContrast ));
+ pSVMenu->SetItemImage( nSlotId, GetImage( xFrame, aSlotURL, FALSE ));
}
}
else if( nType == MENUITEM_STRINGIMAGE && !bIcons )
@@ -667,7 +653,6 @@ void SfxVirtualMenu::UpdateImages()
if ( bIcons )
{
- BOOL bIsHiContrastMode = IsHiContrastMode();
USHORT nItemCount = pSVMenu->GetItemCount();
SfxViewFrame * pViewFrame = pBindings->GetDispatcher()->GetFrame();
Reference<com::sun::star::frame::XFrame> xFrame( pViewFrame->GetFrame().GetFrameInterface() );
@@ -689,13 +674,13 @@ void SfxVirtualMenu::UpdateImages()
if ( pMenuAttributes )
aImageId = pMenuAttributes->aImageId; // Retrieve image id from menu attributes
- pSVMenu->SetItemImage( nSlotId, RetrieveAddOnImage( xFrame, aImageId, aCmd, FALSE, bIsHiContrastMode ));
+ pSVMenu->SetItemImage( nSlotId, RetrieveAddOnImage( xFrame, aImageId, aCmd, FALSE ));
}
else
{
rtl::OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" ));
aSlotURL += rtl::OUString::valueOf( sal_Int32( nSlotId ));
- pSVMenu->SetItemImage( nSlotId, GetImage( xFrame, aSlotURL, FALSE, bWasHighContrast ));
+ pSVMenu->SetItemImage( nSlotId, GetImage( xFrame, aSlotURL, FALSE ));
}
}
}
@@ -717,7 +702,6 @@ void SfxVirtualMenu::UpdateImages( Menu* pMenu )
BOOL bIcons = Application::GetSettings().GetStyleSettings().GetUseImagesInMenus();
if ( bIcons )
{
- BOOL bIsHiContrastMode = IsHiContrastMode();
USHORT nItemCount = pMenu->GetItemCount();
Reference<com::sun::star::frame::XFrame> aXFrame( pBindings->GetDispatcher_Impl()->GetFrame()->GetFrame().GetFrameInterface() );
@@ -735,7 +719,7 @@ void SfxVirtualMenu::UpdateImages( Menu* pMenu )
if ( pMenuAttributes )
aImageId = pMenuAttributes->aImageId; // Retrieve image id from menu attributes
- pMenu->SetItemImage( nSlotId, RetrieveAddOnImage( aXFrame, aImageId, pMenu->GetItemCommand( nSlotId ), FALSE, bIsHiContrastMode ));
+ pMenu->SetItemImage( nSlotId, RetrieveAddOnImage( aXFrame, aImageId, pMenu->GetItemCommand( nSlotId ), FALSE ));
}
if ( pPopup )
@@ -768,7 +752,7 @@ void SfxVirtualMenu::RemoveMenuImages( Menu* pMenu )
//--------------------------------------------------------------------
-FASTBOOL SfxVirtualMenu::Bind_Impl( Menu *pMenu )
+bool SfxVirtualMenu::Bind_Impl( Menu *pMenu )
{
// Selber suchen, da SV mit 'USHORT nSID = pSVMenu->GetCurItemId();' immer
// 0 liefert. Das ist so, weil die Event-Weiterleitung lt. TH nichts mit
@@ -778,7 +762,7 @@ FASTBOOL SfxVirtualMenu::Bind_Impl( Menu *pMenu )
for ( USHORT nPos = 0; nPos < nCount; ++nPos )
{
// angesprochenes Sub-Menu gefunden?
- FASTBOOL bFound = FALSE;
+ bool bFound = false;
USHORT nSID = pSVMenu->GetItemId(nPos);
SfxMenuControl &rCtrl = pItems[nPos];
bFound = pSVMenu->GetPopupMenu(nSID) == pMenu;
@@ -808,9 +792,7 @@ FASTBOOL SfxVirtualMenu::Bind_Impl( Menu *pMenu )
DBG_OUTF( ("Neues VirtualMenu %lx erzeugt", pSubMenu) );
- rCtrl.Bind( this, nSID, *pSubMenu,
- pSVMenu->GetItemText(nSID), pSVMenu->GetHelpText(nSID),
- *pBindings );
+ rCtrl.Bind( this, nSID, *pSubMenu, pSVMenu->GetItemText(nSID), *pBindings );
// Activate weiterleiten
pSubMenu->Bind_Impl( pMenu );
@@ -913,7 +895,7 @@ void SfxVirtualMenu::InsertAddOnsMenuItem( Menu* pMenu )
{
rtl::OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" ));
aSlotURL += rtl::OUString::valueOf( sal_Int32( SID_ADDONS ));
- pMenu->SetItemImage( SID_ADDONS, GetImage( xFrame, aSlotURL, FALSE, bWasHighContrast ));
+ pMenu->SetItemImage( SID_ADDONS, GetImage( xFrame, aSlotURL, FALSE ));
}
}
else
@@ -1060,16 +1042,6 @@ IMPL_LINK( SfxVirtualMenu, Activate, Menu *, pMenu )
if ( pAutoDeactivate ) // QAP-Hack
pAutoDeactivate->Start();
- if ( IsHiContrastMode() != bWasHighContrast )
- {
- // Refresh images as our background color changed and remember it!!
- bWasHighContrast = IsHiContrastMode();
- if ( bIsAddonPopupMenu )
- UpdateImages( pSVMenu );
- else
- UpdateImages();
- }
-
// erledigt
return TRUE;
}
@@ -1324,9 +1296,7 @@ void SfxVirtualMenu::InitPopup( USHORT nPos, BOOL /*bOLE*/ )
DBG_OUTF( ("Neues VirtualMenu %lx erzeugt", pSubMenu) );
- rCtrl.Bind( this, nSID, *pSubMenu,
- pSVMenu->GetItemText(nSID), pSVMenu->GetHelpText(nSID),
- *pBindings );
+ rCtrl.Bind( this, nSID, *pSubMenu, pSVMenu->GetItemText(nSID), *pBindings );
}
}
@@ -1359,3 +1329,4 @@ void SfxVirtualMenu::SetHelpIds( ResMgr *pRes )
pResMgr = pRes;
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-21 21:54:34 +0000