[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - sc/source

[Marco Cecchetti]

 sc/source/ui/inc/viewdata.hxx  |    4 ++--
 sc/source/ui/view/viewdata.cxx |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit fdd74fb577c7c09d1c60f61fce572353966d6c6e
Author: Marco Cecchetti <marco.cecchetti at collabora.com>
Date:   Thu Apr 6 19:15:02 2017 +0200

    LOK - Calc - fix for MSVS 2013
    
    Change-Id: Ieda51d7a4b91d9c107aa5550e27ba11c613ae5a9

diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx
index 06d829613c0d..2271321f400d 100644
--- a/sc/source/ui/inc/viewdata.hxx
+++ b/sc/source/ui/inc/viewdata.hxx
@@ -123,7 +123,7 @@ public:
     static_assert(std::numeric_limits<index_type>::is_signed, "ScPositionCache: index type is not signed");
 
 private:
-    static const index_type null = std::numeric_limits<index_type>::min();
+    static const index_type null;
 
     class Comp
     {
@@ -268,7 +268,7 @@ private:
     bool                bGrowing;
 
     long                m_nLOKPageUpDownOffset;
-    
+
     DECL_DLLPRIVATE_LINK( EditEngineHdl, EditStatus&, void );
 
 
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index fb71e4c47c01..e1e24280e8b9 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -91,7 +91,7 @@ void lcl_LOKRemoveWindow(ScTabViewShell* pTabViewShell, ScSplitPos eWhich)
 
 } // anonymous namespace
 
-const ScPositionHelper::index_type ScPositionHelper::null; // definition
+const ScPositionHelper::index_type ScPositionHelper::null = std::numeric_limits<ScPositionHelper::index_type>::min(); // definition
 
 bool ScPositionHelper::Comp::operator() (const value_type& rValue1, const value_type& rValue2) const
 {