diff options
author | Mihaela Kedikova <misheto@openoffice.org> | 2009-11-02 09:15:45 +0000 |
---|---|---|
committer | Mihaela Kedikova <misheto@openoffice.org> | 2009-11-02 09:15:45 +0000 |
commit | fd6a0c28038e964215e2a1318cd4640942b6be17 (patch) | |
tree | ba979d896b4c86ff249d1318bb8481176019c19d | |
parent | 34c697928962e1b8f6cd4c657d83a62c11fffadb (diff) |
fixes for i106470
-rw-r--r-- | svtools/inc/svtools/table/tablecontrol.hxx | 8 | ||||
-rw-r--r-- | svtools/source/misc/svtaccessiblefactory.cxx | 9 | ||||
-rw-r--r-- | svtools/source/uno/unoiface.cxx | 5 |
3 files changed, 13 insertions, 9 deletions
diff --git a/svtools/inc/svtools/table/tablecontrol.hxx b/svtools/inc/svtools/table/tablecontrol.hxx index 1315adf0c371..e3edd0b681ae 100644 --- a/svtools/inc/svtools/table/tablecontrol.hxx +++ b/svtools/inc/svtools/table/tablecontrol.hxx @@ -59,7 +59,7 @@ namespace svt { namespace table The control supports the concept of a <em>current</em> (or <em>active</em> cell). - The control supports supports accessibility, this is encapsulated in IAccessibleTable + The control supports accessibility, this is encapsulated in IAccessibleTable // TODO: scrolling? */ @@ -203,9 +203,9 @@ namespace svt { namespace table virtual ::rtl::OUString GetColumnName( sal_Int32 _nIndex ) const; virtual ::rtl::OUString GetCellContent( sal_Int32 _nRowPos, sal_Int32 _nColPos) const; virtual sal_Bool HasRowHeader(); - virtual sal_Bool HasColHeader();
- virtual sal_Bool isAccessibleAlive( ) const;
- virtual void commitGridControlEvent( sal_Int16 _nEventId, const com::sun::star::uno::Any& _rNewValue, const com::sun::star::uno::Any& _rOldValue );
+ virtual sal_Bool HasColHeader(); + virtual sal_Bool isAccessibleAlive( ) const; + virtual void commitGridControlEvent( sal_Int16 _nEventId, const com::sun::star::uno::Any& _rNewValue, const com::sun::star::uno::Any& _rOldValue ); protected: diff --git a/svtools/source/misc/svtaccessiblefactory.cxx b/svtools/source/misc/svtaccessiblefactory.cxx index b2d57c250d32..a4b3cc1e8ecc 100644 --- a/svtools/source/misc/svtaccessiblefactory.cxx +++ b/svtools/source/misc/svtaccessiblefactory.cxx @@ -107,6 +107,15 @@ namespace svt return NULL; } + virtual table::IAccessibleTableControl* + createAccessibleTableControl( + const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& /*_rxParent*/, + table::IAccessibleTable& /*_rTable*/ + ) const + { + return NULL; + } + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > createAccessibleIconChoiceCtrl( SvtIconChoiceCtrl& /*_rIconCtrl*/, diff --git a/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx index 45c93f5849c5..a4e003b69682 100644 --- a/svtools/source/uno/unoiface.cxx +++ b/svtools/source/uno/unoiface.cxx @@ -54,7 +54,6 @@ #include <svtools/svtreebx.hxx> #include "treecontrolpeer.hxx" -//#include "vclxgridcontrol.hxx" #include "svtxgridcontrol.hxx" #include <svtools/table/tablecontrol.hxx> @@ -172,10 +171,6 @@ SAL_DLLPUBLIC_EXPORT Window* CreateWindow( VCLXWindow** ppNewComp, const ::com:: { if ( pParent ) { - //::svt::table::TableControl* m_pTable = new ::svt::table::TableControl(pParent, nWinBits); - //UnoControlTableModel* pModel = new UnoControlTableModel(); - //*ppNewComp = pModel; - //pWindow = m_pTable; pWindow = new ::svt::table::TableControl(pParent, nWinBits); *ppNewComp = new SVTXGridControl; } |