sw/source/core/doc/docnew.cxx | 2 +- sw/source/core/inc/laycache.hxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
New commits: commit fff409cb0c31bbf50e508a3f2e15236533988216 Author: Stephan Bergmann <sberg...@redhat.com> Date: Fri Jan 9 12:39:04 2015 +0100 Work around -fsanitize=null (mpLayoutCache may be null, but that was harmless as Write was effectively static) Change-Id: I41b10593c5ae98de92e7b305d9db75d0c4c7b334 diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx index 0f6d0d8..54e486a 100644 --- a/sw/source/core/doc/docnew.cxx +++ b/sw/source/core/doc/docnew.cxx @@ -797,7 +797,7 @@ void SwDoc::ReadLayoutCache( SvStream& rStream ) void SwDoc::WriteLayoutCache( SvStream& rStream ) { - mpLayoutCache->Write( rStream, *this ); + SwLayoutCache::Write( rStream, *this ); } IGrammarContact* getGrammarContact( const SwTxtNode& rTxtNode ) diff --git a/sw/source/core/inc/laycache.hxx b/sw/source/core/inc/laycache.hxx index 5871460..d75e2dd 100644 --- a/sw/source/core/inc/laycache.hxx +++ b/sw/source/core/inc/laycache.hxx @@ -47,7 +47,7 @@ public: ~SwLayoutCache(); void Read( SvStream &rStream ); - void Write( SvStream &rStream, const SwDoc& rDoc ); + static void Write( SvStream &rStream, const SwDoc& rDoc ); void ClearImpl(); bool IsLocked() const { return nLockCount > 0; } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits