diff options
| author | Robinson Tryon <qubit@runcibility.com> | 2015-11-25 06:03:10 -0500 |
|---|---|---|
| committer | Robinson Tryon <qubit@runcibility.com> | 2015-11-25 06:07:38 -0500 |
| commit | 49c2b9808df8a6b197dec666dfc0cda6321a4306 (patch) | |
| tree | 045ef4b9b8dfdb06bfbe18cdf773d59f57d5552d /sw/source/filter/xml/xmlimpit.cxx | |
| parent | 5470a365f25e5052b4dd74f76aa2196f0d70934b (diff) | |
bin/rename-sw-abbreviations.shlibreoffice-5-1-branch-point
This commit renames the most annoying abbreviations in Writer (and
partially in the shared code too).
Change-Id: I77e5134f42f25e3786afa36b7a505c7e3237a9e8
Diffstat (limited to 'sw/source/filter/xml/xmlimpit.cxx')
| -rw-r--r-- | sw/source/filter/xml/xmlimpit.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sw/source/filter/xml/xmlimpit.cxx b/sw/source/filter/xml/xmlimpit.cxx index 2a0d155f9f93..0e28509b7edd 100644 --- a/sw/source/filter/xml/xmlimpit.cxx +++ b/sw/source/filter/xml/xmlimpit.cxx @@ -845,12 +845,12 @@ bool SvXMLImportItemMapper::PutXMLValue( case RES_FRM_SIZE: { - SwFormatFrmSize& rFrmSize = dynamic_cast<SwFormatFrmSize&>(rItem); + SwFormatFrameSize& rFrameSize = dynamic_cast<SwFormatFrameSize&>(rItem); bool bSetHeight = false; bool bSetWidth = false; bool bSetSizeType = false; - SwFrmSize eSizeType = ATT_VAR_SIZE; + SwFrameSize eSizeType = ATT_VAR_SIZE; sal_Int32 nMin = MINLAY; switch( nMemberId ) @@ -866,7 +866,7 @@ bool SvXMLImportItemMapper::PutXMLValue( else if( nValue > 100 ) nValue = 100; - rFrmSize.SetWidthPercent( (sal_Int8)nValue ); + rFrameSize.SetWidthPercent( (sal_Int8)nValue ); } } break; @@ -901,8 +901,8 @@ bool SvXMLImportItemMapper::PutXMLValue( else if( nValue > USHRT_MAX ) nValue = USHRT_MAX; - rFrmSize.SetWidth( (sal_uInt16)nValue ); - rFrmSize.SetHeightSizeType( ATT_VAR_SIZE ); + rFrameSize.SetWidth( (sal_uInt16)nValue ); + rFrameSize.SetHeightSizeType( ATT_VAR_SIZE ); bOk = true; } } @@ -917,11 +917,11 @@ bool SvXMLImportItemMapper::PutXMLValue( if( bOk ) { if( bSetWidth ) - rFrmSize.SetWidth( (sal_uInt16)nValue ); + rFrameSize.SetWidth( (sal_uInt16)nValue ); if( bSetHeight ) - rFrmSize.SetHeight( (sal_uInt16)nValue ); + rFrameSize.SetHeight( (sal_uInt16)nValue ); if( bSetSizeType ) - rFrmSize.SetHeightSizeType( eSizeType ); + rFrameSize.SetHeightSizeType( eSizeType ); } } } |