diff options
Diffstat (limited to 'svx/source/form/fmshimp.cxx')
| -rw-r--r-- | svx/source/form/fmshimp.cxx | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index 743c735869..404ffb39f6 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -1134,12 +1134,10 @@ void FmXFormShell::ForceUpdateSelection(sal_Bool bAllowInvalidation) PopupMenu* FmXFormShell::GetConversionMenu() { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::GetConversionMenu" ); - const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); - BOOL bIsHiContrastMode = rSettings.GetHighContrastMode(); PopupMenu* pNewMenu = new PopupMenu(SVX_RES( RID_FMSHELL_CONVERSIONMENU )); - ImageList aImageList( SVX_RES( bIsHiContrastMode ? RID_SVXIMGLIST_FMEXPL_HC : RID_SVXIMGLIST_FMEXPL) ); + ImageList aImageList( SVX_RES( RID_SVXIMGLIST_FMEXPL) ); for ( size_t i = 0; i < SAL_N_ELEMENTS( nConvertSlots ); ++i ) { // das entsprechende Image dran @@ -1886,7 +1884,7 @@ namespace { return ( _nWhich == SID_FM_RECORD_FIRST ) || ( _nWhich == SID_FM_RECORD_PREV ) - || ( _nWhich == SID_FM_RECORD_NEXT ) + || ( _nWhich == SID_FM_RECORD_NEXT ) || ( _nWhich == SID_FM_RECORD_LAST ) || ( _nWhich == SID_FM_RECORD_NEW ); } @@ -2037,7 +2035,7 @@ void FmXFormShell::setActiveController( const Reference< runtime::XFormControlle stopListening(); - impl_switchActiveControllerListening( false ); + impl_switchActiveControllerListening( false ); m_aActiveControllerFeatures.dispose(); m_xActiveController = xController; |