diff options
author | Joseph Powers <jpowers27@cox.net> | 2010-11-16 19:05:22 -0800 |
---|---|---|
committer | Joseph Powers <jpowers27@cox.net> | 2010-11-16 20:46:05 -0800 |
commit | ffb4652ef4c30624fe4f18e19c38a9e81f17d515 (patch) | |
tree | d81727d0665f45d01668471ad6d7118d94e89fde | |
parent | Fixed a build breakage. (diff) | |
download | core-ffb4652ef4c30624fe4f18e19c38a9e81f17d515.tar.gz core-ffb4652ef4c30624fe4f18e19c38a9e81f17d515.zip |
HC Cleanup - writer
-rw-r--r-- | sw/source/ui/inc/workctrl.hxx | 2 | ||||
-rw-r--r-- | sw/source/ui/lingu/olmenu.cxx | 17 | ||||
-rw-r--r-- | sw/source/ui/ribbar/workctrl.cxx | 18 | ||||
-rw-r--r-- | sw/source/ui/ribbar/workctrl.hrc | 3 |
4 files changed, 12 insertions, 28 deletions
diff --git a/sw/source/ui/inc/workctrl.hxx b/sw/source/ui/inc/workctrl.hxx index cda996304121..cfc02d6fec68 100644 --- a/sw/source/ui/inc/workctrl.hxx +++ b/sw/source/ui/inc/workctrl.hxx @@ -136,7 +136,6 @@ class SwScrollNaviPopup : public SfxPopupWindow FixedLine aSeparator; FixedInfo aInfoField; ImageList aIList; - ImageList aIListH; String sQuickHelp[2 * NID_COUNT]; @@ -169,7 +168,6 @@ class SwNaviImageButton : public ImageButton { SwScrollNaviPopup* pPopup; Image aImage; - Image aImageH; String sQuickText; SfxPopupWindow* pPopupWindow; SfxPopupWindow* pFloatingWindow; diff --git a/sw/source/ui/lingu/olmenu.cxx b/sw/source/ui/lingu/olmenu.cxx index f645db8f282e..602f9300c0c0 100644 --- a/sw/source/ui/lingu/olmenu.cxx +++ b/sw/source/ui/lingu/olmenu.cxx @@ -392,11 +392,11 @@ OUString RetrieveLabelFromCommand( const OUString& aCmdURL ) SwSpellPopup::SwSpellPopup( SwWrtShell* pWrtSh, const uno::Reference< linguistic2::XSpellAlternatives > &xAlt, - const String &rParaText ) : -PopupMenu( SW_RES(MN_SPELL_POPUP) ), -pSh( pWrtSh ), -xSpellAlt(xAlt), -bGrammarResults(false) + const String &rParaText +) : PopupMenu( SW_RES(MN_SPELL_POPUP) ) + , pSh( pWrtSh ) + , xSpellAlt(xAlt) + , bGrammarResults(false) { OSL_ENSURE(xSpellAlt.is(), "no spelling alternatives available"); @@ -412,7 +412,6 @@ bGrammarResults(false) sal_Int16 nStringCount = static_cast< sal_Int16 >( aSuggestions.getLength() ); SvtLinguConfig aCfg; - const bool bHC = Application::GetSettings().GetStyleSettings().GetHighContrastMode(); PopupMenu *pMenu = GetPopupMenu(MN_AUTOCORR); pMenu->SetMenuFlags(MENU_FLAG_NOAUTOMNEMONICS); @@ -424,7 +423,7 @@ bGrammarResults(false) uno::Reference< container::XNamed > xNamed( xSpellAlt, uno::UNO_QUERY ); if (xNamed.is()) { - aSuggestionImageUrl = aCfg.GetSpellAndGrammarContextSuggestionImage( xNamed->getName(), bHC ); + aSuggestionImageUrl = aCfg.GetSpellAndGrammarContextSuggestionImage( xNamed->getName() ); aImage = Image( lcl_GetImageFromPngUrl( aSuggestionImageUrl ) ); } @@ -515,7 +514,7 @@ bGrammarResults(false) if (xSvcInfo.is()) { OUString aDictionaryImageUrl( aCfg.GetSpellAndGrammarContextDictionaryImage( - xSvcInfo->getImplementationName(), bHC) ); + xSvcInfo->getImplementationName() ) ); if (aDictionaryImageUrl.getLength() > 0) { Image aImage( lcl_GetImageFromPngUrl( aDictionaryImageUrl ) ); @@ -571,7 +570,6 @@ bGrammarResults(false) uno::Reference< frame::XFrame > xFrame = pWrtSh->GetView().GetViewFrame()->GetFrame().GetFrameInterface(); Image rImg = ::GetImage( xFrame, OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:SpellingAndGrammarDialog")), sal_False ); - SetItemImage( MN_SPELLING_DLG, rImg ); ////////////////////////////////////////////////////////////////////////////////// @@ -704,7 +702,6 @@ aInfo16( SW_RES(IMG_INFO_16) ) uno::Reference< frame::XFrame > xFrame = pWrtSh->GetView().GetViewFrame()->GetFrame().GetFrameInterface(); Image rImg = ::GetImage( xFrame, OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:SpellingAndGrammarDialog")), sal_False ); - SetItemImage( MN_SPELLING_DLG, rImg ); ////////////////////////////////////////////////////////////////////////////////// diff --git a/sw/source/ui/ribbar/workctrl.cxx b/sw/source/ui/ribbar/workctrl.cxx index 4fc7ba922573..8b9e2c9e41f0 100644 --- a/sw/source/ui/ribbar/workctrl.cxx +++ b/sw/source/ui/ribbar/workctrl.cxx @@ -30,7 +30,6 @@ #include "precompiled_sw.hxx" - #include <string> // HACK: prevent conflict between STLPORT and Workshop headers #include <svl/eitem.hxx> #include <svx/htmlmode.hxx> @@ -92,9 +91,7 @@ void SAL_CALL SwTbxInsertCtrl::update() throw (uno::RuntimeException) ToolBox& rTbx = GetToolBox(); rtl::OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" )); aSlotURL += rtl::OUString::valueOf( sal_Int32( nLastSlotId )); - Image aImage = GetImage( m_xFrame, - aSlotURL, - hasBigImages() ); + Image aImage = GetImage( m_xFrame, aSlotURL, hasBigImages() ); rTbx.SetItemImage(GetId(), aImage); rTbx.Invalidate(); @@ -121,9 +118,7 @@ void SwTbxInsertCtrl::StateChanged( USHORT /*nSID*/, rtl::OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" )); aSlotURL += rtl::OUString::valueOf( sal_Int32( nId )); ToolBox& rBox = GetToolBox(); - Image aImage = GetImage( m_xFrame, - aSlotURL, - hasBigImages() ); + Image aImage = GetImage( m_xFrame, aSlotURL, hasBigImages() ); rBox.SetItemImage(GetId(), aImage); rBox.SetItemImageMirrorMode( GetId(), FALSE ); rBox.SetItemImageAngle( GetId(), pItem->GetRotation() ); @@ -413,7 +408,6 @@ SwScrollNaviPopup::SwScrollNaviPopup( USHORT nId, const Reference< XFrame >& rFr aSeparator(this, SW_RES(FL_SEP)), aInfoField(this, SW_RES(FI_INFO)), aIList(SW_RES(IL_VALUES)), - aIListH(SW_RES(ILH_VALUES)), nFwdId(FN_START_OF_NEXT_PAGE), nBackId(FN_START_OF_PREV_PAGE) { @@ -488,8 +482,7 @@ void SwScrollNaviPopup::DataChanged( const DataChangedEvent& rDCEvt ) void SwScrollNaviPopup::ApplyImageList() { - ImageList& rImgLst = aToolBox.GetSettings().GetStyleSettings().GetHighContrastMode() ? - aIListH : aIList; + ImageList& rImgLst = aIList; for(USHORT i = 0; i < NID_COUNT; i++) { USHORT nNaviId = aNavigationInsertIds[i]; @@ -624,7 +617,6 @@ SwNaviImageButton::SwNaviImageButton( ImageButton(pParent, SW_RES(BTN_NAVI)), pPopup(0), aImage(SW_RES(IMG_BTN)), - aImageH(SW_RES(IMG_BTN_H)), sQuickText(SW_RES(ST_QUICK)), pPopupWindow(0), pFloatingWindow(0), @@ -633,14 +625,14 @@ SwNaviImageButton::SwNaviImageButton( FreeResource(); SetStyle(GetStyle()|WB_NOPOINTERFOCUS); SetQuickHelpText(sQuickText); - SetModeImage( GetSettings().GetStyleSettings().GetHighContrastMode() ? aImageH : aImage); + SetModeImage( aImage ); } void SwNaviImageButton::DataChanged( const DataChangedEvent& rDCEvt ) { if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE) ) - SetModeImage( GetSettings().GetStyleSettings().GetHighContrastMode() ? aImageH : aImage); + SetModeImage( aImage ); Window::DataChanged( rDCEvt ); } diff --git a/sw/source/ui/ribbar/workctrl.hrc b/sw/source/ui/ribbar/workctrl.hrc index 5e5180f363aa..51ac45b2ae87 100644 --- a/sw/source/ui/ribbar/workctrl.hrc +++ b/sw/source/ui/ribbar/workctrl.hrc @@ -37,9 +37,6 @@ #define ST_QUICK 7 #define FI_INFO 8 #define FL_SEP 9 -#define ILH_VALUES 10 -#define IMG_BTN_H 11 - #define ST_TBL 12 #define ST_FRM 13 |