Skip to content

C
core
Kaydet (Commit) b1a310e4 authored tarafından Caolán McNamara's avatar Caolán McNamara Kaydeden (comit) Andras Timar
Dosyalara gözat
Seçenekler

rhbz#1589029 tdf#93789 impress not showing text highlight in presentation mode 

the text hightlighting feature was implemented backed on to the vcl
TextFillColor feature. TextFillColor fills the background of the bounds
of the text with that color

Likely either the same problem or similar as tdf#93789

Change-Id: Iace62cedc49e5f5844ac35d3caa23249b6cb4bc1
Reviewed-on: https://gerrit.libreoffice.org/55635
Tested-by: Jenkins
Reviewed-by: 's avatarAdolfo Jayme Barrientos <fitojb@ubuntu.com>
(cherry picked from commit 761cb908)
üst ced11992
Show whitespace changes
Inline Side-by-side
Showing with 119 additions and 21 deletions
cppcanvas/source/mtfrenderer/emfplus.cxx
Dosyayı görüntüle @ b1a310e4
...@@ -1298,6 +1298,7 @@ namespace cppcanvas ...@@ -1298,6 +1298,7 @@ namespace cppcanvas
::Color(), ::Color(),
::Size(), ::Size(),
::Color(), ::Color(),
::Color(),
text, text,
0, 0,
stringLength, stringLength,
...@@ -1612,6 +1613,7 @@ namespace cppcanvas ...@@ -1612,6 +1613,7 @@ namespace cppcanvas
::Color(), ::Color(),
::Size(), ::Size(),
::Color(), ::Color(),
::Color(),
text, text,
0, 0,
glyphsCount, glyphsCount,
......
cppcanvas/source/mtfrenderer/implrenderer.cxx
Dosyayı görüntüle @ b1a310e4
...@@ -865,6 +865,7 @@ namespace cppcanvas ...@@ -865,6 +865,7 @@ namespace cppcanvas
// TODO(F2): implement all text effects // TODO(F2): implement all text effects
// if( rState.textAlignment ); // TODO(F2): NYI // if( rState.textAlignment ); // TODO(F2): NYI
::Color aTextFillColor( COL_AUTO );
::Color aShadowColor( COL_AUTO ); ::Color aShadowColor( COL_AUTO );
::Color aReliefColor( COL_AUTO ); ::Color aReliefColor( COL_AUTO );
::Size aShadowOffset; ::Size aShadowOffset;
...@@ -930,6 +931,9 @@ namespace cppcanvas ...@@ -930,6 +931,9 @@ namespace cppcanvas
aReliefColor.SetTransparency( aTextColor.GetTransparency() ); aReliefColor.SetTransparency( aTextColor.GetTransparency() );
} }
if (rState.isTextFillColorSet)
aTextFillColor = vcl::unotools::doubleSequenceToColor(rState.textFillColor, xColorSpace);
// create the actual text action // create the actual text action
std::shared_ptr<Action> pTextAction( std::shared_ptr<Action> pTextAction(
TextActionFactory::createTextAction( TextActionFactory::createTextAction(
...@@ -938,6 +942,7 @@ namespace cppcanvas ...@@ -938,6 +942,7 @@ namespace cppcanvas
aReliefColor, aReliefColor,
aShadowOffset, aShadowOffset,
aShadowColor, aShadowColor,
aTextFillColor,
rString, rString,
nIndex, nIndex,
nLength, nLength,
...@@ -1002,6 +1007,7 @@ namespace cppcanvas ...@@ -1002,6 +1007,7 @@ namespace cppcanvas
aReliefColor, aReliefColor,
aShadowOffset, aShadowOffset,
aShadowColor, aShadowColor,
aTextFillColor,
aStrikeoutText, aStrikeoutText,
0/*nStartPos*/, 0/*nStartPos*/,
aStrikeoutText.getLength(), aStrikeoutText.getLength(),
......
cppcanvas/source/mtfrenderer/textaction.cxx
Dosyayı görüntüle @ b1a310e4
...@@ -470,7 +470,7 @@ namespace cppcanvas ...@@ -470,7 +470,7 @@ namespace cppcanvas
virtual ~TextRenderer() {} virtual ~TextRenderer() {}
/// Render text with given RenderState /// Render text with given RenderState
virtual bool operator()( const rendering::RenderState& rRenderState ) const = 0; virtual bool operator()( const rendering::RenderState& rRenderState, const ::Color& rTextFillColor ) const = 0;
}; };
/** Render effect text. /** Render effect text.
...@@ -486,7 +486,8 @@ namespace cppcanvas ...@@ -486,7 +486,8 @@ namespace cppcanvas
const ::Color& rShadowColor, const ::Color& rShadowColor,
const ::basegfx::B2DSize& rShadowOffset, const ::basegfx::B2DSize& rShadowOffset,
const ::Color& rReliefColor, const ::Color& rReliefColor,
const ::basegfx::B2DSize& rReliefOffset ) const ::basegfx::B2DSize& rReliefOffset,
const ::Color& rTextFillColor )
{ {
::Color aEmptyColor( COL_AUTO ); ::Color aEmptyColor( COL_AUTO );
uno::Reference<rendering::XColorSpace> xColorSpace( uno::Reference<rendering::XColorSpace> xColorSpace(
...@@ -507,7 +508,7 @@ namespace cppcanvas ...@@ -507,7 +508,7 @@ namespace cppcanvas
vcl::unotools::colorToDoubleSequence( rShadowColor, vcl::unotools::colorToDoubleSequence( rShadowColor,
xColorSpace ); xColorSpace );
rRenderer( aShadowState ); rRenderer( aShadowState, rTextFillColor );
} }
// draw relief text, if enabled // draw relief text, if enabled
...@@ -525,11 +526,11 @@ namespace cppcanvas ...@@ -525,11 +526,11 @@ namespace cppcanvas
vcl::unotools::colorToDoubleSequence( rReliefColor, vcl::unotools::colorToDoubleSequence( rReliefColor,
xColorSpace ); xColorSpace );
rRenderer( aReliefState ); rRenderer( aReliefState, rTextFillColor );
} }
// draw normal text // draw normal text
rRenderer( rRenderState ); rRenderer( rRenderState, rTextFillColor );
return true; return true;
} }
...@@ -800,7 +801,10 @@ namespace cppcanvas ...@@ -800,7 +801,10 @@ namespace cppcanvas
private: private:
/// Interface TextRenderer /// Interface TextRenderer
virtual bool operator()( const rendering::RenderState& rRenderState ) const override; virtual bool operator()( const rendering::RenderState& rRenderState, const ::Color& rTextFillColor ) const override;
geometry::RealRectangle2D queryTextBounds() const;
css::uno::Reference<css::rendering::XPolyPolygon2D> queryTextBounds(const uno::Reference<rendering::XCanvas>& rCanvas) const;
// TODO(P2): This is potentially a real mass object // TODO(P2): This is potentially a real mass object
// (every character might be a separate TextAction), // (every character might be a separate TextAction),
...@@ -821,6 +825,7 @@ namespace cppcanvas ...@@ -821,6 +825,7 @@ namespace cppcanvas
const ::Color maReliefColor; const ::Color maReliefColor;
const ::basegfx::B2DSize maShadowOffset; const ::basegfx::B2DSize maShadowOffset;
const ::Color maShadowColor; const ::Color maShadowColor;
const ::Color maTextFillColor;
const sal_Int8 maTextDirection; const sal_Int8 maTextDirection;
}; };
...@@ -903,7 +908,7 @@ namespace cppcanvas ...@@ -903,7 +908,7 @@ namespace cppcanvas
"::cppcanvas::internal::EffectTextAction(): Invalid font or lines" ); "::cppcanvas::internal::EffectTextAction(): Invalid font or lines" );
} }
bool EffectTextAction::operator()( const rendering::RenderState& rRenderState ) const bool EffectTextAction::operator()( const rendering::RenderState& rRenderState, const ::Color& rTextFillColor ) const
{ {
const rendering::ViewState& rViewState( mpCanvas->getViewState() ); const rendering::ViewState& rViewState( mpCanvas->getViewState() );
const uno::Reference< rendering::XCanvas >& rCanvas( mpCanvas->getUNOCanvas() ); const uno::Reference< rendering::XCanvas >& rCanvas( mpCanvas->getUNOCanvas() );
...@@ -912,6 +917,18 @@ namespace cppcanvas ...@@ -912,6 +917,18 @@ namespace cppcanvas
rViewState, rViewState,
rRenderState ); rRenderState );
//rhbz#1589029 non-transparent text fill background support
::Color aEmptyColor( COL_AUTO );
if (rTextFillColor != aEmptyColor)
{
rendering::RenderState aLocalState( rRenderState );
aLocalState.DeviceColor = vcl::unotools::colorToDoubleSequence(
rTextFillColor, rCanvas->getDevice()->getDeviceColorSpace());
auto xTextBounds = queryTextBounds(rCanvas);
// background of text
rCanvas->fillPolyPolygon(xTextBounds, rViewState, aLocalState);
}
rCanvas->drawText( maStringContext, mxFont, rCanvas->drawText( maStringContext, mxFont,
rViewState, rViewState,
rRenderState, rRenderState,
...@@ -934,7 +951,8 @@ namespace cppcanvas ...@@ -934,7 +951,8 @@ namespace cppcanvas
maShadowColor, maShadowColor,
maShadowOffset, maShadowOffset,
maReliefColor, maReliefColor,
maReliefOffset ); maReliefOffset,
maTextFillColor);
} }
bool EffectTextAction::renderSubset( const ::basegfx::B2DHomMatrix& rTransformation, bool EffectTextAction::renderSubset( const ::basegfx::B2DHomMatrix& rTransformation,
...@@ -949,7 +967,7 @@ namespace cppcanvas ...@@ -949,7 +967,7 @@ namespace cppcanvas
return render( rTransformation ); return render( rTransformation );
} }
::basegfx::B2DRange EffectTextAction::getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const geometry::RealRectangle2D EffectTextAction::queryTextBounds() const
{ {
// create XTextLayout, to have the // create XTextLayout, to have the
// XTextLayout::queryTextBounds() method available // XTextLayout::queryTextBounds() method available
...@@ -959,11 +977,24 @@ namespace cppcanvas ...@@ -959,11 +977,24 @@ namespace cppcanvas
maTextDirection, maTextDirection,
0 ) ); 0 ) );
return xTextLayout->queryTextBounds();
}
css::uno::Reference<css::rendering::XPolyPolygon2D> EffectTextAction::queryTextBounds(const uno::Reference<rendering::XCanvas>& rCanvas) const
{
auto aTextBounds = queryTextBounds();
auto aB2DBounds = ::basegfx::unotools::b2DRectangleFromRealRectangle2D(aTextBounds);
auto aTextBoundsPoly = ::basegfx::utils::createPolygonFromRect(aB2DBounds);
return ::basegfx::unotools::xPolyPolygonFromB2DPolygon(rCanvas->getDevice(), aTextBoundsPoly);
}
::basegfx::B2DRange EffectTextAction::getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const
{
rendering::RenderState aLocalState( maState ); rendering::RenderState aLocalState( maState );
::canvas::tools::prependToRenderState(aLocalState, rTransformation); ::canvas::tools::prependToRenderState(aLocalState, rTransformation);
return calcEffectTextBounds( ::basegfx::unotools::b2DRectangleFromRealRectangle2D( return calcEffectTextBounds( ::basegfx::unotools::b2DRectangleFromRealRectangle2D(
xTextLayout->queryTextBounds() ), queryTextBounds() ),
::basegfx::B2DRange( 0,0, ::basegfx::B2DRange( 0,0,
maLinesOverallSize.getX(), maLinesOverallSize.getX(),
maLinesOverallSize.getY() ), maLinesOverallSize.getY() ),
...@@ -1184,6 +1215,7 @@ namespace cppcanvas ...@@ -1184,6 +1215,7 @@ namespace cppcanvas
const ::Color& rReliefColor, const ::Color& rReliefColor,
const ::basegfx::B2DSize& rShadowOffset, const ::basegfx::B2DSize& rShadowOffset,
const ::Color& rShadowColor, const ::Color& rShadowColor,
const ::Color& rTextFillColor,
const OUString& rText, const OUString& rText,
sal_Int32 nStartPos, sal_Int32 nStartPos,
sal_Int32 nLen, sal_Int32 nLen,
...@@ -1196,6 +1228,7 @@ namespace cppcanvas ...@@ -1196,6 +1228,7 @@ namespace cppcanvas
const ::Color& rReliefColor, const ::Color& rReliefColor,
const ::basegfx::B2DSize& rShadowOffset, const ::basegfx::B2DSize& rShadowOffset,
const ::Color& rShadowColor, const ::Color& rShadowColor,
const ::Color& rTextFillColor,
const OUString& rText, const OUString& rText,
sal_Int32 nStartPos, sal_Int32 nStartPos,
sal_Int32 nLen, sal_Int32 nLen,
...@@ -1220,7 +1253,9 @@ namespace cppcanvas ...@@ -1220,7 +1253,9 @@ namespace cppcanvas
private: private:
// TextRenderer interface // TextRenderer interface
virtual bool operator()( const rendering::RenderState& rRenderState ) const override; virtual bool operator()( const rendering::RenderState& rRenderState, const ::Color& rTextFillColor ) const override;
css::uno::Reference<css::rendering::XPolyPolygon2D> queryTextBounds(const uno::Reference<rendering::XCanvas>& rCanvas) const;
// TODO(P2): This is potentially a real mass object // TODO(P2): This is potentially a real mass object
// (every character might be a separate TextAction), // (every character might be a separate TextAction),
...@@ -1239,6 +1274,7 @@ namespace cppcanvas ...@@ -1239,6 +1274,7 @@ namespace cppcanvas
const ::Color maReliefColor; const ::Color maReliefColor;
const ::basegfx::B2DSize maShadowOffset; const ::basegfx::B2DSize maShadowOffset;
const ::Color maShadowColor; const ::Color maShadowColor;
const ::Color maTextFillColor;
}; };
EffectTextArrayAction::EffectTextArrayAction( const ::basegfx::B2DPoint& rStartPoint, EffectTextArrayAction::EffectTextArrayAction( const ::basegfx::B2DPoint& rStartPoint,
...@@ -1246,6 +1282,7 @@ namespace cppcanvas ...@@ -1246,6 +1282,7 @@ namespace cppcanvas
const ::Color& rReliefColor, const ::Color& rReliefColor,
const ::basegfx::B2DSize& rShadowOffset, const ::basegfx::B2DSize& rShadowOffset,
const ::Color& rShadowColor, const ::Color& rShadowColor,
const ::Color& rTextFillColor,
const OUString& rText, const OUString& rText,
sal_Int32 nStartPos, sal_Int32 nStartPos,
sal_Int32 nLen, sal_Int32 nLen,
...@@ -1262,7 +1299,8 @@ namespace cppcanvas ...@@ -1262,7 +1299,8 @@ namespace cppcanvas
maReliefOffset( rReliefOffset ), maReliefOffset( rReliefOffset ),
maReliefColor( rReliefColor ), maReliefColor( rReliefColor ),
maShadowOffset( rShadowOffset ), maShadowOffset( rShadowOffset ),
maShadowColor( rShadowColor ) maShadowColor( rShadowColor ),
maTextFillColor( rTextFillColor )
{ {
initEffectLinePolyPolygon( maLinesOverallSize, initEffectLinePolyPolygon( maLinesOverallSize,
mxTextLines, mxTextLines,
...@@ -1286,6 +1324,7 @@ namespace cppcanvas ...@@ -1286,6 +1324,7 @@ namespace cppcanvas
const ::Color& rReliefColor, const ::Color& rReliefColor,
const ::basegfx::B2DSize& rShadowOffset, const ::basegfx::B2DSize& rShadowOffset,
const ::Color& rShadowColor, const ::Color& rShadowColor,
const ::Color& rTextFillColor,
const OUString& rText, const OUString& rText,
sal_Int32 nStartPos, sal_Int32 nStartPos,
sal_Int32 nLen, sal_Int32 nLen,
...@@ -1303,7 +1342,8 @@ namespace cppcanvas ...@@ -1303,7 +1342,8 @@ namespace cppcanvas
maReliefOffset( rReliefOffset ), maReliefOffset( rReliefOffset ),
maReliefColor( rReliefColor ), maReliefColor( rReliefColor ),
maShadowOffset( rShadowOffset ), maShadowOffset( rShadowOffset ),
maShadowColor( rShadowColor ) maShadowColor( rShadowColor ),
maTextFillColor( rTextFillColor )
{ {
initEffectLinePolyPolygon( maLinesOverallSize, initEffectLinePolyPolygon( maLinesOverallSize,
mxTextLines, mxTextLines,
...@@ -1323,7 +1363,15 @@ namespace cppcanvas ...@@ -1323,7 +1363,15 @@ namespace cppcanvas
&rTextTransform ); &rTextTransform );
} }
bool EffectTextArrayAction::operator()( const rendering::RenderState& rRenderState ) const css::uno::Reference<css::rendering::XPolyPolygon2D> EffectTextArrayAction::queryTextBounds(const uno::Reference<rendering::XCanvas>& rCanvas) const
{
const geometry::RealRectangle2D aTextBounds(mxTextLayout->queryTextBounds());
auto aB2DBounds = ::basegfx::unotools::b2DRectangleFromRealRectangle2D(aTextBounds);
auto aTextBoundsPoly = ::basegfx::utils::createPolygonFromRect(aB2DBounds);
return ::basegfx::unotools::xPolyPolygonFromB2DPolygon(rCanvas->getDevice(), aTextBoundsPoly);
}
bool EffectTextArrayAction::operator()( const rendering::RenderState& rRenderState, const ::Color& rTextFillColor ) const
{ {
const rendering::ViewState& rViewState( mpCanvas->getViewState() ); const rendering::ViewState& rViewState( mpCanvas->getViewState() );
const uno::Reference< rendering::XCanvas >& rCanvas( mpCanvas->getUNOCanvas() ); const uno::Reference< rendering::XCanvas >& rCanvas( mpCanvas->getUNOCanvas() );
...@@ -1332,6 +1380,18 @@ namespace cppcanvas ...@@ -1332,6 +1380,18 @@ namespace cppcanvas
rViewState, rViewState,
rRenderState ); rRenderState );
//rhbz#1589029 non-transparent text fill background support
::Color aEmptyColor( COL_AUTO );
if (rTextFillColor != aEmptyColor)
{
rendering::RenderState aLocalState(rRenderState);
aLocalState.DeviceColor = vcl::unotools::colorToDoubleSequence(
rTextFillColor, rCanvas->getDevice()->getDeviceColorSpace());
auto xTextBounds = queryTextBounds(rCanvas);
// background of text
rCanvas->fillPolyPolygon(xTextBounds, rViewState, aLocalState);
}
rCanvas->drawTextLayout( mxTextLayout, rCanvas->drawTextLayout( mxTextLayout,
rViewState, rViewState,
rRenderState ); rRenderState );
...@@ -1353,7 +1413,8 @@ namespace cppcanvas ...@@ -1353,7 +1413,8 @@ namespace cppcanvas
maShadowColor, maShadowColor,
maShadowOffset, maShadowOffset,
maReliefColor, maReliefColor,
maReliefOffset ); maReliefOffset,
maTextFillColor);
} }
class EffectTextArrayRenderHelper : public TextRenderer class EffectTextArrayRenderHelper : public TextRenderer
...@@ -1371,12 +1432,24 @@ namespace cppcanvas ...@@ -1371,12 +1432,24 @@ namespace cppcanvas
} }
// TextRenderer interface // TextRenderer interface
virtual bool operator()( const rendering::RenderState& rRenderState ) const override virtual bool operator()( const rendering::RenderState& rRenderState, const ::Color& rTextFillColor ) const override
{ {
mrCanvas->fillPolyPolygon( mrLinePolygon, mrCanvas->fillPolyPolygon( mrLinePolygon,
mrViewState, mrViewState,
rRenderState ); rRenderState );
//rhbz#1589029 non-transparent text fill background support
::Color aEmptyColor( COL_AUTO );
if (rTextFillColor != aEmptyColor)
{
rendering::RenderState aLocalState(rRenderState);
aLocalState.DeviceColor = vcl::unotools::colorToDoubleSequence(
rTextFillColor, mrCanvas->getDevice()->getDeviceColorSpace());
auto xTextBounds = queryTextBounds();
// background of text
mrCanvas->fillPolyPolygon(xTextBounds, mrViewState, aLocalState);
}
mrCanvas->drawTextLayout( mrTextLayout, mrCanvas->drawTextLayout( mrTextLayout,
mrViewState, mrViewState,
rRenderState ); rRenderState );
...@@ -1385,6 +1458,15 @@ namespace cppcanvas ...@@ -1385,6 +1458,15 @@ namespace cppcanvas
} }
private: private:
css::uno::Reference<css::rendering::XPolyPolygon2D> queryTextBounds() const
{
const geometry::RealRectangle2D aTextBounds(mrTextLayout->queryTextBounds());
auto aB2DBounds = ::basegfx::unotools::b2DRectangleFromRealRectangle2D(aTextBounds);
auto aTextBoundsPoly = ::basegfx::utils::createPolygonFromRect(aB2DBounds);
return ::basegfx::unotools::xPolyPolygonFromB2DPolygon(mrCanvas->getDevice(), aTextBoundsPoly);
}
const uno::Reference< rendering::XCanvas >& mrCanvas; const uno::Reference< rendering::XCanvas >& mrCanvas;
const uno::Reference< rendering::XTextLayout >& mrTextLayout; const uno::Reference< rendering::XTextLayout >& mrTextLayout;
const uno::Reference< rendering::XPolyPolygon2D >& mrLinePolygon; const uno::Reference< rendering::XPolyPolygon2D >& mrLinePolygon;
...@@ -1442,7 +1524,8 @@ namespace cppcanvas ...@@ -1442,7 +1524,8 @@ namespace cppcanvas
maShadowColor, maShadowColor,
maShadowOffset, maShadowOffset,
maReliefColor, maReliefColor,
maReliefOffset ); maReliefOffset,
maTextFillColor);
} }
::basegfx::B2DRange EffectTextArrayAction::getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const ::basegfx::B2DRange EffectTextArrayAction::getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const
...@@ -1554,7 +1637,7 @@ namespace cppcanvas ...@@ -1554,7 +1637,7 @@ namespace cppcanvas
private: private:
// TextRenderer interface // TextRenderer interface
virtual bool operator()( const rendering::RenderState& rRenderState ) const override; virtual bool operator()( const rendering::RenderState& rRenderState, const ::Color& rTextFillColor ) const override;
// TODO(P2): This is potentially a real mass object // TODO(P2): This is potentially a real mass object
// (every character might be a separate TextAction), // (every character might be a separate TextAction),
...@@ -1578,6 +1661,7 @@ namespace cppcanvas ...@@ -1578,6 +1661,7 @@ namespace cppcanvas
const ::Color maReliefColor; const ::Color maReliefColor;
const ::basegfx::B2DSize maShadowOffset; const ::basegfx::B2DSize maShadowOffset;
const ::Color maShadowColor; const ::Color maShadowColor;
const ::Color maTextFillColor;
}; };
double calcOutlineWidth( const OutDevState& rState, double calcOutlineWidth( const OutDevState& rState,
...@@ -1676,7 +1760,7 @@ namespace cppcanvas ...@@ -1676,7 +1760,7 @@ namespace cppcanvas
rTextTransform ); rTextTransform );
} }
bool OutlineAction::operator()( const rendering::RenderState& rRenderState ) const bool OutlineAction::operator()( const rendering::RenderState& rRenderState, const ::Color& /*rTextFillColor*/ ) const
{ {
const rendering::ViewState& rViewState( mpCanvas->getViewState() ); const rendering::ViewState& rViewState( mpCanvas->getViewState() );
const uno::Reference< rendering::XCanvas >& rCanvas( mpCanvas->getUNOCanvas() ); const uno::Reference< rendering::XCanvas >& rCanvas( mpCanvas->getUNOCanvas() );
...@@ -1732,7 +1816,8 @@ namespace cppcanvas ...@@ -1732,7 +1816,8 @@ namespace cppcanvas
maShadowColor, maShadowColor,
maShadowOffset, maShadowOffset,
maReliefColor, maReliefColor,
maReliefOffset ); maReliefOffset,
maTextFillColor);
} }
#if 0 // see #if'ed out use in OutlineAction::renderSubset below: #if 0 // see #if'ed out use in OutlineAction::renderSubset below:
...@@ -2041,6 +2126,7 @@ namespace cppcanvas ...@@ -2041,6 +2126,7 @@ namespace cppcanvas
const ::Color& rReliefColor, const ::Color& rReliefColor,
const ::Size& rShadowOffset, const ::Size& rShadowOffset,
const ::Color& rShadowColor, const ::Color& rShadowColor,
const ::Color& rTextFillColor,
const OUString& rText, const OUString& rText,
sal_Int32 nStartPos, sal_Int32 nStartPos,
sal_Int32 nLen, sal_Int32 nLen,
...@@ -2174,7 +2260,8 @@ namespace cppcanvas ...@@ -2174,7 +2260,8 @@ namespace cppcanvas
!rState.textUnderlineStyle && !rState.textUnderlineStyle &&
!rState.textStrikeoutStyle && !rState.textStrikeoutStyle &&
rReliefColor == aEmptyColor && rReliefColor == aEmptyColor &&
rShadowColor == aEmptyColor ) rShadowColor == aEmptyColor &&
rTextFillColor == aEmptyColor )
{ {
// nope // nope
if( rParms.maTextTransformation.is_initialized() ) if( rParms.maTextTransformation.is_initialized() )
...@@ -2207,6 +2294,7 @@ namespace cppcanvas ...@@ -2207,6 +2294,7 @@ namespace cppcanvas
rReliefColor, rReliefColor,
aShadowOffset, aShadowOffset,
rShadowColor, rShadowColor,
rTextFillColor,
rText, rText,
nStartPos, nStartPos,
nLen, nLen,
...@@ -2222,6 +2310,7 @@ namespace cppcanvas ...@@ -2222,6 +2310,7 @@ namespace cppcanvas
rReliefColor, rReliefColor,
aShadowOffset, aShadowOffset,
rShadowColor, rShadowColor,
rTextFillColor,
rText, rText,
nStartPos, nStartPos,
nLen, nLen,
......
cppcanvas/source/mtfrenderer/textaction.hxx
Dosyayı görüntüle @ b1a310e4
...@@ -66,6 +66,7 @@ namespace cppcanvas ...@@ -66,6 +66,7 @@ namespace cppcanvas
const ::Color& rReliefColor, const ::Color& rReliefColor,
const ::Size& rShadowOffset, const ::Size& rShadowOffset,
const ::Color& rShadowColor, const ::Color& rShadowColor,
const ::Color& rTextFillColor,
const OUString& rText, const OUString& rText,
sal_Int32 nStartPos, sal_Int32 nStartPos,
sal_Int32 nLen, sal_Int32 nLen,
......
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