From 63a3c07d7cdc6b947e91ad8d16d1e77c5ac80de1 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Thu, 7 Jan 2016 19:13:19 +0100 Subject: 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 --- reportdesign/source/ui/misc/UITools.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'reportdesign') diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx index fbef47b96b5c..6a5263f1e0e0 100644 --- a/reportdesign/source/ui/misc/UITools.cxx +++ b/reportdesign/source/ui/misc/UITools.cxx @@ -553,7 +553,7 @@ namespace { const SvxEscapementItem* pFontItem = static_cast(pItem); lcl_pushBack( _out_rProperties, PROPERTY_CHARESCAPEMENT, uno::makeAny( pFontItem->GetEsc() ) ); - lcl_pushBack( _out_rProperties, PROPERTY_CHARESCAPEMENTHEIGHT, uno::makeAny( (sal_Int8)pFontItem->GetProp() ) ); + lcl_pushBack( _out_rProperties, PROPERTY_CHARESCAPEMENTHEIGHT, uno::makeAny(static_cast(pFontItem->GetProportionalHeight())) ); } } -- cgit