diff options
Diffstat (limited to 'cui/source/tabpages')
-rw-r--r-- | cui/source/tabpages/backgrnd.cxx | 6 | ||||
-rw-r--r-- | cui/source/tabpages/chardlg.cxx | 8 | ||||
-rw-r--r-- | cui/source/tabpages/grfpage.cxx | 4 | ||||
-rw-r--r-- | cui/source/tabpages/numpages.cxx | 4 | ||||
-rw-r--r-- | cui/source/tabpages/tpcolor.cxx | 2 | ||||
-rw-r--r-- | cui/source/tabpages/tptrans.cxx | 2 |
6 files changed, 13 insertions, 13 deletions
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index da9e79626002..024a8361b144 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -284,7 +284,7 @@ void BackgroundPreviewImpl::Paint(vcl::RenderContext& rRenderContext, const ::to if (bIsBmp) { - rRenderContext.SetFillColor(Color(COL_TRANSPARENT)); + rRenderContext.SetFillColor(COL_TRANSPARENT); } rRenderContext.DrawRect(aDrawRect); @@ -759,7 +759,7 @@ bool SvxBackgroundTabPage::FillItemSet( SfxItemSet* rCoreSet ) else if ( SfxItemState::DEFAULT == rOldSet.GetItemState( nWhich, false ) ) rCoreSet->ClearItem( nWhich ); } - else if ( SID_ATTR_BRUSH_CHAR == nSlot && aBgdColor != Color( COL_WHITE ) ) + else if ( SID_ATTR_BRUSH_CHAR == nSlot && aBgdColor != COL_WHITE ) { rCoreSet->Put( SvxBrushItem( aBgdColor, nWhich ) ); bModified = true; @@ -1045,7 +1045,7 @@ SvxGraphicPosition SvxBackgroundTabPage::GetGraphicPosition_Impl() IMPL_LINK_NOARG(SvxBackgroundTabPage, BackgroundColorHdl_Impl, ValueSet*, void) { sal_uInt16 nItemId = m_pBackgroundColorSet->GetSelectItemId(); - Color aColor = nItemId ? ( m_pBackgroundColorSet->GetItemColor( nItemId ) ) : Color( COL_TRANSPARENT ); + Color aColor = nItemId ? ( m_pBackgroundColorSet->GetItemColor( nItemId ) ) : COL_TRANSPARENT; aBgdColor = aColor; m_bColorSelected = true; m_pPreviewWin1->NotifyChange( aBgdColor ); diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index a4cba1fa4c52..497dae51e59b 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -1370,9 +1370,9 @@ void SvxCharEffectsPage::EnableNoneFontColor() Color SvxCharEffectsPage::GetPreviewFontColor(const Color& rColor) const { if (rColor.GetColor() == COL_AUTO) - return Color(COL_BLACK); + return COL_BLACK; if (m_bEnableNoneFontColor && rColor == COL_NONE_COLOR) - return Color(COL_BLACK); + return COL_BLACK; return rColor; } @@ -1763,7 +1763,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet* rSet ) } else { - m_pUnderlineColorLB->SelectEntry(Color(COL_AUTO)); + m_pUnderlineColorLB->SelectEntry(COL_AUTO); m_pUnderlineColorLB->Disable(); } } @@ -1807,7 +1807,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet* rSet ) } else { - m_pOverlineColorLB->SelectEntry(Color(COL_AUTO)); + m_pOverlineColorLB->SelectEntry(COL_AUTO); m_pOverlineColorLB->Disable(); } } diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx index 3ce3925c937d..c2ecb7e0d912 100644 --- a/cui/source/tabpages/grfpage.cxx +++ b/cui/source/tabpages/grfpage.cxx @@ -784,7 +784,7 @@ void SvxCropExample::Paint(vcl::RenderContext& rRenderContext, const ::tools::Re rRenderContext.SetRasterOp(RasterOp::OverPaint); rRenderContext.DrawRect(::tools::Rectangle(Point(), aWinSize)); - rRenderContext.SetLineColor(Color(COL_WHITE)); + rRenderContext.SetLineColor(COL_WHITE); ::tools::Rectangle aRect(Point((aWinSize.Width() - aFrameSize.Width())/2, (aWinSize.Height() - aFrameSize.Height())/2), aFrameSize); @@ -792,7 +792,7 @@ void SvxCropExample::Paint(vcl::RenderContext& rRenderContext, const ::tools::Re Size aSz(2, 0); aSz = rRenderContext.PixelToLogic(aSz); - rRenderContext.SetFillColor(Color(COL_TRANSPARENT)); + rRenderContext.SetFillColor(COL_TRANSPARENT); rRenderContext.SetRasterOp(RasterOp::Invert); aRect.AdjustLeft(aTopLeft.Y() ); aRect.AdjustTop(aTopLeft.X() ); diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index e46831efbf59..31217781f427 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -1136,7 +1136,7 @@ SvxNumOptionsTabPage::SvxNumOptionsTabPage(vcl::Window* pParent, get(m_pPreviewWIN, "preview"); - m_pPreviewWIN->SetBackground(Wallpaper(Color(COL_TRANSPARENT))); + m_pPreviewWIN->SetBackground(Wallpaper(COL_TRANSPARENT)); SetExchangeSupport(); aActBulletFont = lcl_GetDefaultBulletFont(); @@ -2605,7 +2605,7 @@ SvxNumPositionTabPage::SvxNumPositionTabPage(vcl::Window* pParent, get(m_pStandardPB, "standard"); get(m_pPreviewWIN, "preview"); - m_pPreviewWIN->SetBackground(Wallpaper(Color(COL_TRANSPARENT))); + m_pPreviewWIN->SetBackground(Wallpaper(COL_TRANSPARENT)); m_pRelativeCB->Check(); m_pAlignLB->SetSelectHdl(LINK(this, SvxNumPositionTabPage, EditModifyHdl_Impl)); diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index 134e6a6f33c2..d9519b32baa0 100644 --- a/cui/source/tabpages/tpcolor.cxx +++ b/cui/source/tabpages/tpcolor.cxx @@ -59,7 +59,7 @@ SvxColorTabPage::SvxColorTabPage(vcl::Window* pParent, const SfxItemSet& rInAttr , rOutAttrs ( rInAttrs ) // All the horrific pointers we store and should not , pnColorListState( nullptr ) - , aXFillColorItem( OUString(), Color( COL_BLACK ) ) + , aXFillColorItem( OUString(), COL_BLACK ) , aXFillAttr( rInAttrs.GetPool() ) , rXFSet( aXFillAttr.GetItemSet() ) , eCM( ColorModel::RGB ) diff --git a/cui/source/tabpages/tptrans.cxx b/cui/source/tabpages/tptrans.cxx index 553e94d232f3..206e46704f4c 100644 --- a/cui/source/tabpages/tptrans.cxx +++ b/cui/source/tabpages/tptrans.cxx @@ -374,7 +374,7 @@ bool SvxTransparenceTabPage::FillItemSet(SfxItemSet* rAttrs) // disable unused XFillFloatTransparenceItem if(bSwitchOffGradient && (bGradActive || bGradUsed)) { - XGradient aGrad(COL_BLACK, Color(COL_WHITE)); + XGradient aGrad(COL_BLACK, COL_WHITE); aGrad.SetStartIntens(100); aGrad.SetEndIntens(100); XFillFloatTransparenceItem aItem(aGrad); |