sw/source/core/unocore/unoportenum.cxx | 2 +- sw/source/ui/ribbar/workctrl.cxx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
New commits: commit 9098e3da831f24cd384f5bc70c42310792bb3bde Author: Tsutomu Uchino <ha...@apache.org> Date: Tue Feb 11 11:58:13 2014 +0000 #i56998# add space separator on the preview zoom control of the preview toolbar diff --git a/sw/source/ui/ribbar/workctrl.cxx b/sw/source/ui/ribbar/workctrl.cxx index 31c8ed1..f294840 100644 --- a/sw/source/ui/ribbar/workctrl.cxx +++ b/sw/source/ui/ribbar/workctrl.cxx @@ -799,7 +799,7 @@ SwZoomBox_Impl::SwZoomBox_Impl( for(sal_uInt16 i = 0; i < sizeof(aZoomValues)/sizeof(sal_uInt16); i++) { String sEntry = String::CreateFromInt32(aZoomValues[i]); - sEntry += '%'; + sEntry.AppendAscii( " %" ); InsertEntry(sEntry); } } @@ -931,7 +931,7 @@ void SwPreviewZoomControl::StateChanged( sal_uInt16 /*nSID*/, if(SFX_ITEM_AVAILABLE <= eState) { String sZoom(String::CreateFromInt32(((const SfxUInt16Item*)pState)->GetValue())); - sZoom += '%'; + sZoom.AppendAscii( " %" ); pBox->SetText(sZoom); pBox->SaveValue(); } commit b95fa33a4d2827adb8e16de5bae4e535d8c826c9 Author: Oliver-Rainer Wittmann <o...@apache.org> Date: Tue Feb 11 10:15:45 2014 +0000 124178: correct export of User Variable Input Fields diff --git a/sw/source/core/unocore/unoportenum.cxx b/sw/source/core/unocore/unoportenum.cxx index c912aeb..7fbfe7b 100644 --- a/sw/source/core/unocore/unoportenum.cxx +++ b/sw/source/core/unocore/unoportenum.cxx @@ -892,7 +892,7 @@ lcl_ExportHints( { pUnoCrsr->Right( - pAttr->GetFmtFld().GetField()->GetPar1().Len() + 2, + pAttr->GetFmtFld().GetField()->ExpandField( true ).Len() + 2, CRSR_SKIP_CHARS, sal_False, sal_False ); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits