diff options
author | Armin Le Grand <alg@apache.org> | 2013-11-27 16:25:40 +0000 |
---|---|---|
committer | Armin Le Grand <alg@apache.org> | 2013-11-27 16:25:40 +0000 |
commit | 812e2a8bf64274e47db572b8ca592f49b1263ad7 (patch) | |
tree | 404f9a7432e94c42a09bb76b33eb7d38186ccff6 /sw/source/ui/uiview/view2.cxx | |
parent | 9818d8d1c64bd93adfaacb8a2f824a9db1f4987d (diff) |
resync to trunk (after accessibility integration)
Diffstat (limited to 'sw/source/ui/uiview/view2.cxx')
-rw-r--r-- | sw/source/ui/uiview/view2.cxx | 38 |
1 files changed, 36 insertions, 2 deletions
diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx index 96caa859f11a..fa4163e68e17 100644 --- a/sw/source/ui/uiview/view2.cxx +++ b/sw/source/ui/uiview/view2.cxx @@ -766,7 +766,7 @@ void __EXPORT SwView::Execute(SfxRequest &rReq) case SID_ATTR_BORDER_OUTER: case SID_ATTR_BORDER_SHADOW: if(pArgs) - pWrtShell->SetAttr(*pArgs); + pWrtShell->SetAttrSet(*pArgs); break; case SID_ATTR_PAGE: @@ -1179,6 +1179,32 @@ void SwView::StateStatusLine(SfxItemSet &rSet) SfxWhichIter aIter( rSet ); sal_uInt16 nWhich = aIter.FirstWhich(); ASSERT( nWhich, "leeres Set"); + //IAccessibility2 Implementation 2009----- + if (Application::IsAccessibilityEnabled()) + { + //get section chang event + const SwSection* CurrSect = rShell.GetCurrSection(); + if( CurrSect ) + { + String sCurrentSectionName = CurrSect->GetSectionName(); + if(sCurrentSectionName != nOldSectionName) + { + rShell.FireSectionChangeEvent(2, 1); + } + nOldSectionName = sCurrentSectionName; + } + else if ( !(nOldSectionName.Equals(String())) ) + { + rShell.FireSectionChangeEvent(2, 1); + nOldSectionName = String(); + } + //get column change event + if(rShell.bColumnChange()) + { + rShell.FireColumnChangeEvent(2, 1); + } + } + //-----IAccessibility2 Implementation 2009 while( nWhich ) { @@ -1192,7 +1218,15 @@ void SwView::StateStatusLine(SfxItemSet &rSet) rShell.GetPageNumber( -1, rShell.IsCrsrVisible(), nPage, nLogPage, sDisplay ); rSet.Put( SfxStringItem( FN_STAT_PAGE, GetPageStr( nPage, nLogPage, sDisplay) )); - + //IAccessibility2 Implementation 2009----- + //if existing page number is not equal to old page number, send out this event. + if (nOldPageNum != nLogPage ) + { + if (nOldPageNum != 0) + rShell.FirePageChangeEvent(nOldPageNum, nLogPage); + nOldPageNum = nLogPage; + } + //-----IAccessibility2 Implementation 2009 sal_uInt16 nCnt = GetWrtShell().GetPageCnt(); if (nPageCnt != nCnt) // Basic benachrichtigen { |