[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sw/source

Caolán McNamara caolanm at redhat.com
Wed Aug 26 08:43:53 PDT 2015


 sw/source/filter/ww8/ww8par.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit af3b581d2678622f992433cc37c16db0f4549489
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Aug 25 16:36:08 2015 +0100

    behave like the native format filter for non-insert mode
    
    just shove the unneeded pam into dead space
    
    (cherry picked from commit d9edac5d58aa3c4f15cf4022a1faf776d3003e78)
    
    Change-Id: Id0a3d550cd9d54394888e6b2d62e21eaded24a7c
    Reviewed-on: https://gerrit.libreoffice.org/18019
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>

diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index de84a15..2b0170b 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -6105,6 +6105,9 @@ sal_uLong WW8Reader::Read(SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, co
         {
             // Remove Frame and offsets from Frame Template
             Reader::ResetFrmFmts( rDoc );
+
+            rPaM.GetBound().nContent.Assign(0, 0);
+            rPaM.GetBound(false).nContent.Assign(0, 0);
         }
         try
         {


More information about the Libreoffice-commits mailing list