[Libreoffice-commits] core.git: Changes to 'private/kendy/mailmerge-04'
Miklos Vajna
vmiklos at collabora.co.uk
Thu Apr 9 10:11:38 PDT 2015
New branch 'private/kendy/mailmerge-04' available with the following commits:
commit 813ee98ed511fd8ce13d1bee4c84c18076ed66e1
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Thu Apr 9 14:20:44 2015 +0200
tdf#89214 SwDoc::GetUniqueNumRuleName: always return pChkStr if it's unused
Regression from commit bb00a0097900ae054401f7758a915047cfde4065 (do not
bother with nice unique names during mailmerge, 2014-11-08),
SwAttrSet::CopyToModify() expects that in case SwDoc::FindNumRulePtr()
returns 0 for a name, then the call to SwDoc::MakeNumRule() will use the
not found name (as SwDoc::GetUniqueNumRuleName() will return the just
checked name).
As a result, simply always returning a random unique name during mail
merge is a problem. Only return a cheap random unique name if no hint is
given.
Unit test not backported, as the framework is missing in the 4.1-LHM.
Conflicts:
sw/qa/extras/mailmerge/mailmerge.cxx
Change-Id: I49d65009ced97d00aa2e8db35a529f2f30ac9ae5
commit 3bb49e8dfb8cc82fbb9c6780eae0754913a6e558
Author: Jan Holesovsky <kendy at collabora.com>
Date: Thu Apr 9 19:09:07 2015 +0200
Buildfix for the backport.
Change-Id: Ia88e3ecbacca6358e7c07b7a415293f57ebf30d7
More information about the Libreoffice-commits
mailing list