mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enable paragraph border settings in HTML editor for all HTML variants

Browse Source 
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.
This commit is contained in:
Harri Pitkänen
2011-08-01 22:12:21 +03:00
committed by Cédric Bosdonnat
parent b664042088
commit 0153fc3c88
4 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sfx2/inc/sfx2/htmlmode.hxx
View File

@@ -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

12
sw/source/ui/chrdlg/pardlg.cxx
View File

@@ -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)

6
sw/source/ui/config/viewopt.cxx
View File

@@ -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|

2
sw/source/ui/fmtui/tmpdlg.cxx
View File

@@ -218,8 +218,6 @@ SwTemplateDlg::SwTemplateDlg(Window* pParent,
RemoveTabPage(TP_BACKGROUND);
RemoveTabPage(TP_DROPCAPS);
}
if(!(nHtmlMode & HTMLMODE_PARA_BORDER))
RemoveTabPage(TP_BORDER);
}
else
{