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

7 files changed, 8 insertions, 8 deletions

diff --git a/editeng/source/editeng/editattr.cxx b/editeng/source/editeng/editattr.cxx
index 088327fd3a49..a556fd3ef137 100644
--- a/editeng/source/editeng/editattr.cxx
+++ b/editeng/source/editeng/editattr.cxx
@@ -278,7 +278,7 @@ EditCharAttribEscapement::EditCharAttribEscapement( const SvxEscapementItem& rAt
 
 void EditCharAttribEscapement::SetFont( SvxFont& rFont, OutputDevice* )
 {
-    sal_uInt16 nProp = static_cast<const SvxEscapementItem*>(GetItem())->GetProp();
+    sal_uInt16 const nProp = static_cast<const SvxEscapementItem*>(GetItem())->GetProportionalHeight();
     rFont.SetPropr( (sal_uInt8)nProp );
 
     short nEsc = static_cast<const SvxEscapementItem*>(GetItem())->GetEsc();
diff --git a/editeng/source/editeng/editdbg.cxx b/editeng/source/editeng/editdbg.cxx
index 37d8badfc2b2..64a7e2f1e28b 100644
--- a/editeng/source/editeng/editdbg.cxx
+++ b/editeng/source/editeng/editdbg.cxx
@@ -265,7 +265,7 @@ OString DbgOutItem(const SfxItemPool& rPool, const SfxPoolItem& rItem)
             aDebStr.append("Escape=");
             aDebStr.append(static_cast<sal_Int32>(static_cast<const SvxEscapementItem&>(rItem).GetEsc()));
             aDebStr.append(", ");
-            aDebStr.append(static_cast<sal_Int32>(static_cast<const SvxEscapementItem&>(rItem).GetProp()));
+            aDebStr.append(static_cast<sal_Int32>(static_cast<const SvxEscapementItem&>(rItem).GetProportionalHeight()));
         break;
         case EE_CHAR_PAIRKERNING:
             aDebStr.append("PairKerning=");
diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx
index 09f5f1f96492..41b227f1276c 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -2068,7 +2068,7 @@ void CreateFont( SvxFont& rFont, const SfxItemSet& rSet, bool bSearchInParent, S
     {
         const SvxEscapementItem& rEsc = static_cast<const SvxEscapementItem&>( rSet.Get( EE_CHAR_ESCAPEMENT ) );
 
-        sal_uInt16 nProp = rEsc.GetProp();
+        sal_uInt16 const nProp = rEsc.GetProportionalHeight();
         rFont.SetPropr( (sal_uInt8)nProp );
 
         short nEsc = rEsc.GetEsc();
diff --git a/editeng/source/editeng/eertfpar.cxx b/editeng/source/editeng/eertfpar.cxx
index a3b271b2ebba..8d7dcf117902 100644
--- a/editeng/source/editeng/eertfpar.cxx
+++ b/editeng/source/editeng/eertfpar.cxx
@@ -343,7 +343,7 @@ void EditRTFParser::SetAttrInDoc( SvxRTFItemStackType &rSet )
             mpEditEngine->SeekCursor(aStartPaM.GetNode(), aStartPaM.GetIndex()+1, aFont);
             nEsc = nEsc * 100 / aFont.GetSize().Height();
 
-            SvxEscapementItem aEscItem( (short) nEsc, static_cast<const SvxEscapementItem*>(pItem)->GetProp(), EE_CHAR_ESCAPEMENT );
+            SvxEscapementItem aEscItem( (short) nEsc, static_cast<const SvxEscapementItem*>(pItem)->GetProportionalHeight(), EE_CHAR_ESCAPEMENT );
             rSet.GetAttrSet().Put( aEscItem );
         }
     }
diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx
index 1f8bf5299876..2a3072353521 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -969,7 +969,7 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput,
             long nFontHeight = GetRefDevice()->LogicToLogic(
                     aFont.GetSize(), &GetRefMapMode(), &aPntMode ).Height();
             nFontHeight *=2;    // Half Points
-            sal_uInt16 nProp = static_cast<const SvxEscapementItem&>(rItem).GetProp();
+            sal_uInt16 const nProp = static_cast<const SvxEscapementItem&>(rItem).GetProportionalHeight();
             sal_uInt16 nProp100 = nProp*100;    // For SWG-Token Prop in 100th percent.
             short nEsc = static_cast<const SvxEscapementItem&>(rItem).GetEsc();
             if ( nEsc == DFLT_ESC_AUTO_SUPER )
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;
 }
diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx
index 01cc8b86c361..9ae0526d6a5f 100644
--- a/editeng/source/rtf/rtfitem.cxx
+++ b/editeng/source/rtf/rtfitem.cxx
@@ -580,7 +580,7 @@ SET_FONTALIGNMENT:
                     if( DFLT_ESC_AUTO_SUPER == rOld.GetEsc() )
                     {
                         nEs = DFLT_ESC_AUTO_SUB;
-                        nProp = rOld.GetProp();
+                        nProp = rOld.GetProportionalHeight();
                     }
                     else
                     {
@@ -927,7 +927,7 @@ ATTR_SETOVERLINE:
                     if( DFLT_ESC_AUTO_SUB == rOld.GetEsc() )
                     {
                         nEs = DFLT_ESC_AUTO_SUPER;
-                        nProp = rOld.GetProp();
+                        nProp = rOld.GetProportionalHeight();
                     }
                     else
                     {