diff options
author | Marco Cecchetti <marco.cecchetti@collabora.com> | 2017-04-06 19:15:02 +0200 |
---|---|---|
committer | Marco Cecchetti <marco.cecchetti@collabora.com> | 2017-04-06 19:15:02 +0200 |
commit | fdd74fb577c7c09d1c60f61fce572353966d6c6e (patch) | |
tree | ccb8d4effc0fdd4f048cbce609e053bcd993b9d3 /sc | |
parent | 6cdc0514f92a24532b3be581b9295324ea02fdf5 (diff) |
LOK - Calc - fix for MSVS 2013
Change-Id: Ieda51d7a4b91d9c107aa5550e27ba11c613ae5a9
Diffstat (limited to 'sc')
-rw-r--r-- | sc/source/ui/inc/viewdata.hxx | 4 | ||||
-rw-r--r-- | sc/source/ui/view/viewdata.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
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 { |