diff options
| author | Katarina Behrens <bubli@bubli.org> | 2014-09-05 14:11:15 +0200 |
|---|---|---|
| committer | Katarina Behrens <bubli@bubli.org> | 2014-09-05 17:43:03 +0200 |
| commit | a784c33fd48eeb3394dc63610e384cf866233093 (patch) | |
| tree | 77bfc55d51a574b691bd121f5e41bc979409212a | |
| parent | a2762333bc052212b44200adfe553e46b83e53d2 (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
| -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 7cde782592f8..4a6a94059143 100644 --- a/sd/source/core/stlpool.cxx +++ b/sd/source/core/stlpool.cxx @@ -937,7 +937,7 @@ struct StyleSheetIsUserDefinedPredicate : svl::StyleSheetPredicate bool Check(const SfxStyleSheetBase& sheet) SAL_OVERRIDE { - return !sheet.IsUserDefined(); + return sheet.IsUserDefined(); } }; } |