summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorHarri Pitkänen <hatapitk@iki.fi>2011-08-03 18:09:11 +0300
committerCédric Bosdonnat <cedric.bosdonnat.ooo@free.fr>2011-08-10 20:05:53 +0200
commit4a111eaece427ba898fe61d7ec9e4953c14d302e (patch)
treea7426a3fcca39e5a9301c17ec240702e5138fb56 /sw
parent0153fc3c8893c56d6a330d6422b04bb5a61a4194 (diff)
Enable export of basic CSS styles in HTML 3.2 mode
Although "style" does not seem to be valid attribute in HTML 3.2 it is harmless to export it. This simplifies the code and makes the exported HTML more useful in modern browsers.
Diffstat (limited to 'sw')
-rw-r--r--sw/source/ui/config/viewopt.cxx7
1 files changed, 2 insertions, 5 deletions
diff --git a/sw/source/ui/config/viewopt.cxx b/sw/source/ui/config/viewopt.cxx
index 7f65e5e58a93..581ed2a6bbe9 100644
--- a/sw/source/ui/config/viewopt.cxx
+++ b/sw/source/ui/config/viewopt.cxx
@@ -333,24 +333,21 @@ sal_uInt16 GetHtmlMode(const SwDocShell* pShell)
sal_uInt16 nRet = 0;
if(!pShell || PTR_CAST(SwWebDocShell, pShell))
{
- nRet = HTMLMODE_ON;
+ nRet = HTMLMODE_ON | HTMLMODE_SOME_STYLES;
SvxHtmlOptions& rHtmlOpt = SvxHtmlOptions::Get();
switch ( rHtmlOpt.GetExportMode() )
{
case HTML_CFG_MSIE_40:
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_SOME_STYLES|
- HTMLMODE_FRM_COLUMNS|HTMLMODE_BLINK|HTMLMODE_GRAPH_POS|
+ nRet |= HTMLMODE_FRM_COLUMNS|HTMLMODE_BLINK|HTMLMODE_GRAPH_POS|
HTMLMODE_SOME_ABS_POS;
break;
case HTML_CFG_WRITER:
nRet |= HTMLMODE_SMALL_CAPS|
- HTMLMODE_SOME_STYLES|
HTMLMODE_FRM_COLUMNS|HTMLMODE_FULL_STYLES|
HTMLMODE_BLINK|HTMLMODE_DROPCAPS|HTMLMODE_GRAPH_POS|
HTMLMODE_FULL_ABS_POS|HTMLMODE_SOME_ABS_POS;