diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2016-09-18 16:14:35 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2016-09-19 10:10:09 +0000 |
| commit | 5b8c22379e2eae74f7ed78326ab89483db5c6624 (patch) | |
| tree | 60cbfdd24bca243b4a911ff1dab298ef91590b5b /sc/source/ui/app/msgpool.cxx | |
| parent | 96646c351e20fa6699fa368457a05ee70f76f103 (diff) | |
tdf#96453, tdf#100793 rework transfer of data between cond format dlgs
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
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Diffstat (limited to 'sc/source/ui/app/msgpool.cxx')
| -rw-r--r-- | sc/source/ui/app/msgpool.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sc/source/ui/app/msgpool.cxx b/sc/source/ui/app/msgpool.cxx index 9eac708dd647..5509647270b1 100644 --- a/sc/source/ui/app/msgpool.cxx +++ b/sc/source/ui/app/msgpool.cxx @@ -53,7 +53,8 @@ ScMessagePool::ScMessagePool() aGlobalSolveItem ( ScSolveItem ( SCITEM_SOLVEDATA, nullptr ) ), aGlobalUserListItem ( ScUserListItem ( SCITEM_USERLIST ) ), - aPrintWarnItem ( SfxBoolItem ( SCITEM_PRINTWARN, false ) ) + aPrintWarnItem ( SfxBoolItem ( SCITEM_PRINTWARN, false ) ), + aCondFormatDlgItem ( ScCondFormatDlgItem ( nullptr, -1, false ) ) { ppPoolDefaults = new SfxPoolItem*[MSGPOOL_END - MSGPOOL_START + 1]; @@ -67,6 +68,7 @@ ScMessagePool::ScMessagePool() ppPoolDefaults[SCITEM_SOLVEDATA - MSGPOOL_START] = &aGlobalSolveItem; ppPoolDefaults[SCITEM_USERLIST - MSGPOOL_START] = &aGlobalUserListItem; ppPoolDefaults[SCITEM_PRINTWARN - MSGPOOL_START] = &aPrintWarnItem; + ppPoolDefaults[SCITEM_CONDFORMATDLGDATA - MSGPOOL_START] = &aCondFormatDlgItem; SetDefaults( ppPoolDefaults ); |