[Libreoffice-commits] core.git: 2 commits - svtools/source translations

[Andras Timar]

 svtools/source/control/ruler.cxx |    1 +
 translations                     |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit e98fab99b509b40312a2d5867327e06f9e55bfe2
Author: Andras Timar <andras.timar at collabora.com>
Date:   Thu May 4 16:35:20 2017 +0200

    Updated core
    Project: translations  b0195da863b1f3edafb44e652f5b0443fb666672
    
    Updated Slovenian translation
    
    Change-Id: Idd7711b7fcbd488163d2a92596fc54c4e91bd54e

diff --git a/translations b/translations
index 2425bbd76383..b0195da863b1 160000
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 2425bbd76383ee0ec7f94441bd432db6af2b3a58
+Subproject commit b0195da863b1f3edafb44e652f5b0443fb666672
commit 088ce8d2df78dd60724d1be0feb9f02bbcd043a4
Author: Mike Kaganski <mike.kaganski at collabora.com>
Date:   Thu May 4 14:58:17 2017 +0300

    tdf#107622: also update nNullVirOff when changing nNullOff
    
    Change-Id: Iad867d6130c263d7bbfd7caf5c1805f13325aedb
    Reviewed-on: https://gerrit.libreoffice.org/37234
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx
index 0adcbe5bf445..57f0311940bd 100644
--- a/svtools/source/control/ruler.cxx
+++ b/svtools/source/control/ruler.cxx
@@ -2495,6 +2495,7 @@ void Ruler::SetNullOffset( long nPos )
 {
     if ( mpData->nNullOff != nPos )
     {
+        mpData->nNullVirOff += nPos - mpData->nNullOff;
         mpData->nNullOff = nPos;
         ImplUpdate();
     }