diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-12-02 16:09:47 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2014-06-10 16:33:47 +0100 |
| commit | 9215eb60c5354346269d22fb5bd9dcedb85b2575 (patch) | |
| tree | 15872542f49601d332d242a8b0f8f90685e85668 | |
| parent | 780218db805296b2043ad6df26e28d0c9b492c65 (diff) | |
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
| -rw-r--r-- | sw/source/core/access/acccell.cxx | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/sw/source/core/access/acccell.cxx b/sw/source/core/access/acccell.cxx index 6bbf1fc81dd0..53baf5012eda 100644 --- a/sw/source/core/access/acccell.cxx +++ b/sw/source/core/access/acccell.cxx @@ -358,30 +358,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; } |