tdf#105303: Drop html export wizard

Done during the conference hackfest

Change-Id: I765e6dc839a98038c4071c8444ce3db9293c8a6c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157173
Tested-by: Xisco Fauli <xiscofauli@libreoffice.org>
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
This commit is contained in:
Xisco Fauli 2023-09-22 20:54:05 +02:00
parent 7d66020d29
commit 28b6480c6b
56 changed files with 169 additions and 7350 deletions

View file

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

View file

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

View file

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

View file

@ -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" },

View file

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

View file

@ -1,30 +0,0 @@
<!--
* 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 .
-->
<node oor:name="draw_html_Export" oor:op="replace">
<prop oor:name="Flags"><value>EXPORT ALIEN</value></prop>
<prop oor:name="UIComponent"><value>com.sun.star.comp.draw.SdHtmlOptionsDialog</value></prop>
<prop oor:name="FilterService"/>
<prop oor:name="UserData"><value></value></prop>
<prop oor:name="FileFormatVersion"><value>0</value></prop>
<prop oor:name="Type"><value>graphic_HTML</value></prop>
<prop oor:name="TemplateName"/>
<prop oor:name="DocumentService"><value>com.sun.star.drawing.DrawingDocument</value></prop>
<prop oor:name="UIName">
<value xml:lang="en-US">HTML Document (Draw)</value>
</prop>
</node>

View file

@ -1,30 +0,0 @@
<!--
* 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 .
-->
<node oor:name="impress_html_Export" oor:op="replace">
<prop oor:name="Flags"><value>EXPORT ALIEN</value></prop>
<prop oor:name="UIComponent"><value>com.sun.star.comp.draw.SdHtmlOptionsDialog</value></prop>
<prop oor:name="FilterService"/>
<prop oor:name="UserData"><value></value></prop>
<prop oor:name="FileFormatVersion"><value>0</value></prop>
<prop oor:name="Type"><value>graphic_HTML</value></prop>
<prop oor:name="TemplateName"/>
<prop oor:name="DocumentService"><value>com.sun.star.presentation.PresentationDocument</value></prop>
<prop oor:name="UIName">
<value xml:lang="en-US">HTML Document (Impress)</value>
</prop>
</node>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.7 KiB

View file

@ -1 +0,0 @@
<svg height="90" viewBox="0 0 120 90" width="120" xmlns="http://www.w3.org/2000/svg"><path d="m0 0v90h120v-90zm1 1h118v88h-118z" fill="#fafafa"/><path d="m96.677272 72.302699a29 29 0 0 1 -40.367852-.98276 29 29 0 0 1 -.252993-40.37902 29 29 0 0 1 40.352367-1.488511l-19.408794 21.547592z" fill="#83beec"/><path d="m-104.51468 71.169352a29 29 0 0 1 -8.14279-21.241041 29 29 0 0 1 9.6894-20.581606l19.290793 21.653295z" fill="#a1ddaa" transform="scale(-1 1)"/><path d="m0 0h12v90h-12z" fill="#fafafa"/><path d="m0 0 112-.0000001-8 12.0000001h-103.99999983z" fill="#83beec"/><g fill="#fafafa"><path d="m26 26h22v2h-22z"/><path d="m26 33h18v2h-18z"/><path d="m26 40h15v2h-15z"/><path d="m26 48h13v2h-13z"/><path d="m26 56h15v2h-15z"/><path d="m26 64h18v2h-18z"/><path d="m26 72h20v2h-20z"/></g><g fill="#fb983b"><path d="m22 26h2v2h-2z"/><path d="m22 33h2v2h-2z"/><path d="m22 40h2v2h-2z"/><path d="m22 48h2v2h-2z"/><path d="m22 56h2v2h-2z"/><path d="m22 64h2v2h-2z"/><path d="m22 72h2v2h-2z"/></g></svg>

Before

Width:  |  Height:  |  Size: 1,000 B

View file

@ -1 +0,0 @@
<svg height="90" viewBox="0 0 120 90" width="120" xmlns="http://www.w3.org/2000/svg"><path d="m0 0v90h120v-90zm1 1h118v88h-118z" fill="#fafafa"/><path d="m88.677272 72.302699a29 29 0 0 1 -40.367852-.98276 29 29 0 0 1 -.252993-40.37902 29 29 0 0 1 40.352367-1.488511l-19.408794 21.547592z" fill="#83beec"/><path d="m-96.514676 71.169352a29 29 0 0 1 -8.142794-21.241041 29 29 0 0 1 9.689397-20.581606l19.290796 21.653295z" fill="#a1ddaa" transform="scale(-1 1)"/><path d="m24 0h2v90h-2z" fill="#c8c6c4"/><path d="m26 0 86-.0000001-8 12.0000001h-78z" fill="#83beec"/><g fill="#fafafa"><path d="m8 24h12v2h-12z"/><path d="m8 31h12v2h-12z"/><path d="m8 38h12v2h-12z"/><path d="m8 46h12v2h-12z"/><path d="m8 54h12v2h-12z"/><path d="m8 62h12v2h-12z"/><path d="m8 70h12v2h-12z"/></g><g fill="#fb983b"><path d="m4 24h2v2h-2z"/><path d="m4 31h2v2h-2z"/><path d="m4 38h2v2h-2z"/><path d="m4 46h2v2h-2z"/><path d="m4 54h2v2h-2z"/><path d="m4 62h2v2h-2z"/><path d="m4 70h2v2h-2z"/></g><path d="m12-120h2v120h-2z" fill="#c8c6c4" transform="rotate(90)"/></svg>

Before

Width:  |  Height:  |  Size: 1 KiB

View file

@ -1 +0,0 @@
<svg height="90" viewBox="0 0 120 90" width="120" xmlns="http://www.w3.org/2000/svg"><path d="m44 75-6 9v4h44v-4l-6-9h-15-2zm1.5 2h13.5 2 13.5l4.5 7h-38z" fill="#fafafa"/><path d="m15 4v58h90v-58zm1 1h88v55.900391h-88z" fill="#fafafa"/><path d="m83.46496 46.296637a14.008686 14.008686 0 0 1 -19.500019-.47473 14.008686 14.008686 0 0 1 -.122211-19.505414 14.008686 14.008686 0 0 1 19.49254-.719037l-9.375576 10.408739z" fill="#83beec"/><path d="m-87.250887 45.749165a14.008686 14.008686 0 0 1 -3.933441-10.260658 14.008686 14.008686 0 0 1 4.680541-9.942112l9.318576 10.4598z" fill="#a1ddaa" transform="scale(-1 1)"/><path d="m15 4h12v58h-12z" fill="#fafafa"/><path d="m16 5 80.769231-.0000001-5.769231 10.0000001h-75z" fill="#83beec"/><g fill="#fafafa"><path d="m34 20h18v2h-18z"/><path d="m34 27h15v2h-15z"/><path d="m34 35h13v2h-13z"/><path d="m34 43h15v2h-15z"/><path d="m34 51h18v2h-18z"/></g><g fill="#fb983b"><path d="m30 20h2v2h-2z"/><path d="m30 27h2v2h-2z"/><path d="m30 35h2v2h-2z"/><path d="m30 43h2v2h-2z"/><path d="m30 51h2v2h-2z"/></g><g fill="#fafafa"><path d="m8 0h104v4h-104z"/><path d="m55 62h10v18h-10z"/></g></svg>

