#i107450#: move ThesaurusDialog and HyphenWordDialog to cui

6 files changed, 31 insertions, 158 deletions

diff --git a/svx/inc/helpid.hrc b/svx/inc/helpid.hrc
index bc36634e24c3..fdb7c00ba6c0 100644
--- a/svx/inc/helpid.hrc
+++ b/svx/inc/helpid.hrc
@@ -122,7 +122,7 @@
 #define HID_GRFFILTER_SMOOTH                                        (HID_SVX_START +  84)
 #define HID_GRFFILTER_SOBEL                                         (HID_SVX_START +  85)
 #define HID_GRFFILTER_SOLARIZE                                      (HID_SVX_START +  86)
-#define HID_HYPHENATE                                               (HID_SVX_START +  87)
+
 #define HID_IMAPDLG_ACTIVE                                          (HID_SVX_START +  88)
 #define HID_IMAPDLG_APPLY                                           (HID_SVX_START +  89)
 #define HID_IMAPDLG_CIRCLE                                          (HID_SVX_START +  90)
@@ -226,7 +226,7 @@
 #define HID_SVX_TP_DOCRECOVERY_SAVE                                 (HID_SVX_START + 188)
 #define HID_SVX_TP_ERR_REP_SEND                                     (HID_SVX_START + 189)
 #define HID_SVX_TP_ERR_REP_WELCOME                                  (HID_SVX_START + 190)
-#define HID_THES_LANGUAGE                                           (HID_SVX_START + 191)
+
 #define HID_VALUESET_EXTRUSION_DIRECTION                            (HID_SVX_START + 192)
 #define HID_VALUESET_EXTRUSION_LIGHTING                             (HID_SVX_START + 193)
 #define HID_WIN_FONTWORK_ALIGN                                      (HID_SVX_START + 194)
diff --git a/svx/inc/svx/dialogs.hrc b/svx/inc/svx/dialogs.hrc
index c7cddf48e27c..fa498eabfd47 100644
--- a/svx/inc/svx/dialogs.hrc
+++ b/svx/inc/svx/dialogs.hrc
@@ -179,11 +179,6 @@
 #define RID_SVXPAGE_HEADER                  (RID_SVX_START +  27)
 #define RID_SVXQBX_DELETE_HEADFOOT          (RID_SVX_START +  28)
 
-// ResId fuer die Linguistik-Dialoge
-#define RID_SVXDLG_HYPHENATE                (RID_SVX_START +  30)
-#define RID_SVXDLG_THESAURUS                (RID_SVX_START +  31)
-#define RID_SVXDLG_THES_LANGUAGE            (RID_SVX_START +  38)
-
 // ResIds fuer HM-QueryBoxen und Error-Strings
 #define RID_SVXQB_THESAURUS                 (RID_SVX_START +  33)
 #define RID_SVXQB_CONTINUE                  (RID_SVX_START +  34)
@@ -427,16 +422,6 @@
 #define RID_SVXSTR_SEARCH                   (RID_SVX_START +  81)
 #define RID_SVXSTR_REPLACE                  (RID_SVX_START +  82)
 
-// Strings fuer die HM-Strings
-#define RID_SVXSTR_HMSTATUS_BEGIN           (RID_SVX_START +  90)
-#define RID_SVXSTR_HMSTATUS_OK              (RID_SVX_START +  90)
-#define RID_SVXSTR_HMSTATUS_DONTUSE         (RID_SVX_START +  91)
-#define RID_SVXSTR_HMSTATUS_WRONG           (RID_SVX_START +  92)
-#define RID_SVXSTR_HMSTATUS_CAPERROR        (RID_SVX_START +  93)
-#define RID_SVXSTR_HMERR_CHECKINSTALL       (RID_SVX_START +  94)
-#define RID_SVXSTR_HMERR_ADDWORD            (RID_SVX_START +  95)
-#define RID_SVXSTR_HMSTATUS_INVALID_LANG    (RID_SVX_START +  96)
-
 // paper formats
 #define RID_SVXSTR_PAPER_A0                 (RID_SVX_START + 100)
 #define RID_SVXSTR_PAPER_A1                 (RID_SVX_START + 101)
@@ -484,7 +469,6 @@
 
 // HM_ERR
 #define RID_SVXSTR_HMERR_THESAURUS          (RID_SVX_START + 150)
