diff options
| author | Harri Pitkänen <hatapitk@iki.fi> | 2011-08-01 22:12:21 +0300 |
|---|---|---|
| committer | Cédric Bosdonnat <cedric.bosdonnat.ooo@free.fr> | 2011-08-10 20:05:53 +0200 |
| commit | 0153fc3c8893c56d6a330d6422b04bb5a61a4194 (patch) | |
| tree | cc0f65ac957b4a5b38c5a5b73e9ac11d0ee0e76e /sw/source/ui/chrdlg | |
| parent | b66404208897179e2d675fa3a4b38d1b06ae571a (diff) | |
Enable paragraph border settings in HTML editor for all HTML variants
Previously border settings were not available in paragraph format dialog
when HTML export format was "HTML 3.2". This was confusing since documents
with borders could still be imported and you could even access the border
dialog with suitably configured shortcut key.
Diffstat (limited to 'sw/source/ui/chrdlg')
| -rw-r--r-- | sw/source/ui/chrdlg/pardlg.cxx | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/sw/source/ui/chrdlg/pardlg.cxx b/sw/source/ui/chrdlg/pardlg.cxx index 5198c14ce76e..07a5b7785a88 100644 --- a/sw/source/ui/chrdlg/pardlg.cxx +++ b/sw/source/ui/chrdlg/pardlg.cxx @@ -161,14 +161,10 @@ SwParaDlg::SwParaDlg(Window *pParent, { RemoveTabPage(TP_BACKGROUND); } - if(!bHtmlMode || (nHtmlMode & HTMLMODE_PARA_BORDER)) - { - OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), "GetTabPageCreatorFunc fail!"); - OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ), "GetTabPageRangesFunc fail!"); - AddTabPage(TP_BORDER, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ) ); - } - else - RemoveTabPage(TP_BORDER); + + OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), "GetTabPageCreatorFunc fail!"); + OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ), "GetTabPageRangesFunc fail!"); + AddTabPage(TP_BORDER, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ) ); } if (nDefPage) |