Before

Width:  |  Height:  |  Size: 1.1 KiB

View file

@ -1 +0,0 @@
<svg height="90" viewBox="0 0 120 90" width="120" xmlns="http://www.w3.org/2000/svg"><path d="m44 75-6 9v4h44v-2.535156a21 21 0 0 1 -7.107422-10.464844h-13.892578-2zm1.5 2h13.5 2 13.5l4.5 7h-38z" fill="#fafafa"/><path d="m15 4v58h60.228516a21 21 0 0 1 .759765-1.849609 21 21 0 0 0 -.359375.75h-59.628906v-55.900391h88v45.054688a21 21 0 0 1 1 .482421v-46.537109zm79.068359 44.035156a21 21 0 0 0 -1.259765.101563 21 21 0 0 1 1.259765-.101563zm-2.191406.21875a21 21 0 0 0 -1.167969.212891 21 21 0 0 1 1.167969-.212891zm-2.037109.41211a21 21 0 0 0 -1.191406.34375 21 21 0 0 1 1.191406-.34375zm-1.972656.607422a21 21 0 0 0 -1.248047.5 21 21 0 0 1 1.248047-.5zm-1.876954.785156a21 21 0 0 0 -1.304687.679687 21 21 0 0 1 1.304687-.679687zm-1.808593.972656a21 21 0 0 0 -1.298829.851562 21 21 0 0 1 1.298829-.851562zm-1.72461 1.158203a21 21 0 0 0 -1.259765 1.023438 21 21 0 0 1 1.259765-1.023438zm-1.580078 1.304688a21 21 0 0 0 -1.210937 1.201171 21 21 0 0 1 1.210937-1.201171zm-1.466797 1.478515a21 21 0 0 0 -1.107422 1.341797 21 21 0 0 1 1.107422-1.341797zm-1.310547 1.609375a21 21 0 0 0 -1.007812 1.509766 21 21 0 0 1 1.007812-1.509766zm-1.136718 1.720703a21 21 0 0 0 -.876953 1.644532 21 21 0 0 1 .876953-1.644532z" fill="#fafafa"/><path d="m83.46496 46.296637a14.008686 14.008686 0 0 1 -19.500019-.47473 14.008686 14.008686 0 0 1 -.122211-19.505414 14.008686 14.008686 0 0 1 19.49254-.719037l-9.375576 10.408739z" fill="#83beec"/><path d="m-87.250887 45.749165a14.008686 14.008686 0 0 1 -3.933441-10.260658 14.008686 14.008686 0 0 1 4.680541-9.942112l9.318576 10.4598z" fill="#a1ddaa" transform="scale(-1 1)"/><path d="m15 4h12v58h-12z" fill="#fafafa"/><path d="m16 5 80.769231-.0000001-5.769231 10.0000001h-75z" fill="#83beec"/><g fill="#fafafa"><path d="m34 20h18v2h-18z"/><path d="m34 27h15v2h-15z"/><path d="m34 35h13v2h-13z"/><path d="m34 43h15v2h-15z"/><path d="m34 51h18v2h-18z"/></g><g fill="#fb983b"><path d="m30 20h2v2h-2z"/><path d="m30 27h2v2h-2z"/><path d="m30 35h2v2h-2z"/><path d="m30 43h2v2h-2z"/><path d="m30 51h2v2h-2z"/></g><path d="m8 0h104v4h-104z" fill="#fafafa"/><path d="m55 62h10v18h-10z" fill="#fafafa"/><g fill="#1e8bcd" transform="translate(1)"><path d="m75 68h38v2h-38z"/><path d="m94 50a19 19 0 0 0 -19 19 19 19 0 0 0 19 19 19 19 0 0 0 19-19 19 19 0 0 0 -19-19zm0 2a17 17 0 0 1 17 17 17 17 0 0 1 -17 17 17 17 0 0 1 -17-17 17 17 0 0 1 17-17z"/><path d="m96.669922 50.208984a21 35 0 0 1 3.330078 18.791016 21 35 0 0 1 -3.316406 18.789062c.786522-.111465 1.556141-.269899 2.308594-.474609a23 37.214783 0 0 0 3.007812-18.314453 23 37.214783 0 0 0 -3.001953-18.314453c-.758554-.206615-1.534949-.364743-2.328125-.476563z"/><path d="m91.308594 50.212891c-.782333.11121-1.548264.267219-2.296875.470703a23 37.214783 0 0 0 -3.011719 18.316406 23 37.214783 0 0 0 2.994141 18.3125c.747298.203892 1.51199.360733 2.292968.472656a21 35 0 0 1 -3.287109-18.785156 21 35 0 0 1 3.308594-18.787109z"/><path d="m109.3418 57.822266a35 21 0 0 1 -15.351566 2.167968 35 21 0 0 1 -15.33789-2.160156c-.408054.559639-.788726 1.138598-1.134766 1.742188a37.214783 23 0 0 0 16.472656 2.417968 37.214783 23 0 0 0 16.490236-2.419922c-.34731-.605596-.72894-1.186715-1.13867-1.748046z"/><path d="m94 77a37.214783 23 0 0 0 -15.976562 2.259766c.383264.595532.790821 1.173258 1.236328 1.720703a35 21 0 0 1 14.740234-1.980469 35 21 0 0 1 14.74023 1.980469c.44699-.549257.85592-1.128908 1.24024-1.726563a37.214783 23 0 0 0 -15.98047-2.253906z"/></g></svg>

Before

Width:  |  Height:  |  Size: 3.4 KiB

View file

