diff options
| author | Armin Le Grand <alg@apache.org> | 2012-06-20 08:17:23 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2013-04-30 15:39:57 +0100 |
| commit | 4c8ffa01131f2df2b314218731d83bd776944802 (patch) | |
| tree | 485475b3f905e01825b98b13a116cef6da99977d /include | |
| parent | Remove weird unused script (diff) | |
| download | core-4c8ffa01131f2df2b314218731d83bd776944802.tar.gz core-4c8ffa01131f2df2b314218731d83bd776944802.zip | |
i#120015# Let SdrUndoAttrObj remember a reference to the used style to survive
removal of the style by UI (which creates no undo actions). Re-add the
style when undoing if needed.
Change-Id: I6069a1cb42dfaeb0dd35fdc15687fd307f2b641e
Diffstat (limited to 'include')
| -rw-r--r-- | include/svx/svdundo.hxx | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/include/svx/svdundo.hxx b/include/svx/svdundo.hxx index 22211640e148..78d9a9c5a439 100644 --- a/include/svx/svdundo.hxx +++ b/include/svx/svdundo.hxx @@ -22,8 +22,9 @@ #include <svl/solar.hrc> #include <svl/undo.hxx> +#include <svl/style.hxx> #include <tools/gen.hxx> -#include <svx/svdtypes.hxx> // fuer enum RepeatFuncts +#include <svx/svdtypes.hxx> // for enum RepeatFuncts #include <svx/svdsob.hxx> #include "svx/svxdllapi.h" @@ -159,9 +160,8 @@ protected: SfxItemSet* pRepeatSet; // oder besser den StyleSheetNamen merken? - SfxStyleSheet* pUndoStyleSheet; - SfxStyleSheet* pRedoStyleSheet; - SfxStyleSheet* pRepeatStyleSheet; + rtl::Reference< SfxStyleSheetBase > mxUndoStyleSheet; + rtl::Reference< SfxStyleSheetBase > mxRedoStyleSheet; bool bStyleSheet; bool bHaveToTakeRedoSet; @@ -174,6 +174,9 @@ protected: // Wenn sich um ein Gruppenobjekt handelt: SdrUndoGroup* pUndoGroup; + // helper to ensure StyleSheet is in pool (provided by SdrModel from SdrObject) + void ensureStyleSheetInStyleSheetPool(SfxStyleSheetBasePool& rStyleSheetPool, SfxStyleSheet& rSheet); + public: SdrUndoAttrObj(SdrObject& rNewObj, bool bStyleSheet1 = false, bool bSaveText = false); virtual ~SdrUndoAttrObj(); |