sw/source/core/txtnode/ndtxt.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
New commits: commit 3e6a0b6d04722d43a1fc8d3745b5e79b7ced90eb Author: Michael Stahl <[email protected]> Date: Mon Feb 25 22:06:18 2013 +0100 fdo#61428: SwTxtNode::ReplaceText: brown paperbag fix Fix the optimization to return only if both replacement and replaced strings are empty. (regression from b6d45f26ea5bcc848737921b59a16253eb1d8587) Change-Id: I984fb151a5ac3e6eb8d03f854ad6a3df88f96000 diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx index 421d09e..0070f9e 100644 --- a/sw/source/core/txtnode/ndtxt.cxx +++ b/sw/source/core/txtnode/ndtxt.cxx @@ -3350,9 +3350,9 @@ void SwTxtNode::ReplaceText( const SwIndex& rStart, const xub_StrLen nDelLen, "SwTxtNode::ReplaceText: node text with insertion > TXTNODE_MAX."); OUString const sInserted( (nOverflow > 0) ? rStr.Copy(0, rStr.Len() - nOverflow) : rStr); - if (sInserted.isEmpty()) + if (sInserted.isEmpty() && 0 == nDelLen) { - return; + return; // nothing to do } const xub_StrLen nStartPos = rStart.GetIndex(); commit fb781bbf66ad95f52552c36f40d11551aebe97c4 Author: Michael Stahl <[email protected]> Date: Mon Feb 25 21:10:57 2013 +0100 moz: makefiles don't need executable bit Change-Id: If17f3fcd143abfe3870ae763052dcf135d831124 diff --git a/moz/ExternalPackage_moz_lib.mk b/moz/ExternalPackage_moz_lib.mk old mode 100755 new mode 100644 diff --git a/moz/UnpackedTarball_moz_lib.mk b/moz/UnpackedTarball_moz_lib.mk old mode 100755 new mode 100644 _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
