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 /cui/source | |
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 'cui/source')
-rw-r--r-- | cui/source/tabpages/chardlg.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index 8351042abdd0..2d6550eaccea 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -2758,18 +2758,18 @@ void SvxCharPositionPage::SetEscapement_Impl( sal_uInt16 nEsc ) if ( SVX_ESCAPEMENT_SUPERSCRIPT == nEsc ) { aEscItm.GetEsc() = m_nSuperEsc; - aEscItm.GetProp() = m_nSuperProp; + aEscItm.GetProportionalHeight() = m_nSuperProp; } else if ( SVX_ESCAPEMENT_SUBSCRIPT == nEsc ) { aEscItm.GetEsc() = m_nSubEsc; - aEscItm.GetProp() = m_nSubProp; + aEscItm.GetProportionalHeight() = m_nSubProp; } short nFac = aEscItm.GetEsc() < 0 ? -1 : 1; m_pHighLowMF->SetValue( aEscItm.GetEsc() * nFac ); - m_pFontSizeMF->SetValue( aEscItm.GetProp() ); + m_pFontSizeMF->SetValue( aEscItm.GetProportionalHeight() ); if ( SVX_ESCAPEMENT_OFF == nEsc ) { @@ -2794,7 +2794,7 @@ void SvxCharPositionPage::SetEscapement_Impl( sal_uInt16 nEsc ) AutoPositionHdl_Impl( m_pHighLowRB ); } - UpdatePreview_Impl( 100, aEscItm.GetProp(), aEscItm.GetEsc() ); + UpdatePreview_Impl( 100, aEscItm.GetProportionalHeight(), aEscItm.GetEsc() ); } @@ -3036,7 +3036,7 @@ void SvxCharPositionPage::Reset( const SfxItemSet* rSet ) { const SvxEscapementItem& rItem = static_cast<const SvxEscapementItem&>(rSet->Get( nWhich )); nEsc = rItem.GetEsc(); - nEscProp = rItem.GetProp(); + nEscProp = rItem.GetProportionalHeight(); if ( nEsc != 0 ) { @@ -3273,7 +3273,7 @@ bool SvxCharPositionPage::FillItemSet( SfxItemSet* rSet ) if ( pOld ) { const SvxEscapementItem& rItem = *static_cast<const SvxEscapementItem*>(pOld); - if ( rItem.GetEsc() == nEsc && rItem.GetProp() == nEscProp ) + if (rItem.GetEsc() == nEsc && rItem.GetProportionalHeight() == nEscProp) bChanged = false; } |