-#define RID_SVXSTR_HMERR_HYPH               (RID_SVX_START + 151)
 
 // Strings der ToolBox-Controls aus tbcontrl.cxx
 #define RID_SVXSTR_FILLPATTERN              (RID_SVX_START + 191)
diff --git a/svx/inc/svx/hangulhanja.hxx b/svx/inc/svx/hangulhanja.hxx
index e4eefce17ea3..239edb9e74a2 100644
--- a/svx/inc/svx/hangulhanja.hxx
+++ b/svx/inc/svx/hangulhanja.hxx
@@ -31,8 +31,6 @@
 #define SVX_HANGUL_HANJA_CONVERSION_HXX
 
 #include <vcl/window.hxx>
-#include <svx/svxenum.hxx>
-
 #include <memory>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/Locale.hpp>
diff --git a/svx/inc/svx/splwrap.hxx b/svx/inc/svx/splwrap.hxx
index e9b71d12320f..731e2ba24991 100644
--- a/svx/inc/svx/splwrap.hxx
+++ b/svx/inc/svx/splwrap.hxx
@@ -81,7 +81,7 @@ private:
                              // aufnehmen und nicht den Dialog starten.
 
     SVX_DLLPRIVATE sal_Bool     SpellNext();        // naechsten Bereich anwaehlen
-    SVX_DLLPRIVATE sal_Bool FindSpellError();   // Suche nach Fehlern ( ueber Bereiche hinweg )
+    sal_Bool    FindSpellError();   // Suche nach Fehlern ( ueber Bereiche hinweg )
 
 public:
     SvxSpellWrapper( Window* pWn,
diff --git a/svx/inc/svx/svxdlg.hxx b/svx/inc/svx/svxdlg.hxx
index 23db741f0991..6f287153f0f8 100644
--- a/svx/inc/svx/svxdlg.hxx
+++ b/svx/inc/svx/svxdlg.hxx
@@ -47,6 +47,8 @@ namespace linguistic2{
     class XDictionary;
     class XSpellChecker1;
     class XSpellChecker;
+    class XThesaurus;
+    class XHyphenator;
 }}}}
 class SvxSpellWrapper; //add for SvxSpellCheckDialog
 typedef SfxTabPage* (*CreateSvxDistributePage)(Window *pParent, const SfxItemSet &rAttrSet, SvxDistributeHorizontal eHor, SvxDistributeVertical eVer);
@@ -61,6 +63,8 @@ class SearchAttrItemList;
 class FmFormShell;
 class Graphic;
 class SdrObject;
+class SvxSpellWrapper;
+
 namespace svx{ class SpellDialogChildWindow;}
 
 #define EMPTY_FRAME_REF com::sun::star::uno::Reference < com::sun::star::frame::XFrame >()
@@ -100,6 +104,22 @@ class AbstractHangulHanjaConversionDialog : public VclAbstractTerminatedDialog /
     virtual String  GetCurrentSuggestion( ) const =0;
 };
 