@ -1 +0,0 @@
<svg height="90" viewBox="0 0 120 90" width="120" xmlns="http://www.w3.org/2000/svg"><path d="m0 0h120v90h-120z" fill="#3a3a38"/><path d="m1 1h118v88h-118z" fill="#fafafa"/><path d="m96.677272 72.302699a29 29 0 0 1 -40.367852-.98276 29 29 0 0 1 -.252993-40.37902 29 29 0 0 1 40.352367-1.488511l-19.408794 21.547592z" fill="#0063b1"/><path d="m-104.51468 71.169352a29 29 0 0 1 -8.14279-21.241041 29 29 0 0 1 9.6894-20.581606l19.290793 21.653295z" fill="#309048" transform="scale(-1 1)"/><path d="m0 0h12v90h-12z" fill="#3a3a38"/><path d="m0 0 112-.0000001-8 12.0000001h-103.99999983z" fill="#0063b1"/><g fill="#3a3a38"><path d="m26 26h22v2h-22z"/><path d="m26 33h18v2h-18z"/><path d="m26 40h15v2h-15z"/><path d="m26 48h13v2h-13z"/><path d="m26 56h15v2h-15z"/><path d="m26 64h18v2h-18z"/><path d="m26 72h20v2h-20z"/></g><path d="m22 26h2v2h-2z" fill="#fb983b"/><path d="m22 33h2v2h-2z" fill="#fb983b"/><path d="m22 40h2v2h-2z" fill="#fb983b"/><path d="m22 48h2v2h-2z" fill="#fb983b"/><path d="m22 56h2v2h-2z" fill="#fb983b"/><path d="m22 64h2v2h-2z" fill="#fb983b"/><path d="m22 72h2v2h-2z" fill="#fb983b"/></svg>

Before

Width:  |  Height:  |  Size: 1.1 KiB

View file

@ -1 +0,0 @@
<svg height="90" viewBox="0 0 120 90" width="120" xmlns="http://www.w3.org/2000/svg"><path d="m0 0h120v90h-120z" fill="#3a3a38"/><path d="m1 1h118v88h-118z" fill="#fafafa"/><path d="m88.677272 72.302699a29 29 0 0 1 -40.367852-.98276 29 29 0 0 1 -.252993-40.37902 29 29 0 0 1 40.352367-1.488511l-19.408794 21.547592z" fill="#0063b1"/><path d="m-96.514676 71.169352a29 29 0 0 1 -8.142794-21.241041 29 29 0 0 1 9.689397-20.581606l19.290796 21.653295z" fill="#309048" transform="scale(-1 1)"/><path d="m24 0h2v90h-2z" fill="#797774"/><path d="m26 0 86-.0000001-8 12.0000001h-78z" fill="#0063b1"/><g fill="#3a3a38"><path d="m8 24h12v2h-12z"/><path d="m8 31h12v2h-12z"/><path d="m8 38h12v2h-12z"/><path d="m8 46h12v2h-12z"/><path d="m8 54h12v2h-12z"/><path d="m8 62h12v2h-12z"/><path d="m8 70h12v2h-12z"/></g><path d="m4 24h2v2h-2z" fill="#fb983b"/><path d="m4 31h2v2h-2z" fill="#fb983b"/><path d="m4 38h2v2h-2z" fill="#fb983b"/><path d="m4 46h2v2h-2z" fill="#fb983b"/><path d="m4 54h2v2h-2z" fill="#fb983b"/><path d="m4 62h2v2h-2z" fill="#fb983b"/><path d="m4 70h2v2h-2z" fill="#fb983b"/><path d="m12-120h2v120h-2z" fill="#797774" transform="rotate(90)"/></svg>

Before

Width:  |  Height:  |  Size: 1.1 KiB

View file

@ -1 +0,0 @@
<svg height="90" viewBox="0 0 120 90" width="120" xmlns="http://www.w3.org/2000/svg"><path d="m44 75-6 9v4h44v-4l-6-9h-15-2zm1.5 2h13.5 2 13.5l4.5 7h-38z" fill="#3a3a38"/><path d="m15 4h90v58h-90z" fill="#3a3a38"/><path d="m16 5h88v55.900562h-88z" fill="#fafafa"/><path d="m83.46496 46.296637a14.008686 14.008686 0 0 1 -19.500019-.47473 14.008686 14.008686 0 0 1 -.122211-19.505414 14.008686 14.008686 0 0 1 19.49254-.719037l-9.375576 10.408739z" fill="#0063b1"/><path d="m-87.250887 45.749165a14.008686 14.008686 0 0 1 -3.933441-10.260658 14.008686 14.008686 0 0 1 4.680541-9.942112l9.318576 10.4598z" fill="#309048" transform="scale(-1 1)"/><path d="m15 4h12v58h-12z" fill="#3a3a38"/><path d="m16 5 80.769231-.0000001-5.769231 10.0000001h-75z" fill="#0063b1"/><g fill="#3a3a38"><path d="m34 20h18v2h-18z"/><path d="m34 27h15v2h-15z"/><path d="m34 35h13v2h-13z"/><path d="m34 43h15v2h-15z"/><path d="m34 51h18v2h-18z"/></g><path d="m30 20h2v2h-2z" fill="#fb983b"/><path d="m30 27h2v2h-2z" fill="#fb983b"/><path d="m30 35h2v2h-2z" fill="#fb983b"/><path d="m30 43h2v2h-2z" fill="#fb983b"/><path d="m30 51h2v2h-2z" fill="#fb983b"/><path d="m8 0h104v4h-104z" fill="#3a3a38"/><path d="m45.5 77-4.5 7h38l-4.5-7h-13.5-2z" fill="#fafafa"/><path d="m55 62h10v18h-10z" fill="#3a3a38"/></svg>

Before

Width:  |  Height:  |  Size: 1.3 KiB

View file

