diff --git a/compilerplugins/clang/singlevalfields.could-be-bool.results b/compilerplugins/clang/singlevalfields.could-be-bool.results
index a724683a6b2f..9b2fdf51b0f5 100644
--- a/compilerplugins/clang/singlevalfields.could-be-bool.results
+++ b/compilerplugins/clang/singlevalfields.could-be-bool.results
@@ -181,9 +181,6 @@ sd/qa/unit/tiledrendering/tiledrendering.cxx:895
sd/source/filter/html/htmlex.hxx:142
HtmlExport meScript
PublishingScript
-sd/source/filter/html/HtmlOptionsDialog.cxx:54
- (anonymous namespace)::SdHtmlOptionsDialog meDocType
- DocumentType
sd/source/ui/slideshow/slideshowimpl.hxx:304
sd::SlideshowImpl meAnimationMode
AnimationMode
diff --git a/compilerplugins/clang/singlevalfields.results b/compilerplugins/clang/singlevalfields.results
index f625c11ff833..f64d36563bf9 100644
--- a/compilerplugins/clang/singlevalfields.results
+++ b/compilerplugins/clang/singlevalfields.results
@@ -754,9 +754,6 @@ sd/source/filter/html/htmlex.hxx:117
sd/source/ui/inc/CustomAnimationPane.hxx:144
sd::CustomAnimationPane maIdle
sd idle treeview select
-sd/source/ui/inc/pubdlg.hxx:157
- SdPublishingDlg aAssistentFunc
- 6
sd/source/ui/inc/View.hxx:271
sd::View maDropErrorIdle
sd View DropError
diff --git a/compilerplugins/clang/writeonlyvars.cxx b/compilerplugins/clang/writeonlyvars.cxx
index 068d4058e09d..3fb3f769b72d 100644
--- a/compilerplugins/clang/writeonlyvars.cxx
+++ b/compilerplugins/clang/writeonlyvars.cxx
@@ -415,8 +415,6 @@ void WriteOnlyVars::run()
return;
if (loplugin::isSamePathname(fn, SRCDIR "/sd/source/filter/xml/sdxmlwrp.cxx"))
return;
- if (loplugin::isSamePathname(fn, SRCDIR "/sd/source/filter/html/pubdlg.cxx"))
- return;
if (loplugin::isSamePathname(fn, SRCDIR "/sw/source/core/txtnode/thints.cxx"))
return;
if (loplugin::isSamePathname(fn, SRCDIR "/sw/source/core/doc/docbm.cxx"))
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 434b65319776..777d1030d075 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -335,7 +335,6 @@ const ExtensionMap aCalcExtensionMap[] =
const ExtensionMap aImpressExtensionMap[] =
{
{ "fodp", "OpenDocument Presentation Flat XML" },
- { "html", "impress_html_Export" },
{ "odg", "impress8_draw" },
{ "odp", "impress8" },
{ "otp", "impress8_template" },
@@ -355,7 +354,6 @@ const ExtensionMap aImpressExtensionMap[] =
const ExtensionMap aDrawExtensionMap[] =
{
{ "fodg", "draw_ODG_FlatXML" },
- { "html", "draw_html_Export" },
{ "odg", "draw8" },
{ "pdf", "draw_pdf_Export" },
{ "svg", "draw_svg_Export" },
diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk
index bd3d3486234e..921189c4de25 100644
--- a/filter/Configuration_filter.mk
+++ b/filter/Configuration_filter.mk
@@ -764,7 +764,6 @@ $(eval $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_drawgraphics_f
draw_emz_Export \
draw_eps_Export \
draw_gif_Export \
- draw_html_Export \
draw_jpg_Export \
draw_png_Export \
draw_svg_Export \
@@ -809,7 +808,6 @@ $(eval $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_impressgraphic
impress_emf_Export \
impress_eps_Export \
impress_gif_Export \
- impress_html_Export \
impress_jpg_Export \
impress_png_Export \
impress_svg_Export \
diff --git a/filter/source/config/fragments/filters/draw_html_Export.xcu b/filter/source/config/fragments/filters/draw_html_Export.xcu
deleted file mode 100644
index 179c7bb7edc0..000000000000
--- a/filter/source/config/fragments/filters/draw_html_Export.xcu
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
- EXPORT ALIEN
- com.sun.star.comp.draw.SdHtmlOptionsDialog
-
-
- 0
- graphic_HTML
-
- com.sun.star.drawing.DrawingDocument
-
- HTML Document (Draw)
-
-
diff --git a/filter/source/config/fragments/filters/impress_html_Export.xcu b/filter/source/config/fragments/filters/impress_html_Export.xcu
deleted file mode 100644
index 65a5c5dadf78..000000000000
--- a/filter/source/config/fragments/filters/impress_html_Export.xcu
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
- EXPORT ALIEN
- com.sun.star.comp.draw.SdHtmlOptionsDialog
-
-
- 0
- graphic_HTML
-
- com.sun.star.presentation.PresentationDocument
-
- HTML Document (Impress)
-
-
diff --git a/icon-themes/colibre/sd/res/pubdes.png b/icon-themes/colibre/sd/res/pubdes.png
deleted file mode 100644
index 82ded6f8b3af..000000000000
Binary files a/icon-themes/colibre/sd/res/pubdes.png and /dev/null differ
diff --git a/icon-themes/colibre/sd/res/pubdes2.png b/icon-themes/colibre/sd/res/pubdes2.png
deleted file mode 100644
index e797a25674b3..000000000000
Binary files a/icon-themes/colibre/sd/res/pubdes2.png and /dev/null differ
diff --git a/icon-themes/colibre/sd/res/pubdes3.png b/icon-themes/colibre/sd/res/pubdes3.png
deleted file mode 100644
index 4070e587bd4c..000000000000
Binary files a/icon-themes/colibre/sd/res/pubdes3.png and /dev/null differ
diff --git a/icon-themes/colibre/sd/res/pubdes4.png b/icon-themes/colibre/sd/res/pubdes4.png
deleted file mode 100644
index 9c0bbbfdc314..000000000000
Binary files a/icon-themes/colibre/sd/res/pubdes4.png and /dev/null differ
diff --git a/icon-themes/colibre_dark/sd/res/pubdes.png b/icon-themes/colibre_dark/sd/res/pubdes.png
deleted file mode 100644
index f414ab5a6e30..000000000000
Binary files a/icon-themes/colibre_dark/sd/res/pubdes.png and /dev/null differ
diff --git a/icon-themes/colibre_dark/sd/res/pubdes2.png b/icon-themes/colibre_dark/sd/res/pubdes2.png
deleted file mode 100644
index 8c25a49ddb08..000000000000
Binary files a/icon-themes/colibre_dark/sd/res/pubdes2.png and /dev/null differ
diff --git a/icon-themes/colibre_dark/sd/res/pubdes3.png b/icon-themes/colibre_dark/sd/res/pubdes3.png
deleted file mode 100644
index 096fea100332..000000000000
Binary files a/icon-themes/colibre_dark/sd/res/pubdes3.png and /dev/null differ
diff --git a/icon-themes/colibre_dark/sd/res/pubdes4.png b/icon-themes/colibre_dark/sd/res/pubdes4.png
deleted file mode 100644
index 7a10ff30c3ff..000000000000
Binary files a/icon-themes/colibre_dark/sd/res/pubdes4.png and /dev/null differ
diff --git a/icon-themes/colibre_dark_svg/sd/res/pubdes.svg b/icon-themes/colibre_dark_svg/sd/res/pubdes.svg
deleted file mode 100644
index 5409042ad4a1..000000000000
--- a/icon-themes/colibre_dark_svg/sd/res/pubdes.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/icon-themes/colibre_dark_svg/sd/res/pubdes2.svg b/icon-themes/colibre_dark_svg/sd/res/pubdes2.svg
deleted file mode 100644
index fc7c230b3b8d..000000000000
--- a/icon-themes/colibre_dark_svg/sd/res/pubdes2.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/icon-themes/colibre_dark_svg/sd/res/pubdes3.svg b/icon-themes/colibre_dark_svg/sd/res/pubdes3.svg
deleted file mode 100644
index bd21496c11b5..000000000000
--- a/icon-themes/colibre_dark_svg/sd/res/pubdes3.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/icon-themes/colibre_dark_svg/sd/res/pubdes4.svg b/icon-themes/colibre_dark_svg/sd/res/pubdes4.svg
deleted file mode 100644
index 049dbfda8354..000000000000
--- a/icon-themes/colibre_dark_svg/sd/res/pubdes4.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/icon-themes/colibre_svg/sd/res/pubdes.svg b/icon-themes/colibre_svg/sd/res/pubdes.svg
deleted file mode 100644
index 691c3ee9f310..000000000000
--- a/icon-themes/colibre_svg/sd/res/pubdes.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/icon-themes/colibre_svg/sd/res/pubdes2.svg b/icon-themes/colibre_svg/sd/res/pubdes2.svg
deleted file mode 100644
index 8f1c9861a264..000000000000
--- a/icon-themes/colibre_svg/sd/res/pubdes2.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/icon-themes/colibre_svg/sd/res/pubdes3.svg b/icon-themes/colibre_svg/sd/res/pubdes3.svg
deleted file mode 100644
index 169f09d240f4..000000000000
--- a/icon-themes/colibre_svg/sd/res/pubdes3.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/icon-themes/colibre_svg/sd/res/pubdes4.svg b/icon-themes/colibre_svg/sd/res/pubdes4.svg
deleted file mode 100644
index 670d3d66761c..000000000000
--- a/icon-themes/colibre_svg/sd/res/pubdes4.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/icon-themes/karasa_jaga/sd/res/pubdes.png b/icon-themes/karasa_jaga/sd/res/pubdes.png
deleted file mode 100644
index 7a37ca7e11e9..000000000000
Binary files a/icon-themes/karasa_jaga/sd/res/pubdes.png and /dev/null differ
diff --git a/icon-themes/karasa_jaga/sd/res/pubdes2.png b/icon-themes/karasa_jaga/sd/res/pubdes2.png
deleted file mode 100644
index c585fa8edc17..000000000000
Binary files a/icon-themes/karasa_jaga/sd/res/pubdes2.png and /dev/null differ
diff --git a/icon-themes/karasa_jaga/sd/res/pubdes3.png b/icon-themes/karasa_jaga/sd/res/pubdes3.png
deleted file mode 100644
index 964568383c88..000000000000
Binary files a/icon-themes/karasa_jaga/sd/res/pubdes3.png and /dev/null differ
diff --git a/icon-themes/karasa_jaga/sd/res/pubdes4.png b/icon-themes/karasa_jaga/sd/res/pubdes4.png
deleted file mode 100644
index f56ff35ecd39..000000000000
Binary files a/icon-themes/karasa_jaga/sd/res/pubdes4.png and /dev/null differ
diff --git a/officecfg/registry/data/org/openoffice/TypeDetection/UISort.xcu b/officecfg/registry/data/org/openoffice/TypeDetection/UISort.xcu
index 5dcce7b1e688..3dc6272ab7b2 100644
--- a/officecfg/registry/data/org/openoffice/TypeDetection/UISort.xcu
+++ b/officecfg/registry/data/org/openoffice/TypeDetection/UISort.xcu
@@ -26,7 +26,7 @@
- draw8;draw8_template;StarOffice XML (Draw);draw_StarOffice_XML_Draw_Template;OpenDocument Drawing Flat XML;draw_html_Export;draw_pdf_Export;draw_flash_Export;WordPerfect Graphics;DXF - AutoCAD Interchange;EMF - MS Windows Metafile;EPS - Encapsulated PostScript;MET - OS/2 Metafile;PCT - Mac Pict;SVM - StarView Metafile;WMF - MS Windows Metafile
+ draw8;draw8_template;StarOffice XML (Draw);draw_StarOffice_XML_Draw_Template;OpenDocument Drawing Flat XML;draw_pdf_Export;draw_flash_Export;WordPerfect Graphics;DXF - AutoCAD Interchange;EMF - MS Windows Metafile;EPS - Encapsulated PostScript;MET - OS/2 Metafile;PCT - Mac Pict;SVM - StarView Metafile;WMF - MS Windows Metafile
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index 3d20e14f0ddd..e042b17edfb2 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -200,10 +200,7 @@ $(eval $(call gb_Library_add_exception_objects,sd,\
sd/source/filter/ppt/pptinanimations \
sd/source/filter/ppt/propread \
sd/source/filter/grf/sdgrffilter \
- sd/source/filter/html/HtmlOptionsDialog \
sd/source/filter/html/buttonset \
- sd/source/filter/html/htmlex \
- sd/source/filter/html/sdhtmlfilter \
sd/source/filter/pdf/sdpdffilter \
sd/source/filter/sdfilter \
sd/source/filter/sdpptwrp \
diff --git a/sd/Library_sdui.mk b/sd/Library_sdui.mk
index 247942273104..a59d2eed9041 100644
--- a/sd/Library_sdui.mk
+++ b/sd/Library_sdui.mk
@@ -67,7 +67,6 @@ $(eval $(call gb_Library_use_libraries,sdui,\
$(eval $(call gb_Library_add_exception_objects,sdui,\
sd/source/filter/html/htmlattr \
- sd/source/filter/html/pubdlg \
sd/source/ui/dlg/brkdlg \
sd/source/ui/dlg/copydlg \
sd/source/ui/dlg/custsdlg \
diff --git a/sd/Module_sd.mk b/sd/Module_sd.mk
index 766e5460c90a..9c3ec45adbfe 100644
--- a/sd/Module_sd.mk
+++ b/sd/Module_sd.mk
@@ -17,7 +17,6 @@ $(eval $(call gb_Module_add_targets,sd,\
Library_sdd \
Library_sdui \
Package_opengl \
- Package_web \
Package_xml \
UIConfig_sdraw \
UIConfig_simpress \
diff --git a/sd/Package_web.mk b/sd/Package_web.mk
deleted file mode 100644
index 1c7c6b80a537..000000000000
--- a/sd/Package_web.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,sd_web,$(SRCDIR)/sd/res))
-
-$(eval $(call gb_Package_add_files,sd_web,$(LIBO_SHARE_FOLDER)/config/webcast,\
- webview/common.inc \
- webview/common.pl \
- webview/edit.asp \
- webview/editpic.asp \
- webview/editpic.pl \
- webview/edit.pl \
- webview/index.pl \
- webview/poll.asp \
- webview/poll.pl \
- webview/savepic.asp \
- webview/savepic.pl \
- webview/show.asp \
- webview/show.pl \
- webview/webcast.asp \
- webview/webcast.pl \
-))
-
-$(eval $(call gb_Package_add_files,sd_web,$(LIBO_SHARE_FOLDER)/config/wizard/web/buttons,\
- buttons/elementary.zip \
- buttons/sukapura.zip \
- buttons/round-white.zip \
- buttons/simple.zip \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/sd/UIConfig_simpress.mk b/sd/UIConfig_simpress.mk
index ab6b2875e7bc..5bd443ca374d 100644
--- a/sd/UIConfig_simpress.mk
+++ b/sd/UIConfig_simpress.mk
@@ -158,7 +158,6 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/simpress,\
sd/uiconfig/simpress/ui/pmsummarypage \
sd/uiconfig/simpress/ui/presentationdialog \
sd/uiconfig/simpress/ui/prntopts \
- sd/uiconfig/simpress/ui/publishingdialog \
sd/uiconfig/simpress/ui/remotedialog \
sd/uiconfig/simpress/ui/rotatemenu \
sd/uiconfig/simpress/ui/scalemenu \
diff --git a/sd/inc/sdabstdlg.hxx b/sd/inc/sdabstdlg.hxx
index 8dbdf363f320..594602af2589 100644
--- a/sd/inc/sdabstdlg.hxx
+++ b/sd/inc/sdabstdlg.hxx
@@ -147,14 +147,6 @@ public:
virtual const GDIMetaFile& GetGDIMetaFile() const = 0;
};
-class AbstractSdPublishingDlg : public VclAbstractDialog
-{
-protected:
- virtual ~AbstractSdPublishingDlg() override = default;
-public:
- virtual void GetParameterSequence( css::uno::Sequence< css::beans::PropertyValue >& rParams ) = 0;
-};
-
class AbstractHeaderFooterDialog : public VclAbstractDialog
{
protected:
@@ -187,7 +179,6 @@ public:
virtual VclPtr CreateSdTabTemplateDlg(weld::Window* pParent, const SfxObjectShell* pDocShell, SfxStyleSheetBase& rStyleBase, SdrModel* pModel, SdrView* pView) = 0;
virtual VclPtr CreatSdActionDialog(weld::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView) = 0;
virtual VclPtr CreateSdVectorizeDlg(weld::Window* pParent, const Bitmap& rBmp, ::sd::DrawDocShell* pDocShell) = 0;
- virtual VclPtr CreateSdPublishingDlg(weld::Window* pWindow, DocumentType eDocType) = 0;
virtual VclPtr CreateMasterLayoutDialog(weld::Window* pParent, SdDrawDocument* pDoc, SdPage*) = 0;
diff --git a/sd/inc/sdhtmlfilter.hxx b/sd/inc/sdhtmlfilter.hxx
deleted file mode 100644
index 84b9c5d48e0f..000000000000
--- a/sd/inc/sdhtmlfilter.hxx
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#pragma once
-
-#include "sdfilter.hxx"
-
-// SdHTMLFilter
-class SdHTMLFilter final : public SdFilter
-{
-public:
- SdHTMLFilter(SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell);
- virtual ~SdHTMLFilter() override;
-
- virtual bool Export() override;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/qa/unit/HtmlExportTest.cxx b/sd/qa/unit/HtmlExportTest.cxx
index 93c1a21339d1..be7884d51156 100644
--- a/sd/qa/unit/HtmlExportTest.cxx
+++ b/sd/qa/unit/HtmlExportTest.cxx
@@ -12,34 +12,14 @@
using namespace css;
-class SdHTMLFilterTest : public UnoApiXmlTest, public HtmlTestTools
+class SdXHTMLFilterTest : public UnoApiXmlTest, public HtmlTestTools
{
public:
- SdHTMLFilterTest()
+ SdXHTMLFilterTest()
: UnoApiXmlTest("/sd/qa/unit/data/")
{
}
- void testHTMLExport()
- {
- loadFromURL(u"HtmlExportTestDocument.odp");
- save("impress_html_Export");
- htmlDocUniquePtr htmlDoc = parseHtml(maTempFile);
-
- assertXPath(htmlDoc, "/html", 1);
- assertXPath(htmlDoc, "/html/body", 1);
- assertXPath(htmlDoc, "/html/body/h1", 4);
- assertXPath(htmlDoc, "/html/body/table", 1);
- assertXPath(htmlDoc, "/html/body/table/tr", 5);
- assertXPath(htmlDoc, "/html/body/ul", 1);
- assertXPath(htmlDoc, "/html/body/ul/li", 2);
-
- assertXPath(htmlDoc, "/html/head/meta[1]", "content", "text/html; charset=utf-8");
- assertXPath(htmlDoc, "/html/head/meta[2]", "name", "generator");
- assertXPath(htmlDoc, "/html/head/meta[3]", "name", "created");
- assertXPath(htmlDoc, "/html/head/meta[3]", "content", "2014-04-09T17:05:41.987922038");
- }
-
void testTdf154989()
{
loadFromURL(u"tdf154989.odg");
@@ -63,13 +43,12 @@ public:
pXmlDoc, "/xhtml:html/xhtml:body/xhtml:div[1]/xhtml:div[4]/xhtml:div/xhtml:p", "below");
}
- CPPUNIT_TEST_SUITE(SdHTMLFilterTest);
- CPPUNIT_TEST(testHTMLExport);
+ CPPUNIT_TEST_SUITE(SdXHTMLFilterTest);
CPPUNIT_TEST(testTdf154989);
CPPUNIT_TEST_SUITE_END();
};
-CPPUNIT_TEST_SUITE_REGISTRATION(SdHTMLFilterTest);
+CPPUNIT_TEST_SUITE_REGISTRATION(SdXHTMLFilterTest);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sd/qa/unit/data/dialogs-test.txt b/sd/qa/unit/data/dialogs-test.txt
index b3585b8e925a..33004038c71f 100644
--- a/sd/qa/unit/data/dialogs-test.txt
+++ b/sd/qa/unit/data/dialogs-test.txt
@@ -36,7 +36,6 @@ modules/sdraw/ui/drawparadialog.ui
modules/sdraw/ui/drawprtldialog.ui
modules/sdraw/ui/vectorize.ui
-modules/simpress/ui/publishingdialog.ui
modules/simpress/ui/customslideshows.ui
modules/simpress/ui/dlgfield.ui
modules/simpress/ui/presentationdialog.ui
diff --git a/sd/qa/unit/dialogs-test.cxx b/sd/qa/unit/dialogs-test.cxx
index 30cb95941b11..6cb34354b84c 100644
--- a/sd/qa/unit/dialogs-test.cxx
+++ b/sd/qa/unit/dialogs-test.cxx
@@ -209,29 +209,28 @@ const SfxItemSet& SdDialogsTest::getEmptyFillStyleSfxItemSet()
void SdDialogsTest::registerKnownDialogsByID(mapType& rKnownDialogs)
{
// fill map of known dialogs
- rKnownDialogs["modules/simpress/ui/publishingdialog.ui"] = 0;
- rKnownDialogs["modules/sdraw/ui/breakdialog.ui"] = 1;
- rKnownDialogs["modules/sdraw/ui/copydlg.ui"] = 2;
- rKnownDialogs["modules/simpress/ui/customslideshows.ui"] = 3;
- rKnownDialogs["modules/sdraw/ui/drawchardialog.ui"] = 4;
- rKnownDialogs["modules/sdraw/ui/drawpagedialog.ui"] = 5;
- rKnownDialogs["modules/simpress/ui/dlgfield.ui"] = 6;
- rKnownDialogs["modules/sdraw/ui/dlgsnap.ui"] = 7;
- rKnownDialogs["modules/sdraw/ui/insertlayer.ui"] = 8;
- rKnownDialogs["modules/sdraw/ui/insertslidesdialog.ui"] = 9;
- rKnownDialogs["modules/sdraw/ui/crossfadedialog.ui"] = 10;
- rKnownDialogs["modules/sdraw/ui/bulletsandnumbering.ui"] = 11;
- rKnownDialogs["modules/sdraw/ui/drawparadialog.ui"] = 12;
- rKnownDialogs["modules/simpress/ui/presentationdialog.ui"] = 13;
- rKnownDialogs["modules/simpress/ui/remotedialog.ui"] = 14;
- rKnownDialogs["modules/sdraw/ui/drawprtldialog.ui"] = 15;
- rKnownDialogs["modules/simpress/ui/slidedesigndialog.ui"] = 16;
- rKnownDialogs["modules/simpress/ui/templatedialog.ui"] = 17;
- rKnownDialogs["modules/simpress/ui/interactiondialog.ui"] = 18;
- rKnownDialogs["modules/sdraw/ui/vectorize.ui"] = 19;
- rKnownDialogs["modules/simpress/ui/photoalbum.ui"] = 20;
- rKnownDialogs["modules/simpress/ui/masterlayoutdlg.ui"] = 21;
- rKnownDialogs["modules/simpress/ui/headerfooterdialog.ui"] = 22;
+ rKnownDialogs["modules/sdraw/ui/breakdialog.ui"] = 0;
+ rKnownDialogs["modules/sdraw/ui/copydlg.ui"] = 1;
+ rKnownDialogs["modules/simpress/ui/customslideshows.ui"] = 2;
+ rKnownDialogs["modules/sdraw/ui/drawchardialog.ui"] = 3;
+ rKnownDialogs["modules/sdraw/ui/drawpagedialog.ui"] = 4;
+ rKnownDialogs["modules/simpress/ui/dlgfield.ui"] = 5;
+ rKnownDialogs["modules/sdraw/ui/dlgsnap.ui"] = 6;
+ rKnownDialogs["modules/sdraw/ui/insertlayer.ui"] = 7;
+ rKnownDialogs["modules/sdraw/ui/insertslidesdialog.ui"] = 8;
+ rKnownDialogs["modules/sdraw/ui/crossfadedialog.ui"] = 9;
+ rKnownDialogs["modules/sdraw/ui/bulletsandnumbering.ui"] = 10;
+ rKnownDialogs["modules/sdraw/ui/drawparadialog.ui"] = 11;
+ rKnownDialogs["modules/simpress/ui/presentationdialog.ui"] = 12;
+ rKnownDialogs["modules/simpress/ui/remotedialog.ui"] = 13;
+ rKnownDialogs["modules/sdraw/ui/drawprtldialog.ui"] = 14;
+ rKnownDialogs["modules/simpress/ui/slidedesigndialog.ui"] = 15;
+ rKnownDialogs["modules/simpress/ui/templatedialog.ui"] = 16;
+ rKnownDialogs["modules/simpress/ui/interactiondialog.ui"] = 17;
+ rKnownDialogs["modules/sdraw/ui/vectorize.ui"] = 18;
+ rKnownDialogs["modules/simpress/ui/photoalbum.ui"] = 19;
+ rKnownDialogs["modules/simpress/ui/masterlayoutdlg.ui"] = 20;
+ rKnownDialogs["modules/simpress/ui/headerfooterdialog.ui"] = 21;
}
VclPtr SdDialogsTest::createDialogByID(sal_uInt32 nID)
@@ -243,18 +242,6 @@ VclPtr SdDialogsTest::createDialogByID(sal_uInt32 nID)
switch (nID)
{
case 0:
- {
- // CreateSdPublishingDlg(vcl::Window* pWindow, DocumentType eDocType) override;
- // this dialog does not need much, not even a SdDrawDocument. OTOH
- // it is more a 'wizard' in that it has prev/next buttons and implicitly
- // multiple pages. To make use of that it is necessary that the implementation
- // supports the 'Screenshot interface'
- pRetval = getSdAbstractDialogFactory()->CreateSdPublishingDlg(
- Application::GetDefDialogParent(),
- DocumentType::Impress);
- break;
- }
- case 1:
{
// CreateBreakDlg(weld::Window* pWindow, ::sd::DrawView* pDrView, ::sd::DrawDocShell* pShell, sal_uLong nSumActionCount, sal_uLong nObjCount) override;
// this dialog requires pDrawView. It does not show much when
@@ -269,7 +256,7 @@ VclPtr SdDialogsTest::createDialogByID(sal_uInt32 nID)
0);
break;
}
- case 2:
+ case 1:
{
// needs an SfxItemSet, use the one from the 1st object
pRetval = getSdAbstractDialogFactory()->CreateCopyDlg(
@@ -278,7 +265,7 @@ VclPtr SdDialogsTest::createDialogByID(sal_uInt32 nID)
getDrawView());
break;
}
- case 3:
+ case 2:
{
// CreateSdCustomShowDlg(SdDrawDocument& rDrawDoc) = 0;
SdDrawDocument* pDrawDoc = getSdXImpressDocument()->GetDoc();
@@ -288,7 +275,7 @@ VclPtr SdDialogsTest::createDialogByID(sal_uInt32 nID)
getViewShell()->GetFrameWeld(), *pDrawDoc);
break;
}
- case 4:
+ case 3:
{
// CreateSdTabCharDialog(const SfxItemSet* pAttr, SfxObjectShell* pDocShell) override;
// needs an SfxItemSet, use an empty constructed one
@@ -299,7 +286,7 @@ VclPtr SdDialogsTest::createDialogByID(sal_uInt32 nID)
getDocShell());
break;
}
- case 5:
+ case 4:
{
// CreateSdTabPageDialog(const SfxItemSet* pAttr, SfxObjectShell* pDocShell, bool bAreaPage = true, bool bIsImpressDoc) override;
// needs a special SfxItemSet with merged content from page and other stuff, crashes without that (2nd page)
@@ -311,7 +298,7 @@ VclPtr SdDialogsTest::createDialogByID(sal_uInt32 nID)
true, /*bIsImpressDoc=*/false);
break;
}
- case 6:
+ case 5:
{
// CreateSdModifyFieldDlg(weld::Window* pWindow, const SvxFieldData* pInField, const SfxItemSet& rSet) override;
pRetval = getSdAbstractDialogFactory()->CreateSdModifyFieldDlg(
@@ -320,7 +307,7 @@ VclPtr SdDialogsTest::createDialogByID(sal_uInt32 nID)
getEmptySfxItemSet());
break;
}
- case 7:
+ case 6:
{
// CreateSdSnapLineDlg(const SfxItemSet& rInAttrs, ::sd::View* pView) override;
SdDrawDocument* pDrawDoc = getSdXImpressDocument()->GetDoc();
@@ -334,7 +321,7 @@ VclPtr SdDialogsTest::createDialogByID(sal_uInt32 nID)
getDrawView());
break;
}
- case 8:
+ case 7:
{
// CreateSdInsertLayerDlg(const SfxItemSet& rInAttrs, bool bDeletable, const OUString& aStr) override;
SdDrawDocument* pDrawDoc = getSdXImpressDocument()->GetDoc();
@@ -355,7 +342,7 @@ VclPtr SdDialogsTest::createDialogByID(sal_uInt32 nID)
SdResId(STR_INSERTLAYER) /* alternative: STR_MODIFYLAYER */);
break;
}
- case 9:
+ case 8:
{
// CreateSdInsertPagesObjsDlg(const SdDrawDocument* pDoc, SfxMedium* pSfxMedium, const OUString& rFileName) override;
SdDrawDocument* pDrawDoc = getSdXImpressDocument()->GetDoc();
@@ -367,7 +354,7 @@ VclPtr SdDialogsTest::createDialogByID(sal_uInt32 nID)
"foo");
break;
}
- case 10:
+ case 9:
{
// CreateMorphDlg(weld::Window* pParent, const SdrObject* pObj1, const SdrObject* pObj2) override;
SdDrawDocument* pDrawDoc = getSdXImpressDocument()->GetDoc();
@@ -383,7 +370,7 @@ VclPtr SdDialogsTest::createDialogByID(sal_uInt32 nID)
pSdrObj);
break;
}
- case 11:
+ case 10:
{
// CreateSdOutlineBulletTabDlg(const SfxItemSet* pAttr, ::sd::View* pView = nullptr) override;
pRetval = getSdAbstractDialogFactory()->CreateSdOutlineBulletTabDlg(
@@ -392,7 +379,7 @@ VclPtr SdDialogsTest::createDialogByID(sal_uInt32 nID)
getDrawView());
break;
}
- case 12:
+ case 11:
{
// CreateSdParagraphTabDlg(const SfxItemSet* pAttr) override;
pRetval = getSdAbstractDialogFactory()->CreateSdParagraphTabDlg(
@@ -400,7 +387,7 @@ VclPtr SdDialogsTest::createDialogByID(sal_uInt32 nID)
&getEmptySfxItemSet());
break;
}
- case 13:
+ case 12:
{
// CreateSdStartPresentationDlg(weld::Window* pWindow, const SfxItemSet& rInAttrs, const std::vector &rPageNames, SdCustomShowList* pCSList) override;
SdDrawDocument* pDrawDoc = getSdXImpressDocument()->GetDoc();
@@ -430,14 +417,14 @@ VclPtr SdDialogsTest::createDialogByID(sal_uInt32 nID)
nullptr);
break;
}
- case 14:
+ case 13:
{
// CreateRemoteDialog(vcl::Window* pWindow) override; // ad for RemoteDialog
pRetval = getSdAbstractDialogFactory()->CreateRemoteDialog(
Application::GetDefDialogParent());
break;
}
- case 15:
+ case 14:
{
// CreateSdPresLayoutTemplateDlg(SfxObjectShell* pDocSh, weld::Window* pParent, const SdResId& DlgId, SfxStyleSheetBase& rStyleBase, PresentationObjects ePO, SfxStyleSheetBasePool* pSSPool) override;
// use STR_PSEUDOSHEET_TITLE configuration, see futempl.cxx for more possible configurations
@@ -455,7 +442,7 @@ VclPtr SdDialogsTest::createDialogByID(sal_uInt32 nID)
pStyleSheetPool);
break;
}
- case 16:
+ case 15:
{
// CreateSdPresLayoutDlg(::sd::DrawDocShell* pDocShell, vcl::Window* pWindow, const SfxItemSet& rInAttrs) override;
pRetval = getSdAbstractDialogFactory()->CreateSdPresLayoutDlg(
@@ -464,7 +451,7 @@ VclPtr SdDialogsTest::createDialogByID(sal_uInt32 nID)
getEmptySfxItemSet());
break;
}
- case 17:
+ case 16:
{
// CreateSdTabTemplateDlg(const SfxObjectShell* pDocShell, SfxStyleSheetBase& rStyleBase, SdrModel* pModel, SdrView* pView) override;
// pretty similar to CreateSdPresLayoutTemplateDlg, see above
@@ -483,7 +470,7 @@ VclPtr SdDialogsTest::createDialogByID(sal_uInt32 nID)
getDrawView());
break;
}
- case 18:
+ case 17:
{
// CreatSdActionDialog(const SfxItemSet* pAttr, ::sd::View* pView) override;
SdDrawDocument* pDrawDoc = getSdXImpressDocument()->GetDoc();
@@ -511,7 +498,7 @@ VclPtr SdDialogsTest::createDialogByID(sal_uInt32 nID)
getDrawView());
break;
}
- case 19:
+ case 18:
{
// CreateSdVectorizeDlg(weld::Window* pParent, const Bitmap& rBmp, ::sd::DrawDocShell* pDocShell) override;
// works well with empty Bitmap, but my be nicer with setting one
@@ -522,7 +509,7 @@ VclPtr SdDialogsTest::createDialogByID(sal_uInt32 nID)
getDocShell());
break;
}
- case 20:
+ case 19:
{
// CreateSdPhotoAlbumDialog(weld::Window* pWindow, SdDrawDocument* pDoc) override;
SdDrawDocument* pDrawDoc = getSdXImpressDocument()->GetDoc();
@@ -532,7 +519,7 @@ VclPtr SdDialogsTest::createDialogByID(sal_uInt32 nID)
pDrawDoc);
break;
}
- case 21:
+ case 20:
{
// CreateMasterLayoutDialog(weld::Window* pParent, SdDrawDocument* pDoc, SdPage*) override;
SdDrawDocument* pDrawDoc = getSdXImpressDocument()->GetDoc();
@@ -545,7 +532,7 @@ VclPtr SdDialogsTest::createDialogByID(sal_uInt32 nID)
pSdPage);
break;
}
- case 22:
+ case 21:
{
// CreateHeaderFooterDialog(sd::ViewShell* pViewShell, weld::Window* pParent, SdDrawDocument* pDoc, SdPage* pCurrentPage) override;
// This is a hard case, for two reasons:
diff --git a/sd/res/buttons/elementary.zip b/sd/res/buttons/elementary.zip
deleted file mode 100644
index 3bb99b9c77b9..000000000000
Binary files a/sd/res/buttons/elementary.zip and /dev/null differ
diff --git a/sd/res/buttons/round-white.zip b/sd/res/buttons/round-white.zip
deleted file mode 100644
index 9c5f1b2aaa3e..000000000000
Binary files a/sd/res/buttons/round-white.zip and /dev/null differ
diff --git a/sd/res/buttons/simple.zip b/sd/res/buttons/simple.zip
deleted file mode 100644
index 60c0b095702a..000000000000
Binary files a/sd/res/buttons/simple.zip and /dev/null differ
diff --git a/sd/res/buttons/sukapura.zip b/sd/res/buttons/sukapura.zip
deleted file mode 100644
index 80cccc6bc122..000000000000
Binary files a/sd/res/buttons/sukapura.zip and /dev/null differ
diff --git a/sd/source/filter/html/HtmlOptionsDialog.cxx b/sd/source/filter/html/HtmlOptionsDialog.cxx
deleted file mode 100644
index 52d50472d9b1..000000000000
--- a/sd/source/filter/html/HtmlOptionsDialog.cxx
+++ /dev/null
@@ -1,203 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-
-using namespace com::sun::star::uno;
-using namespace com::sun::star::lang;
-using namespace com::sun::star::document;
-using namespace com::sun::star::beans;
-using namespace com::sun::star::ui::dialogs;
-
-namespace {
-
-class SdHtmlOptionsDialog : public cppu::WeakImplHelper
-<
- XExporter,
- XExecutableDialog,
- XPropertyAccess,
- XInitialization,
- XServiceInfo
->
-{
- Sequence< PropertyValue > maMediaDescriptor;
- Sequence< PropertyValue > maFilterDataSequence;
- DocumentType meDocType;
-
-public:
-
- SdHtmlOptionsDialog();
-
- // XInterface
- virtual void SAL_CALL acquire() noexcept override;
- virtual void SAL_CALL release() noexcept override;
-
- // XInitialization
- virtual void SAL_CALL initialize( const Sequence< Any > & aArguments ) override;
-
- // XServiceInfo
- virtual OUString SAL_CALL getImplementationName() override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
- virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
-
- // XPropertyAccess
- virtual Sequence< PropertyValue > SAL_CALL getPropertyValues() override;
- virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< css::beans::PropertyValue > & aProps ) override;
-
- // XExecuteDialog
- virtual sal_Int16 SAL_CALL execute() override;
- virtual void SAL_CALL setTitle( const OUString& aTitle ) override;
-
- // XExporter
- virtual void SAL_CALL setSourceDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) override;
-
-};
-
-}
-
-SdHtmlOptionsDialog::SdHtmlOptionsDialog() :
- meDocType ( DocumentType::Draw )
-{
-}
-
-void SAL_CALL SdHtmlOptionsDialog::acquire() noexcept
-{
- OWeakObject::acquire();
-}
-
-void SAL_CALL SdHtmlOptionsDialog::release() noexcept
-{
- OWeakObject::release();
-}
-
-// XInitialization
-void SAL_CALL SdHtmlOptionsDialog::initialize( const Sequence< Any > & )
-{
-}
-
-// XServiceInfo
-OUString SAL_CALL SdHtmlOptionsDialog::getImplementationName()
-{
- return "com.sun.star.comp.draw.SdHtmlOptionsDialog";
-}
-
-sal_Bool SAL_CALL SdHtmlOptionsDialog::supportsService( const OUString& rServiceName )
-{
- return cppu::supportsService(this, rServiceName);
-}
-
-Sequence< OUString > SAL_CALL SdHtmlOptionsDialog::getSupportedServiceNames()
-{
- return { "com.sun.star.ui.dialog.FilterOptionsDialog" };
-}
-
-// XPropertyAccess
-Sequence< PropertyValue > SdHtmlOptionsDialog::getPropertyValues()
-{
- auto pProp = std::find_if(std::cbegin(maMediaDescriptor), std::cend(maMediaDescriptor),
- [](const PropertyValue& rProp) { return rProp.Name == "FilterData"; });
- auto i = static_cast(std::distance(std::cbegin(maMediaDescriptor), pProp));
- sal_Int32 nCount = maMediaDescriptor.getLength();
- if ( i == nCount )
- maMediaDescriptor.realloc( ++nCount );
-
- // the "FilterData" Property is an Any that will contain our PropertySequence of Values
- auto& el = maMediaDescriptor.getArray()[ i ];
- el.Name = "FilterData";
- el.Value <<= maFilterDataSequence;
- return maMediaDescriptor;
-}
-
-void SdHtmlOptionsDialog::setPropertyValues( const Sequence< PropertyValue > & aProps )
-{
- maMediaDescriptor = aProps;
-
- auto pProp = std::find_if(std::cbegin(maMediaDescriptor), std::cend(maMediaDescriptor),
- [](const PropertyValue& rProp) { return rProp.Name == "FilterData"; });
- if (pProp != std::cend(maMediaDescriptor))
- pProp->Value >>= maFilterDataSequence;
-}
-
-// XExecutableDialog
-void SdHtmlOptionsDialog::setTitle( const OUString& )
-{
-}
-
-sal_Int16 SdHtmlOptionsDialog::execute()
-{
- sal_Int16 nRet = ExecutableDialogResults::CANCEL;
-
- SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
- ScopedVclPtr pDlg(pFact->CreateSdPublishingDlg(nullptr /*TODO*/, meDocType));
- if( pDlg->Execute() )
- {
- pDlg->GetParameterSequence( maFilterDataSequence );
- nRet = ExecutableDialogResults::OK;
- }
- else
- {
- nRet = ExecutableDialogResults::CANCEL;
- }
- return nRet;
-}
-
-// XEmporter
-void SdHtmlOptionsDialog::setSourceDocument( const Reference< XComponent >& xDoc )
-{
- // try to set the corresponding metric unit
- Reference< XServiceInfo > xServiceInfo(xDoc, UNO_QUERY);
- if ( xServiceInfo.is() )
- {
- if ( xServiceInfo->supportsService( "com.sun.star.presentation.PresentationDocument" ) )
- {
- meDocType = DocumentType::Impress;
- return;
- }
- else if ( xServiceInfo->supportsService( "com.sun.star.drawing.DrawingDocument" ) )
- {
- meDocType = DocumentType::Draw;
- return;
- }
- }
- throw IllegalArgumentException();
-}
-
-
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
-com_sun_star_comp_draw_SdHtmlOptionsDialog_get_implementation(css::uno::XComponentContext*,
- css::uno::Sequence const &)
-{
- return cppu::acquire(new SdHtmlOptionsDialog());
-}
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
deleted file mode 100644
index c3f1625dad59..000000000000
--- a/sd/source/filter/html/htmlex.cxx
+++ /dev/null
@@ -1,3176 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "htmlex.hxx"
-#include
-#include
-#include
-#include
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-#include
-#include
-#include "htmlpublishmode.hxx"
-#include
-#include
-#include
-#include
-#include
-#include
-#include "buttonset.hxx"
-
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::frame;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::document;
-
-using namespace sdr::table;
-
-// get parameter from Itemset
-#define RESTOHTML( res ) StringToHTMLString(SdResId(res))
-
-const char * const pButtonNames[] =
-{
- "first-inactive.png",
- "first.png",
- "left-inactive.png",
- "left.png",
- "right-inactive.png",
- "right.png",
- "last-inactive.png",
- "last.png",
- "home.png",
- "text.png",
- "expand.png",
- "collapse.png",
-};
-
-#define BTN_FIRST_0 0
-#define BTN_FIRST_1 1
-#define BTN_PREV_0 2
-#define BTN_PREV_1 3
-#define BTN_NEXT_0 4
-#define BTN_NEXT_1 5
-#define BTN_LAST_0 6
-#define BTN_LAST_1 7
-#define BTN_INDEX 8
-#define BTN_TEXT 9
-#define BTN_MORE 10
-#define BTN_LESS 11
-
-namespace {
-
-// Helper class for the simple creation of files local/remote
-class EasyFile
-{
-private:
- std::unique_ptr pOStm;
- bool bOpen;
-
-public:
-
- EasyFile();
- ~EasyFile();
-
- ErrCode createStream( const OUString& rUrl, SvStream*& rpStr );
- void createFileName( const OUString& rUrl, OUString& rFileName );
- void close();
-};
-
-}
-
-// Helper class for the embedding of text attributes into the html output
-class HtmlState
-{
-private:
- bool mbColor;
- bool mbWeight;
- bool mbItalic;
- bool mbUnderline;
- bool mbStrike;
- bool mbLink;
- Color maColor;
- Color maDefColor;
- OUString maLink;
- OUString maTarget;
-
-public:
- explicit HtmlState( Color aDefColor );
-
- OUString SetWeight( bool bWeight );
- OUString SetItalic( bool bItalic );
- OUString SetUnderline( bool bUnderline );
- OUString SetColor( Color aColor );
- OUString SetStrikeout( bool bStrike );
- OUString SetLink( const OUString& aLink, const OUString& aTarget );
- OUString Flush();
-};
-
-// close all still open tags
-OUString HtmlState::Flush()
-{
- OUString aStr = SetWeight(false)
- + SetItalic(false)
- + SetUnderline(false)
- + SetStrikeout(false)
- + SetColor(maDefColor)
- + SetLink("","");
-
- return aStr;
-}
-
-// c'tor with default color for the page
-HtmlState::HtmlState( Color aDefColor )
- : mbColor(false),
- mbWeight(false),
- mbItalic(false),
- mbUnderline(false),
- mbStrike(false),
- mbLink(false),
- maDefColor(aDefColor)
-{
-}
-
-// enables/disables bold print
-OUString HtmlState::SetWeight( bool bWeight )
-{
- OUString aStr;
-
- if(bWeight && !mbWeight)
- aStr = "";
- else if(!bWeight && mbWeight)
- aStr = "";
-
- mbWeight = bWeight;
- return aStr;
-}
-
-// enables/disables italic
-
-OUString HtmlState::SetItalic( bool bItalic )
-{
- OUString aStr;
-
- if(bItalic && !mbItalic)
- aStr = "";
- else if(!bItalic && mbItalic)
- aStr = "";
-
- mbItalic = bItalic;
- return aStr;
-}
-
-// enables/disables underlines
-
-OUString HtmlState::SetUnderline( bool bUnderline )
-{
- OUString aStr;
-
- if(bUnderline && !mbUnderline)
- aStr = "";
- else if(!bUnderline && mbUnderline)
- aStr = "";
-
- mbUnderline = bUnderline;
- return aStr;
-}
-
-// enables/disables strike through
-OUString HtmlState::SetStrikeout( bool bStrike )
-{
- OUString aStr;
-
- if(bStrike && !mbStrike)
- aStr = "";
- else if(!bStrike && mbStrike)
- aStr = "";
-
- mbStrike = bStrike;
- return aStr;
-}
-
-// Sets the specified text color
-OUString HtmlState::SetColor( Color aColor )
-{
- OUString aStr;
-
- if(mbColor && aColor == maColor)
- return aStr;
-
- if(mbColor)
- {
- aStr = "";
- mbColor = false;
- }
-
- if(aColor != maDefColor)
- {
- maColor = aColor;
- aStr += "";
- mbColor = true;
- }
-
- return aStr;
-}
-
-// enables/disables a hyperlink
-OUString HtmlState::SetLink( const OUString& aLink, const OUString& aTarget )
-{
- OUString aStr;
-
- if(mbLink&&maLink == aLink&&maTarget==aTarget)
- return aStr;
-
- if(mbLink)
- {
- aStr = "";
- mbLink = false;
- }
-
- if (!aLink.isEmpty())
- {
- aStr += "";
- mbLink = true;
- maLink = aLink;
- maTarget = aTarget;
- }
-
- return aStr;
-}
-namespace
-{
-
-OUString getParagraphStyle( const SdrOutliner* pOutliner, sal_Int32 nPara )
-{
- SfxItemSet aParaSet( pOutliner->GetParaAttribs( nPara ) );
-
- OUString sStyle;
-
- if( aParaSet.GetItem( EE_PARA_WRITINGDIR )->GetValue() == SvxFrameDirection::Horizontal_RL_TB )
- {
-
- sStyle = "direction: rtl;";
- }
- else
- {
- // This is the default so don't write it out
- // sStyle += "direction: ltr;";
- }
- return sStyle;
-}
-
-void lclAppendStyle(OUStringBuffer& aBuffer, std::u16string_view aTag, std::u16string_view aStyle)
-{
- if (aStyle.empty())
- aBuffer.append(OUString::Concat("<") + aTag + ">");
- else
- aBuffer.append(OUString::Concat("<") + aTag + " style=\"" + aStyle + "\">");
-}
-
-} // anonymous namespace
-
-constexpr OUStringLiteral gaHTMLHeader(
- u"\r\n"
- "\r\n\r\n" );
-
-constexpr OUStringLiteral gaHTMLExtension = u"" STR_HTMLEXP_DEFAULT_EXTENSION;
-
-// constructor for the html export helper classes
-HtmlExport::HtmlExport(
- OUString aPath,
- const Sequence< PropertyValue >& rParams,
- SdDrawDocument* pExpDoc,
- sd::DrawDocShell* pDocShell )
- : maPath(std::move( aPath )),
- mpDoc(pExpDoc),
- mpDocSh( pDocShell ),
- meMode( PUBLISH_SINGLE_DOCUMENT ),
- mbContentsPage(false),
- mnButtonThema(-1),
- mnWidthPixel( PUB_MEDRES_WIDTH ),
- meFormat( FORMAT_JPG ),
- mbNotes(false),
- mnCompression( -1 ),
- mbDownload( false ),
- mbSlideSound(true),
- mbHiddenSlides(true),
- mbUserAttr(false),
- maTextColor(COL_BLACK),
- maBackColor(COL_WHITE),
- mbDocColors(false),
- maIndexUrl("index"),
- meScript( SCRIPT_ASP ),
- mpButtonSet( new ButtonSet() )
-{
- bool bChange = mpDoc->IsChanged();
-
- maIndexUrl += gaHTMLExtension;
-
- InitExportParameters( rParams );
-
- switch( meMode )
- {
- case PUBLISH_HTML:
- case PUBLISH_FRAMES:
- ExportHtml();
- break;
- case PUBLISH_WEBCAST:
- ExportWebCast();
- break;
- case PUBLISH_KIOSK:
- ExportKiosk();
- break;
- case PUBLISH_SINGLE_DOCUMENT:
- ExportSingleDocument();
- break;
- }
-
- mpDoc->SetChanged(bChange);
-}
-
-HtmlExport::~HtmlExport()
-{
-}
-
-// get common export parameters from item set
-void HtmlExport::InitExportParameters( const Sequence< PropertyValue >& rParams )
-{
- mbImpress = mpDoc->GetDocumentType() == DocumentType::Impress;
-
- OUString aStr;
- for( const PropertyValue& rParam : rParams )
- {
- if ( rParam.Name == "PublishMode" )
- {
- sal_Int32 temp = 0;
- rParam.Value >>= temp;
- meMode = static_cast(temp);
- }
- else if ( rParam.Name == "IndexURL" )
- {
- rParam.Value >>= aStr;
- maIndexUrl = aStr;
- }
- else if ( rParam.Name == "Format" )
- {
- sal_Int32 temp = 0;
- rParam.Value >>= temp;
- meFormat = static_cast(temp);
- }
- else if ( rParam.Name == "Compression" )
- {
- rParam.Value >>= aStr;
- OUString aTmp( aStr );
- if(!aTmp.isEmpty())
- {
- aTmp = aTmp.replaceFirst("%", "");
- mnCompression = static_cast(aTmp.toInt32());
- }
- }
- else if ( rParam.Name == "Width" )
- {
- sal_Int32 temp = 0;
- rParam.Value >>= temp;
- mnWidthPixel = static_cast(temp);
- }
- else if ( rParam.Name == "UseButtonSet" )
- {
- sal_Int32 temp = 0;
- rParam.Value >>= temp;
- mnButtonThema = static_cast(temp);
- }
- else if ( rParam.Name == "IsExportNotes" )
- {
- if( mbImpress )
- {
- bool temp = false;
- rParam.Value >>= temp;
- mbNotes = temp;
- }
- }
- else if ( rParam.Name == "IsExportContentsPage" )
- {
- bool temp = false;
- rParam.Value >>= temp;
- mbContentsPage = temp;
- }
- else if ( rParam.Name == "Author" )
- {
- rParam.Value >>= aStr;
- maAuthor = aStr;
- }
- else if ( rParam.Name == "EMail" )
- {
- rParam.Value >>= aStr;
- maEMail = aStr;
- }
- else if ( rParam.Name == "HomepageURL" )
- {
- rParam.Value >>= aStr;
- maHomePage = aStr;
- }
- else if ( rParam.Name == "UserText" )
- {
- rParam.Value >>= aStr;
- maInfo = aStr;
- }
- else if ( rParam.Name == "EnableDownload" )
- {
- bool temp = false;
- rParam.Value >>= temp;
- mbDownload = temp;
- }
- else if ( rParam.Name == "SlideSound" )
- {
- bool temp = true;
- rParam.Value >>= temp;
- mbSlideSound = temp;
- }
- else if ( rParam.Name == "HiddenSlides" )
- {
- bool temp = true;
- rParam.Value >>= temp;
- mbHiddenSlides = temp;
- }
- else if ( rParam.Name == "BackColor" )
- {
- Color temp;
- rParam.Value >>= temp;
- maBackColor = temp;
- mbUserAttr = true;
- }
- else if ( rParam.Name == "TextColor" )
- {
- Color temp;
- rParam.Value >>= temp;
- maTextColor = temp;
- mbUserAttr = true;
- }
- else if ( rParam.Name == "LinkColor" )
- {
- Color temp ;
- rParam.Value >>= temp;
- maLinkColor = temp;
- mbUserAttr = true;
- }
- else if ( rParam.Name == "VLinkColor" )
- {
- Color temp;
- rParam.Value >>= temp;
- maVLinkColor = temp;
- mbUserAttr = true;
- }
- else if ( rParam.Name == "ALinkColor" )
- {
- Color temp;
- rParam.Value >>= temp;
- maALinkColor = temp;
- mbUserAttr = true;
- }
- else if ( rParam.Name == "IsUseDocumentColors" )
- {
- bool temp = false;
- rParam.Value >>= temp;
- mbDocColors = temp;
- }
- else if ( rParam.Name == "KioskSlideDuration" )
- {
- double temp = 0.0;
- rParam.Value >>= temp;
- mfSlideDuration = temp;
- mbAutoSlide = true;
- }
- else if ( rParam.Name == "KioskEndless" )
- {
- bool temp = false;
- rParam.Value >>= temp;
- mbEndless = temp;
- }
- else if ( rParam.Name == "WebCastCGIURL" )
- {
- rParam.Value >>= aStr;
- maCGIPath = aStr;
- }
- else if ( rParam.Name == "WebCastTargetURL" )
- {
- rParam.Value >>= aStr;
- maURLPath = aStr;
- }
- else if ( rParam.Name == "WebCastScriptLanguage" )
- {
- rParam.Value >>= aStr;
- if ( aStr == "asp" )
- {
- meScript = SCRIPT_ASP;
- }
- else
- {
- meScript = SCRIPT_PERL;
- }
- }
- else
- {
- OSL_FAIL("Unknown property for html export detected!");
- }
- }
-
- if( meMode == PUBLISH_KIOSK )
- {
- mbContentsPage = false;
- mbNotes = false;
-
- }
-
- // calculate image sizes
- SdPage* pPage = mpDoc->GetSdPage(0, PageKind::Standard);
- Size aTmpSize( pPage->GetSize() );
- double dRatio=static_cast(aTmpSize.Width())/aTmpSize.Height();
-
- mnHeightPixel = static_cast(mnWidthPixel/dRatio);
-
- // we come up with a destination...
-
- INetURLObject aINetURLObj( maPath );
- DBG_ASSERT( aINetURLObj.GetProtocol() != INetProtocol::NotValid, "invalid URL" );
-
- maExportPath = aINetURLObj.GetPartBeforeLastName(); // with trailing '/'
- maIndex = aINetURLObj.GetLastName();
-
- mnSdPageCount = mpDoc->GetSdPageCount( PageKind::Standard );
- for( sal_uInt16 nPage = 0; nPage < mnSdPageCount; nPage++ )
- {
- pPage = mpDoc->GetSdPage( nPage, PageKind::Standard );
-
- if( mbHiddenSlides || !pPage->IsExcluded() )
- {
- maPages.push_back( pPage );
- maNotesPages.push_back( mpDoc->GetSdPage( nPage, PageKind::Notes ) );
- }
- }
- mnSdPageCount = maPages.size();
-
- mbFrames = meMode == PUBLISH_FRAMES;
-
- maDocFileName = maIndex;
-}
-
-void HtmlExport::ExportSingleDocument()
-{
- SdrOutliner* pOutliner = mpDoc->GetInternalOutliner();
-
- maPageNames.resize(mnSdPageCount);
-
- mnPagesWritten = 0;
- InitProgress(mnSdPageCount);
-
- OUStringBuffer aStr(gaHTMLHeader
- + DocumentMetadata()
- + "\r\n"
- "\r\n"
- + CreateBodyTag());
-
- for(sal_uInt16 nSdPage = 0; nSdPage < mnSdPageCount; ++nSdPage)
- {
- SdPage* pPage = maPages[nSdPage];
- maPageNames[nSdPage] = pPage->GetName();
-
- if( mbDocColors )
- {
- SetDocColors( pPage );
- }
-
- // page title
- OUString sTitleText(CreateTextForTitle(pOutliner, pPage, pPage->GetPageBackgroundColor()));
- OUString sStyle;
-
- if (nSdPage != 0) // First page - no need for a page break here
- sStyle += "page-break-before:always; ";
- sStyle += getParagraphStyle(pOutliner, 0);
-
- lclAppendStyle(aStr, u"h1", sStyle);
-
- aStr.append(sTitleText + "\r\n");
-
- // write outline text
- aStr.append(CreateTextForPage( pOutliner, pPage, true, pPage->GetPageBackgroundColor() ));
-
- // notes
- if(mbNotes)
- {
- SdPage* pNotesPage = maNotesPages[ nSdPage ];
- OUString aNotesStr( CreateTextForNotesPage( pOutliner, pNotesPage, maBackColor) );
-
- if (!aNotesStr.isEmpty())
- {
- aStr.append("
\r\n"
- + RESTOHTML(STR_HTMLEXP_NOTES)
- + ":
\r\n"
- + aNotesStr);
- }
- }
-
- if (mpProgress)
- mpProgress->SetState(++mnPagesWritten);
-
- }
-
- // close page
- aStr.append("\r\n