diff options
author | Harri Pitkänen <hatapitk@iki.fi> | 2011-10-26 21:48:17 +0300 |
---|---|---|
committer | Noel Power <noel.power@novell.com> | 2011-10-28 10:07:17 +0100 |
commit | 89b3820c7b8c97480b556b3553cd78aaa12d07d8 (patch) | |
tree | b0de0a3475722ba637a46c940771c013bf0a79f9 /cui | |
parent | Add UML line ends to palette standard.soe (AOOo #i10547#) (diff) | |
download | core-89b3820c7b8c97480b556b3553cd78aaa12d07d8.tar.gz core-89b3820c7b8c97480b556b3553cd78aaa12d07d8.zip |
Export blinking text attribute to HTML in all HTML export modes
Previously blinking was not exported in IE mode. IE still does not
support blinking (neither does Chrome or Safari) but the extra tag
does not make things any worse and allows importing the HTML back
to LibreOffice without loss of formatting.
Code is also simplified by removing conditionals for options that
no longer need to be disabled.
Diffstat (limited to 'cui')
-rw-r--r-- | cui/source/tabpages/backgrnd.cxx | 2 | ||||
-rw-r--r-- | cui/source/tabpages/chardlg.cxx | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index 8d27b17701bc..b466ea8908b7 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -1086,8 +1086,6 @@ void SvxBackgroundTabPage::ShowSelector() if(nHtmlMode & HTMLMODE_ON) { - if(!(nHtmlMode & HTMLMODE_GRAPH_POS)) - aBtnPosition.Enable(sal_False); aBtnArea.Enable(sal_False); } } diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index a92019eeeaa2..9d320b4410a1 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -2686,8 +2686,7 @@ void SvxCharEffectsPage::DisableControls( sal_uInt16 nDisable ) void SvxCharEffectsPage::EnableFlash() { - if ( !( ( m_nHtmlMode & HTMLMODE_ON ) && !( m_nHtmlMode & HTMLMODE_BLINK ) ) ) - m_aBlinkingBtn.Show(); + m_aBlinkingBtn.Show(); } // ----------------------------------------------------------------------- |