mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

no spaces between inch " and number and use double-prime for "

Browse Source 
Change-Id: I462f532ff5a1abe08663c2ee2bc6c1329689dc5a
This commit is contained in:
Caolán McNamara
2019-09-09 13:20:11 +01:00
parent 470c9e3136
commit df3a588d3b
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
svx/source/dialog/dlgunit.hxx
View File

@@ -32,8 +32,18 @@ inline OUString GetUnitString( long nVal_100, FieldUnit eFieldUnit, sal_Unicode
aVal.insert( 0, "0" ); aVal.insert( 0, "0" );
aVal.insert( aVal.getLength() - 2, cSep ); aVal.insert( aVal.getLength() - 2, cSep );
aVal.append(" "); OUString aSuffix = SdrFormatter::GetUnitStr(eFieldUnit);
aVal.append(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(); return aVal.makeStringAndClear();
} }