diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-02-04 20:46:57 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-02-04 20:49:59 +0000 |
| commit | af6cd2356afd1212acc529f796f8043ad7e278e6 (patch) | |
| tree | a46e0181a88c4fca8cd6d5a9cb473bbfd2d71d31 /sfx2 | |
| parent | 38a65f76bc944ea730ebac7640dc135248ec3da0 (diff) | |
rename MenuConfiguration::Attributes->MenuAttributes
Change-Id: I2ada1394c4cbee7c27b02f241ee4a254597a5dd8
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/menu/mnuitem.cxx | 8 | ||||
| -rw-r--r-- | sfx2/source/menu/virtmenu.cxx | 12 |
2 files changed, 10 insertions, 10 deletions
diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx index 83de775acc6e..455d517db161 100644 --- a/sfx2/source/menu/mnuitem.cxx +++ b/sfx2/source/menu/mnuitem.cxx @@ -352,8 +352,8 @@ IMPL_LINK( SfxAppMenuControl_Impl, Activate, Menu *, pActMenu ) { bool bImageSet = false; OUString aImageId; - ::framework::MenuConfiguration::Attributes* pMenuAttributes = - reinterpret_cast< ::framework::MenuConfiguration::Attributes*>(pMenu->GetUserValue( nItemId )); + ::framework::MenuAttributes* pMenuAttributes = + reinterpret_cast< ::framework::MenuAttributes*>(pMenu->GetUserValue( nItemId )); if ( pMenuAttributes ) aImageId = pMenuAttributes->aImageId; // Retrieve image id from menu attributes @@ -438,8 +438,8 @@ sal_IntPtr Select_Impl( void* /*pHdl*/, void* pVoid ) else { OUString aTargetFrame( "_blank" ); - ::framework::MenuConfiguration::Attributes* pMenuAttributes = - reinterpret_cast< ::framework::MenuConfiguration::Attributes*>(pMenu->GetUserValue( pMenu->GetCurItemId() )); + ::framework::MenuAttributes* pMenuAttributes = + reinterpret_cast< ::framework::MenuAttributes*>(pMenu->GetUserValue( pMenu->GetCurItemId() )); if ( pMenuAttributes ) aTargetFrame = pMenuAttributes->aTargetFrame; diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx index 84c42081e39a..610f7e453bb5 100644 --- a/sfx2/source/menu/virtmenu.cxx +++ b/sfx2/source/menu/virtmenu.cxx @@ -438,8 +438,8 @@ void SfxVirtualMenu::CreateFromSVMenu() { OUString aImageId; - ::framework::MenuConfiguration::Attributes* pMenuAttributes = - reinterpret_cast< ::framework::MenuConfiguration::Attributes*>(pSVMenu->GetUserValue( nSlotId )); + ::framework::MenuAttributes* pMenuAttributes = + reinterpret_cast< ::framework::MenuAttributes*>(pSVMenu->GetUserValue( nSlotId )); if ( pMenuAttributes ) aImageId = pMenuAttributes->aImageId; // Retrieve image id from menu attributes @@ -510,8 +510,8 @@ IMPL_LINK_NOARG(SfxVirtualMenu, SettingsChanged) OUString aCmd( pSVMenu->GetItemCommand( nSlotId ) ); OUString aImageId; - ::framework::MenuConfiguration::Attributes* pMenuAttributes = - reinterpret_cast< ::framework::MenuConfiguration::Attributes*>(pSVMenu->GetUserValue( nSlotId )); + ::framework::MenuAttributes* pMenuAttributes = + reinterpret_cast< ::framework::MenuAttributes*>(pSVMenu->GetUserValue( nSlotId )); if ( pMenuAttributes ) aImageId = pMenuAttributes->aImageId; // Retrieve image id from menu attributes @@ -578,8 +578,8 @@ void SfxVirtualMenu::UpdateImages( Menu* pMenu ) { OUString aImageId; - ::framework::MenuConfiguration::Attributes* pMenuAttributes = - reinterpret_cast< ::framework::MenuConfiguration::Attributes*>(pMenu->GetUserValue( nSlotId )); + ::framework::MenuAttributes* pMenuAttributes = + reinterpret_cast< ::framework::MenuAttributes*>(pMenu->GetUserValue( nSlotId )); if ( pMenuAttributes ) aImageId = pMenuAttributes->aImageId; // Retrieve image id from menu attributes |