Armin Le Grand (collabora)
f70a118b03
Moved creation of Undo/Redo actions for geometry changes directly to the methods addDiagramNode/removeDiagramNode of class DiagramHelper so that not every caller has to do that again. Removed from DiagramDialog where that was done before. Extended DiagramDataState which is used for SdrUndoDiagramModelData with needed Model information. After using SdrModel/XShape data as part of the DiagramModel it is necessary to also keep that info when geometry gets changed. Also the current transformation of the group hosting the Diagram is needed. Also the end state of change in SdrUndoDiagramModelData is now late-evaluated to get the changed state. This is needed in redo, so evaluating this if undo is used is the thing to do. Added a general mechanism to apply locks to the SdrObjects, see applyLocksToDiagramObjects. It currently sets MoveProtect, ResizeProtect and DeleteProtect. These get un-set when the Diagram is reverted to a simple SdrObjGroup to not hinder further editing. There is currently no ToFront/ToBack lock or others which may be needed. In principle all geometric changes to objects of the Diagram need to be blocked. Also still missing is that the BackgroundObject has no LineAttributes, or better is not allowed to have these due to mso only offering a FillStyle for that object. Not sure yet how to do that. Added a mechanism to automatically delete the buffered original data when attributes change, see ItemSetInformationChange. This is triggered by AttributeProperties::ItemSetChanged, but needs to be prevented during import (which also changes Items). Added support to delete the SubSelected object if it is a TextFrame. This leads to geometry change and re-layout and also creates a Undo action now. Attribute access to SubSelection is done in SdrEditView::MergeAttrFromMarked/SetAttrToMarked so that attributes can now be changed like for regular objects. Also some methods in SdrMarkView had to be adapted to work with the SubSelected object. Extended Diagram SubSelection to make tab/ShiftTab work, including from where the Diagram is entered. Also made direct MouseKlick work. Added simplifications to work with Diagram stuff, some tooling directly at SdrObject. Due to UnitTests I reverted the decision to have all SdrObjects in the Diagram 'flat' without Groups. That would be easier and is what the import of MSO visualizationm replacement often uses, but not what a reLayout creates. Those complaining tests are the pptx ones that have no replacement graphics (no drawing*.xml) and have to be re-layouted using our mechanism as existing so far. So keep groups again for now. Price is that all stuff handling SubSelections has to use SdrObjListIter instead of SdrObjList. That makes it somewhat more complicated, but work on a virtually flat hierarchy of SubObjects in any case - maybe safer for the future. Also looked at that Locking oif SdrObjects again also due to a test. I wanted to use the extended/newer stuff, but applying it made the office crash. After some debugging I found that in SdrObjList::RemoveObject the remove is *cancelled* when SdrObject::IsDeleteProtect is set for that object. Unfortunately that remove is due to moving the object to another target list, so it should happen. This is probably a relict of very old stuff, to prevent object delettion that way (!). For now I use the fact that this happens during import. Change-Id: Ied2263928106e2cb02047e2e9a55c680384b2932 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/201497 Reviewed-by: Armin Le Grand <Armin.Le.Grand@me.com> Tested-by: Jenkins
LibreOffice Impress / Draw Application
The core directory for the impress/draw applications.
Think of impress as a hack on top of draw.
sd module contains impress/draw specific code, non-shared UI and part
of ppt and pptx filter, few other filters too.
the slideshow UI lives here as well, the slideshow engine is in
slideshow module though (including the 3D transitions engine
slideshow/source/engine/opengl).
the most used filters are ODF's odp, binary ppt and OOXML's
pptx. their locations are listed below:
-
odpimport and export filters are inxmloffmodule (mostlyxmloff/source/draw) -
pptimport is insd/source/filter/ppt(big shared chunks are also insvx) -
pptexport is insd/source/filter/eppt(big shared chunks are also insvx) -
pptximport is inoox/source/ppt(and uses a lot ofoox/source/drawingmlandoox/source/*) -
pptxexport is insd/source/filter/eppt(mostly inpptx-*source files) and shared part is inoox/source/export
PPTX Export / Import Filters
PPTX export filter is split into 2 parts. Impress related part is in
sd/source/filter/eppt/pptx-* and the other part is in
oox/source/export/ because it contains mostly code related to
DrawingML, which is shared with writer and calc ooxml export.
The export filter was written in 2009 IIRC and was not much extended feature-wise lately.
Presenter Console
The main screen uses a hardware-accelerated
canvas (e.g. cairo canvas), while the entire secondary screen
uses a VCL-canvas that is created in
sd::framework::FullScreenPane::CreateCanvas().
The secondary screen contains 3 Panes which each have
2 XWindows for the border area & the actual content,
and each content Pane is backed by a sd::presenter::PresenterCanvas
that wraps the FullScreenPane's canvas and does clipping.
Future Works
Add custom shapes export (see below). enhance text
output, we don't write text style for indentation levels now, need to
export a:lvl1pPr, a:lvl2pPr, ... elements.
PPTX import was written by Sun/Oracle and then extended in LibreOffice
a lot during bug fixing. It is located in oox/source/ppt and
oox/source/drawingml. The areas with most bugs (at least until today)
were shape placeholders and text style inheritance.