sw/source/ui/shells/annotsh.cxx | 2 +- sw/source/ui/shells/drwtxtex.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
New commits: commit e537049caa30c629092834f6a6d57931dac1dfa0 Author: Noel Grandin <n...@peralex.com> Date: Tue Oct 15 12:34:38 2013 +0200 fix some fallout from my OUString conversions std::min on Windows is a little pickier Change-Id: I34212839f8b3fd934992278dfca60a3a26af8171 diff --git a/sw/source/ui/shells/annotsh.cxx b/sw/source/ui/shells/annotsh.cxx index d80109c..0eca661 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 c30db2c..4c5e9e7 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, ' ')); } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits