diff options
Diffstat (limited to 'svx/source/dialog')
-rw-r--r-- | svx/source/dialog/_bmpmask.cxx | 10 | ||||
-rw-r--r-- | svx/source/dialog/_contdlg.cxx | 6 | ||||
-rw-r--r-- | svx/source/dialog/contwnd.cxx | 6 | ||||
-rw-r--r-- | svx/source/dialog/ctredlin.cxx | 4 | ||||
-rw-r--r-- | svx/source/dialog/dlgctl3d.cxx | 4 | ||||
-rw-r--r-- | svx/source/dialog/dlgctrl.cxx | 10 | ||||
-rw-r--r-- | svx/source/dialog/framelink.cxx | 2 | ||||
-rw-r--r-- | svx/source/dialog/hexcolorcontrol.cxx | 2 | ||||
-rw-r--r-- | svx/source/dialog/imapwnd.cxx | 10 | ||||
-rw-r--r-- | svx/source/dialog/langbox.cxx | 2 | ||||
-rw-r--r-- | svx/source/dialog/pagectrl.cxx | 4 | ||||
-rw-r--r-- | svx/source/dialog/paraprev.cxx | 2 | ||||
-rw-r--r-- | svx/source/dialog/svxruler.cxx | 4 | ||||
-rw-r--r-- | svx/source/dialog/swframeexample.cxx | 14 |
14 files changed, 40 insertions, 40 deletions
diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx index 4784c54a6fa2..33fd03046fc9 100644 --- a/svx/source/dialog/_bmpmask.cxx +++ b/svx/source/dialog/_bmpmask.cxx @@ -402,11 +402,11 @@ SvxBmpMask::SvxBmpMask(SfxBindings *pBindinx, SfxChildWindow *pCW, vcl::Window* get(m_pCbxTrans, "cbx5"); get(m_pLbColorTrans, "color5"); - m_pLbColorTrans->SelectEntry(Color(COL_BLACK)); - m_pLbColor1->SelectEntry(Color(COL_TRANSPARENT)); - m_pLbColor2->SelectEntry(Color(COL_TRANSPARENT)); - m_pLbColor3->SelectEntry(Color(COL_TRANSPARENT)); - m_pLbColor4->SelectEntry(Color(COL_TRANSPARENT)); + m_pLbColorTrans->SelectEntry(COL_BLACK); + m_pLbColor1->SelectEntry(COL_TRANSPARENT); + m_pLbColor2->SelectEntry(COL_TRANSPARENT); + m_pLbColor3->SelectEntry(COL_TRANSPARENT); + m_pLbColor4->SelectEntry(COL_TRANSPARENT); m_pTbxPipette->SetSelectHdl( LINK( pData, MaskData, PipetteHdl ) ); m_pBtnExec->SetClickHdl( LINK( pData, MaskData, ExecHdl ) ); diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx index 322d06dfb970..7e4180b8f986 100644 --- a/svx/source/dialog/_contdlg.cxx +++ b/svx/source/dialog/_contdlg.cxx @@ -119,8 +119,8 @@ tools::PolyPolygon SvxContourDlg::CreateAutoContour( const Graphic& rGraphic, if ( pVDev->SetOutputSizePixel( rSizePix ) ) { - pVDev->SetLineColor( Color( COL_BLACK ) ); - pVDev->SetFillColor( Color( COL_BLACK ) ); + pVDev->SetLineColor( COL_BLACK ); + pVDev->SetFillColor( COL_BLACK ); for( sal_uInt16 i = 0; i < nCount; i++ ) { @@ -149,7 +149,7 @@ tools::PolyPolygon SvxContourDlg::CreateAutoContour( const Graphic& rGraphic, } else if( rGraphic.GetType() != GraphicType::NONE ) { - const Graphic aTmpGrf( rGraphic.GetGDIMetaFile().GetMonochromeMtf( Color( COL_BLACK ) ) ); + const Graphic aTmpGrf( rGraphic.GetGDIMetaFile().GetMonochromeMtf( COL_BLACK ) ); ScopedVclPtrInstance< VirtualDevice > pVDev; Size aSizePix( pVDev->LogicToPixel( aTmpGrf.GetPrefSize(), aTmpGrf.GetPrefMapMode() ) ); diff --git a/svx/source/dialog/contwnd.cxx b/svx/source/dialog/contwnd.cxx index b25c123f27b6..e404154ed46d 100644 --- a/svx/source/dialog/contwnd.cxx +++ b/svx/source/dialog/contwnd.cxx @@ -31,7 +31,7 @@ using namespace css; -#define TRANSCOL Color(COL_WHITE) +#define TRANSCOL COL_WHITE ContourWindow::ContourWindow(vcl::Window* pParent, WinBits nBits) : GraphCtrl (pParent, nBits) @@ -224,8 +224,8 @@ void ContourWindow::Paint(vcl::RenderContext& rRenderContext, const tools::Recta const Graphic& rGraphic = GetGraphic(); rTarget.Push(PushFlags::LINECOLOR |PushFlags::FILLCOLOR); - rTarget.SetLineColor(Color(COL_BLACK)); - rTarget.SetFillColor(Color(COL_WHITE)); + rTarget.SetLineColor(COL_BLACK); + rTarget.SetFillColor(COL_WHITE); rTarget.DrawRect( tools::Rectangle( Point(), GetGraphicSize() ) ); rTarget.Pop(); diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx index 96b1cd5b347d..8e2e68baafc4 100644 --- a/svx/source/dialog/ctredlin.cxx +++ b/svx/source/dialog/ctredlin.cxx @@ -297,7 +297,7 @@ bool SvxRedlinTable::IsValidComment(const OUString &rCommentStr) SvTreeListEntry* SvxRedlinTable::InsertEntry(const OUString& rStr, RedlinData *pUserData, SvTreeListEntry* pParent, sal_uLong nPos) { - const Color aColor = (pUserData && pUserData->bDisabled) ? Color(COL_GRAY) : GetTextColor(); + const Color aColor = (pUserData && pUserData->bDisabled) ? COL_GRAY : GetTextColor(); return InsertEntry(rStr, pUserData, aColor, pParent, nPos); } @@ -318,7 +318,7 @@ SvTreeListEntry* SvxRedlinTable::InsertEntry(const OUString& rStr, SvTreeListEntry* SvxRedlinTable::InsertEntry(const Image &rRedlineType, const OUString& rStr, RedlinData *pUserData, SvTreeListEntry* pParent, sal_uLong nPos) { - maEntryColor = (pUserData && pUserData->bDisabled) ? Color(COL_GRAY) : GetTextColor(); + maEntryColor = (pUserData && pUserData->bDisabled) ? COL_GRAY : GetTextColor(); maEntryImage = rRedlineType; maEntryString = rStr; diff --git a/svx/source/dialog/dlgctl3d.cxx b/svx/source/dialog/dlgctl3d.cxx index 33a2d601e7b3..0eee4586f225 100644 --- a/svx/source/dialog/dlgctl3d.cxx +++ b/svx/source/dialog/dlgctl3d.cxx @@ -135,7 +135,7 @@ void Svx3DPreviewControl::Construct() XATTR_FILL_FIRST, XATTR_FILLBITMAP>{} ); aSet.Put( XLineStyleItem( drawing::LineStyle_NONE ) ); aSet.Put( XFillStyleItem( drawing::FillStyle_SOLID ) ); - aSet.Put( XFillColorItem( "", Color( COL_WHITE ) ) ); + aSet.Put( XFillColorItem( "", COL_WHITE ) ); mpScene->SetMergedItemSet(aSet); @@ -907,7 +907,7 @@ Color Svx3DLightControl::GetLightColor(sal_uInt32 nNum) const } } - return Color(COL_BLACK); + return COL_BLACK; } basegfx::B3DVector Svx3DLightControl::GetLightDirection(sal_uInt32 nNum) const diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx index 92f2d147379c..d89b71b3e2a1 100644 --- a/svx/source/dialog/dlgctrl.cxx +++ b/svx/source/dialog/dlgctrl.cxx @@ -727,9 +727,9 @@ SvxPixelCtl::SvxPixelCtl(vcl::Window* pParent) , bPaintable(true) , aFocusPosition(0,0) { - SetPixelColor( Color( COL_BLACK ) ); - SetBackgroundColor( Color( COL_WHITE ) ); - SetLineColor( Color( COL_LIGHTGRAY ) ); + SetPixelColor( COL_BLACK ); + SetBackgroundColor( COL_WHITE ); + SetLineColor( COL_LIGHTGRAY ); maPixelData.fill(0); } @@ -837,8 +837,8 @@ void SvxPixelCtl::Paint( vcl::RenderContext& rRenderContext, const tools::Rectan } else { - rRenderContext.SetBackground(Wallpaper(Color(COL_LIGHTGRAY))); - rRenderContext.SetLineColor(Color(COL_LIGHTRED)); + rRenderContext.SetBackground(Wallpaper(COL_LIGHTGRAY)); + rRenderContext.SetLineColor(COL_LIGHTRED); rRenderContext.DrawLine(Point(0, 0), Point(aRectSize.Width(), aRectSize.Height())); rRenderContext.DrawLine(Point(0, aRectSize.Height()), Point(aRectSize.Width(), 0)); } diff --git a/svx/source/dialog/framelink.cxx b/svx/source/dialog/framelink.cxx index 269ac3e52e49..fd5681a634d9 100644 --- a/svx/source/dialog/framelink.cxx +++ b/svx/source/dialog/framelink.cxx @@ -642,7 +642,7 @@ StyleVectorCombination::StyleVectorCombination( rStyle.Dist() * 0.5, rStyle.UseGapColor() ? (nullptr != pForceColor ? *pForceColor : rStyle.GetColorGap()) - : Color(COL_TRANSPARENT))); + : COL_TRANSPARENT)); maOffsets.push_back( OffsetAndHalfWidthAndColor( diff --git a/svx/source/dialog/hexcolorcontrol.cxx b/svx/source/dialog/hexcolorcontrol.cxx index 115dbe7997cd..884340980708 100644 --- a/svx/source/dialog/hexcolorcontrol.cxx +++ b/svx/source/dialog/hexcolorcontrol.cxx @@ -51,7 +51,7 @@ sal_Int32 HexColorControl::GetColor() sax::Converter::convertColor(nColor, aStr); if (nColor == -1) - SetControlBackground(Color(COL_RED)); + SetControlBackground(COL_RED); else SetControlBackground(); diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx index c577bd8fb1e9..8c2ae5c64807 100644 --- a/svx/source/dialog/imapwnd.cxx +++ b/svx/source/dialog/imapwnd.cxx @@ -52,7 +52,7 @@ using namespace com::sun::star; using ::com::sun::star::frame::XFrame; using ::com::sun::star::uno::Reference; -#define TRANSCOL Color( COL_WHITE ) +#define TRANSCOL COL_WHITE IMapWindow::IMapWindow( vcl::Window* pParent, WinBits nBits, const Reference< XFrame >& rxDocumentFrame ) : GraphCtrl( pParent, nBits ), @@ -261,12 +261,12 @@ SdrObject* IMapWindow::CreateObj( const IMapObject* pIMapObj ) if ( !pIMapObj->IsActive() ) { aSet.Put( XFillTransparenceItem( 100 ) ); - aSet.Put( XLineColorItem( "", Color( COL_RED ) ) ); + aSet.Put( XLineColorItem( "", COL_RED ) ); } else { aSet.Put( XFillTransparenceItem( 50 ) ); - aSet.Put( XLineColorItem( "", Color( COL_BLACK ) ) ); + aSet.Put( XLineColorItem( "", COL_BLACK ) ); } pSdrObj->SetMergedItemSetAndBroadcast(aSet); @@ -583,12 +583,12 @@ void IMapWindow::SetCurrentObjState( bool bActive ) if ( !bActive ) { aSet.Put( XFillTransparenceItem( 100 ) ); - aSet.Put( XLineColorItem( "", Color( COL_RED ) ) ); + aSet.Put( XLineColorItem( "", COL_RED ) ); } else { aSet.Put( XFillTransparenceItem( 50 ) ); - aSet.Put( XLineColorItem( "", Color( COL_BLACK ) ) ); + aSet.Put( XLineColorItem( "", COL_BLACK ) ); } pView->SetAttributes( aSet ); diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx index 18e93e62e45d..dd80e3848e3d 100644 --- a/svx/source/dialog/langbox.cxx +++ b/svx/source/dialog/langbox.cxx @@ -785,7 +785,7 @@ IMPL_LINK_NOARG( SvxLanguageComboBox, EditModifyHdl, Edit&, void ) #if 0 //! Gives white on white!?! instead of white on reddish. SetControlBackground( ::Color( Color( 0xff, 0x65, 0x63))); - SetControlForeground( ::Color( COL_WHITE)); + SetControlForeground( ::COL_WHITE); #else SetControlForeground( ::Color( 0xf0, 0, 0) ); #endif diff --git a/svx/source/dialog/pagectrl.cxx b/svx/source/dialog/pagectrl.cxx index a4ae5bb1f47c..eb2fc6ef92fd 100644 --- a/svx/source/dialog/pagectrl.cxx +++ b/svx/source/dialog/pagectrl.cxx @@ -152,7 +152,7 @@ void SvxPageWindow::DrawPage(vcl::RenderContext& rRenderContext, const Point& rO // background if (!bSecond || bResetBackground) { - rRenderContext.SetLineColor(Color(COL_TRANSPARENT)); + rRenderContext.SetLineColor(COL_TRANSPARENT); rRenderContext.SetFillColor(rDlgColor); Size winSize(rRenderContext.GetOutputSize()); rRenderContext.DrawRect(tools::Rectangle(Point(0,0), winSize)); @@ -307,7 +307,7 @@ void SvxPageWindow::DrawPage(vcl::RenderContext& rRenderContext, const Point& rO if (bTable) { // Paint Table, if necessary center it - rRenderContext.SetLineColor(Color(COL_LIGHTGRAY)); + rRenderContext.SetLineColor(COL_LIGHTGRAY); long nW = aRect.GetWidth(); long nH = aRect.GetHeight(); diff --git a/svx/source/dialog/paraprev.cxx b/svx/source/dialog/paraprev.cxx index 3eee8771b4e5..9f203542cae5 100644 --- a/svx/source/dialog/paraprev.cxx +++ b/svx/source/dialog/paraprev.cxx @@ -84,7 +84,7 @@ void SvxParaPrevWindow::DrawParagraph(vcl::RenderContext& rRenderContext) { if (i == 3) { - rRenderContext.SetFillColor(Color(COL_GRAY)); + rRenderContext.SetFillColor(COL_GRAY); long nTop = nUpper * aLineSiz.Height() / aSize.Height(); aPnt.AdjustY(nTop * 2 ); } diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx index 616f6eec9b34..ebfbefd4139a 100644 --- a/svx/source/dialog/svxruler.cxx +++ b/svx/source/dialog/svxruler.cxx @@ -3364,7 +3364,7 @@ void SvxRuler::Command( const CommandEvent& rCommandEvent ) ScopedVclPtrInstance< VirtualDevice > pDev; const Size aSz(ruler_tab_svx.width + 2, ruler_tab_svx.height + 2); pDev->SetOutputSize(aSz); - pDev->SetBackground(Wallpaper(Color(COL_WHITE))); + pDev->SetBackground(Wallpaper(COL_WHITE)); Color aFillColor(pDev->GetSettings().GetStyleSettings().GetShadowColor()); const Point aPt(aSz.Width() / 2, aSz.Height() / 2); @@ -3375,7 +3375,7 @@ void SvxRuler::Command( const CommandEvent& rCommandEvent ) DrawTab(*pDev, aFillColor, aPt, nStyle); aMenu->InsertItem(i + 1, SvxResId(RID_SVXSTR_RULER_TAB[i]), - Image(BitmapEx(pDev->GetBitmap(Point(), aSz), Color(COL_WHITE)))); + Image(BitmapEx(pDev->GetBitmap(Point(), aSz), COL_WHITE))); aMenu->CheckItem(i + 1, i == mpTabs[mxRulerImpl->nIdx + TAB_GAP].nStyle); pDev->SetOutputSize(aSz); // delete device } diff --git a/svx/source/dialog/swframeexample.cxx b/svx/source/dialog/swframeexample.cxx index 245864645af8..ceacc555d0e6 100644 --- a/svx/source/dialog/swframeexample.cxx +++ b/svx/source/dialog/swframeexample.cxx @@ -75,17 +75,17 @@ void SvxSwFrameExample::InitColors_Impl() bool bHC = rSettings.GetHighContrastMode(); - m_aFrameColor = Color( COL_LIGHTGREEN ); - m_aAlignColor = Color( COL_LIGHTRED ); - m_aTransColor = Color( COL_TRANSPARENT ); + m_aFrameColor = COL_LIGHTGREEN; + m_aAlignColor = COL_LIGHTRED; + m_aTransColor = COL_TRANSPARENT; m_aTxtCol = bHC? svtools::ColorConfig().GetColorValue(svtools::FONTCOLOR).nColor : - Color( COL_GRAY ); - m_aPrintAreaCol = bHC? m_aTxtCol : Color( COL_GRAY ); + COL_GRAY; + m_aPrintAreaCol = bHC? m_aTxtCol : COL_GRAY; m_aBorderCol = m_aTxtCol; - m_aBlankCol = bHC? m_aTxtCol : Color( COL_LIGHTGRAY ); - m_aBlankFrameCol = bHC? m_aTxtCol : Color( COL_GRAY ); + m_aBlankCol = bHC? m_aTxtCol : COL_LIGHTGRAY; + m_aBlankFrameCol = bHC? m_aTxtCol : COL_GRAY; } void SvxSwFrameExample::DataChanged(const DataChangedEvent& rDCEvt) |