sw/source/filter/ww8/rtfattributeoutput.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit cd7b246c6661e48489f4ee5ca23c2911640e2002
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Fri Apr 15 08:37:17 2016 +0200
RtfAttributeOutput::StartRuby: guard against nullptr pRubyText
The member function checks for nullptr earlier, so check everywhere to
be consistent.
Change-Id: Ic357551dd95affe50ff6ef3cfdd44e36af9a0c38
Reviewed-on: https://gerrit.libreoffice.org/24101
Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk>
Tested-by: Jenkins <c...@libreoffice.org>
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx
b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 337a65f..20b361a 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -520,7 +520,7 @@ void RtfAttributeOutput::StartRuby(const SwTextNode& rNode,
sal_Int32 /*nPos*/,
}
aStr += "(\\s\\up ";
- if (g_pBreakIt->GetBreakIter().is())
+ if (g_pBreakIt->GetBreakIter().is() && pRubyText)
nRubyScript =
g_pBreakIt->GetBreakIter()->getScriptType(rNode.GetText(),
pRubyText->GetStart());
else
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
