diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2010-11-16 14:32:00 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2010-11-16 17:06:33 +0000 |
| commit | f364dced8efbf3cfc455920e9f7cbd697751476c (patch) | |
| tree | d8142754edadd84e5c7a27d23f44b8d078ce2d9d | |
| parent | fa82d4de348ec744331d0f5610e724c4df7a4151 (diff) | |
get this building again
| -rw-r--r-- | dbaccess/source/ui/control/dbtreelistbox.cxx | 4 | ||||
| -rw-r--r-- | reportdesign/source/ui/report/ReportSection.cxx | 10 |
2 files changed, 5 insertions, 9 deletions
diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx index c2d057037..e7635179f 100644 --- a/dbaccess/source/ui/control/dbtreelistbox.cxx +++ b/dbaccess/source/ui/control/dbtreelistbox.cxx @@ -533,8 +533,6 @@ namespace } void lcl_insertMenuItemImages( Menu& _rMenu, IController& _rCommandController ) { - const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); - const BOOL bHiContrast = rSettings.GetHighContrastMode(); uno::Reference< frame::XController > xController = _rCommandController.getXController(); uno::Reference< frame::XFrame> xFrame; if ( xController.is() ) @@ -556,7 +554,7 @@ namespace } // if ( pPopup ) if ( xFrame.is() ) - _rMenu.SetItemImage(nId,framework::GetImageFromURL(xFrame,aCommand,FALSE,bHiContrast)); + _rMenu.SetItemImage(nId,framework::GetImageFromURL(xFrame,aCommand,FALSE)); } } // ========================================================================= diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx index 9c7888e12..06d4768d5 100644 --- a/reportdesign/source/ui/report/ReportSection.cxx +++ b/reportdesign/source/ui/report/ReportSection.cxx @@ -461,7 +461,7 @@ void OReportSection::SelectAll(const sal_uInt16 _nObjectType) } } } -void lcl_insertMenuItemImages(PopupMenu& rContextMenu,OReportController& rController,const uno::Reference< report::XReportDefinition>& _xReportDefinition,uno::Reference<frame::XFrame>& _rFrame,BOOL _bHiContrast) +void lcl_insertMenuItemImages(PopupMenu& rContextMenu,OReportController& rController,const uno::Reference< report::XReportDefinition>& _xReportDefinition,uno::Reference<frame::XFrame>& _rFrame) { const USHORT nCount = rContextMenu.GetItemCount(); for (USHORT i = 0; i < nCount; ++i) @@ -472,12 +472,12 @@ void lcl_insertMenuItemImages(PopupMenu& rContextMenu,OReportController& rContro PopupMenu* pPopupMenu = rContextMenu.GetPopupMenu( nId ); if ( pPopupMenu ) { - lcl_insertMenuItemImages(*pPopupMenu,rController,_xReportDefinition,_rFrame,_bHiContrast); + lcl_insertMenuItemImages(*pPopupMenu,rController,_xReportDefinition,_rFrame); } else { const ::rtl::OUString sCommand = rContextMenu.GetItemCommand(nId); - rContextMenu.SetItemImage(nId,framework::GetImageFromURL(_rFrame,sCommand,FALSE,_bHiContrast)); + rContextMenu.SetItemImage(nId,framework::GetImageFromURL(_rFrame,sCommand,FALSE)); if ( nId == SID_PAGEHEADERFOOTER ) { String sText = String(ModuleRes((_xReportDefinition.is() && _xReportDefinition->getPageHeaderOn()) ? RID_STR_PAGEHEADERFOOTER_DELETE : RID_STR_PAGEHEADERFOOTER_INSERT)); @@ -502,14 +502,12 @@ void OReportSection::Command( const CommandEvent& _rCEvt ) { case COMMAND_CONTEXTMENU: { - const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); - BOOL bHiContrast = rSettings.GetHighContrastMode(); OReportController& rController = m_pParent->getViewsWindow()->getView()->getReportView()->getController(); uno::Reference<frame::XFrame> xFrame = rController.getFrame(); PopupMenu aContextMenu( ModuleRes( RID_MENU_REPORT ) ); uno::Reference< report::XReportDefinition> xReportDefinition = getSection()->getReportDefinition(); - lcl_insertMenuItemImages(aContextMenu,rController,xReportDefinition,xFrame,bHiContrast); + lcl_insertMenuItemImages(aContextMenu,rController,xReportDefinition,xFrame); Point aPos = _rCEvt.GetMousePosPixel(); m_pView->EndAction(); |