tdf#96453, tdf#100793 rework transfer of data between cond format dlgs

Desktop / LibreOffice - Markus Mohrhard [googlemail.com] - 19 September 2016 05:10 UTC

The xml based transfer of information was a bad idea from the start. It can obviously not transport the temporary conditional format information from the manager dialog. Therefore the whole handling here was completely broken and deleted formats came back, changed formats were not saved and added formats got applied directly to the document.

Now the document fornat list and the one from the manager are indepedent again and as long as the manager has not been closed with ok nothing is written to the document.

Change-Id: I9802be11cd15c2d2d877e55c91d836735fe0e0ff Reviewed-on: https://gerrit.libreoffice.org/28995

5b8c223 tdf#96453, tdf#100793 rework transfer of data between cond format dlgs
sc/Library_sc.mk | 1 +
sc/inc/scabstdlg.hxx | 4 +-
sc/inc/scitems.hxx | 3 +-
sc/source/ui/app/msgpool.cxx | 4 +-
sc/source/ui/attrdlg/scdlgfact.cxx | 7 +-
sc/source/ui/attrdlg/scdlgfact.hxx | 4 +-
sc/source/ui/condformat/condformatdlg.cxx | 214 +++++++------------------
sc/source/ui/condformat/condformatdlgitem.cxx | 77 +++++++++
sc/source/ui/condformat/condformatmgr.cxx | 13 ++
sc/source/ui/inc/condformatdlg.hxx | 33 +---
sc/source/ui/inc/condformatdlgitem.hxx | 68 ++++++++
sc/source/ui/inc/condformatmgr.hxx | 3 +-
sc/source/ui/inc/msgpool.hxx | 2 +
sc/source/ui/view/cellsh1.cxx | 74 +++++----
sc/source/ui/view/tabvwshc.cxx | 47 ++----
15 files changed, 299 insertions(+), 255 deletions(-)

Upstream: cgit.freedesktop.org

  • Share