Modified: openoffice/trunk/main/accessibility/source/standard/vclxaccessibletoolbox.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/accessibility/source/standard/vclxaccessibletoolbox.cxx?rev=1541847&r1=1541846&r2=1541847&view=diff ============================================================================== --- openoffice/trunk/main/accessibility/source/standard/vclxaccessibletoolbox.cxx (original) +++ openoffice/trunk/main/accessibility/source/standard/vclxaccessibletoolbox.cxx Thu Nov 14 08:18:05 2013 @@ -208,7 +208,7 @@ VCLXAccessibleToolBoxItem* VCLXAccessibl { ToolBoxItemsMap::iterator aIter = m_aAccessibleChildren.find( _nPos ); // returns only toolbox buttons, not windows - if ( aIter != m_aAccessibleChildren.end() && !aIter->second.is()) + if ( aIter != m_aAccessibleChildren.end() && aIter->second.is()) pItem = static_cast< VCLXAccessibleToolBoxItem* >( aIter->second.get() ); } @@ -284,11 +284,14 @@ void VCLXAccessibleToolBox::ReleaseFocus } } // ----------------------------------------------------------------------------- -void VCLXAccessibleToolBox::UpdateChecked_Impl( sal_Int32 ) +void VCLXAccessibleToolBox::UpdateChecked_Impl( sal_Int32 _nPos ) { ToolBox* pToolBox = static_cast< ToolBox* >( GetWindow() ); if ( pToolBox ) { + sal_uInt16 nFocusId = pToolBox->GetItemId( (sal_uInt16)_nPos ); + VCLXAccessibleToolBoxItem* pFocusItem = NULL; + for ( ToolBoxItemsMap::iterator aIter = m_aAccessibleChildren.begin(); aIter != m_aAccessibleChildren.end(); ++aIter ) { @@ -297,7 +300,12 @@ void VCLXAccessibleToolBox::UpdateChecke VCLXAccessibleToolBoxItem* pItem = static_cast< VCLXAccessibleToolBoxItem* >( aIter->second.get() ); pItem->SetChecked( pToolBox->IsItemChecked( nItemId ) ); + if ( nItemId == nFocusId ) + pFocusItem = pItem; } + //Solution:If the position is not a child item,the focus should not be called + if ( pFocusItem && (sal_uInt16)_nPos != TOOLBOX_ITEM_NOTFOUND ) + pFocusItem->SetFocus( sal_True ); } } // ----------------------------------------------------------------------------- @@ -535,23 +543,41 @@ void VCLXAccessibleToolBox::ProcessWindo // to prevent an early release of the toolbox (VCLEVENT_OBJECT_DYING) Reference< XAccessibleContext > xTemp = this; + ToolBox* pToolBox = static_cast< ToolBox* >( GetWindow() ); switch ( rVclWindowEvent.GetId() ) { case VCLEVENT_TOOLBOX_CLICK: + case VCLEVENT_TOOLBOX_SELECT: { if ( rVclWindowEvent.GetData() ) { UpdateChecked_Impl( (sal_Int32)(sal_IntPtr)rVclWindowEvent.GetData() ); UpdateIndeterminate_Impl( (sal_Int32)(sal_IntPtr)rVclWindowEvent.GetData() ); } + else if( pToolBox->GetItemPos(pToolBox->GetCurItemId()) != TOOLBOX_ITEM_NOTFOUND ) + { + UpdateChecked_Impl( pToolBox->GetItemPos(pToolBox->GetCurItemId()) ); + UpdateIndeterminate_Impl( pToolBox->GetItemPos(pToolBox->GetCurItemId()) ); + } break; } case VCLEVENT_TOOLBOX_DOUBLECLICK: case VCLEVENT_TOOLBOX_ACTIVATE: case VCLEVENT_TOOLBOX_DEACTIVATE: - case VCLEVENT_TOOLBOX_SELECT: + //case VCLEVENT_TOOLBOX_SELECT: break; - + // IA2 CWS. MT: Still using VCLEVENT_TOOLBOX_CLICK, see comment in vcl/source/window/toolbox2.cxx + /* + case VCLEVENT_TOOLBOX_ITEMUPDATED: + { + if ( rVclWindowEvent.GetData() ) + { + UpdateChecked_Impl( TOOLBOX_ITEM_NOTFOUND ); + UpdateIndeterminate_Impl( (sal_Int32)rVclWindowEvent.GetData() ); + } + break; + } + */ case VCLEVENT_TOOLBOX_HIGHLIGHT: UpdateFocus_Impl(); break;
Modified: openoffice/trunk/main/accessibility/source/standard/vclxaccessibletoolboxitem.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/accessibility/source/standard/vclxaccessibletoolboxitem.cxx?rev=1541847&r1=1541846&r2=1541847&view=diff ============================================================================== --- openoffice/trunk/main/accessibility/source/standard/vclxaccessibletoolboxitem.cxx (original) +++ openoffice/trunk/main/accessibility/source/standard/vclxaccessibletoolboxitem.cxx Thu Nov 14 08:18:05 2013 @@ -97,6 +97,10 @@ VCLXAccessibleToolBoxItem::VCLXAccessibl else if (( ( nBits & TIB_CHECKABLE ) == TIB_CHECKABLE ) || ( ( nBits & TIB_AUTOCHECK ) == TIB_AUTOCHECK ) ) m_nRole = AccessibleRole::TOGGLE_BUTTON; + else if ( (nBits & TIB_DROPDOWN) == TIB_DROPDOWN ) + { + m_nRole = AccessibleRole::BUTTON_DROPDOWN; + } else if ( m_pToolBox->GetItemWindow( m_nItemId ) ) m_nRole = AccessibleRole::PANEL; break; @@ -144,6 +148,18 @@ VCLXAccessibleToolBoxItem::~VCLXAccessib // sRet += String( RTL_CONSTASCII_USTRINGPARAM( " " ) ); // sRet += sWinText; // } + if ( sRet.getLength() == 0 ) + { + Window* pItemWindow = m_pToolBox->GetItemWindow( m_nItemId ); + if ( m_nRole == AccessibleRole::PANEL && pItemWindow && pItemWindow->GetAccessible().is() && + pItemWindow->GetAccessible()->getAccessibleContext().is() ) + { + ::rtl::OUString sWinText = pItemWindow->GetAccessible()->getAccessibleContext()->getAccessibleName(); + if ( sWinText.getLength() > 0 ) + sRet = sWinText; + } + } + } return sRet; } @@ -165,6 +181,8 @@ void VCLXAccessibleToolBoxItem::SetFocus // ----------------------------------------------------------------------------- void VCLXAccessibleToolBoxItem::SetChecked( sal_Bool _bCheck ) { + if( m_nRole == AccessibleRole::PANEL) + return; if ( m_bIsChecked != _bCheck ) { Any aOldValue; @@ -370,11 +388,19 @@ sal_Int16 SAL_CALL VCLXAccessibleToolBox { OExternalLockGuard aGuard( this ); - ::rtl::OUString sDescription; - if ( m_pToolBox ) + + if(m_nRole == AccessibleRole::PANEL && getAccessibleChildCount() > 0 ) + { + return ::rtl::OUString( TK_RES_STRING( RID_STR_ACC_PANEL_DESCRIPTION ) ); + } + else + { + ::rtl::OUString sDescription; + if ( m_pToolBox ) sDescription = m_pToolBox->GetHelpText( m_nItemId ); - return sDescription; + return sDescription; + } } // ----------------------------------------------------------------------------- ::rtl::OUString SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleName( ) throw (RuntimeException) @@ -404,11 +430,11 @@ Reference< XAccessibleStateSet > SAL_CAL if ( m_pToolBox && !rBHelper.bDisposed && !rBHelper.bInDispose ) { pStateSetHelper->AddState( AccessibleStateType::FOCUSABLE ); - if ( m_bIsChecked ) + if ( m_bIsChecked && m_nRole != AccessibleRole::PANEL ) pStateSetHelper->AddState( AccessibleStateType::CHECKED ); if ( m_bIndeterminate ) pStateSetHelper->AddState( AccessibleStateType::INDETERMINATE ); - if ( m_pToolBox->IsItemEnabled( m_nItemId ) ) + if ( m_pToolBox->IsEnabled() && m_pToolBox->IsItemEnabled( m_nItemId ) ) { pStateSetHelper->AddState( AccessibleStateType::ENABLED ); pStateSetHelper->AddState( AccessibleStateType::SENSITIVE ); @@ -674,6 +700,8 @@ Any VCLXAccessibleToolBoxItem::getCurren if ( m_pToolBox ) aValue <<= (sal_Int32)m_pToolBox->IsItemChecked( m_nItemId ); + if( m_nRole == AccessibleRole::PANEL ) + aValue <<= (sal_Int32)0; return aValue; } // ----------------------------------------------------------------------------- Modified: openoffice/trunk/main/chart2/source/controller/accessibility/AccessibleBase.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/chart2/source/controller/accessibility/AccessibleBase.cxx?rev=1541847&r1=1541846&r2=1541847&view=diff ============================================================================== --- openoffice/trunk/main/chart2/source/controller/accessibility/AccessibleBase.cxx (original) +++ openoffice/trunk/main/chart2/source/controller/accessibility/AccessibleBase.cxx Thu Nov 14 08:18:05 2013 @@ -651,7 +651,9 @@ sal_Int32 SAL_CALL AccessibleBase::getAc sal_Int16 SAL_CALL AccessibleBase::getAccessibleRole() throw (RuntimeException) { - return AccessibleRole::LIST_ITEM; // #i73747# role SHAPE seems more appropriate, but is not read + //IAccessibility2 Implementation 2009----- + return AccessibleRole::SHAPE/*LIST_ITEM*/; // #i73747# role SHAPE seems more appropriate, but is not read + //-----IAccessibility2 Implementation 2009 } Reference< XAccessibleRelationSet > SAL_CALL AccessibleBase::getAccessibleRelationSet() Modified: openoffice/trunk/main/chart2/source/controller/dialogs/tp_DataSource.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/chart2/source/controller/dialogs/tp_DataSource.cxx?rev=1541847&r1=1541846&r2=1541847&view=diff ============================================================================== --- openoffice/trunk/main/chart2/source/controller/dialogs/tp_DataSource.cxx (original) +++ openoffice/trunk/main/chart2/source/controller/dialogs/tp_DataSource.cxx Thu Nov 14 08:18:05 2013 @@ -69,10 +69,13 @@ const OUString lcl_aLabelRole( RTL_CONST String lcl_GetRoleLBEntry( const OUString & rRole, const OUString & rRange ) { - String aEntry( rRole ); - aEntry += '\t'; - aEntry += String( - ::chart::DialogModel::ConvertRoleFromInternalToUI( rRole )); +//IAccessibility2 Implementation 2009----- + //String aEntry( rRole ); + //aEntry += '\t'; + //aEntry += String( + // ::chart::DialogModel::ConvertRoleFromInternalToUI( rRole )); + String aEntry(::chart::DialogModel::ConvertRoleFromInternalToUI( rRole )); + //-----IAccessibility2 Implementation 2009 aEntry += '\t'; aEntry += String( rRange ); @@ -139,10 +142,12 @@ OUString lcl_GetSequenceNameForLabel( :: return aResult; } +//IAccessibility2 Implementation 2009----- static long lcl_pRoleListBoxTabs[] = - { 3, // Number of Tabs - 0, 0, 75 + { 2, // Number of Tabs + 0, 75 }; +//-----IAccessibility2 Implementation 2009 void lcl_ShowChooserButton( ::chart::RangeSelectionButton & rChooserButton, Modified: openoffice/trunk/main/cui/source/customize/cfg.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/cui/source/customize/cfg.cxx?rev=1541847&r1=1541846&r2=1541847&view=diff ============================================================================== --- openoffice/trunk/main/cui/source/customize/cfg.cxx (original) +++ openoffice/trunk/main/cui/source/customize/cfg.cxx Thu Nov 14 08:18:05 2013 @@ -1662,7 +1662,7 @@ SvxConfigPage::SvxConfigPage( aDescriptionField.SetControlBackground( GetSettings().GetStyleSettings().GetDialogColor() ); aDescriptionField.SetAutoScroll( sal_True ); aDescriptionField.EnableCursor( sal_False ); - + //IAccessibility2 Implementation 2009----- aMoveUpButton.SetAccessibleName(String(CUI_RES(BUTTON_STR_UP))); aMoveDownButton.SetAccessibleName(String(CUI_RES(BUTTON_STR_DOWN))); aMoveUpButton.SetAccessibleRelationMemberOf(&aContentsSeparator); @@ -1671,6 +1671,7 @@ SvxConfigPage::SvxConfigPage( aModifyTopLevelButton.SetAccessibleRelationMemberOf(&aTopLevelSeparator); aAddCommandsButton.SetAccessibleRelationMemberOf(&aContentsSeparator); aModifyCommandButton.SetAccessibleRelationMemberOf(&aContentsSeparator); + //-----IAccessibility2 Implementation 2009 } SvxConfigPage::~SvxConfigPage() @@ -2929,9 +2930,10 @@ SvxMainMenuOrganizerDialog::SvxMainMenuO LINK( this, SvxMainMenuOrganizerDialog, MoveHdl) ); aMoveDownButton.SetClickHdl ( LINK( this, SvxMainMenuOrganizerDialog, MoveHdl) ); - + //IAccessibility2 Implementation 2009----- aMoveUpButton.SetAccessibleName(String(CUI_RES(BUTTON_STR_UP))); aMoveDownButton.SetAccessibleName(String(CUI_RES(BUTTON_STR_DOWN))); + //-----IAccessibility2 Implementation 2009 } IMPL_LINK(SvxMainMenuOrganizerDialog, ModifyHdl, Edit*, pEdit) Modified: openoffice/trunk/main/cui/source/customize/cfg.src URL: http://svn.apache.org/viewvc/openoffice/trunk/main/cui/source/customize/cfg.src?rev=1541847&r1=1541846&r2=1541847&view=diff ============================================================================== --- openoffice/trunk/main/cui/source/customize/cfg.src (original) +++ openoffice/trunk/main/cui/source/customize/cfg.src Thu Nov 14 08:18:05 2013 @@ -822,7 +822,7 @@ String RID_SVXSTR_RENAME_TOOLBAR { Text [ en-US ] = "Rename Toolbar"; }; - +//IAccessibility2 Implementation 2009----- String BUTTON_STR_UP { Text [ en-US ] = "Up"; @@ -831,4 +831,5 @@ String BUTTON_STR_DOWN { Text [ en-US ] = "Down"; }; +//-----IAccessibility2 Implementation 2009 Modified: openoffice/trunk/main/cui/source/customize/macropg.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/cui/source/customize/macropg.cxx?rev=1541847&r1=1541846&r2=1541847&view=diff ============================================================================== --- openoffice/trunk/main/cui/source/customize/macropg.cxx (original) +++ openoffice/trunk/main/cui/source/customize/macropg.cxx Thu Nov 14 08:18:05 2013 @@ -166,6 +166,9 @@ _HeaderTabListBox::_HeaderTabListBox( Wi maHeaderBar( this, WB_BUTTONSTYLE | WB_BOTTOMBORDER ) { maListBox.SetHelpId( HID_MACRO_HEADERTABLISTBOX ); + + // enable the cell focus to show visible focus + maListBox.EnableCellFocus(); } _HeaderTabListBox::~_HeaderTabListBox() Modified: openoffice/trunk/main/cui/source/dialogs/cuigrfflt.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/cui/source/dialogs/cuigrfflt.cxx?rev=1541847&r1=1541846&r2=1541847&view=diff ============================================================================== --- openoffice/trunk/main/cui/source/dialogs/cuigrfflt.cxx (original) +++ openoffice/trunk/main/cui/source/dialogs/cuigrfflt.cxx Thu Nov 14 08:18:05 2013 @@ -535,7 +535,8 @@ GraphicFilterSolarize::GraphicFilterSola maCbxInvert.Check( bInvert ); maCbxInvert.SetToggleHdl( GetModifyHdl() ); - maMtrThreshold.GrabFocus(); + // IAccessibility2 Implementation 2009 + // maMtrThreshold.GrabFocus(); } // ----------------------------------------------------------------------------- @@ -595,7 +596,8 @@ GraphicFilterSepia::GraphicFilterSepia( maMtrSepia.SetValue( nSepiaPercent ); maMtrSepia.SetModifyHdl( GetModifyHdl() ); - maMtrSepia.GrabFocus(); + // IAccessibility2 Implementation 2009 + // maMtrSepia.GrabFocus(); } // ----------------------------------------------------------------------------- @@ -646,7 +648,9 @@ GraphicFilterPoster::GraphicFilterPoster maNumPoster.SetLast( rGraphic.GetBitmapEx().GetBitCount() ); maNumPoster.SetValue( nPosterCount ); maNumPoster.SetModifyHdl( GetModifyHdl() ); - maNumPoster.GrabFocus(); + + // IAccessibility2 Implementation 2009 + // maNumPoster.GrabFocus(); } // ----------------------------------------------------------------------------- Modified: openoffice/trunk/main/cui/source/dialogs/iconcdlg.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/cui/source/dialogs/iconcdlg.cxx?rev=1541847&r1=1541846&r2=1541847&view=diff ============================================================================== --- openoffice/trunk/main/cui/source/dialogs/iconcdlg.cxx (original) +++ openoffice/trunk/main/cui/source/dialogs/iconcdlg.cxx Thu Nov 14 08:18:05 2013 @@ -456,6 +456,11 @@ void IconChoiceDialog::ShowPage( sal_uIn ActivatePageImpl( ); if(bInvalidate) Invalidate(); + + // IA2 CWS. MT: I guess we want the event now, and not in Paint()? + IconChoicePageData* pData = GetPageData ( mnCurrentPageId ); + if(pData) + ShowPageImpl ( pData ); } /********************************************************************** Modified: openoffice/trunk/main/cui/source/inc/cuicharmap.hxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/cui/source/inc/cuicharmap.hxx?rev=1541847&r1=1541846&r2=1541847&view=diff ============================================================================== --- openoffice/trunk/main/cui/source/inc/cuicharmap.hxx (original) +++ openoffice/trunk/main/cui/source/inc/cuicharmap.hxx Thu Nov 14 08:18:05 2013 @@ -82,7 +82,12 @@ private: friend class SvxCharacterMap; SfxModalDialog* mpDialog; + FixedText aFontText; + ListBox aFontLB; + FixedText aSubsetText; + ListBox aSubsetLB; SvxShowCharSet aShowSet; + FixedText aSymbolText; SvxShowText aShowText; // SvxShowText aShowShortcut; OKButton aOKBtn; @@ -90,11 +95,6 @@ friend class SvxCharacterMap; HelpButton aHelpBtn; PushButton aDeleteBtn; // PushButton aAssignBtn; - FixedText aFontText; - ListBox aFontLB; - FixedText aSubsetText; - ListBox aSubsetLB; - FixedText aSymbolText; SvxShowText aShowChar; FixedText aCharCodeText; // FixedText aAssignText; Modified: openoffice/trunk/main/cui/source/inc/headertablistbox.hxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/cui/source/inc/headertablistbox.hxx?rev=1541847&r1=1541846&r2=1541847&view=diff ============================================================================== --- openoffice/trunk/main/cui/source/inc/headertablistbox.hxx (original) +++ openoffice/trunk/main/cui/source/inc/headertablistbox.hxx Thu Nov 14 08:18:05 2013 @@ -31,8 +31,8 @@ class _HeaderTabListBox : public Control { private: - SvHeaderTabListBox maListBox; HeaderBar maHeaderBar; + SvHeaderTabListBox maListBox; protected: DECL_LINK( HeaderEndDrag_Impl, HeaderBar* ); virtual long Notify( NotifyEvent& rNEvt ); Modified: openoffice/trunk/main/cui/source/tabpages/autocdlg.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/cui/source/tabpages/autocdlg.cxx?rev=1541847&r1=1541846&r2=1541847&view=diff ============================================================================== --- openoffice/trunk/main/cui/source/tabpages/autocdlg.cxx (original) +++ openoffice/trunk/main/cui/source/tabpages/autocdlg.cxx Thu Nov 14 08:18:05 2013 @@ -2052,12 +2052,12 @@ OfaQuoteTabPage::OfaQuoteTabPage( Window sStandard(CUI_RES(ST_STANDARD)) { - aSglStandardPB.SetAccessibleName(String(CUI_RES(STR_PB_SGL_STD) ) ); - aDblStandardPB.SetAccessibleName(String(CUI_RES(STR_PB_DBL_STD) ) ); - aStartQuotePB.SetAccessibleName( String(CUI_RES(STR_PB_DBL_START) )); - aEndQuotePB.SetAccessibleName(String(CUI_RES(STR_PB_DBL_END) )); - aSglStartQuotePB.SetAccessibleName(String(CUI_RES(STR_PB_SGL_START) )); - aSglEndQuotePB.SetAccessibleName(String(CUI_RES(STR_PB_SGL_END) ) ); + //aSglStandardPB.SetAccessibleName(String(CUI_RES(STR_PB_SGL_STD) ) ); + //aDblStandardPB.SetAccessibleName(String(CUI_RES(STR_PB_DBL_STD) ) ); + //aStartQuotePB.SetAccessibleName( String(CUI_RES(STR_PB_DBL_START) )); + //aEndQuotePB.SetAccessibleName(String(CUI_RES(STR_PB_DBL_END) )); + //aSglStartQuotePB.SetAccessibleName(String(CUI_RES(STR_PB_SGL_START) )); + //aSglEndQuotePB.SetAccessibleName(String(CUI_RES(STR_PB_SGL_END) ) ); FreeResource(); @@ -2100,6 +2100,15 @@ OfaQuoteTabPage::OfaQuoteTabPage( Window aDblStandardPB.SetClickHdl(LINK(this, OfaQuoteTabPage, StdQuoteHdl)); aSglStandardPB.SetClickHdl(LINK(this, OfaQuoteTabPage, StdQuoteHdl)); + //IAccessibility2 Implementation 2009----- + // Move down from the position before FreeResource() + // For lost help ID issue + aSglStandardPB.SetAccessibleName(String(CUI_RES(STR_PB_SGL_STD) ) ); + aDblStandardPB.SetAccessibleName(String(CUI_RES(STR_PB_DBL_STD) ) ); + aStartQuotePB.SetAccessibleName( String(CUI_RES(STR_PB_DBL_START) )); + aEndQuotePB.SetAccessibleName(String(CUI_RES(STR_PB_DBL_END) )); + aSglStartQuotePB.SetAccessibleName(String(CUI_RES(STR_PB_SGL_START) )); + aSglEndQuotePB.SetAccessibleName(String(CUI_RES(STR_PB_SGL_END) ) ); aSglStartQuotePB.SetAccessibleRelationLabeledBy( &aSglStartQuoteFT ); aSglEndQuotePB.SetAccessibleRelationLabeledBy( &aSglEndQuoteFT ); aSglStartQuotePB.SetAccessibleRelationMemberOf( &aSingleFL ); Modified: openoffice/trunk/main/cui/source/tabpages/autocdlg.src URL: http://svn.apache.org/viewvc/openoffice/trunk/main/cui/source/tabpages/autocdlg.src?rev=1541847&r1=1541846&r2=1541847&view=diff ============================================================================== --- openoffice/trunk/main/cui/source/tabpages/autocdlg.src (original) +++ openoffice/trunk/main/cui/source/tabpages/autocdlg.src Thu Nov 14 08:18:05 2013 @@ -493,6 +493,30 @@ TabPage RID_OFAPAGE_AUTOCORR_EXCEPT { Text [ en-US ] = "Delete words with two initial capitals" ; }; + String STR_PB_SGL_STD + { + Text [ en-US ] = "Single quotes default" ; + }; + String STR_PB_DBL_STD + { + Text [ en-US ] = "Double quotes default" ; + }; + String STR_PB_SGL_START + { + Text [ en-US ] = "Start quote of single quotes" ; + }; + String STR_PB_DBL_START + { + Text [ en-US ] = "Start quote of double quotes" ; + }; + String STR_PB_SGL_END + { + Text [ en-US ] = "End quote of single quotes" ; + }; + String STR_PB_DBL_END + { + Text [ en-US ] = "End quote of double quotes" ; + }; }; /**************************************************************************/ /* */ @@ -661,30 +685,6 @@ TabPage RID_OFAPAGE_AUTOCORR_QUOTE { Text [ en-US ] = "Default" ; }; - String STR_PB_SGL_STD - { - Text [ en-US ] = "Single quotes default" ; - }; - String STR_PB_DBL_STD - { - Text [ en-US ] = "Double quotes default" ; - }; - String STR_PB_SGL_START - { - Text [ en-US ] = "Start quote of single quotes" ; - }; - String STR_PB_DBL_START - { - Text [ en-US ] = "Start quote of double quotes" ; - }; - String STR_PB_SGL_END - { - Text [ en-US ] = "End quote of single quotes" ; - }; - String STR_PB_DBL_END - { - Text [ en-US ] = "End quote of double quotes" ; - }; }; /**************************************************************************/ Modified: openoffice/trunk/main/cui/source/tabpages/connect.hrc URL: http://svn.apache.org/viewvc/openoffice/trunk/main/cui/source/tabpages/connect.hrc?rev=1541847&r1=1541846&r2=1541847&view=diff ============================================================================== --- openoffice/trunk/main/cui/source/tabpages/connect.hrc (original) +++ openoffice/trunk/main/cui/source/tabpages/connect.hrc Thu Nov 14 08:18:05 2013 @@ -39,3 +39,5 @@ #define FT_TYPE 8 #define LB_TYPE 1 #define CTL_PREVIEW 1 +//IAccessibility2 Implementation 2009----- +#define STR_EXAMPLE 1 Modified: openoffice/trunk/main/cui/source/tabpages/tabarea.src URL: http://svn.apache.org/viewvc/openoffice/trunk/main/cui/source/tabpages/tabarea.src?rev=1541847&r1=1541846&r2=1541847&view=diff ============================================================================== --- openoffice/trunk/main/cui/source/tabpages/tabarea.src (original) +++ openoffice/trunk/main/cui/source/tabpages/tabarea.src Thu Nov 14 08:18:05 2013 @@ -875,6 +875,9 @@ TabPage RID_SVXPAGE_BITMAP Pos = MAP_APPFONT ( 12 , 25 ) ; Size = MAP_APPFONT ( 72 , 72 ) ; TabStop = TRUE ; + //IAccessibility2 Implementation 2009----- + Text [ en-US ] = "Pattern Editor"; + //-----IAccessibility2 Implementation 2009 }; FixedText FT_COLOR { @@ -1316,12 +1319,18 @@ TabPage RID_SVXPAGE_COLOR Border = TRUE; Pos = MAP_APPFONT ( 157 , 14 ) ; Size = MAP_APPFONT ( 34 , 25 ) ; + // IAccessibility2 implementation 2009. ------ + Text [ en-US ] = "Old Color" ; + // ------ IAccessibility2 implementation 2009. }; Control CTL_PREVIEW_NEW { Border = TRUE; Pos = MAP_APPFONT ( 157, 39 ) ; Size = MAP_APPFONT ( 34 , 25 ) ; + // IAccessibility2 implementation 2009. ------ + Text [ en-US ] = "New Color" ; + // ------ IAccessibility2 implementation 2009. }; ListBox LB_COLORMODEL { Modified: openoffice/trunk/main/cui/source/tabpages/tparea.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/cui/source/tabpages/tparea.cxx?rev=1541847&r1=1541846&r2=1541847&view=diff ============================================================================== --- openoffice/trunk/main/cui/source/tabpages/tparea.cxx (original) +++ openoffice/trunk/main/cui/source/tabpages/tparea.cxx Thu Nov 14 08:18:05 2013 @@ -2213,6 +2213,11 @@ IMPL_LINK( SvxAreaTabPage, ClickBitmapHd aMtrFldYOffset.Show(); aFlPosition.Show(); aRbtRow.Show(); +//IAccessible2 Implementation 2009----- + //Solution:Check one when initializing. + if(!aRbtRow.IsChecked()&&!aRbtColumn.IsChecked()) + aRbtRow.Check(); +//-----IAccessible2 Implementation 2009 aRbtColumn.Show(); aMtrFldOffset.Show(); aFlOffset.Show(); Modified: openoffice/trunk/main/curl/curl-7.19.7_win.patch URL: http://svn.apache.org/viewvc/openoffice/trunk/main/curl/curl-7.19.7_win.patch?rev=1541847&r1=1541846&r2=1541847&view=diff ============================================================================== --- openoffice/trunk/main/curl/curl-7.19.7_win.patch (original) +++ openoffice/trunk/main/curl/curl-7.19.7_win.patch Thu Nov 14 08:18:05 2013 @@ -1,19 +1,19 @@ ---- misc/curl-7.19.7/lib/Makefile.vc9 2009-11-04 13:35:39.000000000 +0100 -+++ misc/build/curl-7.19.7/lib/Makefile.vc9 2009-11-18 12:32:57.234375000 +0100 -@@ -46,13 +46,13 @@ - # Stem for static libs and DLLs - # - LIB_NAME = libcurl --LIB_NAME_DEBUG = libcurld -+LIB_NAME_DEBUG = libcurl - - # - # Stem for DLL import libs - # --IMPLIB_NAME = libcurl_imp --IMPLIB_NAME_DEBUG = libcurld_imp -+IMPLIB_NAME = libcurl -+IMPLIB_NAME_DEBUG = libcurl - - !IFNDEF OPENSSL_PATH - OPENSSL_PATH = ../../openssl-0.9.8g +--- misc/curl-7.19.7/lib/Makefile.vc9 2009-11-04 13:35:39.000000000 +0100 ++++ misc/build/curl-7.19.7/lib/Makefile.vc9 2009-11-18 12:32:57.234375000 +0100 +@@ -46,13 +46,13 @@ + # Stem for static libs and DLLs + # + LIB_NAME = libcurl +-LIB_NAME_DEBUG = libcurld ++LIB_NAME_DEBUG = libcurl + + # + # Stem for DLL import libs + # +-IMPLIB_NAME = libcurl_imp +-IMPLIB_NAME_DEBUG = libcurld_imp ++IMPLIB_NAME = libcurl ++IMPLIB_NAME_DEBUG = libcurl + + !IFNDEF OPENSSL_PATH + OPENSSL_PATH = ../../openssl-0.9.8g Propchange: openoffice/trunk/main/curl/curl-7.19.7_win.patch ------------------------------------------------------------------------------ svn:eol-style = native Modified: openoffice/trunk/main/editeng/inc/editeng/AccessibleEditableTextPara.hxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/editeng/inc/editeng/AccessibleEditableTextPara.hxx?rev=1541847&r1=1541846&r2=1541847&view=diff ============================================================================== --- openoffice/trunk/main/editeng/inc/editeng/AccessibleEditableTextPara.hxx (original) +++ openoffice/trunk/main/editeng/inc/editeng/AccessibleEditableTextPara.hxx Thu Nov 14 08:18:05 2013 @@ -373,6 +373,13 @@ namespace accessibility /// Check whether 0<=nStart<=n and 0<=nEnd<=n void CheckRange( sal_Int32 nStart, sal_Int32 nEnd ) SAL_THROW((::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException)); +//IAccessibility2 Implementation 2009----- + void _correctValues( const sal_Int32 nIndex, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rValues ); + sal_Int32 SkipField(sal_Int32 nIndex, sal_Bool bForward); + // get overlapped field, extend return string. Only extend forward for now + sal_Bool ExtendByField( ::com::sun::star::accessibility::TextSegment& Segment ); + String GetFieldTypeNameAtIndex(sal_Int32 nIndex); +//-----IAccessibility2 Implementation 2009 // the paragraph index in the edit engine (guarded by solar mutex) sal_Int32 mnParagraphIndex; @@ -400,6 +407,14 @@ namespace accessibility /// Our listeners (guarded by maMutex) int mnNotifierClientId; + //IAccessibility2 Implementation 2009----- +public: + void SetParagraphBackColorAccessible(const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > & ref) + { m_xAccInfo = ref ;} +private: + ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > m_xAccInfo; + //virtual sal_Bool IsShapeParaFocusable( ); + //-----IAccessibility2 Implementation 2009 // --> OD 2006-01-11 #i27138# // the paragraph manager, which created this instance - is NULL, if Modified: openoffice/trunk/main/editeng/inc/editeng/editdata.hxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/editeng/inc/editeng/editdata.hxx?rev=1541847&r1=1541846&r2=1541847&view=diff ============================================================================== --- openoffice/trunk/main/editeng/inc/editeng/editdata.hxx (original) +++ openoffice/trunk/main/editeng/inc/editeng/editdata.hxx Thu Nov 14 08:18:05 2013 @@ -363,7 +363,10 @@ enum EENotifyType EE_NOTIFY_INPUT_START, /// Denotes the end of a high-level action triggered by a key press - EE_NOTIFY_INPUT_END + EE_NOTIFY_INPUT_END, +//IAccessibility2 Implementation 2009----- + EE_NOTIFY_TEXTVIEWSELECTIONCHANGED_ENDD_PARA +//-----IAccessibility2 Implementation 2009 }; struct EENotify Modified: openoffice/trunk/main/editeng/inc/editeng/editeng.hxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/editeng/inc/editeng/editeng.hxx?rev=1541847&r1=1541846&r2=1541847&view=diff ============================================================================== --- openoffice/trunk/main/editeng/inc/editeng/editeng.hxx (original) +++ openoffice/trunk/main/editeng/inc/editeng/editeng.hxx Thu Nov 14 08:18:05 2013 @@ -108,6 +108,9 @@ const sal_uInt8 EditEngineAttribs_OnlyHa #define GETATTRIBS_CHARATTRIBS (sal_uInt8)0x04 #define GETATTRIBS_ALL (sal_uInt8)0xFF +//IAccessibility2 Implementation 2009----- +class SdrObject; +//-----IAccessibility2 Implementation 2009 class EDITENG_DLLPUBLIC EditEngine { friend class EditView; @@ -145,6 +148,9 @@ public: void SetUpdateMode( sal_Bool bUpdate ); sal_Bool GetUpdateMode() const; + //IAccessible2 migration fix + void SetUpdateModeForAcc( sal_Bool bUp); + sal_Bool GetUpdateModeForAcc( ) const; void SetBackgroundColor( const Color& rColor ); Color GetBackgroundColor() const; @@ -469,7 +475,9 @@ public: static void ImportBulletItem( SvxNumBulletItem& rNumBullet, sal_uInt16 nLevel, const SvxBulletItem* pOldBullet, const SvxLRSpaceItem* pOldLRSpace ); static sal_Bool IsPrintable( sal_Unicode c ) { return ( ( c >= 32 ) && ( c != 127 ) ); } static sal_Bool HasValidData( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rTransferable ); - + //IAccessibility2 Implementation 2009----- + virtual SdrObject* GetCurTextObj() { return NULL; } + //-----IAccessibility2 Implementation 2009 /** sets a link that is called at the beginning of a drag operation at an edit view */ void SetBeginDropHdl( const Link& rLink ); Link GetBeginDropHdl() const; Modified: openoffice/trunk/main/editeng/inc/editeng/editrids.hrc URL: http://svn.apache.org/viewvc/openoffice/trunk/main/editeng/inc/editeng/editrids.hrc?rev=1541847&r1=1541846&r2=1541847&view=diff ============================================================================== --- openoffice/trunk/main/editeng/inc/editeng/editrids.hrc (original) +++ openoffice/trunk/main/editeng/inc/editeng/editrids.hrc Thu Nov 14 08:18:05 2013 @@ -373,8 +373,10 @@ #define RID_STR_WORD (RID_EDIT_START + 313) #define RID_SVXSTR_A11Y_IMAGEBULLET_DESCRIPTION (RID_EDIT_START + 314) #define RID_SVXSTR_A11Y_IMAGEBULLET_NAME (RID_EDIT_START + 315) +#define RID_SVXSTR_A11Y_PARAGRAPH_DESCRIPTION (RID_EDIT_START + 316) +#define RID_SVXSTR_A11Y_PARAGRAPH_NAME (RID_EDIT_START + 317) -#if 315 > (RID_EDIT_END-RID_EDIT_START) +#if 317 > (RID_EDIT_END-RID_EDIT_START) #error Resource-Ueberlauf in #line, #file #endif Modified: openoffice/trunk/main/editeng/inc/editeng/editview.hxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/editeng/inc/editeng/editview.hxx?rev=1541847&r1=1541846&r2=1541847&view=diff ============================================================================== --- openoffice/trunk/main/editeng/inc/editeng/editview.hxx (original) +++ openoffice/trunk/main/editeng/inc/editeng/editview.hxx Thu Nov 14 08:18:05 2013 @@ -219,6 +219,10 @@ public: sal_Bool IsCursorAtWrongSpelledWord( sal_Bool bMarkIfWrong = sal_False ); sal_Bool IsWrongSpelledWordAtPos( const Point& rPosPixel, sal_Bool bMarkIfWrong = sal_False ); + //IAccessibility2 Implementation 2009----- + sal_Bool IsShapeParaFocusable( ) ; + sal_Bool WrongSpelledBreakPara(sal_Int32 nPara,sal_uInt16& nStartIndex, sal_uInt16& nEndIndex,sal_Int32 nIndex); + //-----IAccessibility2 Implementation 2009 void SpellIgnoreWord(); void ExecuteSpellPopup( const Point& rPosPixel, Link* pCallBack = 0 ); Modified: openoffice/trunk/main/editeng/inc/editeng/splwrap.hxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/editeng/inc/editeng/splwrap.hxx?rev=1541847&r1=1541846&r2=1541847&view=diff ============================================================================== --- openoffice/trunk/main/editeng/inc/editeng/splwrap.hxx (original) +++ openoffice/trunk/main/editeng/inc/editeng/splwrap.hxx Thu Nov 14 08:18:05 2013 @@ -39,7 +39,8 @@ namespace com { namespace sun { namespac }}}} class Window; - +//IAccessibility2 Impplementaton 2009----- +class SdrObject; // misc functions --------------------------------------------------------------- void EDITENG_DLLPUBLIC SvxPrepareAutoCorrect( String &rOldText, String &rNewText ); @@ -61,6 +62,8 @@ private: ::com::sun::star::linguistic2::XSpellChecker1 > xSpell; ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenator > xHyph; +//IAccessibility2 Impplementaton 2009----- + SdrObject* mpTextObj; sal_uInt16 nOldLang; // Sprache merken, nur bei Aenderung SetLanguage rufen sal_Bool bOtherCntnt : 1; // gesetzt => Sonderbereiche zunaechst pruefen sal_Bool bDialog : 1; // Ist pWin der Svx...Dialog? @@ -151,6 +154,10 @@ protected: virtual void AutoCorrect( const String& rAktStr, const String& rNewStr ); virtual void InsertHyphen( const sal_uInt16 nPos ); // Hyphen einfuegen +//IAccessibility2 Impplementaton 2009----- + void SetCurTextObj( SdrObject* pObj ) { mpTextObj = pObj; } + SdrObject* GetCurTextObj() { return mpTextObj; } +//-----IAccessibility2 Impplementaton 2009 }; #endif Modified: openoffice/trunk/main/editeng/inc/editeng/unoedhlp.hxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/editeng/inc/editeng/unoedhlp.hxx?rev=1541847&r1=1541846&r2=1541847&view=diff ============================================================================== --- openoffice/trunk/main/editeng/inc/editeng/unoedhlp.hxx (original) +++ openoffice/trunk/main/editeng/inc/editeng/unoedhlp.hxx Thu Nov 14 08:18:05 2013 @@ -60,7 +60,17 @@ public: void SetStartValue( sal_uLong n ); void SetEndValue( sal_uLong n ); }; - +//IAccessibility2 Implementation 2009----- +class SvxEditSourceHintEndPara :public SvxEditSourceHint +{ +public: + TYPEINFO(); + SvxEditSourceHintEndPara( sal_uInt32 nId ) + :SvxEditSourceHint(nId) {} + SvxEditSourceHintEndPara( sal_uInt32 nId, sal_uInt32 nValue, sal_uInt32 nStart=0, sal_uInt32 nEnd=0 ) + :SvxEditSourceHint(nId,nValue,nStart){ (void)nEnd; } +}; +//-----IAccessibility2 Implementation 2009 /** Helper class for common functionality in edit sources */ class EDITENG_DLLPUBLIC SvxEditSourceHelper @@ -97,7 +107,10 @@ public: @return sal_True, if the range has been successfully determined */ - static sal_Bool GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, const EditEngine& rEE, sal_uInt16 nPara, sal_uInt16 nIndex ); + //IAccessibility2 Implementation 2009----- + //static sal_Bool GetAttributeRun( USHORT& nStartIndex, USHORT& nEndIndex, const EditEngine& rEE, USHORT nPara, USHORT nIndex ); + static sal_Bool GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, const EditEngine& rEE, sal_uInt16 nPara, sal_uInt16 nIndex, sal_Bool bInCell=sal_False ); + //-----IAccessibility2 Implementation 2009 /** Convert point from edit engine to user coordinate space Modified: openoffice/trunk/main/editeng/inc/editeng/unoedprx.hxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/editeng/inc/editeng/unoedprx.hxx?rev=1541847&r1=1541846&r2=1541847&view=diff ============================================================================== --- openoffice/trunk/main/editeng/inc/editeng/unoedprx.hxx (original) +++ openoffice/trunk/main/editeng/inc/editeng/unoedprx.hxx Thu Nov 14 08:18:05 2013 @@ -74,9 +74,12 @@ public: virtual OutputDevice* GetRefDevice() const; virtual sal_Bool GetIndexAtPoint( const Point&, sal_uInt16& nPara, sal_uInt16& nIndex ) const; virtual sal_Bool GetWordIndices( sal_uInt16 nPara, sal_uInt16 nIndex, sal_uInt16& nStart, sal_uInt16& nEnd ) const; - virtual sal_Bool GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex ) const; - virtual sal_uInt16 GetLineCount( sal_uInt16 nPara ) const; - virtual sal_uInt16 GetLineLen( sal_uInt16 nPara, sal_uInt16 nLine ) const; + //IAccessibility2 Implementation 2009----- + virtual void SetUpdateModeForAcc( sal_Bool bUp); + virtual sal_Bool GetUpdateModeForAcc() const; + virtual sal_Bool GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex, sal_Bool bInCell = sal_False ) const; + virtual sal_uInt16 GetLineCount( sal_uInt16 nPara ) const; + virtual sal_uInt16 GetLineLen( sal_uInt16 nPara, sal_uInt16 nLine ) const; virtual void GetLineBoundaries( /*out*/sal_uInt16 &rStart, /*out*/sal_uInt16 &rEnd, sal_uInt16 nParagraph, sal_uInt16 nLine ) const; virtual sal_uInt16 GetLineNumberAtIndex( sal_uInt16 nPara, sal_uInt16 nIndex ) const; Modified: openoffice/trunk/main/editeng/inc/editeng/unoedsrc.hxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/editeng/inc/editeng/unoedsrc.hxx?rev=1541847&r1=1541846&r2=1541847&view=diff ============================================================================== --- openoffice/trunk/main/editeng/inc/editeng/unoedsrc.hxx (original) +++ openoffice/trunk/main/editeng/inc/editeng/unoedsrc.hxx Thu Nov 14 08:18:05 2013 @@ -219,7 +219,12 @@ public: Index of paragraph to query bullet info on */ virtual EBulletInfo GetBulletInfo( sal_uInt16 nPara ) const = 0; - +//IAccessibility2 Implementation 2009----- + virtual String GetNumStr(sal_uInt16) const { return XubString();}; + //IAccessible2 migration fix + virtual void SetUpdateModeForAcc( sal_Bool ) {}; + virtual sal_Bool GetUpdateModeForAcc() const { return sal_True; }; +//-----IAccessibility2 Implementation 2009 /** Query the bounding rectangle of the given character @param nPara[0 .. n] @@ -331,7 +336,10 @@ public: @return sal_True, if the range has been successfully determined */ - virtual sal_Bool GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex ) const = 0; + //IAccessibility2 Implementation 2009----- +// virtual sal_Bool GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex ) const = 0; + virtual sal_Bool GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex, sal_Bool bInCell = sal_False ) const = 0; + //-----IAccessibility2 Implementation 2009 /** Query number of lines in the formatted paragraph @@ -542,6 +550,11 @@ public: */ virtual sal_Bool Paste() = 0; +//IAccessibility2 Implementation 2009----- + virtual sal_Bool IsWrongSpelledWordAtPos( sal_Int32, sal_Int32 ) { return sal_False; }; + virtual sal_Bool IsShapeParaFocusable( ) { return sal_True; }; + virtual sal_Bool BreakParaWrongList(sal_Int32, sal_uInt16&, sal_uInt16&, sal_Int32){ return sal_False; }; +//-----IAccessibility2 Implementation 2009 }; #endif Modified: openoffice/trunk/main/editeng/inc/editeng/unofored.hxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/editeng/inc/editeng/unofored.hxx?rev=1541847&r1=1541846&r2=1541847&view=diff ============================================================================== --- openoffice/trunk/main/editeng/inc/editeng/unofored.hxx (original) +++ openoffice/trunk/main/editeng/inc/editeng/unofored.hxx Thu Nov 14 08:18:05 2013 @@ -72,7 +72,10 @@ public: virtual OutputDevice* GetRefDevice() const; virtual sal_Bool GetIndexAtPoint( const Point&, sal_uInt16& nPara, sal_uInt16& nIndex ) const; virtual sal_Bool GetWordIndices( sal_uInt16 nPara, sal_uInt16 nIndex, sal_uInt16& nStart, sal_uInt16& nEnd ) const; - virtual sal_Bool GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex ) const; + //IAccessibility2 Implementation 2009----- +// virtual sal_Bool GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex ) const; + virtual sal_Bool GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex, sal_Bool bInCell = sal_False ) const; + //-----IAccessibility2 Implementation 2009 virtual sal_uInt16 GetLineCount( sal_uInt16 nPara ) const; virtual sal_uInt16 GetLineLen( sal_uInt16 nPara, sal_uInt16 nLine ) const; virtual void GetLineBoundaries( /*out*/sal_uInt16 &rStart, /*out*/sal_uInt16 &rEnd, sal_uInt16 nParagraph, sal_uInt16 nLine ) const; Modified: openoffice/trunk/main/editeng/inc/editeng/unoforou.hxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/editeng/inc/editeng/unoforou.hxx?rev=1541847&r1=1541846&r2=1541847&view=diff ============================================================================== --- openoffice/trunk/main/editeng/inc/editeng/unoforou.hxx (original) +++ openoffice/trunk/main/editeng/inc/editeng/unoforou.hxx Thu Nov 14 08:18:05 2013 @@ -93,7 +93,10 @@ public: virtual OutputDevice* GetRefDevice() const; virtual sal_Bool GetIndexAtPoint( const Point&, sal_uInt16& nPara, sal_uInt16& nIndex ) const; virtual sal_Bool GetWordIndices( sal_uInt16 nPara, sal_uInt16 nIndex, sal_uInt16& nStart, sal_uInt16& nEnd ) const; - virtual sal_Bool GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex ) const; + //IAccessibility2 Implementation 2009----- +// virtual sal_Bool GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex ) const; + virtual sal_Bool GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex, sal_Bool bInCell = sal_False ) const; + //-----IAccessibility2 Implementation 2009 virtual sal_uInt16 GetLineCount( sal_uInt16 nPara ) const; virtual sal_uInt16 GetLineLen( sal_uInt16 nPara, sal_uInt16 nLine ) const; virtual void GetLineBoundaries( /*out*/sal_uInt16 &rStart, /*out*/sal_uInt16 &rEnd, sal_uInt16 nPara, sal_uInt16 nLine ) const; Modified: openoffice/trunk/main/editeng/inc/editeng/unotext.hxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/editeng/inc/editeng/unotext.hxx?rev=1541847&r1=1541846&r2=1541847&view=diff ============================================================================== --- openoffice/trunk/main/editeng/inc/editeng/unotext.hxx (original) +++ openoffice/trunk/main/editeng/inc/editeng/unotext.hxx Thu Nov 14 08:18:05 2013 @@ -218,7 +218,10 @@ public: virtual OutputDevice* GetRefDevice() const; virtual sal_Bool GetIndexAtPoint( const Point&, sal_uInt16& nPara, sal_uInt16& nIndex ) const; virtual sal_Bool GetWordIndices( sal_uInt16 nPara, sal_uInt16 nIndex, sal_uInt16& nStart, sal_uInt16& nEnd ) const; - virtual sal_Bool GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex ) const; + //IAccessibility2 Implementation 2009----- +// virtual sal_Bool GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex ) const; + virtual sal_Bool GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex, sal_Bool bInCell = sal_False ) const; + //-----IAccessibility2 Implementation 2009 virtual sal_uInt16 GetLineCount( sal_uInt16 nPara ) const; virtual sal_uInt16 GetLineLen( sal_uInt16 nPara, sal_uInt16 nLine ) const; virtual void GetLineBoundaries( /*out*/sal_uInt16 &rStart, /*out*/sal_uInt16 &rEnd, sal_uInt16 nParagraph, sal_uInt16 nLine ) const;
