diff options
author | Noel Grandin <noel@peralex.com> | 2013-10-15 12:34:38 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2013-10-15 12:34:38 +0200 |
commit | e537049caa30c629092834f6a6d57931dac1dfa0 (patch) | |
tree | f4915b9c967cbbac8a03364dfd1e2656e8d4c2a0 /sw | |
parent | 02bfed8a53556badfea637930b05d923cf9465f2 (diff) |
fix some fallout from my OUString conversions
std::min on Windows is a little pickier
Change-Id: I34212839f8b3fd934992278dfca60a3a26af8171
Diffstat (limited to 'sw')
-rw-r--r-- | sw/source/ui/shells/annotsh.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/shells/drwtxtex.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/ui/shells/annotsh.cxx b/sw/source/ui/shells/annotsh.cxx index d80109c30352..0eca661beec1 100644 --- a/sw/source/ui/shells/annotsh.cxx +++ b/sw/source/ui/shells/annotsh.cxx @@ -1050,7 +1050,7 @@ void SwAnnotationShell::StateInsert(SfxItemSet &rSet) else { OUString sSel(pOLV->GetSelected()); - sSel = sSel.copy(0, std::min(255, sSel.getLength())); + sSel = sSel.copy(0, std::min(static_cast<sal_Int32>(255), sSel.getLength())); aHLinkItem.SetName(comphelper::string::stripEnd(sSel, ' ')); } diff --git a/sw/source/ui/shells/drwtxtex.cxx b/sw/source/ui/shells/drwtxtex.cxx index c30db2c2c476..4c5e9e77b978 100644 --- a/sw/source/ui/shells/drwtxtex.cxx +++ b/sw/source/ui/shells/drwtxtex.cxx @@ -1013,7 +1013,7 @@ void SwDrawTextShell::StateInsert(SfxItemSet &rSet) else { OUString sSel(pOLV->GetSelected()); - sSel = sSel.copy(0, std::min(255, sSel.getLength())); + sSel = sSel.copy(0, std::min(static_cast<sal_Int32>(255), sSel.getLength())); aHLinkItem.SetName(comphelper::string::stripEnd(sSel, ' ')); } |