sd/source/core/stlpool.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit a784c33fd48eeb3394dc63610e384cf866233093
Author: Katarina Behrens <bu...@bubli.org>
Date: Fri Sep 5 14:11:15 2014 +0200
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
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index 7cde782..4a6a940 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();
}
};
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
