diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2009-01-29 10:50:15 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2009-01-29 10:50:15 +0000 |
| commit | 426ab2c0e8f6e3fe2b766f74f6b8da873d860260 (patch) | |
| tree | 2d750aa6fa2bdebb474372db7adcbce37e03abf8 /framework | |
| parent | 25dad84813feb405e709c31b180361dc1b7cfaaa (diff) | |
CWS-TOOLING: integrate CWS metropatch01_DEV300
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/uielement/menubarmanager.cxx | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index 39586fc65611..c29ab54c9869 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -676,12 +676,24 @@ throw ( RuntimeException ) { sal_Bool bCheckmark( sal_False ); sal_Bool bMenuItemEnabled( m_pVCLMenu->IsItemEnabled( pMenuItemHandler->nItemId )); + sal_Bool bEnabledItem( Event.IsEnabled ); rtl::OUString aItemText; status::Visibility aVisibilityStatus; + #ifdef UNIX + // #b6673979# enable some slots hardly, because UNIX clipboard does not notify all changes + // Can be removed if follow up task will be fixed directly within applications. + if ( + ( pMenuItemHandler->aMenuItemURL.equalsAscii (".uno:Paste" ) ) || + ( pMenuItemHandler->aMenuItemURL.equalsAscii (".uno:PasteSpecial" ) ) || + ( pMenuItemHandler->aMenuItemURL.equalsAscii (".uno:PasteClipboard") ) // special for draw/impress + ) + bEnabledItem = sal_True; + #endif + // Enable/disable item - if ( Event.IsEnabled != bMenuItemEnabled ) - m_pVCLMenu->EnableItem( pMenuItemHandler->nItemId, Event.IsEnabled ); + if ( bEnabledItem != bMenuItemEnabled ) + m_pVCLMenu->EnableItem( pMenuItemHandler->nItemId, bEnabledItem ); if ( Event.State >>= bCheckmark ) { |