diff options
Diffstat (limited to 'sw')
27 files changed, 55 insertions, 55 deletions
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx index 0a16a201ad1a..923ac193bb0b 100644 --- a/sw/qa/extras/uiwriter/uiwriter.cxx +++ b/sw/qa/extras/uiwriter/uiwriter.cxx @@ -4079,7 +4079,7 @@ void SwUiWriterTest::testTdf87922() // If no color background color is found, assume white. Color* pColor = sw::GetActiveRetoucheColor(); - *pColor = Color(COL_WHITE); + *pColor = COL_WHITE; // Make sure that automatic color on black background is white, not black. vcl::Font aFont; diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx index 92b630350d09..b43ec2dfe50d 100644 --- a/sw/source/core/frmedt/fefly1.cxx +++ b/sw/source/core/frmedt/fefly1.cxx @@ -600,7 +600,7 @@ Point SwFEShell::FindAnchorPos( const Point& rAbsPos, bool bMoveIt ) if( Color(COL_TRANSPARENT) != GetOut()->GetLineColor() ) { OSL_FAIL( "Hey, Joe: Where's my Null Pen?" ); - GetOut()->SetLineColor( Color(COL_TRANSPARENT) ); + GetOut()->SetLineColor( COL_TRANSPARENT ); } #endif } diff --git a/sw/source/core/inc/wrong.hxx b/sw/source/core/inc/wrong.hxx index fc44c6db8ead..3bca9d8d6fa0 100644 --- a/sw/source/core/inc/wrong.hxx +++ b/sw/source/core/inc/wrong.hxx @@ -145,7 +145,7 @@ private: } else if (WRONGLIST_GRAMMAR == listType) { - return Color( COL_LIGHTBLUE ); + return COL_LIGHTBLUE; } else if (WRONGLIST_SMARTTAG == listType) { diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index bc9b35e7be7b..a4b10585e6b3 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -6170,10 +6170,10 @@ void SwFrame::PaintSwFrameBackground( const SwRect &rRect, const SwPageFrame *pP ) ) { - pTmpBackBrush = new SvxBrushItem( Color( COL_WHITE ), RES_BACKGROUND ); + pTmpBackBrush = new SvxBrushItem( COL_WHITE, RES_BACKGROUND ); //UUU - aFillAttributes.reset(new drawinglayer::attribute::SdrAllFillAttributesHelper(Color( COL_WHITE ))); + aFillAttributes.reset(new drawinglayer::attribute::SdrAllFillAttributesHelper(COL_WHITE)); } else { diff --git a/sw/source/core/text/itrpaint.cxx b/sw/source/core/text/itrpaint.cxx index 20c183064492..47769b372ef8 100644 --- a/sw/source/core/text/itrpaint.cxx +++ b/sw/source/core/text/itrpaint.cxx @@ -72,7 +72,7 @@ bool IsUnderlineBreak( const SwLinePortion& rPor, const SwFont& rFnt ) const Color GetUnderColor( const SwFont *pFont ) { - return pFont->GetUnderColor() == Color( COL_AUTO ) ? + return pFont->GetUnderColor() == COL_AUTO ? pFont->GetColor() : pFont->GetUnderColor(); } @@ -504,7 +504,7 @@ void SwTextPainter::CheckSpecialUnderline( const SwLinePortion* pPor, // Bug 120769:Color of underline display wrongly if ( GetInfo().GetUnderFnt() && GetInfo().GetUnderFnt()->GetFont().GetUnderline() == GetFnt()->GetUnderline() && - GetInfo().GetFont() && GetInfo().GetFont()->GetUnderColor() != Color(COL_AUTO) ) + GetInfo().GetFont() && GetInfo().GetFont()->GetUnderColor() != COL_AUTO ) return; //Bug 120769(End) diff --git a/sw/source/core/text/redlnitr.cxx b/sw/source/core/text/redlnitr.cxx index e16d7b3b1e34..08c8fcd2e0cc 100644 --- a/sw/source/core/text/redlnitr.cxx +++ b/sw/source/core/text/redlnitr.cxx @@ -403,7 +403,7 @@ void SwExtend::ActualizeFont( SwFont &rFnt, ExtTextInputAttr nAttr ) rFnt.SetUnderline( LINESTYLE_DOTTED ); if ( nAttr & ExtTextInputAttr::RedText ) - rFnt.SetColor( Color( COL_RED ) ); + rFnt.SetColor( COL_RED ); if ( nAttr & ExtTextInputAttr::Highlight ) { diff --git a/sw/source/core/text/txtdrop.cxx b/sw/source/core/text/txtdrop.cxx index 0f7cdc0ce42c..1650b2ea1473 100644 --- a/sw/source/core/text/txtdrop.cxx +++ b/sw/source/core/text/txtdrop.cxx @@ -269,7 +269,7 @@ void SwDropPortion::PaintText( const SwTextPaintInfo &rInf ) const if ( rInf.OnWin() && !rInf.GetOpt().IsPagePreview() && !rInf.GetOpt().IsReadonly() && SwViewOption::IsFieldShadings() && - (!pCurrPart->GetFont().GetBackColor() || *pCurrPart->GetFont().GetBackColor() == Color(COL_TRANSPARENT)) ) + (!pCurrPart->GetFont().GetBackColor() || *pCurrPart->GetFont().GetBackColor() == COL_TRANSPARENT) ) { rInf.DrawBackground( *this ); } diff --git a/sw/source/core/text/txtinit.cxx b/sw/source/core/text/txtinit.cxx index 7770b1d3d5c0..dc952771899c 100644 --- a/sw/source/core/text/txtinit.cxx +++ b/sw/source/core/text/txtinit.cxx @@ -63,7 +63,7 @@ void TextInit_() #endif ); SwTextFrame::SetTextCache( pTextCache ); - pWaveCol = new Color( COL_GRAY ); + pWaveCol = new Color(COL_GRAY); PROTOCOL_INIT } diff --git a/sw/source/core/text/txtpaint.hxx b/sw/source/core/text/txtpaint.hxx index 44ae26ff49bf..eba46093f9c2 100644 --- a/sw/source/core/text/txtpaint.hxx +++ b/sw/source/core/text/txtpaint.hxx @@ -85,7 +85,7 @@ inline DbgBackColor::DbgBackColor( OutputDevice* pOutDev, const bool bOn ) if( pOut ) { aOldFillColor = pOut->GetFillColor(); - pOut->SetFillColor( Color(COL_RED) ); + pOut->SetFillColor( COL_RED ); } } @@ -108,7 +108,7 @@ inline DbgRect::DbgRect( OutputDevice* pOutDev, const tools::Rectangle &rRect, Color aLineColor = pOut->GetLineColor(); pOut->SetLineColor( aColor ); Color aFillColor = pOut->GetFillColor(); - pOut->SetFillColor( Color(COL_TRANSPARENT) ); + pOut->SetFillColor( COL_TRANSPARENT ); pOut->DrawRect( rRect ); pOut->SetLineColor( aLineColor ); pOut->SetFillColor( aFillColor ); diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx index d6d4be4380b1..2f2e1805b8dc 100644 --- a/sw/source/filter/html/htmlatr.cxx +++ b/sw/source/filter/html/htmlatr.cxx @@ -2077,7 +2077,7 @@ Writer& OutHTML_SwTextNode( Writer& rWrt, const SwContentNode& rNode ) aHtml.attribute(OOO_STRING_SVTOOLS_HTML_O_size, sWidth); const Color& rBorderColor = pBorderLine->GetColor(); - if( !rBorderColor.IsRGBEqual( Color(COL_GRAY) ) ) + if( !rBorderColor.IsRGBEqual( COL_GRAY ) ) { HtmlWriterHelper::applyColor(aHtml, OOO_STRING_SVTOOLS_HTML_O_color, rBorderColor); } diff --git a/sw/source/filter/html/svxcss1.cxx b/sw/source/filter/html/svxcss1.cxx index e89eab2f6424..78ec9ef1342c 100644 --- a/sw/source/filter/html/svxcss1.cxx +++ b/sw/source/filter/html/svxcss1.cxx @@ -1544,7 +1544,7 @@ static void ParseCSS1_background( const CSS1Expression *pExpr, SvxBrushItem aBrushItem( aItemIds.nBrush ); if( bTransparent ) - aBrushItem.SetColor( Color(COL_TRANSPARENT)); + aBrushItem.SetColor( COL_TRANSPARENT); else if( bColor ) aBrushItem.SetColor( aColor ); @@ -1596,7 +1596,7 @@ static void ParseCSS1_background_color( const CSS1Expression *pExpr, SvxBrushItem aBrushItem( aItemIds.nBrush ); if( bTransparent ) - aBrushItem.SetColor( Color(COL_TRANSPARENT) ); + aBrushItem.SetColor( COL_TRANSPARENT ); else if( bColor ) aBrushItem.SetColor( aColor); diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx index 3005b5dcc16a..72297baeb175 100644 --- a/sw/source/filter/ww8/ww8par2.cxx +++ b/sw/source/filter/ww8/ww8par2.cxx @@ -3708,7 +3708,7 @@ void WW8RStyle::Set1StyleDefaults() { // Style has no text color set, winword default is auto if ( !bTextColChanged ) - pIo->m_pCurrentColl->SetFormatAttr(SvxColorItem(Color(COL_AUTO), RES_CHRATR_COLOR)); + pIo->m_pCurrentColl->SetFormatAttr(SvxColorItem(COL_AUTO, RES_CHRATR_COLOR)); // Style has no FontSize ? WinWord Default is 10pt for western and asian if( !bFSizeChanged ) diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index 085e2ea6d75b..a9a9ee0cdbfe 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -342,7 +342,7 @@ bool wwSectionManager::SetCols(SwFrameFormat &rFormat, const wwSection &rSection { aCol.SetLineAdj(COLADJ_TOP); // Line aCol.SetLineHeight(100); - aCol.SetLineColor(Color(COL_BLACK)); + aCol.SetLineColor(COL_BLACK); aCol.SetLineWidth(1); } @@ -1479,7 +1479,7 @@ bool SwWW8ImplReader::SetShadow(SvxShadowItem& rShadow, const short *pSizeArray, bool bRet = aRightBrc.fShadow() && pSizeArray && pSizeArray[WW8_RIGHT]; if (bRet) { - rShadow.SetColor(Color(COL_BLACK)); + rShadow.SetColor(COL_BLACK); //i120718 short nVal = aRightBrc.DetermineBorderProperties(); //End diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx index fb9a75947c11..23bc335fd122 100644 --- a/sw/source/ui/chrdlg/drpcps.cxx +++ b/sw/source/ui/chrdlg/drpcps.cxx @@ -264,7 +264,7 @@ void SwDropCapsPict::GetFontSettings( const SwDropCapsPage& _rPage, vcl::Font& _ void SwDropCapsPict::UpdatePaintSettings() { maBackColor = GetSettings().GetStyleSettings().GetWindowColor(); - maTextLineColor = Color( COL_LIGHTGRAY ); + maTextLineColor = COL_LIGHTGRAY; // gray lines mnTotLineH = (GetOutputSizePixel().Height() - 2 * BORDER) / LINES; diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index 5634f8153bc5..bd8baa174c58 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -1593,9 +1593,9 @@ void SwMarkPreview::InitColors() m_aBgCol = rSettings.GetWindowColor(); bool bHC = rSettings.GetHighContrastMode(); - m_aLineCol = bHC? SwViewOption::GetFontColor() : Color( COL_BLACK ); + m_aLineCol = bHC? SwViewOption::GetFontColor() : COL_BLACK; m_aShadowCol = bHC? m_aBgCol : rSettings.GetShadowColor(); - m_aTextCol = bHC? SwViewOption::GetFontColor() : Color( COL_GRAY ); + m_aTextCol = bHC? SwViewOption::GetFontColor() : COL_GRAY; m_aPrintAreaCol = m_aTextCol; } @@ -1998,13 +1998,13 @@ IMPL_LINK( SwRedlineOptionsTabPage, AttribHdl, ListBox&, rLB, void ) if (aColor == COL_NONE_COLOR) { - rFont.SetColor( Color( COL_BLACK ) ); - rCJKFont.SetColor( Color( COL_BLACK ) ); + rFont.SetColor( COL_BLACK ); + rCJKFont.SetColor( COL_BLACK ); } else if (aColor == COL_TRANSPARENT) { - rFont.SetColor( Color( COL_RED ) ); - rCJKFont.SetColor( Color( COL_RED ) ); + rFont.SetColor( COL_RED ); + rCJKFont.SetColor( COL_RED ); } else { @@ -2052,9 +2052,9 @@ IMPL_LINK( SwRedlineOptionsTabPage, AttribHdl, ListBox&, rLB, void ) if (aBgColor != COL_NONE_COLOR) pPrev->SetColor(aBgColor); else - pPrev->SetColor(Color(COL_LIGHTGRAY)); - rFont.SetColor( Color( COL_BLACK ) ); - rCJKFont.SetColor( Color( COL_BLACK ) ); + pPrev->SetColor(COL_LIGHTGRAY); + rFont.SetColor( COL_BLACK ); + rCJKFont.SetColor( COL_BLACK ); } break; } @@ -2094,14 +2094,14 @@ IMPL_LINK( SwRedlineOptionsTabPage, ColorHdl, SvxColorListBox&, rListBox, void ) if( pAttr->nItemId == SID_ATTR_BRUSH ) { - rFont.SetColor( Color( COL_BLACK ) ); - rCJKFont.SetColor( Color( COL_BLACK ) ); + rFont.SetColor( COL_BLACK ); + rCJKFont.SetColor( COL_BLACK ); Color aBgColor = pColorLB->GetSelectEntryColor(); if (aBgColor != COL_NONE_COLOR) pPrev->SetColor(aBgColor); else - pPrev->SetColor(Color(COL_LIGHTGRAY)); + pPrev->SetColor(COL_LIGHTGRAY); } else { @@ -2109,13 +2109,13 @@ IMPL_LINK( SwRedlineOptionsTabPage, ColorHdl, SvxColorListBox&, rListBox, void ) if (aColor == COL_NONE_COLOR) { - rFont.SetColor( Color( COL_BLACK ) ); - rCJKFont.SetColor( Color( COL_BLACK ) ); + rFont.SetColor( COL_BLACK ); + rCJKFont.SetColor( COL_BLACK ); } else if (aColor == COL_TRANSPARENT) { - rFont.SetColor( Color( COL_RED ) ); - rCJKFont.SetColor( Color( COL_RED ) ); + rFont.SetColor( COL_RED ); + rCJKFont.SetColor( COL_RED ); } else { diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx index d3b6ba795ef1..5d65297f293e 100644 --- a/sw/source/ui/misc/num.cxx +++ b/sw/source/ui/misc/num.cxx @@ -97,7 +97,7 @@ SwNumPositionTabPage::SwNumPositionTabPage(vcl::Window* pParent, get(m_pPreviewWIN, "preview"); SetExchangeSupport(); - m_pPreviewWIN->SetBackground(Wallpaper(Color(COL_TRANSPARENT))); + m_pPreviewWIN->SetBackground(Wallpaper(COL_TRANSPARENT)); m_pRelativeCB->Check(); m_pAlignLB->SetSelectHdl(LINK(this, SwNumPositionTabPage, EditModifyHdl)); diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx index afe7076fe9d0..fe967dd98a71 100644 --- a/sw/source/ui/misc/outline.cxx +++ b/sw/source/ui/misc/outline.cxx @@ -1046,7 +1046,7 @@ void NumberingPreview::Paint(vcl::RenderContext& rRenderContext, const tools::Re } tools::Rectangle aRect1(Point(nTextXPos, nYStart + nFontHeight / 2), Size(aSize.Width() / 2, 2)); - pVDev->SetFillColor(rRenderContext.GetSettings().GetStyleSettings().GetWindowColor()); // Color( COL_BLACK ) ); + pVDev->SetFillColor(rRenderContext.GetSettings().GetStyleSettings().GetWindowColor()); // COL_BLACK ); pVDev->DrawRect(aRect1); tools::Rectangle aRect2(Point(nXStart, nYStart + nLineHeight + nFontHeight / 2), Size(aSize.Width() / 2, 2)); diff --git a/sw/source/uibase/app/docshini.cxx b/sw/source/uibase/app/docshini.cxx index e9bbeb63a2b6..1435276ff9cd 100644 --- a/sw/source/uibase/app/docshini.cxx +++ b/sw/source/uibase/app/docshini.cxx @@ -683,7 +683,7 @@ void SwDocShell::SubInitNew() aDfltSet.Put( SvxTabStopItem( 1, nNewPos, SvxTabAdjust::Default, RES_PARATR_TABSTOP ) ); } - aDfltSet.Put( SvxColorItem( Color( COL_AUTO ), RES_CHRATR_COLOR ) ); + aDfltSet.Put( SvxColorItem( COL_AUTO, RES_CHRATR_COLOR ) ); m_xDoc->SetDefault( aDfltSet ); diff --git a/sw/source/uibase/config/viewopt.cxx b/sw/source/uibase/config/viewopt.cxx index 90eb12c95c95..e8b436894ed9 100644 --- a/sw/source/uibase/config/viewopt.cxx +++ b/sw/source/uibase/config/viewopt.cxx @@ -120,8 +120,8 @@ void SwViewOption::DrawRectPrinter( OutputDevice *pOut, { Color aOldColor(pOut->GetLineColor()); Color aOldFillColor( pOut->GetFillColor() ); - pOut->SetLineColor( Color(COL_BLACK) ); - pOut->SetFillColor( Color(COL_TRANSPARENT )); + pOut->SetLineColor( COL_BLACK ); + pOut->SetFillColor( COL_TRANSPARENT); pOut->DrawRect( rRect.SVRect() ); pOut->SetFillColor( aOldFillColor ); pOut->SetLineColor( aOldColor ); @@ -138,7 +138,7 @@ void SwViewOption::PaintPostIts( OutputDevice *pOut, const SwRect &rRect, bool b if( pOut && bIsScript ) { Color aOldLineColor( pOut->GetLineColor() ); - pOut->SetLineColor( Color(COL_GRAY ) ); + pOut->SetLineColor( COL_GRAY ); // to make it look nice, we subtract two pixels everywhere sal_uInt16 nPix = m_nPixelTwips * 2; if( rRect.Width() <= 2 * nPix || rRect.Height() <= 2 * nPix ) diff --git a/sw/source/uibase/dbui/mailmergehelper.cxx b/sw/source/uibase/dbui/mailmergehelper.cxx index e544ff05b333..70e156639498 100644 --- a/sw/source/uibase/dbui/mailmergehelper.cxx +++ b/sw/source/uibase/dbui/mailmergehelper.cxx @@ -305,7 +305,7 @@ void SwAddressPreview::Paint(vcl::RenderContext& rRenderContext, const tools::Re { const StyleSettings& rSettings = rRenderContext.GetSettings().GetStyleSettings(); rRenderContext.SetFillColor(rSettings.GetWindowColor()); - rRenderContext.SetLineColor(Color(COL_TRANSPARENT)); + rRenderContext.SetLineColor(COL_TRANSPARENT); rRenderContext.DrawRect(tools::Rectangle(Point(0, 0), GetOutputSizePixel())); Color aPaintColor(IsEnabled() ? rSettings.GetWindowTextColor() : rSettings.GetDisableColor()); rRenderContext.SetLineColor(aPaintColor); @@ -433,7 +433,7 @@ void SwAddressPreview::DrawText_Impl(vcl::RenderContext& rRenderContext, const O if (bIsSelected) { //selection rectangle - rRenderContext.SetFillColor(Color(COL_TRANSPARENT)); + rRenderContext.SetFillColor(COL_TRANSPARENT); rRenderContext.DrawRect(tools::Rectangle(rTopLeft, rSize)); } sal_Int32 nHeight = GetTextHeight(); 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) diff --git a/sw/source/uibase/frmdlg/colex.cxx b/sw/source/uibase/frmdlg/colex.cxx index 11568bd934a9..5a4a67bb9c11 100644 --- a/sw/source/uibase/frmdlg/colex.cxx +++ b/sw/source/uibase/frmdlg/colex.cxx @@ -213,7 +213,7 @@ void SwColExample::DrawPage(vcl::RenderContext& rRenderContext, const Point& rOr nR = GetLeft(); } - rRenderContext.SetFillColor(Color(COL_LIGHTGRAY)); + rRenderContext.SetFillColor(COL_LIGHTGRAY); tools::Rectangle aRect; aRect.SetRight( rOrg.X() + GetSize().Width() - nR ); aRect.SetLeft( rOrg.X() + nL ); @@ -379,7 +379,7 @@ void SwColumnOnlyExample::Paint(vcl::RenderContext& rRenderContext, const tools: tools::Rectangle aRect(aTL, m_aFrameSize); //draw a shadow rectangle - rRenderContext.SetFillColor(Color(COL_GRAY)); + rRenderContext.SetFillColor(COL_GRAY); tools::Rectangle aShadowRect(aRect); aShadowRect.Move(aTL.Y(), aTL.Y()); rRenderContext.DrawRect(aShadowRect); @@ -580,7 +580,7 @@ void SwPageGridExample::DrawPage(vcl::RenderContext& rRenderContext, const Point //vertical lines bool bBothLines = pGridItem->GetGridType() == GRID_LINES_CHARS; - rRenderContext.SetFillColor(Color(COL_TRANSPARENT)); + rRenderContext.SetFillColor(COL_TRANSPARENT); sal_Int32 nXMove = m_bVertical ? nLineHeight : 0; sal_Int32 nYMove = m_bVertical ? 0 : nLineHeight; for (sal_Int32 nLine = 0; nLine < nLines; nLine++) diff --git a/sw/source/uibase/lingu/sdrhhcwrap.cxx b/sw/source/uibase/lingu/sdrhhcwrap.cxx index 5bb3e164352b..6ae103bcb830 100644 --- a/sw/source/uibase/lingu/sdrhhcwrap.cxx +++ b/sw/source/uibase/lingu/sdrhhcwrap.cxx @@ -76,7 +76,7 @@ SdrHHCWrapper::SdrHHCWrapper( SwView* pVw, pOutlView->GetOutliner()->SetRefDevice(pView->GetWrtShell().getIDocumentDeviceAccess().getPrinter( false )); // Hack: all SdrTextObj attributes should be transferred to EditEngine - pOutlView->SetBackgroundColor( Color( COL_WHITE ) ); + pOutlView->SetBackgroundColor( COL_WHITE ); InsertView( pOutlView ); Point aPoint( 0, 0 ); diff --git a/sw/source/uibase/misc/swruler.cxx b/sw/source/uibase/misc/swruler.cxx index 51d65e760f44..e681cc1e3d71 100644 --- a/sw/source/uibase/misc/swruler.cxx +++ b/sw/source/uibase/misc/swruler.cxx @@ -182,7 +182,7 @@ void SwCommentRuler::DrawCommentControl(vcl::RenderContext& rRenderContext) // Draw arrow // FIXME consistence of button colors. http://opengrok.libreoffice.org/xref/core/vcl/source/control/button.cxx#785 - Color aArrowColor = GetFadedColor(Color(COL_BLACK), rStyleSettings.GetShadowColor()); + Color aArrowColor = GetFadedColor(COL_BLACK, rStyleSettings.GetShadowColor()); ImplDrawArrow(*maVirDev.get(), aArrowPos.X(), aArrowPos.Y(), aArrowColor, bArrowToRight); // Blit comment control diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx index 2a4acb63a607..05ff06eda599 100644 --- a/sw/source/uibase/shells/basesh.cxx +++ b/sw/source/uibase/shells/basesh.cxx @@ -2306,7 +2306,7 @@ void SwBaseShell::ExecBckCol(SfxRequest& rReq) else { aBrushItem.SetColor(COL_TRANSPARENT); - rReq.AppendItem(SvxColorItem(Color(COL_TRANSPARENT),nSlot)); + rReq.AppendItem(SvxColorItem(COL_TRANSPARENT,nSlot)); } break; } diff --git a/sw/source/uibase/uiview/srcview.cxx b/sw/source/uibase/uiview/srcview.cxx index fa3fe1ee1dae..f61582c26ecc 100644 --- a/sw/source/uibase/uiview/srcview.cxx +++ b/sw/source/uibase/uiview/srcview.cxx @@ -130,7 +130,7 @@ static void lcl_PrintHeader( vcl::RenderContext &rOutDev, sal_Int32 nPages, sal_ Color aOldFillColor( rOutDev.GetFillColor() ); vcl::Font aOldFont( rOutDev.GetFont() ); - rOutDev.SetFillColor( Color(COL_TRANSPARENT) ); + rOutDev.SetFillColor( COL_TRANSPARENT ); vcl::Font aFont( aOldFont ); aFont.SetWeight( WEIGHT_BOLD ); |