cui/source/tabpages/autocdlg.cxx | 4 ++-- svtools/source/control/ctrlbox.cxx | 3 +-- svx/source/dialog/relfld.cxx | 3 +-- svx/source/stbctrls/zoomctrl.cxx | 6 +++--- 4 files changed, 7 insertions(+), 9 deletions(-)
New commits: commit 8f97a74f843edebca2b64cc3649c7a45a6ef3df0 Author: Tsutomu Uchino <[email protected]> Date: Sun Jan 19 15:15:38 2014 +0000 #i56998# add space separater before percent for Combine single line paragraphs option in AutoCorrect dialog diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index dd82595..77895e1 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -753,7 +753,7 @@ void OfaSwAutoFmtOptionsPage::Reset( const SfxItemSet& ) nPercent = pOpt->nRightMargin; sMargin = ' '; sMargin += String::CreateFromInt32( nPercent ); - sMargin += '%'; + sMargin.AppendAscii( " %" ); pUserData = new ImpUserData(&sMargin, 0); aCheckLB.SetUserData( MERGE_SINGLE_LINE_PARA, pUserData ); @@ -817,7 +817,7 @@ IMPL_LINK(OfaSwAutoFmtOptionsPage, EditHdl, PushButton*, EMPTYARG) nPercent = (sal_uInt16)aDlg.GetPrcntFld().GetValue(); sMargin = ' '; sMargin += String::CreateFromInt32( nPercent ); - sMargin += '%'; + sMargin.AppendAscii( " %" ); } } aCheckLB.Invalidate(); commit c07254878c8728e76e1a7b34e9e32cf5c31d191b Author: Tsutomu Uchino <[email protected]> Date: Sun Jan 19 14:40:52 2014 +0000 #i56998# add space separator between zoom value and percent on zoom statusbar item diff --git a/svx/source/stbctrls/zoomctrl.cxx b/svx/source/stbctrls/zoomctrl.cxx index 214fa76..33369b7 100644 --- a/svx/source/stbctrls/zoomctrl.cxx +++ b/svx/source/stbctrls/zoomctrl.cxx @@ -132,7 +132,7 @@ void SvxZoomStatusBarControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxUInt16Item* pItem = (const SfxUInt16Item*)pState; nZoom = pItem->GetValue(); String aStr( String::CreateFromInt32(nZoom) ); - aStr += '%'; + aStr.AppendAscii( " %" ); GetStatusBar().SetItemText( GetId(), aStr ); if ( pState->ISA(SvxZoomItem) ) @@ -168,7 +168,7 @@ void SvxZoomStatusBarControl::StateChanged( sal_uInt16, SfxItemState eState, void SvxZoomStatusBarControl::Paint( const UserDrawEvent& ) { String aStr( String::CreateFromInt32( nZoom )); - aStr += '%'; + aStr.AppendAscii( " %" ); GetStatusBar().SetItemText( GetId(), aStr ); } @@ -212,7 +212,7 @@ void SvxZoomStatusBarControl::Command( const CommandEvent& rCEvt ) sal_uIntPtr SvxZoomStatusBarControl::GetDefItemWidth(const StatusBar& rStb) { - long nWidth1 = rStb.GetTextWidth(String::CreateFromAscii("XXXXX%")); + long nWidth1 = rStb.GetTextWidth(String::CreateFromAscii("XXXXX %")); return nWidth1; } commit fc6fc5b576b972a8ea0551091cc57aa1cfe1334d Author: Tsutomu Uchino <[email protected]> Date: Sun Jan 19 14:16:45 2014 +0000 #i56998# use FUNIT_PERCENT on fields that allow relative value diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx index 537e4e6..a72487b 100644 --- a/svtools/source/control/ctrlbox.cxx +++ b/svtools/source/control/ctrlbox.cxx @@ -1387,8 +1387,7 @@ void FontSizeBox::SetRelative( sal_Bool bNewRelative ) SetDecimalDigits( 0 ); SetMin( nRelMin ); SetMax( nRelMax ); - SetCustomUnitText( '%' ); - SetUnit( FUNIT_CUSTOM ); + SetUnit( FUNIT_PERCENT ); Clear(); sal_uInt16 i = nRelMin; diff --git a/svx/source/dialog/relfld.cxx b/svx/source/dialog/relfld.cxx index bbf7010..ded8404 100644 --- a/svx/source/dialog/relfld.cxx +++ b/svx/source/dialog/relfld.cxx @@ -123,8 +123,7 @@ void SvxRelativeField::SetRelative( sal_Bool bNewRelative ) SetDecimalDigits( 0 ); SetMin( nRelMin ); SetMax( nRelMax ); - SetCustomUnitText( String( sal_Unicode( '%' ) ) ); - SetUnit( FUNIT_CUSTOM ); + SetUnit( FUNIT_PERCENT ); } else { _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
