diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-18 14:12:17 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-18 14:12:17 +0200 |
commit | baecdfb578cb7bc992944857ad4d8882ef7e842c (patch) | |
tree | e68693fe45e6536c28eb4cf563458073f1628777 /linguistic/inc | |
parent | d0d162ecdc0d037b59e36391cd3c6a900d1a660b (diff) |
fixing rebase errors
Diffstat (limited to 'linguistic/inc')
-rw-r--r-- | linguistic/inc/linguistic/spelldta.hxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/linguistic/inc/linguistic/spelldta.hxx b/linguistic/inc/linguistic/spelldta.hxx index 5d2c55b162a0..aab68ac63eb7 100644 --- a/linguistic/inc/linguistic/spelldta.hxx +++ b/linguistic/inc/linguistic/spelldta.hxx @@ -118,14 +118,13 @@ public: // XSetSpellAlternatives virtual void SAL_CALL setAlternatives( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aAlternatives ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setFailureType( ::sal_Int16 nFailureType ) throw (::com::sun::star::uno::RuntimeException); - static com::sun::star::uno::Reference < com::sun::star::linguistic2::XSpellAlternatives > LNG_DLLPUBLIC CreateSpellAlternatives( - const ::rtl::OUString &rWord, sal_Int16 nLang, sal_Int16 nTypeP, const ::com::sun::star::uno::Sequence< ::rtl::OUString > &rAlt ); // non-interface specific functions void SetWordLanguage(const ::rtl::OUString &rWord, sal_Int16 nLang); void SetFailureType(sal_Int16 nTypeP); - void SetAlternatives( - const ::com::sun::star::uno::Sequence< ::rtl::OUString > &rAlt ); + void SetAlternatives( const ::com::sun::star::uno::Sequence< ::rtl::OUString > &rAlt ); + static com::sun::star::uno::Reference < com::sun::star::linguistic2::XSpellAlternatives > LNG_DLLPUBLIC CreateSpellAlternatives( + const ::rtl::OUString &rWord, sal_Int16 nLang, sal_Int16 nTypeP, const ::com::sun::star::uno::Sequence< ::rtl::OUString > &rAlt ); }; |