From 79cfd48dae2b986b691bb00a8400c7e9cc2cdda7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Tue, 29 Aug 2017 11:43:42 +0100 Subject: [PATCH] Resolves: tdf#112017 crash on particular odt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I6ba2e73562a16afecb6abdfe4f1a40b1e316379e Reviewed-on: https://gerrit.libreoffice.org/41685 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- svx/source/unodraw/unoshape.cxx | 3 ++- sw/qa/core/data/odt/pass/tdf112017.odt | Bin 0 -> 1988 bytes 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 sw/qa/core/data/odt/pass/tdf112017.odt diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index 161bf34b1d8a..3c5b88860df4 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -3034,7 +3034,8 @@ void SvxShape::setAllPropertiesToDefault() mpObj->SetMergedItem(Svx3DCharacterModeItem(true)); } - mpModel->SetChanged(); + if (mpModel) + mpModel->SetChanged(); } void SvxShape::setPropertiesToDefault( diff --git a/sw/qa/core/data/odt/pass/tdf112017.odt b/sw/qa/core/data/odt/pass/tdf112017.odt new file mode 100644 index 0000000000000000000000000000000000000000..02a24d9db1467f4d13fb854db7667b8a825c8851 GIT binary patch literal 1988 zcmWIWW@Zs#;Nak3*t++b7XuRD0J3v4b5lzy3sM=?8E*VfEGWpyOinDx%+J#=%S+MA zPb|(X*2^zQ%}dEoF3nBNE72=SttbibX6J}IX2hcd)UOW20XS{o2FfPq=aqnTR^;aN z2HoyEq##iHUEAz#x^-!-R^b0uCMC}4Y|EDZ+k0WFp6|6A>d%VwCQJIgs|xiIcy}YA z<*043*yZ1*lDW)3-_BcoF#1tOKx0Ifi^7SH*R8P;OI#*9-wpA%`)-n#n!aY!rX}9z zciM%UADPE+MB;VDnz_?ITsCo^a6t3Y-xV%@;v~up=6;y1D{TKDc758nuzfmvFO+O5 z`nH9U=~v^!2dpAL5~keCnz1qS=(6Q2c5Tg-c$zjfaG#)~;lr@0J-RzD^Pb&*+HOlO zck%XJZ~V?Hm-pTOziG|XO_7`Y9rvkzY^v2e=lEh}EW=Ocs^yAL1I!+}HU_;YuC!HJ z^Ss^s|Nl+Zz;I&c$SOPi_dhUHq?qxAnvqknW}S-IEf>Yfpv`Nm>{;`9l<6_dFy zP53)!!jV7MW_MrSx{Gr|d)@V%y5x=<*M4T+yz*EkIeJb_^o8#Vx62MG?g*RKBo?D- zSfL)etlwmXcS7mxV9t3gUz8;yrgf}&#rS^5I*+~Eh>`{B``SPzbQ}*ur zUugaJx%1a_P?)S-Y-xTG=;LlCd|?7kt*Ir6;Dj{sY+j22Ps{t-t}g2(t8E2Kf9okq zbWAyNqEJk({%7R2g;`hU*xs)=_V36#W2uyGE2|GNRtaD2tY0_Zao?^qY5IyL&P&?t zj+>@gG}#NxT=jJ6FO7M76H;Y~oWD zrD^lLq$QO2j28NrNz~>|37x%(FVW6V;_T~S*}lZgT*E(7+5B@XmQ0h2czP^ytEP1G zPEp&>3auRvuE_XoeInGzQYd5EFX*yJJwNu{y3pvXFNZI!E?k~|>2AvIJ7?w9{?wkV zkNt7{?6Y}$t4-%GTRCf8^hfX5>q)c49=(3c2uf{J3VoI_FfuR%;te@2P{@^3=A_~d zH&A-hC=>hj?P>bWwpF3U-)bI9{+8W+E@Oi3s}~1~J^y4j#-*p*o~*6VPWm7uDmf|6 zQsHFOBaVL!DXXSUf3>#aLsdXy@kie|mvSd}Z|e$O{9?;)-s@(wt7lCTDsNofA$*Nf=3gg ztP-Y5r(a!`^8u3LTo_iT-4FNHd*~_9zQU4CpmQE-iu3$#cl+tR|A~k0Pychhwf;_y z+>M**pEGBzdbvw<|CLhRZJCO8ar?k2PG{=$X`pcP2ZtLYlL!N%Rza=}K=~9E!0MO) zZ&Y2#Wg)1hK!7A56RF-n*N9wTfQm{4m<4no)`An=2;}^O>f&|4QV3Wlg3B3nUC3z% ql(!Jz5inGca~ir%