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

[Kohei Yoshida]

 sc/source/core/data/column3.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e4f500934e51946cd1fbfa8b8dc6f6fb26a7779b
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date:   Fri May 9 14:04:30 2014 -0400

    fdo#77379: Don't return from the call. Notes are handled at the end.
    
    Returning prematurely would end up skipping pasting of notes.
    
    Change-Id: I79e0968023342a68fe729f31eb6cfc3cfacd5850
    (cherry picked from commit f4673ccd5e26d38a28f297d64ed70ba719d21ef2)
    Reviewed-on: https://gerrit.libreoffice.org/9295
    Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index ef726d1..6f5e4e2 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -881,7 +881,7 @@ public:
             case sc::element_type_string:
             {
                 if (!bString)
-                    return;
+                    break;
 
                 sc::string_block::const_iterator it = sc::string_block::begin(*node.data);
                 std::advance(it, nOffset);
@@ -905,7 +905,7 @@ public:
             case sc::element_type_edittext:
             {
                 if (!bString)
-                    return;
+                    break;
 
                 sc::edittext_block::const_iterator it = sc::edittext_block::begin(*node.data);
                 std::advance(it, nOffset);