Kaydet (Commit) b1a310e4 authored tarafından Caolán McNamara's avatar Caolán McNamara Kaydeden (comit) Andras Timar

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
...@@ -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,
......
...@@ -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(),
......
...@@ -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