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 | |
| 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.
| -rw-r--r-- | sfx2/inc/sfx2/htmlmode.hxx | 1 | ||||
| -rw-r--r-- | sw/source/ui/chrdlg/pardlg.cxx | 12 | ||||
| -rw-r--r-- | sw/source/ui/config/viewopt.cxx | 6 | ||||
| -rw-r--r-- | sw/source/ui/fmtui/tmpdlg.cxx | 2 |
4 files changed, 7 insertions, 14 deletions
diff --git a/sfx2/inc/sfx2/htmlmode.hxx b/sfx2/inc/sfx2/htmlmode.hxx index 5f3c36c147d5..f4db27ad3c3f 100644 --- a/sfx2/inc/sfx2/htmlmode.hxx +++ b/sfx2/inc/sfx2/htmlmode.hxx @@ -30,7 +30,6 @@ #define HTMLMODE_ON 0x0001 -#define HTMLMODE_PARA_BORDER 0x0002 #define HTMLMODE_PARA_DISTANCE 0x0004 #define HTMLMODE_SMALL_CAPS 0x0008 #define HTMLMODE_FRM_COLUMNS 0x0010 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) diff --git a/sw/source/ui/config/viewopt.cxx b/sw/source/ui/config/viewopt.cxx index 637862c2d8e1..7f65e5e58a93 100644 --- a/sw/source/ui/config/viewopt.cxx +++ b/sw/source/ui/config/viewopt.cxx @@ -338,18 +338,18 @@ sal_uInt16 GetHtmlMode(const SwDocShell* pShell) switch ( rHtmlOpt.GetExportMode() ) { case HTML_CFG_MSIE_40: - nRet |= HTMLMODE_PARA_BORDER|HTMLMODE_SMALL_CAPS| + nRet |= HTMLMODE_SMALL_CAPS| HTMLMODE_SOME_STYLES| HTMLMODE_FULL_STYLES|HTMLMODE_GRAPH_POS| HTMLMODE_FULL_ABS_POS|HTMLMODE_SOME_ABS_POS; break; case HTML_CFG_NS40: - nRet |= HTMLMODE_PARA_BORDER|HTMLMODE_SOME_STYLES| + nRet |= HTMLMODE_SOME_STYLES| HTMLMODE_FRM_COLUMNS|HTMLMODE_BLINK|HTMLMODE_GRAPH_POS| HTMLMODE_SOME_ABS_POS; break; case HTML_CFG_WRITER: - nRet |= HTMLMODE_PARA_BORDER|HTMLMODE_SMALL_CAPS| + nRet |= HTMLMODE_SMALL_CAPS| HTMLMODE_SOME_STYLES| HTMLMODE_FRM_COLUMNS|HTMLMODE_FULL_STYLES| HTMLMODE_BLINK|HTMLMODE_DROPCAPS|HTMLMODE_GRAPH_POS| diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx index 2843aa98d64f..55cf1cc1dc0b 100644 --- a/sw/source/ui/fmtui/tmpdlg.cxx +++ b/sw/source/ui/fmtui/tmpdlg.cxx @@ -218,8 +218,6 @@ SwTemplateDlg::SwTemplateDlg(Window* pParent, RemoveTabPage(TP_BACKGROUND); RemoveTabPage(TP_DROPCAPS); } - if(!(nHtmlMode & HTMLMODE_PARA_BORDER)) - RemoveTabPage(TP_BORDER); } else { |