summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2014-01-28 16:59:22 +0100
committerEike Rathke <erack@redhat.com>2014-01-28 17:03:04 +0100
commitcac1123cb9d847da7a04384320f34fa03e3e21ff (patch)
tree9df1f0ce4d34aebb1174fbea7da62278419fbead
parent7bd346b63be249e3ab2695a8f1e767baf0ba8861 (diff)
give MSVC a hint to not break the build, fdo#74042 related
... and be explicit about std::min() types. Change-Id: I6a0dd499d1a29d389ee9da31b71639e3c7c1a6ae (cherry picked from commit 0b3c6203f87f72684ad018963674a10e1c6f7c36)
-rw-r--r--sc/source/ui/view/editsh.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx
index a7fe53c96d01..9a36bbc56c67 100644
--- a/sc/source/ui/view/editsh.cxx
+++ b/sc/source/ui/view/editsh.cxx
@@ -698,7 +698,7 @@ void ScEditShell::GetState( SfxItemSet& rSet )
{
// use selected text as name for urls
OUString sReturn = pActiveView->GetSelected();
- sReturn = sReturn.copy(0, std::min(sReturn.getLength(), 255));
+ sReturn = sReturn.copy(0, std::min(sReturn.getLength(), static_cast<sal_Int32>(255)));
aHLinkItem.SetName(comphelper::string::stripEnd(sReturn, ' '));
}
rSet.Put(aHLinkItem);