sw/source/core/access/acccell.cxx | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-)
New commits: commit 1cb1dca1260da2cea5b6800483e86a6d6b251844 Author: Stephan Bergmann <sberg...@redhat.com> Date: Mon Dec 2 16:09:47 2013 +0100 Revert SwAccessibleCell::getCurrentValue to return a numeric value again 76c549eb01dcb7b5bf28a271ce00e386f3d388ba "Integrate branch of IAccessible2" had changed it to return a string, but that neither matched the documentation of css.accessibility.XAccessibleValue nor did it satisfy JunitTest_sw_unoapi. This needs further clarification apparently. Change-Id: Ib09f7549db7ba5155798d5917908c7ce50e7a592 diff --git a/sw/source/core/access/acccell.cxx b/sw/source/core/access/acccell.cxx index 721fb89..97e1460 100644 --- a/sw/source/core/access/acccell.cxx +++ b/sw/source/core/access/acccell.cxx @@ -363,30 +363,7 @@ uno::Any SwAccessibleCell::getCurrentValue( ) CHECK_FOR_DEFUNC( XAccessibleValue ); uno::Any aAny; - - const SwCellFrm* pCellFrm = static_cast<const SwCellFrm*>( GetFrm() ); - const SwStartNode *pSttNd = pCellFrm->GetTabBox()->GetSttNd(); - if( pSttNd ) - { - OUString strRet; - SwNodeIndex aCntntIdx( *pSttNd, 0 ); - SwCntntNode* pCNd=NULL; - for(int nIndex = 0 ; - 0 != ( pCNd = pSttNd->GetNodes().GoNext( &aCntntIdx ) ) && - aCntntIdx.GetIndex() < pSttNd->EndOfSectionIndex(); - ++nIndex ) - { - if(pCNd && pCNd->IsTxtNode()) - { - if (0 != nIndex) - { - strRet += " "; - } - strRet +=((SwTxtNode*)pCNd)->GetTxt(); - } - } - aAny <<= strRet; - } + aAny <<= GetTblBoxFormat()->GetTblBoxValue().GetValue(); return aAny; } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits