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

[Michael Stahl]

 odk/docs/install.html                                   |   24 ++++++++++++++--
 sw/source/core/doc/DocumentContentOperationsManager.cxx |    3 +-
 2 files changed, 24 insertions(+), 3 deletions(-)

New commits:
commit cac440fd5a76f4a76565466cd9df363f5634e8bd
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri Aug 18 17:25:17 2017 +0200

    tdf#99692 sw: fix the fix: don't set bNullContent if node was split
    
    When showing the redlines in rhbz908615-13.odt, the following assertion
    happens:
    
    Assertion `IDocumentMarkAccess::IsLegalPaMForCrossRefHeadingBookmark(rPaM) && "<CrossRefBookmark::CrossRefBookmark(..)>" "- creation of cross-reference bookmark with an illegal PaM that does not expand over exactly one whole paragraph."' failed.
    
    This is because in DocumentContentOperationsManager::MoveRange() the
    flag bNullContent is set after the node has been split; in this case the
    nContent is of course always 0.
    
    Later the function then restores aSavePam to the index 0 of the next
    node, when it actually shouldn't do anything because the JoinNext()
    already positioned it correctly at the merge-index of the re-joined node.
    
    (regression from 850795942b3e168cab8ce88b4f2b421945ff29ca)
    
    Change-Id: I64d50e70b19e2fd81537a9771fa8706898b17642
    (cherry picked from commit 6a018363791945b6fd7f04f2aa311e4f4753f6aa)
    Reviewed-on: https://gerrit.libreoffice.org/41304
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index 32f7da7e99de..cfc4f4fe9605 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -2039,7 +2039,8 @@ bool DocumentContentOperationsManager::MoveRange( SwPaM& rPaM, SwPosition& rPos,
     // the manipulated range.
     // tdf#99692 don't Move() back if that would end up in another node
     // because moving backward is not necessarily the inverse of forward then.
-    const bool bNullContent = aSavePam.GetPoint()->nContent == 0;
+    // (but do Move() back if we have split the node)
+    const bool bNullContent = !bSplit && aSavePam.GetPoint()->nContent == 0;
     if( bNullContent )
     {
         aSavePam.GetPoint()->nNode--;
commit 20989f6c206619e527d57d79d5b8b7c8ef3fe70d
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Aug 17 15:42:32 2017 +0200

    tdf#107785 odk: document where to download the SDK
    
    Change-Id: I56368bc7e75671f170cce2360ac093e43b629e66
    (cherry picked from commit 7cecf138815770ade61c090efad2258f5baf5c9a)
    Reviewed-on: https://gerrit.libreoffice.org/41254
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/odk/docs/install.html b/odk/docs/install.html
index fad79c08d01f..644f42490e8b 100644
--- a/odk/docs/install.html
+++ b/odk/docs/install.html
@@ -67,9 +67,29 @@
                         <tr valign="top">
                           <td><b>LibreOffice %PRODUCT_RELEASE%
                               installation</b></td>
-                          <td class="content80">The SDK works on top of an
+                          <td class="content80"><p>The SDK works on top of an
                             existing LibreOffice installation and uses the same
-                            libraries as the LibreOffice installation.</td>
+                            libraries as the LibreOffice installation.</p>
+                            <p>Download the SDK from the same
+                            source as your LibreOffice packges.</p>
+                            <ul>
+                              <li>If you have installed an official The
+                                Document Foundation LibreOffice release,
+                                download and install the corresponding SDK
+                                release for your platform from
+                                <a target="_blank" href="https://www.libreoffice.org/download" title="link to The Document Foundation download page">https://www.libreoffice.org/download</a>
+                              </li>
+                              <li>If you have installed a downstream LibreOffice
+                                release via your operating system's package
+                                management tools, use the same package
+                                management tools to install the corresponding
+                                downstream SDK package(s).
+                              </li>
+                            </ul>
+                            <p><b>Note</b>: Do not mix and match The Document
+                              Foundation LibreOffice releases with downstream
+                              SDK packages or vice versa!</p></td>
+                            </td>
                         </tr>
                         <tr valign="middle">
                           <td colspan="2"><img class="line" src="images/sdk_line-1.gif"/></td>