diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2013-03-08 18:11:16 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2013-03-08 19:05:52 +0100 |
| commit | 332fa1344aaaf8ff190c594fe5829cf1551c5211 (patch) | |
| tree | b6197a14fbb79a99e4e33b8c9efa691d05059ec1 /sw | |
| parent | 73422d433bde55a107e4cfebc72a099cbd9b5933 (diff) | |
SwTableBox::IsValidNumTxtNd: Allow trivial formatting
Not allowing flys or footnotes during string -> number conversion is
fine, but I don't see what's the reason for rejecting simple formatting
(like bold) completely.
Change-Id: I8f54aebeb6ea35d099a88570d3f7d365c7325dc0
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/table/swtable.cxx | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx index b54531a41b77..0b54d93c9198 100644 --- a/sw/source/core/table/swtable.cxx +++ b/sw/source/core/table/swtable.cxx @@ -2518,7 +2518,6 @@ sal_uLong SwTableBox::IsValidNumTxtNd( sal_Bool bCheckAttr ) const if( bCheckAttr ) { const SwpHints* pHts = pTextNode->GetpSwpHints(); - const String& rTxt = pTextNode->GetTxt(); // do some tests if there's only text in the node! // Flys/fields/... if( pHts ) @@ -2527,9 +2526,7 @@ sal_uLong SwTableBox::IsValidNumTxtNd( sal_Bool bCheckAttr ) const for( sal_uInt16 n = 0; n < pHts->Count(); ++n ) { const SwTxtAttr* pAttr = (*pHts)[ n ]; - if( RES_TXTATR_NOEND_BEGIN <= pAttr->Which() || - *pAttr->GetStart() || - *pAttr->GetAnyEnd() < rTxt.Len() ) + if( RES_TXTATR_NOEND_BEGIN <= pAttr->Which() ) { if ((*pAttr->GetStart() == nNextSetField) && (pAttr->Which() == RES_TXTATR_FIELD)) |