svtools/source/control/ctrlbox.cxx | 3 +-- svx/source/dialog/relfld.cxx | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-)
New commits: commit 66ff6924d50fc77e7a3e80c74a12a088a874df8b Author: Tsutomu Uchino <ha...@apache.org> Date: Sun Jan 19 14:16:45 2014 +0000 Related: #i56998# use FUNIT_PERCENT on fields that allow relative value (cherry picked from commit fc6fc5b576b972a8ea0551091cc57aa1cfe1334d) Conflicts: svtools/source/control/ctrlbox.cxx svx/source/dialog/relfld.cxx Change-Id: Ic8f0f550dbbcab0678fbeb9bf45a478b0cea642d diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx index 80de8e5..b77b737 100644 --- a/svtools/source/control/ctrlbox.cxx +++ b/svtools/source/control/ctrlbox.cxx @@ -1896,8 +1896,7 @@ void FontSizeBox::SetRelative( sal_Bool bNewRelative ) SetDecimalDigits( 0 ); SetMin( nRelMin ); SetMax( nRelMax ); - SetCustomUnitText(OUString('%')); - 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 67a4a59..4d5a505 100644 --- a/svx/source/dialog/relfld.cxx +++ b/svx/source/dialog/relfld.cxx @@ -102,8 +102,7 @@ void SvxRelativeField::SetRelative( sal_Bool bNewRelative ) SetDecimalDigits( 0 ); SetMin( nRelMin ); SetMax( nRelMax ); - SetCustomUnitText( OUString('%') ); - SetUnit( FUNIT_CUSTOM ); + SetUnit( FUNIT_PERCENT ); } else { _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits