diff options
author | Mathias Bauer <mba@openoffice.org> | 2010-11-01 15:03:22 +0100 |
---|---|---|
committer | Mathias Bauer <mba@openoffice.org> | 2010-11-01 15:03:22 +0100 |
commit | 5eb79dec3d96d4615f58eedfce048d405cee614e (patch) | |
tree | 58cf3f58d3ff585e72d3d2ff32cc9b26580342cd /sw/source/core/access | |
parent | d854960f9ee36760fa49bd6de97d9e01aa087900 (diff) | |
parent | 8409cfd0c4842fae1e087f8c932748f9305871a8 (diff) |
CWS swlayoutrefactoring: resync to m91
Diffstat (limited to 'sw/source/core/access')
-rw-r--r-- | sw/source/core/access/accportions.cxx | 17 | ||||
-rw-r--r-- | sw/source/core/access/accportions.hxx | 1 |
2 files changed, 11 insertions, 7 deletions
diff --git a/sw/source/core/access/accportions.cxx b/sw/source/core/access/accportions.cxx index 705e0026b767..093d22136d81 100644 --- a/sw/source/core/access/accportions.cxx +++ b/sw/source/core/access/accportions.cxx @@ -173,6 +173,17 @@ void SwAccessiblePortionData::Special( sDisplay = aTmpBuffer.makeStringAndClear(); break; } + // --> OD 2010-06-04 #i111768# - apply patch from kstribley: + // Include the control characters. + case POR_CONTROLCHAR: + { + OUStringBuffer aTmpBuffer( rText.Len() + 1 ); + aTmpBuffer.append( rText ); + aTmpBuffer.append( pTxtNode->GetTxt().GetChar(nModelPosition) ); + sDisplay = aTmpBuffer.makeStringAndClear(); + break; + } + // <-- default: sDisplay = rText; break; @@ -259,12 +270,6 @@ sal_Bool SwAccessiblePortionData::IsReadOnlyPortion( size_t nPortionNo ) const return IsPortionAttrSet(nPortionNo, PORATTR_READONLY); } -sal_Bool SwAccessiblePortionData::IsGrayPortion( size_t nPortionNo ) const -{ - return IsPortionAttrSet(nPortionNo, PORATTR_GRAY); -} - - sal_Bool SwAccessiblePortionData::IsGrayPortionType( USHORT nType ) const { // gray portions? diff --git a/sw/source/core/access/accportions.hxx b/sw/source/core/access/accportions.hxx index 64bd308fbbd6..807070a6573d 100644 --- a/sw/source/core/access/accportions.hxx +++ b/sw/source/core/access/accportions.hxx @@ -90,7 +90,6 @@ class SwAccessiblePortionData : public SwPortionHandler sal_Bool IsPortionAttrSet( size_t nPortionNo, sal_uInt8 nAttr ) const; sal_Bool IsSpecialPortion( size_t nPortionNo ) const; sal_Bool IsReadOnlyPortion( size_t nPortionNo ) const; - sal_Bool IsGrayPortion( size_t nPortionNo ) const; sal_Bool IsGrayPortionType( USHORT nType ) const; // helper method for GetEditableRange(...): |