diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-02-26 13:30:35 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-02-27 11:28:29 +0100 |
| commit | c98d3303027bd8bf8e0881b61918710ac479864c (patch) | |
| tree | e6843dfd93352f134207cbc482451e8f17266bc2 /sw/source/uibase/docvw | |
| parent | 44a485c2baaf5bab81748f992915459bdaa58615 (diff) | |
replace Color(COL_*) with COL_*
using
git grep -lwP "Color\s*\(\s*(COL_\w+)\s*\)"
| xargs perl -pi -e "s/Color\s*\(\s*(COL_\w+)\s*\)//g"
and then some manual fixup where the resulting expression no longer
compiled
Change-Id: I0e268d78611c3be40bba9f60ecfdc087a36c0df4
Reviewed-on: https://gerrit.libreoffice.org/50372
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/source/uibase/docvw')
| -rw-r--r-- | sw/source/uibase/docvw/AnnotationMenuButton.cxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/docvw/PostItMgr.cxx | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sw/source/uibase/docvw/AnnotationMenuButton.cxx b/sw/source/uibase/docvw/AnnotationMenuButton.cxx index b8da589d4ad2..5e10465cb92a 100644 --- a/sw/source/uibase/docvw/AnnotationMenuButton.cxx +++ b/sw/source/uibase/docvw/AnnotationMenuButton.cxx @@ -177,7 +177,7 @@ void AnnotationMenuButton::Paint(vcl::RenderContext& rRenderContext, const tools const long nBorderDistanceBottom = ((aSymbolRect.GetHeight() * 150) + 500) / 1000; aSymbolRect.AdjustBottom( -nBorderDistanceBottom ); DecorationView aDecoView(&rRenderContext); - aDecoView.DrawSymbol(aSymbolRect, SymbolType::SPIN_DOWN, (bHighContrast ? Color(COL_WHITE) : Color(COL_BLACK))); + aDecoView.DrawSymbol(aSymbolRect, SymbolType::SPIN_DOWN, (bHighContrast ? COL_WHITE : COL_BLACK)); } void AnnotationMenuButton::KeyInput(const KeyEvent& rKeyEvt) diff --git a/sw/source/uibase/docvw/PostItMgr.cxx b/sw/source/uibase/docvw/PostItMgr.cxx index 0eb0cbb2d9e0..f0f76560218e 100644 --- a/sw/source/uibase/docvw/PostItMgr.cxx +++ b/sw/source/uibase/docvw/PostItMgr.cxx @@ -1109,7 +1109,7 @@ Color SwPostItMgr::GetArrowColor(sal_uInt16 aDirection,unsigned long aPage) cons if (ArrowEnabled(aDirection,aPage)) { if (Application::GetSettings().GetStyleSettings().GetHighContrastMode()) - return Color(COL_WHITE); + return COL_WHITE; else return COL_NOTES_SIDEPANE_ARROW_ENABLED; } @@ -2047,7 +2047,7 @@ Color SwPostItMgr::GetColorDark(std::size_t aAuthorIndex) return aArrayNormal[ aAuthorIndex % SAL_N_ELEMENTS( aArrayNormal )]; } else - return Color(COL_WHITE); + return COL_WHITE; } Color SwPostItMgr::GetColorLight(std::size_t aAuthorIndex) @@ -2062,7 +2062,7 @@ Color SwPostItMgr::GetColorLight(std::size_t aAuthorIndex) return aArrayLight[ aAuthorIndex % SAL_N_ELEMENTS( aArrayLight )]; } else - return Color(COL_WHITE); + return COL_WHITE; } Color SwPostItMgr::GetColorAnchor(std::size_t aAuthorIndex) @@ -2077,7 +2077,7 @@ Color SwPostItMgr::GetColorAnchor(std::size_t aAuthorIndex) return aArrayAnchor[ aAuthorIndex % SAL_N_ELEMENTS( aArrayAnchor )]; } else - return Color(COL_WHITE); + return COL_WHITE; } void SwPostItMgr::SetActiveSidebarWin( SwAnnotationWin* p) |