unused ctor, and use boost::noncopyable

2 files changed, 6 insertions, 24 deletions

diff --git a/linguistic/inc/linguistic/spelldta.hxx b/linguistic/inc/linguistic/spelldta.hxx
index afc8fab96564..827dad15a3f4 100644
--- a/linguistic/inc/linguistic/spelldta.hxx
+++ b/linguistic/inc/linguistic/spelldta.hxx
@@ -35,10 +35,12 @@
 
 #include <tools/solar.h>
 
-#include <uno/lbnames.h>            // CPPU_CURRENT_LANGUAGE_BINDING_NAME macro, which specify the environment type
+#include <uno/lbnames.h>
 #include <cppuhelper/implbase2.hxx>
 #include <linguistic/lngdllapi.h>
 
+#include <boost/noncopyable.hpp>
+
 namespace com { namespace sun { namespace star {
     namespace linguistic2 {
         class XDictionaryList;
@@ -75,27 +77,22 @@ void SearchSimilarText( const rtl::OUString &rText, sal_Int16 nLanguage,
 ///////////////////////////////////////////////////////////////////////////
 
 
-class SpellAlternatives :
-    public cppu::WeakImplHelper2
+class SpellAlternatives
+    : public cppu::WeakImplHelper2
     <
         ::com::sun::star::linguistic2::XSpellAlternatives,
         ::com::sun::star::linguistic2::XSetSpellAlternatives
     >
+    , private ::boost::noncopyable
 {
     ::com::sun::star::uno::Sequence< ::rtl::OUString >  aAlt;   // list of alternatives, may be empty.
     ::rtl::OUString         aWord;
     sal_Int16                   nType;          // type of failure
     sal_Int16                   nLanguage;
 
-    // disallow copy-constructor and assignment-operator for now
-    SpellAlternatives(const SpellAlternatives &);
-    SpellAlternatives & operator = (const SpellAlternatives &);
-
 public:
     SpellAlternatives();
     SpellAlternatives(const ::rtl::OUString &rWord, sal_Int16 nLang, sal_Int16 nFailureType,
-                      const ::rtl::OUString &rRplcWord );
-    SpellAlternatives(const ::rtl::OUString &rWord, sal_Int16 nLang, sal_Int16 nFailureType,
                       const ::com::sun::star::uno::Sequence< ::rtl::OUString > &rAlternatives );
     virtual ~SpellAlternatives();
 
diff --git a/linguistic/source/spelldta.cxx b/linguistic/source/spelldta.cxx
index c197fea767e6..90d1d6092318 100644
--- a/linguistic/source/spelldta.cxx
+++ b/linguistic/source/spelldta.cxx
@@ -199,21 +199,6 @@ SpellAlternatives::SpellAlternatives()
 
 
 SpellAlternatives::SpellAlternatives(
-            const OUString &rWord, sal_Int16 nLang,
-            sal_Int16 nFailureType, const OUString &rRplcWord ) :
-    aAlt        ( Sequence< OUString >(1) ),
-    aWord       (rWord),
-    nType       (nFailureType),
-    nLanguage   (nLang)
-{
-    if (rRplcWord.getLength())
-        aAlt.getArray()[ 0 ] = rRplcWord;
-    else
-        aAlt.realloc( 0 );
-}
-
-
-SpellAlternatives::SpellAlternatives(
         const OUString &rWord, sal_Int16 nLang, sal_Int16 nFailureType,
         const Sequence< OUString > &rAlternatives ) :
     aAlt        (rAlternatives),