sw/source/core/table/swtable.cxx | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
New commits:
commit a31707dd91aec5d2dc5b8060ef42960b709ec068
Author: Miklos Vajna <vmik...@suse.cz>
Date: Fri Mar 8 18:11:16 2013 +0100
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.
(cherry picked from commit 332fa1344aaaf8ff190c594fe5829cf1551c5211)
Change-Id: I8f54aebeb6ea35d099a88570d3f7d365c7325dc0
Reviewed-on: https://gerrit.libreoffice.org/2606
Reviewed-by: Fridrich Strba <fridr...@documentfoundation.org>
Tested-by: Fridrich Strba <fridr...@documentfoundation.org>
diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx
index c37ff85..4b95b15 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))
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