@ -1 +0,0 @@
<svg height="90" viewBox="0 0 120 90" width="120" xmlns="http://www.w3.org/2000/svg"><path d="m44 75-6 9v4h44v-2.535156a21 21 0 0 1 -7.107422-10.464844h-13.892578-2zm1.5 2h13.5 2 13.5l4.5 7h-38z" fill="#3a3a38"/><path d="m15 4v58h60.228516a21 21 0 0 1 19.771484-14 21 21 0 0 1 10 2.537109v-46.537109z" fill="#3a3a38"/><path d="m16 5v55.900391h59.628906a21 21 0 0 1 19.371094-12.900391 21 21 0 0 1 9 2.054688v-45.054688z" fill="#fafafa"/><path d="m83.46496 46.296637a14.008686 14.008686 0 0 1 -19.500019-.47473 14.008686 14.008686 0 0 1 -.122211-19.505414 14.008686 14.008686 0 0 1 19.49254-.719037l-9.375576 10.408739z" fill="#0063b1"/><path d="m-87.250887 45.749165a14.008686 14.008686 0 0 1 -3.933441-10.260658 14.008686 14.008686 0 0 1 4.680541-9.942112l9.318576 10.4598z" fill="#309048" transform="scale(-1 1)"/><path d="m15 4h12v58h-12z" fill="#3a3a38"/><path d="m16 5 80.769231-.0000001-5.769231 10.0000001h-75z" fill="#0063b1"/><g fill="#3a3a38"><path d="m34 20h18v2h-18z"/><path d="m34 27h15v2h-15z"/><path d="m34 35h13v2h-13z"/><path d="m34 43h15v2h-15z"/><path d="m34 51h18v2h-18z"/></g><path d="m30 20h2v2h-2z" fill="#fb983b"/><path d="m30 27h2v2h-2z" fill="#fb983b"/><path d="m30 35h2v2h-2z" fill="#fb983b"/><path d="m30 43h2v2h-2z" fill="#fb983b"/><path d="m30 51h2v2h-2z" fill="#fb983b"/><path d="m8 0h104v4h-104z" fill="#3a3a38"/><path d="m45.5 77-4.5 7h38l-4.5-7h-13.5-2z" fill="#fafafa"/><path d="m55 62h10v18h-10z" fill="#3a3a38"/><g transform="translate(1)"><path d="m111 69a17 17 0 0 1 -17 17 17 17 0 0 1 -17-17 17 17 0 0 1 17-17 17 17 0 0 1 17 17z" fill="#fafafa"/><g fill="#1e8bcd"><path d="m75 68h38v2h-38z"/><path d="m94 50a19 19 0 0 0 -19 19 19 19 0 0 0 19 19 19 19 0 0 0 19-19 19 19 0 0 0 -19-19zm0 2a17 17 0 0 1 17 17 17 17 0 0 1 -17 17 17 17 0 0 1 -17-17 17 17 0 0 1 17-17z"/><path d="m96.669922 50.208984a21 35 0 0 1 3.330078 18.791016 21 35 0 0 1 -3.316406 18.789062c.786522-.111465 1.556141-.269899 2.308594-.474609a23 37.214783 0 0 0 3.007812-18.314453 23 37.214783 0 0 0 -3.001953-18.314453c-.758554-.206615-1.534949-.364743-2.328125-.476563z"/><path d="m91.308594 50.212891c-.782333.11121-1.548264.267219-2.296875.470703a23 37.214783 0 0 0 -3.011719 18.316406 23 37.214783 0 0 0 2.994141 18.3125c.747298.203892 1.51199.360733 2.292968.472656a21 35 0 0 1 -3.287109-18.785156 21 35 0 0 1 3.308594-18.787109z"/><path d="m109.3418 57.822266a35 21 0 0 1 -15.351566 2.167968 35 21 0 0 1 -15.33789-2.160156c-.408054.559639-.788726 1.138598-1.134766 1.742188a37.214783 23 0 0 0 16.472656 2.417968 37.214783 23 0 0 0 16.490236-2.419922c-.34731-.605596-.72894-1.186715-1.13867-1.748046z"/><path d="m94 77a37.214783 23 0 0 0 -15.976562 2.259766c.383264.595532.790821 1.173258 1.236328 1.720703a35 21 0 0 1 14.740234-1.980469 35 21 0 0 1 14.74023 1.980469c.44699-.549257.85592-1.128908 1.24024-1.726563a37.214783 23 0 0 0 -15.98047-2.253906z"/></g></g></svg>

Before

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3 KiB

View file

@ -26,7 +26,7 @@
</node>
<node oor:name="com.sun.star.drawing.DrawingDocument" oor:op="replace" install:module="draw">
<prop oor:name="SortedFilterList">
<value oor:separator=";">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</value>
<value oor:separator=";">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</value>
</prop>
</node>
<node oor:name="com.sun.star.presentation.PresentationDocument" oor:op="replace" install:module="impress">

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -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<SfxAbstractTabDialog> CreateSdTabTemplateDlg(weld::Window* pParent, const SfxObjectShell* pDocShell, SfxStyleSheetBase& rStyleBase, SdrModel* pModel, SdrView* pView) = 0;
virtual VclPtr<SfxAbstractDialog> CreatSdActionDialog(weld::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView) = 0;
virtual VclPtr<AbstractSdVectorizeDlg> CreateSdVectorizeDlg(weld::Window* pParent, const Bitmap& rBmp, ::sd::DrawDocShell* pDocShell) = 0;
virtual VclPtr<AbstractSdPublishingDlg> CreateSdPublishingDlg(weld::Window* pWindow, DocumentType eDocType) = 0;
virtual VclPtr<VclAbstractDialog> CreateMasterLayoutDialog(weld::Window* pParent, SdDrawDocument* pDoc, SdPage*) = 0;

View file

@ -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: */

View file

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

View file

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

View file

@ -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<VclAbstractDialog> SdDialogsTest::createDialogByID(sal_uInt32 nID)
@ -243,18 +242,6 @@ VclPtr<VclAbstractDialog> 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<VclAbstractDialog> 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<VclAbstractDialog> SdDialogsTest::createDialogByID(sal_uInt32 nID)
getDrawView());
break;
}
case 3:
case 2:
{
// CreateSdCustomShowDlg(SdDrawDocument& rDrawDoc) = 0;
SdDrawDocument* pDrawDoc = getSdXImpressDocument()->GetDoc();
@ -288,7 +275,7 @@ VclPtr<VclAbstractDialog> 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<VclAbstractDialog> 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<VclAbstractDialog> 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<VclAbstractDialog> 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<VclAbstractDialog> 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<VclAbstractDialog> 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<VclAbstractDialog> 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<VclAbstractDialog> 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<VclAbstractDialog> SdDialogsTest::createDialogByID(sal_uInt32 nID)
getDrawView());
break;
}
case 12:
case 11:
{
// CreateSdParagraphTabDlg(const SfxItemSet* pAttr) override;
pRetval = getSdAbstractDialogFactory()->CreateSdParagraphTabDlg(
@ -400,7 +387,7 @@ VclPtr<VclAbstractDialog> SdDialogsTest::createDialogByID(sal_uInt32 nID)
&getEmptySfxItemSet());
break;
}
case 13:
case 12:
{
// CreateSdStartPresentationDlg(weld::Window* pWindow, const SfxItemSet& rInAttrs, const std::vector<OUString> &rPageNames, SdCustomShowList* pCSList) override;
SdDrawDocument* pDrawDoc = getSdXImpressDocument()->GetDoc();
@ -430,14 +417,14 @@ VclPtr<VclAbstractDialog> 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<VclAbstractDialog> 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<VclAbstractDialog> 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<VclAbstractDialog> 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<VclAbstractDialog> 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<VclAbstractDialog> 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<VclAbstractDialog> 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<VclAbstractDialog> 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:

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View file

@ -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 <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/uno/Sequence.h>
#include <com/sun/star/uno/Any.h>
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/beans/XPropertyAccess.hpp>
#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
#include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
#include <com/sun/star/document/XExporter.hpp>
#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <vcl/svapp.hxx>
#include <pres.hxx>
#include <sdabstdlg.hxx>
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<sal_Int32>(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<AbstractSdPublishingDlg> 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<css::uno::Any> const &)
{
return cppu::acquire(new SdHtmlOptionsDialog());
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

File diff suppressed because it is too large Load diff

View file

@ -1,237 +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 <resltn.hxx>
#include <rtl/ustrbuf.hxx>
#include <tools/color.hxx>
#include <tools/solar.h>
#include <vcl/errinf.hxx>
#include <unotools/resmgr.hxx>
#include "htmlpublishmode.hxx"
#include <memory>
#include <string_view>
#include <vector>
namespace basegfx { class B2DPolyPolygon; }
namespace com::sun::star::beans { struct PropertyValue; }
namespace com::sun::star::ucb { class XSimpleFileAccess3; }
namespace sd { class DrawDocShell; }
namespace tools { class Rectangle; }
#define PUB_LOWRES_WIDTH 640
#define PUB_MEDRES_WIDTH 800
#define PUB_HIGHRES_WIDTH 1024
#define PUB_FHDRES_WIDTH 1920
#define PUB_THUMBNAIL_WIDTH 256
#define PUB_THUMBNAIL_HEIGHT 192
class ErrCode;
class OutlinerParaObject;
class SfxItemSet;
class Size;
class SfxProgress;
class SdrOutliner;
class SdPage;
class HtmlState;
class SdrTextObj;
class SdrObjGroup;
namespace sdr::table { class SdrTableObj; }
class SdrPage;
class SdDrawDocument;
class ButtonSet;
class HtmlErrorContext : public ErrorContext
{
private:
TranslateId mpResId;
OUString maURL1;
OUString maURL2;
public:
explicit HtmlErrorContext();
virtual bool GetString( ErrCode nErrId, OUString& rCtxStr ) override;
void SetContext(TranslateId pResId, const OUString& rURL);
void SetContext(TranslateId pResId, const OUString& rURL1, const OUString& rURL2);
};
/// this class exports an Impress Document as a HTML Presentation.
class HtmlExport final
{
std::vector< SdPage* > maPages;
std::vector< SdPage* > maNotesPages;
OUString maPath;
SdDrawDocument* mpDoc;
::sd::DrawDocShell* mpDocSh;
HtmlErrorContext meEC;
HtmlPublishMode meMode;
std::unique_ptr<SfxProgress> mpProgress;
bool mbImpress;
sal_uInt16 mnSdPageCount;
sal_uInt16 mnPagesWritten;
bool mbContentsPage;
sal_Int16 mnButtonThema;
sal_uInt16 mnWidthPixel;
sal_uInt16 mnHeightPixel;
PublishingFormat meFormat;
bool mbHeader;
bool mbNotes;
bool mbFrames;
OUString maIndex;
OUString maEMail;
OUString maAuthor;
OUString maHomePage;
OUString maInfo;
sal_Int16 mnCompression;
OUString maDocFileName;
OUString maFramePage;
OUString mDocTitle;
bool mbDownload;
bool mbAutoSlide;
double mfSlideDuration;
bool mbSlideSound;
bool mbHiddenSlides;
bool mbEndless;
bool mbUserAttr;
Color maTextColor; ///< The following colors are used for the <body> tag if mbUserAttr is true.
Color maBackColor;
Color maLinkColor;
Color maVLinkColor;
Color maALinkColor;
Color maFirstPageColor;
bool mbDocColors;
std::vector<OUString> maHTMLFiles;
std::vector<OUString> maImageFiles;
std::vector<OUString> maThumbnailFiles;
std::vector<OUString> maPageNames;
std::vector<OUString> maTextFiles;
OUString maExportPath; ///< output directory or URL.
OUString maIndexUrl;
OUString maURLPath;
OUString maCGIPath;
PublishingScript meScript;
std::unique_ptr< ButtonSet > mpButtonSet;
static SdrTextObj* GetLayoutTextObject(SdrPage const * pPage);
void SetDocColors( SdPage* pPage = nullptr );
bool CreateImagesForPresPages( bool bThumbnails = false );
bool CreateHtmlTextForPresPages();
bool CreateHtmlForPresPages();
bool CreateContentPage();
void CreateFileNames();
void CreateBitmaps();
bool CreateOutlinePages();
bool CreateFrames();
bool CreateNotesPages();
bool CreateNavBarFrames();
bool CreateASPScripts();
bool CreatePERLScripts();
bool CreateImageFileList();
bool CreateImageNumberFile();
bool checkForExistingFiles();
bool checkFileExists( css::uno::Reference< css::ucb::XSimpleFileAccess3 > const & xFileAccess, std::u16string_view aFileName );
OUString const & getDocumentTitle();
bool SavePresentation();
static OUString CreateLink( std::u16string_view aLink, std::u16string_view aText,
std::u16string_view aTarget = std::u16string_view());
static OUString CreateImage( std::u16string_view aImage, std::u16string_view aAltText );
OUString CreateNavBar( sal_uInt16 nSdPage, bool bIsText ) const;
OUString CreateBodyTag() const;
OUString ParagraphToHTMLString( SdrOutliner const * pOutliner, sal_Int32 nPara, const Color& rBackgroundColor );
OUString TextAttribToHTMLString( SfxItemSet const * pSet, HtmlState* pState, const Color& rBackgroundColor );
OUString CreateTextForTitle( SdrOutliner* pOutliner, SdPage* pPage, const Color& rBackgroundColor );
OUString CreateTextForPage( SdrOutliner* pOutliner, SdPage const * pPage, bool bHeadLine, const Color& rBackgroundColor );
OUString CreateTextForNotesPage( SdrOutliner* pOutliner, SdPage* pPage, const Color& rBackgroundColor );
static OUString CreateHTMLCircleArea( sal_uLong nRadius, sal_uLong nCenterX,
sal_uLong nCenterY, std::u16string_view rHRef );
static OUString CreateHTMLPolygonArea( const ::basegfx::B2DPolyPolygon& rPolyPoly, Size aShift, double fFactor, std::u16string_view rHRef );
static OUString CreateHTMLRectArea( const ::tools::Rectangle& rRect,
std::u16string_view rHRef );
OUString CreatePageURL( sal_uInt16 nPgNum );
OUString InsertSound( const OUString& rSoundFile );
bool CopyFile( const OUString& rSourceFile, const OUString& rDestFile );
bool CopyScript( std::u16string_view rPath, const OUString& rSource, const OUString& rDest, bool bUnix = false );
void InitProgress( sal_uInt16 nProgrCount );
void ResetProgress();
/// Output only the charset metadata, title etc. will be handled separately.
static OUString CreateMetaCharset();
/// Output document metadata.
OUString DocumentMetadata() const;
void InitExportParameters( const css::uno::Sequence< css::beans::PropertyValue >& rParams);
void ExportHtml();
void ExportKiosk();
void ExportWebCast();
void ExportSingleDocument();
bool WriteHtml( const OUString& rFileName, bool bAddExtension, std::u16string_view rHtmlData );
static OUString GetButtonName( int nButton );
void WriteOutlinerParagraph(OUStringBuffer& aStr, SdrOutliner* pOutliner,
OutlinerParaObject const * pOutlinerParagraphObject,
const Color& rBackgroundColor, bool bHeadLine);
void WriteObjectGroup(OUStringBuffer& aStr, SdrObjGroup const * pObjectGroup,
SdrOutliner* pOutliner, const Color& rBackgroundColor, bool bHeadLine);
void WriteTable(OUStringBuffer& aStr, sdr::table::SdrTableObj const * pTableObject,
SdrOutliner* pOutliner, const Color& rBackgroundColor);
public:
HtmlExport(OUString aPath,
const css::uno::Sequence<css::beans::PropertyValue>& rParams,
SdDrawDocument* pExpDoc,
sd::DrawDocShell* pDocShell);
~HtmlExport();
static OUString ColorToHTMLString( Color aColor );
static OUString StringToHTMLString( const OUString& rString );
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

File diff suppressed because it is too large Load diff

View file

@ -1,49 +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 <sfx2/docfile.hxx>
#include <sfx2/frame.hxx>
#include <sfx2/sfxsids.hrc>
#include "htmlex.hxx"
#include <sdhtmlfilter.hxx>
SdHTMLFilter::SdHTMLFilter(SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell)
: SdFilter(rMedium, rDocShell)
{
}
SdHTMLFilter::~SdHTMLFilter() {}
bool SdHTMLFilter::Export()
{
mrMedium.Close();
mrMedium.Commit();
css::uno::Sequence<css::beans::PropertyValue> aParams;
if (const SfxUnoAnyItem* pItem = mrMedium.GetItemSet().GetItemIfSet(SID_FILTER_DATA, false))
pItem->GetValue() >>= aParams;
HtmlExport aExport(mrMedium.GetName(), aParams, &mrDocument, &mrDocShell);
return true;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View file

@ -39,7 +39,6 @@
#include <vectdlg.hxx>
#include <tpoption.hxx>
#include <prntopts.hxx>
#include <pubdlg.hxx>
#include <masterlayoutdlg.hxx>
#include <headerfooterdlg.hxx>
#include "PhotoAlbumDialog.hxx"
@ -146,11 +145,6 @@ short AbstractSdVectorizeDlg_Impl::Execute()
return m_xDlg->run();
}
short AbstractSdPublishingDlg_Impl::Execute()
{
return m_xDlg->run();
}
short AbstractHeaderFooterDialog_Impl::Execute()
{
return m_xDlg->run();
@ -568,22 +562,6 @@ OUString AbstractSdVectorizeDlg_Impl::GetScreenshotId() const
return m_xDlg->get_help_id();
}
void AbstractSdPublishingDlg_Impl::GetParameterSequence( css::uno::Sequence< css::beans::PropertyValue >& rParams )
{
m_xDlg->GetParameterSequence( rParams );
}
BitmapEx AbstractSdPublishingDlg_Impl::createScreenshot() const
{
VclPtr<VirtualDevice> xDialogSurface(m_xDlg->getDialog()->screenshot());
return xDialogSurface->GetBitmapEx(Point(), xDialogSurface->GetOutputSizePixel());
}
OUString AbstractSdPublishingDlg_Impl::GetScreenshotId() const
{
return m_xDlg->get_help_id();
}
//-------------- SdAbstractDialogFactory implementation--------------
VclPtr<AbstractSvxBulletAndPositionDlg> SdAbstractDialogFactory_Impl::CreateSvxBulletAndPositionDlg(weld::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView)
@ -694,11 +672,6 @@ VclPtr<AbstractSdVectorizeDlg> SdAbstractDialogFactory_Impl::CreateSdVectorizeD
return VclPtr<AbstractSdVectorizeDlg_Impl>::Create(std::make_unique<SdVectorizeDlg>(pParent, rBmp, pDocShell));
}
VclPtr<AbstractSdPublishingDlg> SdAbstractDialogFactory_Impl::CreateSdPublishingDlg(weld::Window* pParent, DocumentType eDocType)
{
return VclPtr<AbstractSdPublishingDlg_Impl>::Create(std::make_unique<SdPublishingDlg>(pParent, eDocType));
}
// Factories for TabPages
CreateTabPage SdAbstractDialogFactory_Impl::GetSdOptionsContentsTabPageCreatorFunc()
{

View file

@ -34,7 +34,6 @@
#include <dlgfield.hxx>
#include <sdpreslt.hxx>
#include <prltempl.hxx>
#include <pubdlg.hxx>
#include <dlgsnap.hxx>
#include <present.hxx>
#include <vectdlg.hxx>
@ -364,23 +363,6 @@ public:
virtual OUString GetScreenshotId() const override;
};
class AbstractSdPublishingDlg_Impl :public AbstractSdPublishingDlg
{
private:
std::unique_ptr<SdPublishingDlg> m_xDlg;
public:
AbstractSdPublishingDlg_Impl(std::unique_ptr<SdPublishingDlg> pDlg)
: m_xDlg(std::move(pDlg))
{
}
virtual short Execute() override;
virtual void GetParameterSequence( css::uno::Sequence< css::beans::PropertyValue >& rParams ) override;
// screenshotting
virtual BitmapEx createScreenshot() const override;
virtual OUString GetScreenshotId() const override;
};
class AbstractHeaderFooterDialog_Impl :public AbstractHeaderFooterDialog
{
private:
@ -426,7 +408,6 @@ public:
virtual VclPtr<SfxAbstractTabDialog> CreateSdTabTemplateDlg(weld::Window* pParent, const SfxObjectShell* pDocShell, SfxStyleSheetBase& rStyleBase, SdrModel* pModel, SdrView* pView ) override;
virtual VclPtr<SfxAbstractDialog> CreatSdActionDialog(weld::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView) override;
virtual VclPtr<AbstractSdVectorizeDlg> CreateSdVectorizeDlg(weld::Window* pParent, const Bitmap& rBmp, ::sd::DrawDocShell* pDocShell) override;
virtual VclPtr<AbstractSdPublishingDlg> CreateSdPublishingDlg(weld::Window* pWindow, DocumentType eDocType) override;
virtual VclPtr<VclAbstractDialog> CreateSdPhotoAlbumDialog(weld::Window* pWindow, SdDrawDocument* pDoc) override;

View file

@ -70,7 +70,6 @@
#include <sdpptwrp.hxx>
#include <sdcgmfilter.hxx>
#include <sdgrffilter.hxx>
#include <sdhtmlfilter.hxx>
#include <sdpdffilter.hxx>
#include <framework/FrameworkHelper.hxx>
#include <o3tl/string_view.hxx>
@ -602,11 +601,7 @@ bool DrawDocShell::ConvertTo( SfxMedium& rMedium )
const OUString aTypeName( pMediumFilter->GetTypeName() );
std::unique_ptr<SdFilter> xFilter;
if( aTypeName.indexOf( "graphic_HTML" ) >= 0 )
{
xFilter = std::make_unique<SdHTMLFilter>(rMedium, *this);
}
else if( aTypeName.indexOf( "MS_PowerPoint_97" ) >= 0 )
if( aTypeName.indexOf( "MS_PowerPoint_97" ) >= 0 )
{
xFilter = std::make_unique<SdPPTFilter>(rMedium, *this);
static_cast<SdPPTFilter*>(xFilter.get())->PreSaveBasic();

View file

@ -1,205 +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 <svtools/valueset.hxx>
#include <vcl/weld.hxx>
#include <vcl/weldutils.hxx>
#include <pres.hxx>
#include "assclass.hxx"
#include <memory>
#include <vector>
class ListBox;
class Edit;
class SdHtmlAttrPreview;
class SdPublishingDesign;
class ButtonSet;
namespace com::sun::star::beans
{
struct PropertyValue;
}
namespace com::sun::star::uno
{
template <class E> class Sequence;
}
// *********************************************************************
// Html-Export Autopilot
// *********************************************************************
// should turn this into a wizard
class SdPublishingDlg final : public weld::GenericDialogController
{
private:
// page 1 controls
std::unique_ptr<weld::Container> m_xPage1;
std::unique_ptr<weld::Label> m_xPage1_Title;
std::unique_ptr<weld::RadioButton> m_xPage1_NewDesign;
std::unique_ptr<weld::RadioButton> m_xPage1_OldDesign;
std::unique_ptr<weld::TreeView> m_xPage1_Designs;
std::unique_ptr<weld::Button> m_xPage1_DelDesign;
std::unique_ptr<weld::Label> m_xPage1_Desc;
// page 2 controls
std::unique_ptr<weld::Container> m_xPage2;
std::unique_ptr<weld::Container> m_xPage2Frame2;
std::unique_ptr<weld::Container> m_xPage2Frame3;
std::unique_ptr<weld::Container> m_xPage2Frame4;
std::unique_ptr<weld::Label> m_xPage2_Title;
std::unique_ptr<weld::RadioButton> m_xPage2_Standard;
std::unique_ptr<weld::RadioButton> m_xPage2_Frames;
std::unique_ptr<weld::RadioButton> m_xPage2_SingleDocument;
std::unique_ptr<weld::RadioButton> m_xPage2_Kiosk;
std::unique_ptr<weld::RadioButton> m_xPage2_WebCast;
std::unique_ptr<weld::Image> m_xPage2_Standard_FB;
std::unique_ptr<weld::Image> m_xPage2_Frames_FB;
std::unique_ptr<weld::Image> m_xPage2_Kiosk_FB;
std::unique_ptr<weld::Image> m_xPage2_WebCast_FB;
std::unique_ptr<weld::Label> m_xPage2_Title_Html;
std::unique_ptr<weld::CheckButton> m_xPage2_Content;
std::unique_ptr<weld::CheckButton> m_xPage2_Notes;
std::unique_ptr<weld::Label> m_xPage2_Title_WebCast;
std::unique_ptr<weld::RadioButton> m_xPage2_ASP;
std::unique_ptr<weld::RadioButton> m_xPage2_PERL;
std::unique_ptr<weld::Label> m_xPage2_URL_txt;
std::unique_ptr<weld::Entry> m_xPage2_URL;
std::unique_ptr<weld::Label> m_xPage2_CGI_txt;
std::unique_ptr<weld::Entry> m_xPage2_CGI;
std::unique_ptr<weld::Label> m_xPage2_Index_txt;
std::unique_ptr<weld::Entry> m_xPage2_Index;
std::unique_ptr<weld::Label> m_xPage2_Title_Kiosk;
std::unique_ptr<weld::RadioButton> m_xPage2_ChgDefault;
std::unique_ptr<weld::RadioButton> m_xPage2_ChgAuto;
std::unique_ptr<weld::Label> m_xPage2_Duration_txt;
std::unique_ptr<weld::FormattedSpinButton> m_xPage2_Duration;
std::unique_ptr<weld::TimeFormatter> m_xFormatter;
std::unique_ptr<weld::CheckButton> m_xPage2_Endless;
// page 3 controls
std::unique_ptr<weld::Container> m_xPage3;
std::unique_ptr<weld::Label> m_xPage3_Title1;
std::unique_ptr<weld::RadioButton> m_xPage3_Png;
std::unique_ptr<weld::RadioButton> m_xPage3_Gif;
std::unique_ptr<weld::RadioButton> m_xPage3_Jpg;
std::unique_ptr<weld::Label> m_xPage3_Quality_txt;
std::unique_ptr<weld::ComboBox> m_xPage3_Quality;
std::unique_ptr<weld::Label> m_xPage3_Title2;
std::unique_ptr<weld::RadioButton> m_xPage3_Resolution_1;
std::unique_ptr<weld::RadioButton> m_xPage3_Resolution_2;
std::unique_ptr<weld::RadioButton> m_xPage3_Resolution_3;
std::unique_ptr<weld::RadioButton> m_xPage3_Resolution_4;
std::unique_ptr<weld::Label> m_xPage3_Title3;
std::unique_ptr<weld::CheckButton> m_xPage3_SldSound;
std::unique_ptr<weld::CheckButton> m_xPage3_HiddenSlides;
// page 4 controls
std::unique_ptr<weld::Container> m_xPage4;
std::unique_ptr<weld::Label> m_xPage4_Title1;
std::unique_ptr<weld::Label> m_xPage4_Author_txt;
std::unique_ptr<weld::Entry> m_xPage4_Author;
std::unique_ptr<weld::Label> m_xPage4_Email_txt;
std::unique_ptr<weld::Entry> m_xPage4_Email;
std::unique_ptr<weld::Label> m_xPage4_WWW_txt;
std::unique_ptr<weld::Entry> m_xPage4_WWW;
std::unique_ptr<weld::Label> m_xPage4_Title2;
std::unique_ptr<weld::TextView> m_xPage4_Misc;
std::unique_ptr<weld::CheckButton> m_xPage4_Download;
// page 5 controls
std::unique_ptr<weld::Container> m_xPage5;
std::unique_ptr<weld::Label> m_xPage5_Title;
std::unique_ptr<weld::CheckButton> m_xPage5_TextOnly;
std::unique_ptr<ValueSet> m_xPage5_Buttons;
std::unique_ptr<weld::CustomWeld> m_xPage5_ButtonsWnd;
// page 6 controls
std::unique_ptr<weld::Container> m_xPage6;
std::unique_ptr<weld::Label> m_xPage6_Title;
std::unique_ptr<weld::RadioButton> m_xPage6_Default;
std::unique_ptr<weld::RadioButton> m_xPage6_User;
std::unique_ptr<weld::Button> m_xPage6_Back;
std::unique_ptr<weld::Button> m_xPage6_Text;
std::unique_ptr<weld::Button> m_xPage6_Link;
std::unique_ptr<weld::Button> m_xPage6_VLink;
std::unique_ptr<weld::Button> m_xPage6_ALink;
std::unique_ptr<weld::RadioButton> m_xPage6_DocColors;
std::unique_ptr<SdHtmlAttrPreview> m_xPage6_Preview;
std::unique_ptr<weld::CustomWeld> m_xPage6_PreviewWnd;
std::unique_ptr<ButtonSet> m_xButtonSet;
// standard controls
std::unique_ptr<weld::Button> m_xLastPageButton;
std::unique_ptr<weld::Button> m_xNextPageButton;
std::unique_ptr<weld::Button> m_xFinishButton;
Assistent aAssistentFunc;
bool m_bImpress;
bool m_bButtonsDirty;
void SetDefaults();
void CreatePages();
Color m_aBackColor, m_aTextColor, m_aLinkColor;
Color m_aVLinkColor, m_aALinkColor;
void ChangePage();
void UpdatePage();
std::vector<SdPublishingDesign> m_aDesignList;
bool m_bDesignListDirty;
SdPublishingDesign* m_pDesign;
void Load();
bool Save();
void GetDesign(SdPublishingDesign* pDesign);
void SetDesign(SdPublishingDesign const* pDesign);
void LoadPreviewButtons();
DECL_LINK(FinishHdl, weld::Button&, void);
DECL_LINK(NextPageHdl, weld::Button&, void);
DECL_LINK(LastPageHdl, weld::Button&, void);
DECL_LINK(DesignHdl, weld::Toggleable&, void);
DECL_LINK(DesignSelectHdl, weld::TreeView&, void);
DECL_LINK(DesignDeleteHdl, weld::Button&, void);
DECL_LINK(BaseHdl, weld::Toggleable&, void);
DECL_LINK(ContentHdl, weld::Toggleable&, void);
DECL_LINK(GfxFormatHdl, weld::Toggleable&, void);
DECL_LINK(ResolutionHdl, weld::Toggleable&, void);
DECL_LINK(ButtonsHdl, ValueSet*, void);
DECL_LINK(ColorHdl, weld::Button&, void);
DECL_LINK(WebServerHdl, weld::Toggleable&, void);
DECL_LINK(SlideChgHdl, weld::Toggleable&, void);
public:
SdPublishingDlg(weld::Window* pWindow, DocumentType eDocType);
virtual ~SdPublishingDlg() override;
void GetParameterSequence(css::uno::Sequence<css::beans::PropertyValue>& rParams);
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

File diff suppressed because it is too large Load diff

View file

@ -53,10 +53,6 @@
constructor="org_openoffice_comp_Draw_framework_PanelFactory_get_implementation">
<service name="com.sun.star.drawing.framework.PanelFactory"/>
</implementation>
<implementation name="com.sun.star.comp.draw.SdHtmlOptionsDialog"
constructor="com_sun_star_comp_draw_SdHtmlOptionsDialog_get_implementation">
<service name="com.sun.star.ui.dialog.FilterOptionsDialog"/>
</implementation>
<implementation name="com.sun.star.comp.sd.InsertSlideController"
constructor="com_sun_star_comp_sd_InsertSlideController_get_implementation">
<service name="com.sun.star.frame.ToolbarController"/>

View file

@ -697,7 +697,6 @@ draw_constructor_list = [
"com_sun_star_comp_Draw_PresenterHelper_get_implementation",
"com_sun_star_comp_Draw_PresenterPreviewCache_get_implementation",
"com_sun_star_comp_Draw_SlideRenderer_get_implementation",
"com_sun_star_comp_draw_SdHtmlOptionsDialog_get_implementation",
"com_sun_star_comp_sd_InsertSlideController_get_implementation",
"com_sun_star_comp_sd_SlideLayoutController_get_implementation",
"com_sun_star_comp_sd_DisplayModeController_get_implementation",

View file

@ -9543,13 +9543,11 @@ sd/source/filter/eppt/pptx-stylesheet.cxx
sd/source/filter/eppt/pptx-text.cxx
sd/source/filter/eppt/text.hxx
sd/source/filter/grf/sdgrffilter.cxx
sd/source/filter/html/HtmlOptionsDialog.cxx
sd/source/filter/html/buttonset.cxx
sd/source/filter/html/htmlattr.cxx
sd/source/filter/html/htmlattr.hxx
sd/source/filter/html/htmlex.cxx
sd/source/filter/html/htmlex.hxx
sd/source/filter/html/pubdlg.cxx
sd/source/filter/ppt/ppt97animations.cxx
sd/source/filter/ppt/ppt97animations.hxx
sd/source/filter/ppt/pptanimations.hxx

View file

@ -61,7 +61,6 @@ void * sd_PresentationDocument_get_implementation( void *, void * );
void * com_sun_star_comp_Draw_PresenterHelper_get_implementation( void *, void * );
void * com_sun_star_comp_Draw_PresenterPreviewCache_get_implementation( void *, void * );
void * com_sun_star_comp_Draw_SlideRenderer_get_implementation( void *, void * );
void * com_sun_star_comp_draw_SdHtmlOptionsDialog_get_implementation( void *, void * );
void * com_sun_star_comp_sd_InsertSlideController_get_implementation( void *, void * );
void * com_sun_star_comp_sd_SlideLayoutController_get_implementation( void *, void * );
void * com_sun_star_comp_sd_DisplayModeController_get_implementation( void *, void * );
@ -132,7 +131,6 @@ lo_get_constructor_map(void)
{ "com_sun_star_comp_Draw_PresenterHelper_get_implementation", com_sun_star_comp_Draw_PresenterHelper_get_implementation },
{ "com_sun_star_comp_Draw_PresenterPreviewCache_get_implementation", com_sun_star_comp_Draw_PresenterPreviewCache_get_implementation },
{ "com_sun_star_comp_Draw_SlideRenderer_get_implementation", com_sun_star_comp_Draw_SlideRenderer_get_implementation },
{ "com_sun_star_comp_draw_SdHtmlOptionsDialog_get_implementation", com_sun_star_comp_draw_SdHtmlOptionsDialog_get_implementation },
{ "com_sun_star_comp_sd_InsertSlideController_get_implementation", com_sun_star_comp_sd_InsertSlideController_get_implementation },
{ "com_sun_star_comp_sd_SlideLayoutController_get_implementation", com_sun_star_comp_sd_SlideLayoutController_get_implementation },
{ "com_sun_star_comp_sd_DisplayModeController_get_implementation", com_sun_star_comp_sd_DisplayModeController_get_implementation },