summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--editeng/source/editeng/editattr.cxx9
-rw-r--r--editeng/source/editeng/impedit3.cxx6
-rw-r--r--editeng/source/items/svxfont.cxx4
-rw-r--r--editeng/source/items/textitem.cxx2
-rw-r--r--include/editeng/colritem.hxx6
-rw-r--r--include/vcl/font.hxx5
-rw-r--r--vcl/source/gdi/font.cxx11
-rw-r--r--vcl/source/outdev/text.cxx20
8 files changed, 1 insertions, 62 deletions
diff --git a/editeng/source/editeng/editattr.cxx b/editeng/source/editeng/editattr.cxx
index 978958c2cd26..0f25267273a8 100644
--- a/editeng/source/editeng/editattr.cxx
+++ b/editeng/source/editeng/editattr.cxx
@@ -128,17 +128,8 @@ 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() );
- /* FIXME(matteocam) */
- rFont.SetFillColor(aColor);
- rFont.SetTransparent(false);
- //if (pOutDev)
- // pOutDev->SetTextFillColor(aColor); // this doesn't work either
- // end FIXME
-
if ( pOutDev )
pOutDev->SetTextLineColor( ((const SvxUnderlineItem*)GetItem())->GetColor() );
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index 86a8090875c2..adbc9feb2628 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -3421,12 +3421,6 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRect, Point aSt
' ' == aText[nTextStart + nTextLen - 1] )
--nTextLen;
- // FIXME(matteocam)
- if (aTmpFont.GetItalic() != ITALIC_NONE) {
- Color aColor = COL_BROWN;
- aTmpFont.SetFillColor(aColor);
- }
-
// output directly
aTmpFont.QuickDrawText( pOutDev, aRealOutPos, aText, nTextStart, nTextLen, pDXArray );
diff --git a/editeng/source/items/svxfont.cxx b/editeng/source/items/svxfont.cxx
index 718675b01924..895eef60291c 100644
--- a/editeng/source/items/svxfont.cxx
+++ b/editeng/source/items/svxfont.cxx
@@ -457,10 +457,6 @@ void SvxFont::QuickDrawText( OutputDevice *pOut,
const sal_Int32 nIdx, const sal_Int32 nLen, const sal_Int32* pDXArray ) const
{
- fprintf(stderr, "About to print %s\n", rTxt.getStr());
-
-
-
// Font has to be selected in OutputDevice...
if ( !IsCaseMap() && !IsCapital() && !IsKern() && !IsEsc() )
{
diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index ca4d0f72a8a7..9fd76b0d334e 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -122,7 +122,7 @@ TYPEINIT1_FACTORY(SvxWordLineModeItem, SfxBoolItem, new SvxWordLineModeItem(fals
TYPEINIT1_FACTORY(SvxContourItem, SfxBoolItem, new SvxContourItem(false, 0));
TYPEINIT1_FACTORY(SvxPropSizeItem, SfxUInt16Item, new SvxPropSizeItem(100, 0));
TYPEINIT1_FACTORY(SvxColorItem, SfxPoolItem, new SvxColorItem(0));
-// FIXME(matteocam): Should 2nd argoment of next line SfxColorItem or SfxPoolItem?
+// XXX: Should 2nd argoment of next line SfxColorItem or SfxPoolItem?
TYPEINIT1_FACTORY(SvxBackgroundColorItem, SvxColorItem, new SvxBackgroundColorItem(0));
TYPEINIT1_FACTORY(SvxCharSetColorItem, SvxColorItem, new SvxCharSetColorItem(0));
TYPEINIT1_FACTORY(SvxKerningItem, SfxInt16Item, new SvxKerningItem(0, 0));
diff --git a/include/editeng/colritem.hxx b/include/editeng/colritem.hxx
index 815d2ed3f3d1..7ec7b69e77f4 100644
--- a/include/editeng/colritem.hxx
+++ b/include/editeng/colritem.hxx
@@ -77,12 +77,6 @@ public:
};
-/*
- * FIXME(matteocam):
- * both classes Svx{Background,}Color should be derived from a
- * common ancestor or be totally separate (not recommended probably).
-*/
-
// class SvxBackgroundColorItem
// XXX: to be moved in a separate header.
diff --git a/include/vcl/font.hxx b/include/vcl/font.hxx
index b4a36146cfdf..5e0b13481005 100644
--- a/include/vcl/font.hxx
+++ b/include/vcl/font.hxx
@@ -60,11 +60,6 @@ public:
void SetAlign( FontAlign );
FontAlign GetAlign() const;
- // FIXME(matteocam) // XXX: is this the right spot for changes?
- void SetBackgroundColor(const Color &);
- const Color& GetBackgroundColor() const;
-
-
void SetName( const OUString& rFamilyName );
const OUString& GetName() const;
void SetStyleName( const OUString& rStyleName );
diff --git a/vcl/source/gdi/font.cxx b/vcl/source/gdi/font.cxx
index f223d7b428b5..b3daebd8ee3a 100644
--- a/vcl/source/gdi/font.cxx
+++ b/vcl/source/gdi/font.cxx
@@ -305,15 +305,6 @@ void Font::SetFillColor( const Color& rColor )
}
}
-void Font::SetBackgroundColor(const Color& rColor)
-{
- // FIXME(matteocam)
- //MakeUnique();
- /*mpImplFont->maBkgColor = rColor;
- if () */
-}
-
-
void Font::SetTransparent( bool bTransparent )
{
@@ -970,8 +961,6 @@ const Color& Font::GetColor() const { return mpImplFont->maColor; }
const Color& Font::GetFillColor() const { return mpImplFont->maFillColor; }
-const Color& Font::GetBackgroundColor() const { /*return mpImplFont->maBkgColor;*/ }
-
bool Font::IsTransparent() const { return mpImplFont->mbTransparent; }
FontAlign Font::GetAlign() const { return mpImplFont->meAlign; }
diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx
index 3fd6500f7951..7b955666f068 100644
--- a/vcl/source/outdev/text.cxx
+++ b/vcl/source/outdev/text.cxx
@@ -742,12 +742,6 @@ void OutputDevice::SetTextFillColor()
mpMetaFile->AddAction( new MetaTextFillColorAction( Color(), false ) );
if ( maFont.GetColor() != Color( COL_TRANSPARENT ) ) {
- // FIXME(matteocam)
- Color aColor = maFont.GetColor();
- if (aColor.GetRed() == 0x66) {
- fprintf(stderr, "OutputDevice::SetTextFillColor() changing blue to transparent\n ");
- }
- // end modified code
maFont.SetFillColor( Color( COL_TRANSPARENT ) );
}
if ( !maFont.IsTransparent() )
@@ -763,14 +757,6 @@ void OutputDevice::SetTextFillColor( const Color& rColor )
Color aColor( rColor );
bool bTransFill = ImplIsColorTransparent( aColor );
- // FIXME(matteocam)
- if ( rColor.GetRed() == 0x66 ) { // component of the blue I use
- fprintf(stderr, "OutputDevice::SetTextFillColor(Color &): called with (%d, %d, %d)\n",
- rColor.GetRed(), rColor.GetGreen(), rColor.GetBlue());
- }
-
- // end modified code
-
if ( !bTransFill )
{
if ( mnDrawMode & ( DRAWMODE_BLACKFILL | DRAWMODE_WHITEFILL |
@@ -966,12 +952,6 @@ void OutputDevice::DrawTextArray( const Point& rStartPt, const OUString& rStr,
const sal_Int32* pDXAry,
sal_Int32 nIndex, sal_Int32 nLen )
{
- if ( maFont.IsTransparent() )
- fprintf(stderr, "[Actually transparent font] Real color = %x\n", maFont.GetFillColor().GetColor() );
- fprintf(stderr, "TextFillColor printing %c is %x\n",
- (char) rStr.toChar(),
- GetTextFillColor().GetColor());
-
if(nLen == 0x0FFFF)
{
SAL_INFO("sal.rtl.xub",
generated by cgit (git 2.34.1) at 2024-06-09 10:12:50 +0000