diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-01-07 19:13:19 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-01-07 19:18:31 +0100 |
| commit | 63a3c07d7cdc6b947e91ad8d16d1e77c5ac80de1 (patch) | |
| tree | f2eac4b50567380eb0c242f99bc43cbff5923b26 /editeng/source/items/textitem.cxx | |
| parent | 1f4751491b38196d0a246c135349bdd42aba28f1 (diff) | |
svx: fix windows build, rename SvxEscapementItem::GetProp()
90e07dd6f5d64a0d0041361c1592a6cd93ff2ac0 introduced a new unit test
which calls SvxEscapementItem::GetProp(), and apparently the unit test
also #includes windows.h somehow, so GetProp macro is defined to
GetPropA and that fails to link since SvxEscapementItem doesn't have
this member function. Thank you, C preprocessor, you barbarous relic.
Change-Id: I6fd8e9d832ed5e1ce1a4fa7f1516c55d51a3283b
Diffstat (limited to 'editeng/source/items/textitem.cxx')
| -rw-r--r-- | editeng/source/items/textitem.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx index d4417b869cdc..7ca6b6a061b2 100644 --- a/editeng/source/items/textitem.cxx +++ b/editeng/source/items/textitem.cxx @@ -2339,7 +2339,7 @@ SvStream& SvxEscapementItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion* else if( DFLT_ESC_AUTO_SUB == _nEsc ) _nEsc = DFLT_ESC_SUB; } - rStrm.WriteUChar( GetProp() ) + rStrm.WriteUChar( GetProportionalHeight() ) .WriteInt16( _nEsc ); return rStrm; } |