[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - solenv/bin sw/source sysui/desktop

[Andre Fischer]

 solenv/bin/modules/installer/epmfile.pm |   12 +-----------
 sw/source/core/docnode/nodes.cxx        |   24 ++++++++++++++++++++++++
 sysui/desktop/debian/control            |    4 ++--
 3 files changed, 27 insertions(+), 13 deletions(-)

New commits:
commit 7f250ed4ce273c5d54898a142f07ef93f38c3056
Author: Andre Fischer <af at apache.org>
Date:   Mon Jul 1 15:10:21 2013 +0000

    121479: Prevent crash when loading some RTF documents.

diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx
index 1150d509..eddef2a 100644
--- a/sw/source/core/docnode/nodes.cxx
+++ b/sw/source/core/docnode/nodes.cxx
@@ -522,6 +522,30 @@ sal_Bool SwNodes::_MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes,
     sal_uInt16 nSectNdCnt = 0;
     sal_Bool bSaveNewFrms = bNewFrms;
 
+    // Check that the range of nodes to move is valid.
+    // This is a very specific test that only checks that table nodes
+    // are completely covered by the range.  Issue 121479 has a
+    // document for which this test fails.
+    SwNodeIndex aNodeIndex (aRg.aEnd);
+    while (aNodeIndex > aRg.aStart)
+    {
+        SwNode* pNode = rNodes[aNodeIndex.GetIndex()];
+        if (pNode->GetNodeType() != ND_ENDNODE)
+            break;
+        SwStartNode* pStartNode = pNode->pStartOfSection;
+        if (pStartNode==NULL)
+            break;
+        if ( ! pStartNode->IsTableNode())
+            break;
+        aNodeIndex = *pStartNode;
+        if (aNodeIndex < aRg.aStart.GetIndex())
+        {
+            return sal_False;
+        }
+        --aNodeIndex;
+    }
+
+
     // bis alles verschoben ist
     while( aRg.aStart < aRg.aEnd )
         switch( (pAktNode = &aRg.aEnd.GetNode())->GetNodeType() )
commit e9991e068f17bbe588b97cdfa07fdd0a3f901f33
Author: Oliver-Rainer Wittmann <orw at apache.org>
Date:   Mon Jul 1 14:23:10 2013 +0000

    121968: further changes for the creation of debian packages in order to get them installed when a former AOO resp. OOo version is installed.

diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm
index cd7ed76..d0efdc0 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -538,23 +538,13 @@ sub create_epm_header
                 if ( $installer::globals::debian ) { $onereplaces =~ s/_/-/g; } # Debian allows no underline in package name
                 $line = "%replaces" . " " . $onereplaces . "\n";
                 push(@epmheader, $line);
-
-                # Force the openofficeorg packages to get removed,
-                # see http://www.debian.org/doc/debian-policy/ch-relationships.html
-                # 7.5.2 Replacing whole packages, forcing their removal
-
-                if ( $installer::globals::debian )
-                {
-                    $line = "%incompat" . " " . $onereplaces . "\n";
-                    push(@epmheader, $line);
-                }
             }
 
             if ( $installer::globals::debian && $variableshashref->{'UNIXPRODUCTNAME'} eq 'openoffice' )
             {
                 $line = "%provides" . " openoffice.org-unbundled\n";
                 push(@epmheader, $line);
-                $line = "%incompat" . " openoffice.org-bundled\n";
+                $line = "%replaces" . " openoffice.org-bundled\n";
                 push(@epmheader, $line);
             }
         }
diff --git a/sysui/desktop/debian/control b/sysui/desktop/debian/control
index a1db639..90f0c09 100644
--- a/sysui/desktop/debian/control
+++ b/sysui/desktop/debian/control
@@ -2,5 +2,5 @@ Description: %productname desktop integration
 Maintainer: Apache Software Foundation
 Architecture: all
 Provides: openoffice-desktop-integration, openoffice.org-unbundled
-Conflicts: openoffice-desktop-integration, openofficeorg-desktop-integration, openoffice.org-debian-menus, openoffice.org-bundled
-Replaces: openoffice-desktop-integration, openoffice.org-debian-menus
+Conflicts: openoffice-desktop-integration, openofficeorg-desktop-integration, openoffice.org-debian-menus
+Replaces: openoffice-desktop-integration, openoffice.org-debian-menus, openoffice.org-bundled, openoffice.org-common