Skip to content

C
core
Kaydet (Commit) e537049c authored tarafından Noel Grandin's avatar Noel Grandin
Dosyalara gözat
Seçenekler

fix some fallout from my OUString conversions 

std::min on Windows is a little pickier

Change-Id: I34212839f8b3fd934992278dfca60a3a26af8171
üst 02bfed8a
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
sw/source/ui/shells/annotsh.cxx
Dosyayı görüntüle @ e537049c
...@@ -1050,7 +1050,7 @@ void SwAnnotationShell::StateInsert(SfxItemSet &rSet) ...@@ -1050,7 +1050,7 @@ void SwAnnotationShell::StateInsert(SfxItemSet &rSet)
else else
{ {
OUString sSel(pOLV->GetSelected()); 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, ' ')); aHLinkItem.SetName(comphelper::string::stripEnd(sSel, ' '));
} }
......
sw/source/ui/shells/drwtxtex.cxx
Dosyayı görüntüle @ e537049c
...@@ -1013,7 +1013,7 @@ void SwDrawTextShell::StateInsert(SfxItemSet &rSet) ...@@ -1013,7 +1013,7 @@ void SwDrawTextShell::StateInsert(SfxItemSet &rSet)
else else
{ {
OUString sSel(pOLV->GetSelected()); 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, ' ')); aHLinkItem.SetName(comphelper::string::stripEnd(sSel, ' '));
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment