summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorGabor Kelemen <kelemen.gabor2@nisz.hu>2020-04-23 00:39:33 +0200
committerMiklos Vajna <vmiklos@collabora.com>2020-05-06 09:14:33 +0200
commit1eb6210d678bbb0c875f0f72bd876a9e7795dfbe (patch)
tree19c5d7834b9aadc3293497e951c92226ea518dc2 /sw
parent38016653cb9b338d6287c06a49663252f636f548 (diff)
tdf#132373 Remove blinking character property from the UI/editor
So far from document body and Character properties tab only. Importing and exporting existing files still works. Change-Id: I42179b47c64fe5c7db0393d0d4373363d772b51e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92875 Tested-by: Jenkins Tested-by: Heiko Tietze <heiko.tietze@documentfoundation.org> Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
Diffstat (limited to 'sw')
-rw-r--r--sw/qa/uitest/writer_tests2/formatCharacter.py4
-rw-r--r--sw/qa/uitest/writer_tests5/tdf122722.py2
-rw-r--r--sw/source/core/text/inftxt.cxx35
3 files changed, 0 insertions, 41 deletions
diff --git a/sw/qa/uitest/writer_tests2/formatCharacter.py b/sw/qa/uitest/writer_tests2/formatCharacter.py
index 885f88ad3981..e1da1d2cb73b 100644
--- a/sw/qa/uitest/writer_tests2/formatCharacter.py
+++ b/sw/qa/uitest/writer_tests2/formatCharacter.py
@@ -77,7 +77,6 @@ class formatCharacter(UITestCase):
xEffects = xDialog.getChild("effectslb")
xRelief = xDialog.getChild("relieflb")
- xBlinking = xDialog.getChild("blinkingcb")
xHidden = xDialog.getChild("hiddencb")
xOverline = xDialog.getChild("overlinelb")
xStrikeout = xDialog.getChild("strikeoutlb")
@@ -87,7 +86,6 @@ class formatCharacter(UITestCase):
select_pos(xEffects, "1")
select_pos(xRelief, "1")
- xBlinking.executeAction("CLICK", tuple())
xHidden.executeAction("CLICK", tuple())
select_pos(xOverline, "1")
select_pos(xStrikeout, "1")
@@ -105,7 +103,6 @@ class formatCharacter(UITestCase):
xEffects = xDialog.getChild("effectslb")
xRelief = xDialog.getChild("relieflb")
- xBlinking = xDialog.getChild("blinkingcb")
xHidden = xDialog.getChild("hiddencb")
xOverline = xDialog.getChild("overlinelb")
xStrikeout = xDialog.getChild("strikeoutlb")
@@ -115,7 +112,6 @@ class formatCharacter(UITestCase):
self.assertEqual(get_state_as_dict(xEffects)["SelectEntryText"], "UPPERCASE")
self.assertEqual(get_state_as_dict(xRelief)["SelectEntryText"], "Embossed")
- self.assertEqual(get_state_as_dict(xBlinking)["Selected"], "true")
self.assertEqual(get_state_as_dict(xHidden)["Selected"], "true")
self.assertEqual(get_state_as_dict(xOverline)["SelectEntryText"], "Single")
self.assertEqual(get_state_as_dict(xStrikeout)["SelectEntryText"], "Single")
diff --git a/sw/qa/uitest/writer_tests5/tdf122722.py b/sw/qa/uitest/writer_tests5/tdf122722.py
index 3edd2e14e0cf..cbc46e09c17b 100644
--- a/sw/qa/uitest/writer_tests5/tdf122722.py
+++ b/sw/qa/uitest/writer_tests5/tdf122722.py
@@ -38,7 +38,6 @@ class tdf122722(UITestCase):
xEffects = xDialog.getChild("effectslb")
xRelief = xDialog.getChild("relieflb")
- xBlinking = xDialog.getChild("blinkingcb")
xHidden = xDialog.getChild("hiddencb")
xOverline = xDialog.getChild("overlinelb")
xStrikeout = xDialog.getChild("strikeoutlb")
@@ -58,7 +57,6 @@ class tdf122722(UITestCase):
xEffects = xDialog.getChild("effectslb")
xRelief = xDialog.getChild("relieflb")
- xBlinking = xDialog.getChild("blinkingcb")
xHidden = xDialog.getChild("hiddencb")
xOverline = xDialog.getChild("overlinelb")
xStrikeout = xDialog.getChild("strikeoutlb")
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index 5cebec8c1e18..797110ceaf45 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -50,13 +50,11 @@
#include <paratr.hxx>
#include <rootfrm.hxx>
#include "inftxt.hxx"
-#include <blink.hxx>
#include <noteurl.hxx>
#include "porftn.hxx"
#include "porrst.hxx"
#include "itratr.hxx"
#include "portab.hxx"
-#include <accessibilityoptions.hxx>
#include <wrong.hxx>
#include <doc.hxx>
#include <pam.hxx>
@@ -630,39 +628,6 @@ void SwTextPaintInfo::DrawText_( const OUString &rText, const SwLinePortion &rPo
if( !nLength )
return;
- if( GetFont()->IsBlink() && OnWin() && rPor.Width() )
- {
- // check if accessibility options allow blinking portions:
- const SwViewShell* pSh = GetTextFrame()->getRootFrame()->GetCurrShell();
- if ( pSh && ! pSh->GetAccessibilityOptions()->IsStopAnimatedText() &&
- ! pSh->IsPreview() )
- {
- if( !pBlink )
- pBlink = new SwBlink();
-
- Point aPoint( aPos );
-
- if ( GetTextFrame()->IsRightToLeft() )
- GetTextFrame()->SwitchLTRtoRTL( aPoint );
-
- if ( ComplexTextLayoutFlags::BiDiStrong != GetOut()->GetLayoutMode() )
- aPoint.AdjustX( -(rPor.Width()) );
-
- if ( GetTextFrame()->IsVertical() )
- GetTextFrame()->SwitchHorizontalToVertical( aPoint );
-
- pBlink->Insert( aPoint, &rPor, GetTextFrame(), m_pFnt->GetOrientation() );
-
- if( !pBlink->IsVisible() )
- return;
- }
- else
- {
- delete pBlink;
- pBlink = nullptr;
- }
- }
-
// The SwScriptInfo is useless if we are inside a field portion
SwScriptInfo* pSI = nullptr;
if ( ! rPor.InFieldGrp() )