diff options
| author | Kohei Yoshida <kyoshida@novell.com> | 2011-06-06 13:44:40 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kyoshida@novell.com> | 2011-06-06 13:50:52 -0400 |
| commit | 5336fee91b318586e1a0ae9332b567394a4489ef (patch) | |
| tree | 24dc23fcd1b23a8c88e674af0d27af5590f01ae5 /sc/inc/datauno.hxx | |
| parent | b7b71077b63dbb1b58330cea5a649278e763c361 (diff) | |
| parent | d1670d617523ae023b5d987e9df7af2179122c5c (diff) | |
Merge remote branch 'origin/libreoffice-3-4'
Conflicts:
sc/source/core/tool/dbcolect.cxx
sc/source/filter/excel/xiname.cxx
sc/source/filter/xml/xmldrani.cxx
sc/source/ui/view/tabview2.cxx
Diffstat (limited to 'sc/inc/datauno.hxx')
| -rw-r--r-- | sc/inc/datauno.hxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sc/inc/datauno.hxx b/sc/inc/datauno.hxx index e54fd3135d33..94bdfa676e9f 100644 --- a/sc/inc/datauno.hxx +++ b/sc/inc/datauno.hxx @@ -683,7 +683,7 @@ public: virtual void SAL_CALL setByTable( const ::com::sun::star::table::CellRangeAddress& aRange ) throw(::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException ); - virtual com::sun::star::uno::Any SAL_CALL getByTable( const sal_Int32 nTab ) + virtual com::sun::star::uno::Any SAL_CALL getByTable( sal_Int32 nTab ) throw(::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::container::NoSuchElementException ); |