[Libreoffice-commits] .: Branch 'feature/gnumake4' - linguistic/inc sfx2/prj

[Bjoern Michaelsen]

 linguistic/inc/linguistic/spelldta.hxx |    7 +++----
 sfx2/prj/build.lst                     |    1 -
 2 files changed, 3 insertions(+), 5 deletions(-)

New commits:
commit c0afdcf645e29a0c422ffa940d732af4e2c1d36a
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Sat Jun 18 14:12:17 2011 +0200

    fixing rebase errors

diff --git a/linguistic/inc/linguistic/spelldta.hxx b/linguistic/inc/linguistic/spelldta.hxx
index 2ef17e3..80f8f75 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 );
 };
 
 
diff --git a/sfx2/prj/build.lst b/sfx2/prj/build.lst
index 6e13fe6..dbc233c 100644
--- a/sfx2/prj/build.lst
+++ b/sfx2/prj/build.lst
@@ -1,3 +1,2 @@
 sf      sfx2    :    L10N:l10n idl basic xmlscript framework readlicense_oo shell sax SYSTRAY_GTK:libegg LIBXML2:libxml2 LIBXSLT:libxslt NULL
 sf	sfx2\prj								nmake	-	all	sf_prj NULL
-