include/svtools/htmlcfg.hxx | 6 -
officecfg/registry/schema/org/openoffice/Office/Common.xcs | 4
svtools/source/config/htmlcfg.cxx | 14 --
sw/source/filter/html/htmlfly.hxx | 2
sw/source/filter/html/htmlflyt.cxx | 65 -------------
sw/source/filter/html/wrthtml.cxx | 4
6 files changed, 9 insertions(+), 86 deletions(-)
New commits:
commit fb9614ddb4c27c8ef61c84110b481db85b8ad07b
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Mon Jun 19 08:06:43 2023 +0300
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Mon Jun 19 09:34:17 2023 +0200
Drop code leftovers of HTML 3.2 support
The support itself was removed in commit
3f43b02433b970cd36ee4c9249e425d6b1bd9fbe
(Remove HTML 3.2 export option, 2011-08-26).
Change-Id: Ide699aed3078fd60490c49bb20b5fc487002726a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153241
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/include/svtools/htmlcfg.hxx b/include/svtools/htmlcfg.hxx
index 1ed542867ef0..8a734c3e876f 100644
--- a/include/svtools/htmlcfg.hxx
+++ b/include/svtools/htmlcfg.hxx
@@ -25,9 +25,9 @@
// !!!be aware!!!: the following defines are _not_ used as values in the
configuration file
// this is because of compatibility reasons
-#define HTML_CFG_MSIE 1 // Internet Explorer
-#define HTML_CFG_WRITER 2 // Writer
-#define HTML_CFG_NS40 3 // Netscape 4.0
+#define HTML_CFG_MSIE 0 // Internet Explorer
+#define HTML_CFG_WRITER 1 // Writer
+#define HTML_CFG_NS40 2 // Netscape 4.0
#define HTML_CFG_MAX HTML_CFG_NS40
diff --git a/sw/source/filter/html/htmlfly.hxx
b/sw/source/filter/html/htmlfly.hxx
index f6265f532526..958fbbf39d76 100644
--- a/sw/source/filter/html/htmlfly.hxx
+++ b/sw/source/filter/html/htmlfly.hxx
@@ -80,7 +80,7 @@ namespace o3tl {
}
const sal_uInt16 MAX_FRMTYPES = HTML_FRMTYPE_END;
-const sal_uInt16 MAX_BROWSERS = 4;
+const sal_uInt16 MAX_BROWSERS = 3;
struct AllHtmlFlags {
HtmlOut nOut;
diff --git a/sw/source/filter/html/htmlflyt.cxx
b/sw/source/filter/html/htmlflyt.cxx
index 9e4596ebc7bb..9f527796709b 100644
--- a/sw/source/filter/html/htmlflyt.cxx
+++ b/sw/source/filter/html/htmlflyt.cxx
@@ -25,84 +25,72 @@ AllHtmlFlags const
aHTMLOutFramePageFlyTable[MAX_FRMTYPES][MAX_BROWSERS] =
{
{
// text frame with table
- TE(TableNode, Before, NONE), // HTML 3.2
TE(Div, Prefix, NONE), // IE 4
TE(Div, Prefix, NONE), // SW
TE(Div, Prefix, NONE) // Netscape 4!
},
{
// text frame with table and headline
- TE(TableNode, Before, NONE), // HTML 3.2
TE(Div, Prefix, NONE), // IE 4
TE(Div, Prefix, NONE), // SW
TE(Div, Prefix, NONE) // Netscape 4
},
{
// column frame
- TE(GraphicFrame, Inside, NONE), // HTML 3.2
TE(GraphicFrame, Prefix, NONE), // IE 4
TE(MultiCol, Prefix, NONE), // SW
TE(MultiCol, Prefix, Div) // Netscape 4
},
{
// empty text frame
- TE(GraphicFrame, Inside, NONE), // HTML 3.2
TE(Div, Prefix, NONE), // IE 4
TE(Div, Prefix, NONE), // SW
TE(Div, Prefix, NONE) // Netscape 4
},
{
// other text frame
- TE(GraphicFrame, Inside, NONE), // HTML 3.2
TE(Div, Prefix, NONE), // IE 4
TE(Div, Prefix, NONE), // SW
TE(Div, Prefix, NONE) // Netscape 4
},
{
// graphic node
- TE(GraphicNode, Inside, NONE), // HTML 3.2
TE(GraphicNode, Prefix, NONE), // IE 4
TE(GraphicNode, Prefix, NONE), // SW
TE(GraphicNode, Prefix, Span) // Netscape 4
},
{
// plug-in
- TE(OleNode, Inside, NONE), // HTML 3.2
TE(OleNode, Prefix, NONE), // IE 4
TE(OleNode, Prefix, NONE), // SW
TE(OleNode, Prefix, Span) // Netscape 4
},
{
// applet
- TE(OleNode, Inside, NONE), // HTML 3.2
TE(OleNode, Prefix, NONE), // IE 4
TE(OleNode, Prefix, NONE), // SW
TE(OleNode, Prefix, Span) // Netscape 4
},
{
// floating frame
- TE(OleGraphic, Inside, NONE), // HTML 3.2
TE(OleNode, Prefix, NONE), // IE 4
TE(OleNode, Prefix, NONE), // SW
TE(OleGraphic, Prefix, Span) // Netscape 4
},
{
// other OLE objects
- TE(OleGraphic, Inside, NONE), // HTML 3.2
TE(OleGraphic, Prefix, NONE), // IE 4
TE(OleGraphic, Prefix, NONE), // SW
TE(OleGraphic, Prefix, Span) // Netscape 4
},
{
// marquee
- TE(GraphicFrame, Inside, NONE), // HTML 3.2
TE(AMarquee, Prefix, NONE), // IE 4
TE(AMarquee, Prefix, NONE), // SW
TE(GraphicFrame, Prefix, Span) // Netscape 4
},
{
// controls
- TE(Control, Inside, NONE), // HTML 3.2
TE(Control, Prefix, NONE), // IE 4
TE(Control, Prefix, NONE), // SW
// Netscape disables FROM at controls in absolute position span.
@@ -110,7 +98,6 @@ AllHtmlFlags const
aHTMLOutFramePageFlyTable[MAX_FRMTYPES][MAX_BROWSERS] =
},
{
// other character objects
- TE(GraphicFrame, Inside, NONE), // HTML 3.2
TE(GraphicFrame, Prefix, NONE), // IE 4
TE(GraphicFrame, Prefix, NONE), // SW
TE(GraphicFrame, Prefix, Span) // Netscape 4
@@ -121,70 +108,60 @@ AllHtmlFlags const
aHTMLOutFrameParaFrameTable[MAX_FRMTYPES][MAX_BROWSERS] =
{
{
// text frame with table
- TE(TableNode, Before, NONE), // HTML 3.2
TE(TableNode, Before, NONE), // IE 4
TE(TableNode, Before, NONE), // SW
TE(TableNode, Before, NONE) // Netscape 4
},
{
// text frame with table and headline
- TE(TableNode, Before, NONE), // HTML 3.2
TE(Div, Before, NONE), // IE 4
TE(Div, Before, NONE), // SW
TE(TableNode, Before, NONE) // Netscape 4
},
{
// column frame
- TE(GraphicFrame, Before, NONE), // HTML 3.2
TE(GraphicFrame, Before, NONE), // IE 4
TE(MultiCol, Before, NONE), // SW
TE(MultiCol, Before, Div) // Netscape 4
},
{
// empty text frame
- TE(GraphicFrame, Before, NONE), // HTML 3.2
TE(Div, Before, NONE), // IE 4
TE(Spacer, Before, NONE), // SW
TE(Spacer, Before, NONE) // Netscape 4
},
{
// other text frame
- TE(GraphicFrame, Before, NONE), // HTML 3.2
TE(Div, Before, NONE), // IE 4
TE(Div, Before, NONE), // SW
TE(Div, Before, NONE) // Netscape 4
},
{
// graphic node
- TE(GraphicNode, Before, NONE), // HTML 3.2
TE(GraphicNode, Before, NONE), // IE 4
TE(GraphicNode, Before, NONE), // SW
TE(GraphicNode, Before, NONE) // Netscape 4
},
{
// plug-in
- TE(OleNode, Before, NONE), // HTML 3.2
TE(OleNode, Before, NONE), // IE 4
TE(OleNode, Before, NONE), // SW
TE(OleNode, Before, NONE) // Netscape 4
},
{
// applet
- TE(OleNode, Before, NONE), // HTML 3.2
TE(OleNode, Before, NONE), // IE 4
TE(OleNode, Before, NONE), // SW
TE(OleNode, Before, NONE) // Netscape 4
},
{
// floating frame
- TE(OleGraphic, Before, NONE), // HTML 3.2
TE(OleNode, Before, NONE), // IE 4
TE(OleNode, Before, NONE), // SW
TE(OleGraphic, Before, NONE) // Netscape 4
},
{
// other OLE objects
- TE(OleGraphic, Before, NONE), // HTML 3.2
TE(OleGraphic, Before, NONE), // IE 4
TE(OleGraphic, Before, NONE), // SW
TE(OleGraphic, Before, NONE) // Netscape 4
@@ -192,14 +169,12 @@ AllHtmlFlags const
aHTMLOutFrameParaFrameTable[MAX_FRMTYPES][MAX_BROWSERS] =
{
// marquee (for Netscape 4 in container, so that
// the marquee appears at the right spot)
- TE(GraphicFrame, Before, NONE), // HTML 3.2
TE(AMarquee, Before, NONE), // IE 4
TE(AMarquee, Before, NONE), // SW
TE(GraphicFrame, Before, NONE) // Netscape 4
},
{
// controls
- TE(Control, Inside, NONE), // HTML 3.2
TE(Control, Before, NONE), // IE 4
TE(Control, Before, NONE), // SW
// here you could make container out if it (import is missing)
@@ -207,7 +182,6 @@ AllHtmlFlags const
aHTMLOutFrameParaFrameTable[MAX_FRMTYPES][MAX_BROWSERS] =
},
{
// other character objects
- TE(GraphicFrame, Before, NONE), // HTML 3.2
TE(GraphicFrame, Before, NONE), // IE 4
TE(GraphicFrame, Before, NONE), // SW
TE(GraphicFrame, Before, NONE) // Netscape 4
@@ -218,84 +192,72 @@ AllHtmlFlags const
aHTMLOutFrameParaPrtAreaTable[MAX_FRMTYPES][MAX_BROWSERS] =
{
{
// text frame with table
- TE(TableNode, Inside, NONE), // HTML 3.2
TE(TableNode, Inside, NONE), // IE 4
TE(TableNode, Inside, NONE), // SW
TE(TableNode, Inside, NONE) // Netscape 4
},
{
// text frame with table and headline
- TE(TableNode, Inside, NONE), // HTML 3.2
TE(Span, Inside, NONE), // IE 4
TE(Span, Inside, NONE), // SW
TE(Span, Inside, NONE) // Netscape 4
},
{
// column frame
- TE(GraphicFrame, Inside, NONE), // HTML 3.2
TE(GraphicFrame, Inside, NONE), // IE 4
TE(MultiCol, Inside, NONE), // SW
TE(MultiCol, Inside, Span) // Netscape 4
},
{
// empty text frame
- TE(GraphicFrame, Inside, NONE), // HTML 3.2
TE(Span, Inside, NONE), // IE 4
TE(Spacer, Inside, NONE), // SW
TE(Spacer, Inside, NONE) // Netscape 4
},
{
// other text frame
- TE(GraphicFrame, Inside, NONE), // HTML 3.2
TE(Span, Inside, NONE), // IE 4
TE(Span, Inside, NONE), // SW
TE(Span, Inside, NONE) // Netscape 4
},
{
// graphic node
- TE(GraphicNode, Inside, NONE), // HTML 3.2
TE(GraphicNode, Inside, NONE), // IE 4
TE(GraphicNode, Inside, NONE), // SW
TE(GraphicNode, Inside, NONE) // Netscape 4
},
{
// plug-in
- TE(OleNode, Inside, NONE), // HTML 3.2
TE(OleNode, Inside, NONE), // IE 4
TE(OleNode, Inside, NONE), // SW
TE(OleNode, Inside, NONE) // Netscape 4
},
{
// applet
- TE(OleNode, Inside, NONE), // HTML 3.2
TE(OleNode, Inside, NONE), // IE 4
TE(OleNode, Inside, NONE), // SW
TE(OleNode, Inside, NONE) // Netscape 4
},
{
// floating frame
- TE(OleGraphic, Inside, NONE), // HTML 3.2
TE(OleNode, Inside, NONE), // IE 4
TE(OleNode, Inside, NONE), // SW
TE(OleGraphic, Inside, NONE) // Netscape 4
},
{
// other OLE objects
- TE(OleGraphic, Inside, NONE), // HTML 3.2
TE(OleGraphic, Inside, NONE), // IE 4
TE(OleGraphic, Inside, NONE), // SW
TE(OleGraphic, Inside, NONE) // Netscape 4
},
{
// marquee
- TE(GraphicFrame, Inside, NONE), // HTML 3.2
TE(AMarquee, Inside, NONE), // IE 4
TE(AMarquee, Inside, NONE), // SW
TE(GraphicFrame, Inside, NONE) // Netscape 4
},
{
// controls
- TE(Control, Inside, NONE), // HTML 3.2
TE(Control, Inside, NONE), // IE 4
TE(Control, Inside, NONE), // SW
// here you could make container out if it (import is missing)
@@ -303,7 +265,6 @@ AllHtmlFlags const
aHTMLOutFrameParaPrtAreaTable[MAX_FRMTYPES][MAX_BROWSERS] =
},
{
// other character objects
- TE(GraphicFrame, Inside, NONE), // HTML 3.2
TE(GraphicFrame, Inside, NONE), // IE 4
TE(GraphicFrame, Inside, NONE), // SW
TE(GraphicFrame, Inside, NONE) // Netscape 4
@@ -314,84 +275,72 @@ AllHtmlFlags const
aHTMLOutFrameParaOtherTable[MAX_FRMTYPES][MAX_BROWSERS] =
{
{
// text frame with table
- TE(TableNode, Before, NONE), // HTML 3.2
TE(Span, Inside, NONE), // IE 4
TE(Span, Inside, NONE), // SW
TE(Span, Inside, NONE) // Netscape 4
},
{
// text frame with table and headline
- TE(TableNode, Before, NONE), // HTML 3.2
TE(Span, Inside, NONE), // IE 4
TE(Span, Inside, NONE), // SW
TE(Span, Inside, NONE) // Netscape 4
},
{
// column frame
- TE(GraphicFrame, Inside, NONE), // HTML 3.2
TE(GraphicFrame, Inside, NONE), // IE 4
TE(MultiCol, Inside, NONE), // SW
TE(MultiCol, Inside, Span) // Netscape 4
},
{
// empty text frame
- TE(GraphicFrame, Inside, NONE), // HTML 3.2
TE(Span, Inside, NONE), // IE 4
TE(Span, Inside, NONE), // SW
TE(Span, Inside, NONE) // Netscape 4
},
{
// other text frame
- TE(GraphicFrame, Inside, NONE), // HTML 3.2
TE(Span, Inside, NONE), // IE 4
TE(Span, Inside, NONE), // SW
TE(Span, Inside, NONE) // Netscape 4
},
{
// graphic node
- TE(GraphicNode, Inside, NONE), // HTML 3.2
TE(GraphicNode, Inside, NONE), // IE 4
TE(GraphicNode, Inside, NONE), // SW
TE(GraphicNode, Inside, Span) // Netscape 4
},
{
// plug-in
- TE(OleNode, Inside, NONE), // HTML 3.2
TE(OleNode, Inside, NONE), // IE 4
TE(OleNode, Inside, NONE), // SW
TE(OleNode, Inside, Span) // Netscape 4
},
{
// applet
- TE(OleNode, Inside, NONE), // HTML 3.2
TE(OleNode, Inside, NONE), // IE 4
TE(OleNode, Inside, NONE), // SW
TE(OleNode, Inside, Span) // Netscape 4
},
{
// floating frame
- TE(OleGraphic, Inside, NONE), // HTML 3.2
TE(OleNode, Inside, NONE), // IE 4
TE(OleNode, Inside, NONE), // SW
TE(OleGraphic, Inside, Span) // Netscape 4
},
{
// other OLE objects
- TE(OleGraphic, Inside, NONE), // HTML 3.2
TE(OleGraphic, Inside, NONE), // IE 4
TE(OleGraphic, Inside, NONE), // SW
TE(OleGraphic, Inside, Span) // Netscape 4
},
{
// marquee
- TE(GraphicFrame, Inside, NONE), // HTML 3.2
TE(AMarquee, Inside, NONE), // IE 4
TE(AMarquee, Inside, NONE), // SW
TE(GraphicFrame, Inside, Span) // Netscape 4
},
{
// controls
- TE(Control, Inside, NONE), // HTML 3.2
TE(Control, Inside, NONE), // IE 4
TE(Control, Inside, NONE), // SW
// Netscape disables FROM at controls in absolute position span.
@@ -399,7 +348,6 @@ AllHtmlFlags const
aHTMLOutFrameParaOtherTable[MAX_FRMTYPES][MAX_BROWSERS] =
},
{
// other character objects
- TE(GraphicFrame, Inside, NONE), // HTML 3.2
TE(GraphicFrame, Inside, NONE), // IE 4
TE(GraphicFrame, Inside, NONE), // SW
TE(GraphicFrame, Inside, Span) // Netscape 4
@@ -410,70 +358,60 @@ AllHtmlFlags const
aHTMLOutFrameAsCharTable[MAX_FRMTYPES][MAX_BROWSERS] =
{
{
// text frame with table
- TE(GraphicFrame, Inside, NONE), // HTML 3.2
TE(GraphicFrame, Inside, NONE), // IE 4
TE(GraphicFrame, Inside, NONE), // SW
TE(GraphicFrame, Inside, NONE) // Netscape 4
},
{
// text frame with table and headline
- TE(GraphicFrame, Inside, NONE), // HTML 3.2
TE(GraphicFrame, Inside, NONE), // IE 4
TE(GraphicFrame, Inside, NONE), // SW
TE(GraphicFrame, Inside, NONE) // Netscape 4
},
{
// column frame
- TE(GraphicFrame, Inside, NONE), // HTML 3.2
TE(GraphicFrame, Inside, NONE), // IE 4
TE(MultiCol, Inside, NONE), // SW
TE(MultiCol, Inside, NONE) // Netscape 4
},
{
// empty text frame
- TE(GraphicFrame, Inside, NONE), // HTML 3.2
TE(GraphicFrame, Inside, NONE), // IE 4
TE(Spacer, Inside, NONE), // SW
TE(Spacer, Inside, NONE) // Netscape 4
},
{
// other text frame
- TE(GraphicFrame, Inside, NONE), // HTML 3.2
TE(GraphicFrame, Inside, NONE), // IE 4
TE(GraphicFrame, Inside, NONE), // SW
TE(GraphicFrame, Inside, NONE) // Netscape 4
},
{
// graphic node
- TE(GraphicNode, Inside, NONE), // HTML 3.2
TE(GraphicNode, Inside, NONE), // IE 4
TE(GraphicNode, Inside, NONE), // SW
TE(GraphicNode, Inside, NONE) // Netscape 4
},
{
// plug-in
- TE(OleNode, Inside, NONE), // HTML 3.2
TE(OleNode, Inside, NONE), // IE 4
TE(OleNode, Inside, NONE), // SW
TE(OleNode, Inside, NONE) // Netscape 4
},
{
// applet
- TE(OleNode, Inside, NONE), // HTML 3.2
TE(OleNode, Inside, NONE), // IE 4
TE(OleNode, Inside, NONE), // SW
TE(OleNode, Inside, NONE) // Netscape 4
},
{
// floating frame
- TE(OleGraphic, Inside, NONE), // HTML 3.2
TE(OleNode, Inside, NONE), // IE 4
TE(OleNode, Inside, NONE), // SW
TE(OleGraphic, Inside, NONE) // Netscape 4
},
{
// other OLE objects
- TE(OleGraphic, Inside, NONE), // HTML 3.2
TE(OleGraphic, Inside, NONE), // IE 4
TE(OleGraphic, Inside, NONE), // SW
TE(OleGraphic, Inside, NONE) // Netscape 4
@@ -481,21 +419,18 @@ AllHtmlFlags const
aHTMLOutFrameAsCharTable[MAX_FRMTYPES][MAX_BROWSERS] =
{
// marquee (can always exported as marquee, because
// the content shows up at the right spot
- TE(Marquee, Inside, NONE), // HTML 3.2
TE(Marquee, Inside, NONE), // IE 4
TE(Marquee, Inside, NONE), // SW
TE(Marquee, Inside, NONE) // Netscape 4
},
{
// controls
- TE(Control, Inside, NONE), // HTML 3.2
TE(Control, Inside, NONE), // IE 4
TE(Control, Inside, NONE), // SW
TE(Control, Inside, NONE) // Netscape 4
},
{
// other character objects
- TE(GraphicFrame, Inside, NONE), // HTML 3.2
TE(GraphicFrame, Inside, NONE), // IE 4
TE(GraphicFrame, Inside, NONE), // SW
TE(GraphicFrame, Inside, NONE) // Netscape 4
commit 622e49a2da8243631e413be9335304c458cec9a5
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Mon Jun 19 07:29:28 2023 +0300
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Mon Jun 19 09:34:13 2023 +0200
Simplify a bit
No other options are possible, as implemented in GetExportMode
Change-Id: I0ed00173d9a7b56bde841831c2964b2572fb1140
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153240
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/sw/source/filter/html/wrthtml.cxx
b/sw/source/filter/html/wrthtml.cxx
index 2229491a1140..9cbbdd5d9d4a 100644
--- a/sw/source/filter/html/wrthtml.cxx
+++ b/sw/source/filter/html/wrthtml.cxx
@@ -398,8 +398,8 @@ ErrCode SwHTMLWriter::WriteStream()
if( HTML_CFG_MSIE == m_nExportMode )
m_nHTMLMode |= HTMLMODE_NBSP_IN_TABLES;
- if( HTML_CFG_WRITER == m_nExportMode || HTML_CFG_NS40 == m_nExportMode ||
HTML_CFG_MSIE == m_nExportMode )
- m_nHTMLMode |= HTMLMODE_ABS_POS_FLY | HTMLMODE_ABS_POS_DRAW;
+ // For all three of HTML_CFG_WRITER, HTML_CFG_NS40, HTML_CFG_MSIE
+ m_nHTMLMode |= HTMLMODE_ABS_POS_FLY | HTMLMODE_ABS_POS_DRAW;
if( HTML_CFG_WRITER == m_nExportMode )
m_nHTMLMode |= HTMLMODE_FLY_MARGINS;
commit 9e4d16d75156bb1080118353a66846b18cf5ba04
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Mon Jun 19 07:26:05 2023 +0300
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Mon Jun 19 09:34:08 2023 +0200
Simplify a bit
No other options are possible, as implemented in GetExportMode
Change-Id: Id64ec1b5bd52f28a100bd2b31cd56c6620bb2cb2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153239
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/svtools/source/config/htmlcfg.cxx
b/svtools/source/config/htmlcfg.cxx
index 983d85e4bf22..473efc9d45dd 100644
--- a/svtools/source/config/htmlcfg.cxx
+++ b/svtools/source/config/htmlcfg.cxx
@@ -60,8 +60,6 @@ sal_uInt16 GetExportMode()
nExpMode = HTML_CFG_WRITER;
break;
case 4:
- nExpMode = HTML_CFG_NS40;
- break;
default:
nExpMode = HTML_CFG_NS40;
break;
@@ -71,17 +69,7 @@ sal_uInt16 GetExportMode()
bool IsPrintLayoutExtension()
{
- bool bRet =
officecfg::Office::Common::Filter::HTML::Export::PrintLayout::get();
- switch (GetExportMode())
- {
- case HTML_CFG_MSIE:
- case HTML_CFG_NS40:
- case HTML_CFG_WRITER:
- break;
- default:
- bRet = false;
- }
- return bRet;
+ return officecfg::Office::Common::Filter::HTML::Export::PrintLayout::get();
}
} // namespace SvxHtmlOptions
commit 404298113071c182a24d74b6acfdd4f739dbe86f
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Mon Jun 19 07:20:13 2023 +0300
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Mon Jun 19 09:34:03 2023 +0200
Mark obsolete options as such
They were removed since commit b7ae1f52ddcc9729e3c078563c5f17e4ee9a00c2
(#97559# HTML export for Netscape 3.0 removed 2002-07-04), and commit
3f43b02433b970cd36ee4c9249e425d6b1bd9fbe (Remove HTML 3.2 export option,
2011-08-26).
Change-Id: Ie05245929bca67ee4ebed66ab1bea25349f62e12
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153238
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index f47edadcae0f..e94a2ce4c9ac 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -4413,7 +4413,7 @@
<constraints>
<enumeration oor:value="0">
<info>
- <desc>Html 3.2</desc>
+ <desc>Obsolete; equivalent to 4</desc>
</info>
</enumeration>
<enumeration oor:value="1">
@@ -4423,7 +4423,7 @@
</enumeration>
<enumeration oor:value="2">
<info>
- <desc>Netscape 3.0</desc>
+ <desc>Obsolete; equivalent to 4</desc>
</info>
</enumeration>
<enumeration oor:value="3">
