On 11/27/2013 04:44 PM, Stephan Bergmann wrote:
Below are two commits that were necessary to make (Linux) "make check"
work again post
<http://cgit.freedesktop.org/libreoffice/core/commit/?id=efb23f29983f87104a684e7fab00b84fc59d131d>
"Integrate branch of IAccessible2." In both cases, the problematic
changes made by that commit looked rather unmotivated to me, and I do
not know whether it would actually have been better to change the code
under test or the test code. So, insight welcome.
And one more oddity:
commit 1cb1dca1260da2cea5b6800483e86a6d6b251844
Author: Stephan Bergmann <sbergman@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;
}
Context
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.