svx/source/dialog/dlgunit.hxx | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
New commits:
commit df3a588d3b604c301bc222b4ac1bde7d1dd855d0
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Sep 9 13:20:11 2019 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Sep 9 16:23:41 2019 +0100
no spaces between inch " and number and use double-prime for "
Change-Id: I462f532ff5a1abe08663c2ee2bc6c1329689dc5a
diff --git a/svx/source/dialog/dlgunit.hxx b/svx/source/dialog/dlgunit.hxx
index aab743480728..914e52d54388 100644
--- a/svx/source/dialog/dlgunit.hxx
+++ b/svx/source/dialog/dlgunit.hxx
@@ -32,8 +32,18 @@ inline OUString GetUnitString( long nVal_100, FieldUnit
eFieldUnit, sal_Unicode
aVal.insert( 0, "0" );
aVal.insert( aVal.getLength() - 2, cSep );
- aVal.append(" ");
- aVal.append(SdrFormatter::GetUnitStr( eFieldUnit ));
+ OUString aSuffix = SdrFormatter::GetUnitStr(eFieldUnit);
+ if (eFieldUnit != FieldUnit::NONE && eFieldUnit != FieldUnit::DEGREE &&
eFieldUnit != FieldUnit::INCH)
+ aVal.append(" ");
+ if (eFieldUnit == FieldUnit::INCH)
+ {
+ OUString sDoublePrime = u"\u2033";
+ if (aSuffix != "\"" && aSuffix != sDoublePrime)
+ aVal.append(" ");
+ else
+ aSuffix = sDoublePrime;
+ }
+ aVal.append(aSuffix);
return aVal.makeStringAndClear();
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
