[Libreoffice-commits] core.git: 2 commits - forms/source sc/source

[Eike Rathke]

 forms/source/xforms/binding.hxx |    2 +-
 sc/source/core/tool/token.cxx   |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 6e1efe7b6bd16e3183cdb7c87d786cb714a61959
Author: Eike Rathke <erack at redhat.com>
Date:   Thu Feb 9 16:54:43 2017 +0100

    preserve 3D flag if sheet reference is absolute, tdf#103890 follow-up
    
    A reference like $Sheet1.A1 should have the 3D flag preserved when
    moving around, otherwise the absolute flag is still there but invisible
    when moving within or onto Sheet1.
    
    Change-Id: I937091535bc37d0bdbffb786472d7eae2f931df0

diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index d8c1033..02f8a04 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -3151,7 +3151,7 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceOnMove(
                         }
 
                         rRef.SetAddress(aAbs, rNewPos);
-                        rRef.SetFlag3D(aAbs.Tab() != rNewPos.Tab());
+                        rRef.SetFlag3D(aAbs.Tab() != rNewPos.Tab() || !rRef.IsTabRel());
                     }
                     break;
                 case svDoubleRef:
@@ -3167,7 +3167,7 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceOnMove(
                         }
 
                         rRef.SetRange(aAbs, rNewPos);
-                        rRef.Ref1.SetFlag3D(aAbs.aStart.Tab() != rNewPos.Tab());
+                        rRef.Ref1.SetFlag3D(aAbs.aStart.Tab() != rNewPos.Tab() || !rRef.Ref1.IsTabRel());
                     }
                     break;
                 case svExternalSingleRef:
commit 12ecbe796218dd1b1a3e951e6cbc532ff41be6bc
Author: Eike Rathke <erack at redhat.com>
Date:   Tue Feb 7 17:17:10 2017 +0100

    space typo
    
    it's an interface name..
    
    Change-Id: Ie758f29864761a4e0c41326dac14d233c22e5f52

diff --git a/forms/source/xforms/binding.hxx b/forms/source/xforms/binding.hxx
index 9f1220f..bf6cedc 100644
--- a/forms/source/xforms/binding.hxx
+++ b/forms/source/xforms/binding.hxx
@@ -330,7 +330,7 @@ public:
     virtual void SAL_CALL setValue( const css::uno::Any& aValue ) override;
 
 
-    // XListEntry Source
+    // XListEntrySource
 
 
     virtual sal_Int32 SAL_CALL getListEntryCount() override;