diff options
| author | Harri Pitkänen <hatapitk@iki.fi> | 2013-03-23 12:10:15 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2013-03-27 12:50:50 +0000 |
| commit | da45a0e255f77d002c35438e9c2a17fecdde6d81 (patch) | |
| tree | a72670f131f569d3829f7728deb125ab441ba45b /sfx2 | |
| parent | f5442623090dd535a1a561f1ecfdb09f2dff129b (diff) | |
Remove HTMLMODE_FRM_COLUMNS and export column-count CSS attribute
For multi-column sections in Writer, HTMLMODE_FRM_COLUMNS controlled
whether column settings for the section were exported to html or not.
This was disabled for Internet Explorer and enabled for other browsers.
The export was implemented using non-standard MULTICOL html element
and did not actually work in any modern browser (apparently only
some versions of Netscape have ever supported this). This patch
- exports the column count also using "column-count" CSS attribute
which is supported by latest versions of Opera and IE. Firefox and
Webkit based browsers would currently require -moz-column-count and
-webkit-column-count but I have not added these since the browsers
will likely stop requiring the prefix in the future anyway.
- removes HTMLMODE_FRM_COLUMNS conditional so that this export will
happen with all html compatibility options, including IE.
Remaining issue: Using the MULTICOL element (as opposed to DIV element)
confuses at least Opera so that it ignores all style attributes applied
on the element. But corresponding html import code in LibreOffice still
relies on MULTICOL. I will work on a separate patch to add support for
column-count CSS attribute to the import code and switch export to use
DIV instead.
Change-Id: I82a065fdda0e074fbfcd0007e6ff6e46185be3f5
Reviewed-on: https://gerrit.libreoffice.org/2950
Reviewed-by: Petr Mladek <pmladek@suse.cz>
Tested-by: Petr Mladek <pmladek@suse.cz>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/inc/sfx2/htmlmode.hxx | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sfx2/inc/sfx2/htmlmode.hxx b/sfx2/inc/sfx2/htmlmode.hxx index 90af4b257555..0ce8e430869e 100644 --- a/sfx2/inc/sfx2/htmlmode.hxx +++ b/sfx2/inc/sfx2/htmlmode.hxx @@ -21,7 +21,6 @@ #define HTMLMODE_ON 0x0001 #define HTMLMODE_PARA_DISTANCE 0x0004 -#define HTMLMODE_FRM_COLUMNS 0x0010 #define HTMLMODE_SOME_STYLES 0x0020 /* mind. MS IE */ #define HTMLMODE_FULL_STYLES 0x0040 /* == SW */ #define HTMLMODE_PARA_BLOCK 0x0100 |