[Libreoffice-commits] core.git: sw/source

[Harri Pitkänen]

 sw/source/ui/chrdlg/pardlg.cxx |   11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

New commits:
commit 745f594556f690b57918bc32579157acc5598336
Author: Harri Pitkänen <hatapitk at iki.fi>
Date:   Sat Sep 21 11:01:56 2013 +0300

    Enable Drop Caps for Firefox HTML compatibility mode
    
    Drop Caps tab was disabled in paragraph options when Firefox was
    selected in HTML compatibility options and Writer was in HTML
    editor mode. There is no need to do that. Firefox and all modern
    browsers will display drop caps correctly if they are exported
    from LibreOffice.
    
    Change-Id: I9ee0d9647b8e8ed7c57c4b08dc4995ef1b8f91f3
    Reviewed-on: https://gerrit.libreoffice.org/6013
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/ui/chrdlg/pardlg.cxx b/sw/source/ui/chrdlg/pardlg.cxx
index 3106894..a964eb0 100644
--- a/sw/source/ui/chrdlg/pardlg.cxx
+++ b/sw/source/ui/chrdlg/pardlg.cxx
@@ -134,14 +134,9 @@ SwParaDlg::SwParaDlg(Window *pParent,
             m_nParaNumPara = AddTabPage("labelTP_NUMPARA", SwParagraphNumTabPage::Create, SwParagraphNumTabPage::GetRanges);
         else
             RemoveTabPage("labelTP_NUMPARA");
-        if(!bHtmlMode || (nHtmlMode & HTMLMODE_FULL_STYLES))
-        {
-            m_nParaDrpCps = AddTabPage("labelTP_DROPCAPS",  SwDropCapsPage::Create, SwDropCapsPage::GetRanges);
-        }
-        else
-        {
-            RemoveTabPage("labelTP_DROPCAPS");
-        }
+
+        m_nParaDrpCps = AddTabPage("labelTP_DROPCAPS",  SwDropCapsPage::Create, SwDropCapsPage::GetRanges);
+
         if(!bHtmlMode || (nHtmlMode & (HTMLMODE_SOME_STYLES|HTMLMODE_FULL_STYLES)))
         {
             OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageCreatorFunc fail!");