diff options
| author | Noel Grandin <noel@peralex.com> | 2013-10-15 12:54:25 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-10-15 12:55:36 +0200 |
| commit | 1014cc94e86cafac31192da384bc41790130debb (patch) | |
| tree | 21a1a52cb00b72caf35b93d0a5170fc289db8d2b /sw | |
| parent | 66a96c82746118c70a447d7768b0428e15d2f5ad (diff) | |
more fixes for OUString conversion in Windows build
More std::min pickiness, and some ternary operator pickiness.
Change-Id: Ic7feed165c6bb35e08a5e44031d06a1fcb298983
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/ui/index/cnttab.cxx | 4 | ||||
| -rw-r--r-- | sw/source/ui/shells/annotsh.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/shells/drwtxtex.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/shells/textsh.cxx | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index feda8ab743bb..4f164076a79d 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -3947,9 +3947,9 @@ void SwEntryBrowseBox::WriteEntries(SvStream& rOutStr) sWrite += ";"; sWrite += pEntry->sSecKey; sWrite += ";"; - sWrite += pEntry->bCase ? "1" : "0"; + sWrite += pEntry->bCase ? OUString("1") : OUString("0"); sWrite += ";"; - sWrite += pEntry->bWord ? "1" : "0"; + sWrite += pEntry->bWord ? OUString("1") : OUString("0"); if( sWrite.getLength() > 5 ) rOutStr.WriteByteStringLine( sWrite, eTEnc ); diff --git a/sw/source/ui/shells/annotsh.cxx b/sw/source/ui/shells/annotsh.cxx index 0eca661beec1..d01c5947dd8c 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(static_cast<sal_Int32>(255), sSel.getLength())); + sSel = sSel.copy(0, std::min<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 4c5e9e77b978..eb8ed5e6de0f 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(static_cast<sal_Int32>(255), sSel.getLength())); + sSel = sSel.copy(0, std::min<sal_Int32>(255, sSel.getLength())); aHLinkItem.SetName(comphelper::string::stripEnd(sSel, ' ')); } diff --git a/sw/source/ui/shells/textsh.cxx b/sw/source/ui/shells/textsh.cxx index 266c03b0c7df..49f248e056f7 100644 --- a/sw/source/ui/shells/textsh.cxx +++ b/sw/source/ui/shells/textsh.cxx @@ -766,7 +766,7 @@ void SwTextShell::StateInsert( SfxItemSet &rSet ) else { OUString sReturn = rSh.GetSelTxt(); - sReturn = sReturn.copy(0, std::min(255, sReturn.getLength())); + sReturn = sReturn.copy(0, std::min<sal_Int32>(255, sReturn.getLength())); aHLinkItem.SetName(comphelper::string::stripEnd(sReturn, ' ')); } |