Instead of creating instances of sd::presenter::PresenterHelper
by using a "com.sun.star.drawing.PresenterHelper" service
and a factory to create them, call the ctor directly.
Drop the now unused service/component.
The use of UNO abstraction seems to be historical only, see the
/** This interface is a collection of functions that were necessary to
implement larger parts of the presenter screen as extension. The
methods of this interface give access to services that could only be
implemented in the Office core, not in an extension.
<p>As the presenter screen is no extension any more, this hack can go again;
it just needs clean-up.</p>
*/
comment in offapi/com/sun/star/drawing/XPresenterHelper.idl,
introduced with
commit ea91c7d90d
Author: Stephan Bergmann <sbergman@redhat.com>
Date: Wed Nov 21 17:19:28 2012 +0100
Turn presenter screen from bundled extension to plain code
Change-Id: I9e65b907eca64c0abcafee3423fb21d2a657d850
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182239
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Tested-by: Jenkins
This reverts commit 2cf7c26293.
Reason for revert:
<_rene_> noelgrandin: sdui->sd... and what about people not needing that ui?
<_rene_> (e.g. --disable-gui and libreoffice-draw-nogui and impress-nogui)
<_rene_> i.e. the use case of --convert-to for ppt(x) etc
Change-Id: I6755c209e63f34b3fc9f9fdc4af7001b18579e8b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163348
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
which eliminates another dynamic-symbol lookup and another complication
which was making it harder to do better with --enable-mergedlibs
sd is relatively small, so even the combined library is not as big as
one of the sw and sc libraries
Change-Id: Ibef8077d70a5abc7361c95f5dbb8c43447610188
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163302
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
which was introduced in
commit 8c4d7aa42d
Author: Kurt Zenker <kz@openoffice.org>
Date: Thu Apr 3 13:42:43 2008 +0000
INTEGRATION: CWS presenterview (1.1.2); FILE ADDED
but does not appear to have ever been actually used.
Change-Id: Icd33f81cfee246fe72a4b9e584f7a6ca96d6e38b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145907
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
(see commit message of 86ce77b925 "Don't adertise
PresenterCanvas as com.sun.star.rendering.Canvas service"; maybe it was just
cargo cult to make it available as a service in the first place)
Change-Id: I31291a7685c89d469309754cc4630b824a276890
Window::ImplGetCanvas (vcl/source/window/window.cxx) tries to obtain such a
Canvas service (passing in 6 initialization arguments), and the CanvasFactory in
canvas/source/factory/cf_service.cxx apparently goes through the implementations
advertised to implement that service, looking for the best match. At least for
Linux-rpm_deb-x86_64@70-TDF-dbg tinderbox, it somehow manages to pick the
PresenterCanvas (instead of one of the more obvious choices among the variants
in canvas/soruce/{cairo,directx,vcl}), but which only epects 5 initialization
arguments, so CppunitTest_cppcanvas_emfplus fails with a "PresenterCanvas:
invalid number of arguments" exception. (And the choice of the PresenterCanvas
looks more than dubious anyway.)
Normally, instances of PresenterCanvas appear to be created "directly" from
PresenterHelper::createSharedCanvas (sd/source/ui/presenter/PresenterHelper.cxx)
so it shouldn't hurt to no longer adertise this implementation as providing the
Canvas service---and it might not even be necessary to make it available via the
service manager at all.
Change-Id: Ie76bfc87fec51b6d5361930204e55ef9cb80370e
TODO: take into account remarks from Gerrit
New combo to select display mode among:
- Slide edition (Normal)
- Outline
- Notes
- Slide sorter
- Slide master
- Notes master
- Handout (master, as we are designing the template used to generate
the handout)
The combo is based on uno command .uno:DisplayMode
Center pane tabs are hidden by default. A new uno dispatch
command (.uno:ToggleTabBarVisibility) is available to show/hide
this tab bar.
Modified uno dispatch commands:
No uno name has been modified.
.uno:DiaMode :
SID_DIAMODE renamed SID_SLIDER_SORTER_MODE
.uno:OutlineMode
SID_OUTLINEMODE renamed SID_OUTLINE_MODE
.uno:NotesMode
No change
.uno:HandoutMode
SID_HANDOUT_MODE renamed SID_HANDOUT_MASTER_MODE
All internal code also considers the edit mode as master
.uno:SlideMasterPage
SID_SLIDE_MASTERPAGE renamed SID_SLIDE_MASTER_MODE
If the input parameter SfxBoolItem Isactive is true or not provided,
activates Slide Master mode. If parameter is false, activates the
"Normal" (slide editing) mode.
.uno:NotesMasterPage
SID_NOTES_MASTERPAGE renamed SID_NOTES_MASTER_MODE
If the input parameter SfxBoolItem Isactive is true or not provided,
activates Notes Master mode. If parameter is false, activates the
"Notes" mode.
Modified behaviours: Now only one mode can be chosen. It is possible to
navigate from a mode to any other mode.
Previous behaviour: the following navigation
Normal -> Slide Master -> Notes -> Normal
was displaying slide master. It was required to activate Normal once more
to get back to normal.
Now the same commands will display the requested mode.
Still to come (at least):
- Fix reopen the last display mode.
- Center pane tabs are now presenting all buttons for all modes (TODO).
Change-Id: I11ab59d2f3caa9149260c5e55d44d598d0ce3390
Reviewed-on: https://gerrit.libreoffice.org/16723
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
This reverts commit 7ce2a89f4f.
Change-Id: I53f572777e84f66fd4c3d18fb686dac09095804a
revert d38cb53e3b
Change-Id: I5b243b69e50084316aaeab250d6b01079c12b718
Revert "sidebar: disable impress task pane if sidebar is enabled."
This reverts commit ee1726bfdb.
revert 54d820a781
Change-Id: Ie7c83d88f5427a7e42fa50879280a0c4a7c2cdd1
Revert "Only register and use the Sidebar if it is globally enabled."
This reverts commit 66a5cc468c.
Conflicts:
sfx2/source/view/viewfrm.cxx
Change-Id: I17fe702996c4adf7f387573d36ea993f8cc32c96
Revert "disable sidebar menu option if it is disabled."
This reverts commit 05f0eb5761.
Revert "finally get the taskpane rendering again"
This reverts commit 228bb7ffe0.
Conflicts:
officecfg/registry/data/org/openoffice/Office/Impress.xcu
sd/source/ui/framework/factories/TaskPanelFactory.cxx
sd/source/ui/framework/tools/FrameworkHelper.cxx
Change-Id: I248cc9a769695cde19e78774d42ce666dc685599
Revert "don't throw up the sidebar on start."
This reverts commit 645db9a2bd.
Conflicts:
officecfg/registry/data/org/openoffice/Office/Views.xcu
Change-Id: I911859757e2e019836e8ed5213d2ba69ff82aec8
Revert "update to the right service name for new URLs."
This reverts commit 55f49970f4.
Conflicts:
sd/source/ui/framework/tools/FrameworkHelper.cxx
Change-Id: I1ba2762a4c969a9125ff8354a9b6035813290021
Revert "tentatively restore more UNO / task-pane goo ..."
This reverts commit 052ac10a6f.
Conflicts:
officecfg/registry/data/org/openoffice/Office/Impress.xcu
Change-Id: I7e62f27329af033df811549436718648a6447dea
Revert "more reverts, first cut at making sidebar optional."
This reverts commit a65a423e22.
Revert "add experimental option for sidebar to 'Advanced' pane."
This reverts commit 54d820a781.
Conflicts:
cui/source/options/optjava.cxx
sd/source/ui/framework/module/ImpressModule.cxx
Change-Id: I09a6c0f7834c8ef330d05a014505aaaf09ae096f
Revert "Restore FrameworkHelper taskpane URLs."
This reverts commit e9c2d5b26b.
more foo
Change-Id: I2eaa2fbd74dc7a2f7ba937d310472cee6b5a0b57
really go to town on it
Change-Id: I885dc03cd0286bbfdf05c05da9f0bbea2b78bcf4
Xisco Fauli