+class AbstractThesaurusDialog : public VclAbstractDialog
+{
+public:
+    virtual String      GetWord() = 0;
+    virtual sal_uInt16  GetLanguage() const = 0;
+    virtual Window*     GetWindow() = 0;
+};
+
+class AbstractHyphenWordDialog : public VclAbstractDialog
+{
+public:
+    virtual void    SelLeft() = 0;
+    virtual void    SelRight() = 0;
+    virtual Window* GetWindow() = 0;
+};
+
 class AbstractFmShowColsDialog : public VclAbstractDialog //add for FmShowColsDialog
 {
  public:
@@ -381,6 +401,14 @@ public:
     virtual AbstractHangulHanjaConversionDialog * CreateHangulHanjaConversionDialog( Window* _pParent,  //add for HangulHanjaConversionDialog CHINA001
                                             HangulHanjaConversion::ConversionDirection _ePrimaryDirection ) = 0;
 
+    virtual AbstractThesaurusDialog*        CreateThesaurusDialog( Window*, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XThesaurus >  xThesaurus,
+                                                const String &rWord, sal_Int16 nLanguage ) = 0;
+
+    virtual AbstractHyphenWordDialog*       CreateHyphenWordDialog( Window*,
+                                                const String &rWord, LanguageType nLang,
+                                                ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenator >  &xHyphen,
+                                                SvxSpellWrapper* pWrapper ) = 0;
+
     virtual AbstractFmShowColsDialog * CreateFmShowColsDialog( Window* pParent ) = 0;
 
     virtual AbstractSvxZoomDialog * CreateSvxZoomDialog( Window* pParent,  //add for SvxZoomDialog
diff --git a/svx/inc/svx/thesdlg.hxx b/svx/inc/svx/thesdlg.hxx
deleted file mode 100644
index 4ca5376ad8a7..000000000000
--- a/svx/inc/svx/thesdlg.hxx
+++ /dev/null
@@ -1,137 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: thesdlg.hxx,v $
- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _SVX_THESDLG_HXX
-#define _SVX_THESDLG_HXX
-// include ---------------------------------------------------------------
-
-#ifndef _EDIT_HXX //autogen
-#include <vcl/edit.hxx>
-#endif
-#ifndef _BUTTON_HXX //autogen
-#include <vcl/button.hxx>
-#endif
-#ifndef _LSTBOX_HXX //autogen
-#include <vcl/lstbox.hxx>
-#endif
-#ifndef _FIXED_HXX //autogen
-#include <vcl/fixed.hxx>
-#endif
-#include <svx/stddlg.hxx>
-#include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/beans/PropertyValues.hpp>
-#include "svx/svxdllapi.h"
-
-// forward ---------------------------------------------------------------
-
-struct ThesDlg_Impl;
-
-class SvxThesaurusLanguageDlg_Impl;
-
-namespace com { namespace sun { namespace star {
-    namespace linguistic2 {
-        class XThesaurus;
-        class XMeaning;
-    }
-    namespace lang {
-        struct Locale;
-    }
-}}}
-
-// class SvxThesaurusDialog ----------------------------------------------
-
-class SVX_DLLPUBLIC SvxThesaurusDialog : public SvxStandardDialog
-{
-public:
-    friend class SvxThesaurusLanguageDlg_Impl;
-
-    SvxThesaurusDialog( Window* pParent,
-                        ::com::sun::star::uno::Reference<
-                            ::com::sun::star::linguistic2::XThesaurus >  xThesaurus,
-                        const String &rWord, sal_Int16 nLanguage );
-    ~SvxThesaurusDialog();
-
-    String          GetWord() { return aReplaceEdit.GetText(); }
-
-    sal_uInt16      GetLanguage() const;
-
-private:
-    FixedText       aWordText;
-    ListBox         aWordLB;
-    FixedText       aReplaceText;
-    Edit            aReplaceEdit;
-    FixedText       aMeanText;
-    ListBox         aMeanLB;
-    FixedText       aSynonymText;
-    ListBox         aSynonymLB;
-    FixedLine       aVarFL;
-
-    OKButton        aOkBtn;
-    CancelButton    aCancelBtn;
-    PushButton      aLookUpBtn;
-    PushButton      aLangBtn;
-    HelpButton      aHelpBtn;
-
-    String          aErrStr;
-
-    ThesDlg_Impl*   pImpl;      // always != NULL
-
-    SVX_DLLPRIVATE virtual void     Apply();
-
-#ifdef _SVX_THESDLG_CXX
-    SVX_DLLPRIVATE void             UpdateSynonymBox_Impl();
-    SVX_DLLPRIVATE void             UpdateMeaningBox_Impl(
-                        ::com::sun::star::uno::Sequence<
-                            ::com::sun::star::uno::Reference<
-                                ::com::sun::star::linguistic2::XMeaning >  > *pMeaningSeq = NULL );
-    SVX_DLLPRIVATE void         Init_Impl(sal_Int16 nLanguage);
-
-    ::com::sun::star::uno::Sequence<
-            ::com::sun::star::uno::Reference<
-                ::com::sun::star::linguistic2::XMeaning > > SAL_CALL
-        queryMeanings_Impl(
-                ::rtl::OUString& rTerm,
-                const ::com::sun::star::lang::Locale& rLocale,
-                const ::com::sun::star::beans::PropertyValues& rProperties )
-            throw(::com::sun::star::lang::IllegalArgumentException,
-                  ::com::sun::star::uno::RuntimeException);
-
-    // Handler
-    DECL_LINK( SelectHdl_Impl, ListBox * );
-    DECL_LINK( SynonymHdl_Impl, ListBox * );
-    DECL_LINK( LookUpHdl_Impl, Button * );
-    DECL_LINK( LanguageHdl_Impl, Button * );
-    DECL_LINK( EntryHdl_Impl, ListBox * );
-    DECL_LINK( SpellErrorHdl_Impl, void * );
-#endif
-};
-
-#endif
-