Kaydet (Commit) a74e5885 authored tarafından matteocam's avatar matteocam Kaydeden (comit) Fridrich Štrba

Setting SetTextFillColor from Attrs. Experiment with line color

Change-Id: If34f000d6c5ef6ec38f7f735ada194b8fff4f56d
(cherry picked from commit 7fb0e8c9)
üst 7b59e449
......@@ -128,12 +128,15 @@ EditCharAttribUnderline::EditCharAttribUnderline( const SvxUnderlineItem& rAttr,
void EditCharAttribUnderline::SetFont( SvxFont& rFont, OutputDevice* pOutDev )
{
Color aColor = RGB_COLORDATA(0x66,0x66, 0xFF); // blue-ish
rFont.SetUnderline( (FontUnderline)((const SvxUnderlineItem*)GetItem())->GetValue() );
if ( pOutDev )
pOutDev->SetTextLineColor( ((const SvxUnderlineItem*)GetItem())->GetColor() );
if ( pOutDev ) // FIXME(matteocam)
pOutDev->SetTextLineColor( aColor );
//pOutDev->SetTextLineColor( ((const SvxUnderlineItem*)GetItem())->GetColor() );
// FIXME(matteocam)
Color aColor = RGB_COLORDATA(0x66,0x66, 0xFF); // blue-ish
if ( pOutDev )
pOutDev->SetTextFillColor(aColor);
}
......
......@@ -465,6 +465,7 @@ void OutputDevice::ImplDrawSpecialText( SalLayout& rSalLayout )
void OutputDevice::ImplDrawText( SalLayout& rSalLayout )
{
if( mbInitClipRegion )
InitClipRegion();
if( mbOutputClipped )
......@@ -828,6 +829,8 @@ void OutputDevice::DrawText( const Point& rStartPt, const OUString& rStr,
MetricVector* pVector, OUString* pDisplayText
)
{
if(nLen == 0x0FFFF)
{
SAL_INFO("sal.rtl.xub",
......@@ -948,6 +951,12 @@ void OutputDevice::DrawTextArray( const Point& rStartPt, const OUString& rStr,
const sal_Int32* pDXAry,
sal_Int32 nIndex, sal_Int32 nLen )
{
fprintf(stderr, "TextFillColor printing %c is (%d, %d, %d)\n",
(char) rStr.toChar(),
GetTextFillColor().GetRed(),
GetTextFillColor().GetGreen(),
GetTextFillColor().GetBlue());
if(nLen == 0x0FFFF)
{
SAL_INFO("sal.rtl.xub",
......@@ -1429,6 +1438,7 @@ void OutputDevice::ImplDrawText( OutputDevice& rTargetDevice, const Rectangle& r
MetricVector* pVector, OUString* pDisplayText,
::vcl::ITextLayout& _rLayout )
{
Color aOldTextColor;
Color aOldTextFillColor;
bool bRestoreFillColor = false;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment