diff options
| author | Katarina Behrens <bubli@bubli.org> | 2014-09-05 14:11:15 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2014-12-13 16:00:42 +0100 |
| commit | b6a3cc9bdccfb9a9029741edf1b418c8920ddf6f (patch) | |
| tree | 2e7bbfb40d3c9b5c249ed7023a0eee622d0bd235 /sd | |
| parent | d94218cef23b12d9ca24bc5e42072650d2081c60 (diff) | |
fdo#82681: return IsUserDefined w/o negation
when the predicate is called StyleSheetIsUserDefinedPredicate
Returning negation thereof somewhere, somehow, corrupts one of
SfxItem pools. Thus, invalid read happens and crashes Impress
and Draw.
Now the loop in SdStyleSheetPool::UpdateStdNames does nothing
(it iterates through user-defined styles, but its body does
something for non-user-defined styles), so more investigation
here is needed.
This is partial revert of commit 3440766f0ad43454287a874b5fd34b6f2af6bdf1
Change-Id: I06f0da320c49674dac2adf43b7c374babbdadb57
(cherry picked from commit a784c33fd48eeb3394dc63610e384cf866233093)
Signed-off-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/core/stlpool.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx index 17ca4f09caee..c98dff72fa5f 100644 --- a/sd/source/core/stlpool.cxx +++ b/sd/source/core/stlpool.cxx @@ -943,7 +943,7 @@ struct StyleSheetIsUserDefinedPredicate : svl::StyleSheetPredicate bool Check(const SfxStyleSheetBase& sheet) SAL_OVERRIDE { - return !sheet.IsUserDefined(); + return sheet.IsUserDefined(); } }; } |