adapt spelling dialog to use .ui

Change-Id: I51fdb40378253780cd15127f0c79eda54dce15f0

cui/AllLangResTarget_cui.mk

@@ -73,7 +73,6 @@ $(eval $(call gb_SrsTarget_add_files,cui/res,\
     cui/source/dialogs/scriptdlg.src \
     cui/source/dialogs/sdrcelldlg.src \
     cui/source/dialogs/showcols.src \
-    cui/source/dialogs/SpellDialog.src \
     cui/source/dialogs/splitcelldlg.src \
     cui/source/dialogs/srchxtra.src \
     cui/source/dialogs/svuidlg.src \

cui/source/dialogs/SpellDialog.hrc

-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#define FT_SUGGESTION   31
-#define LB_SUGGESTION   32
-#define FT_NOTINDICT    33
-#define ED_NEWWORD      34
-#define FT_LANGUAGE     35
-#define LB_LANGUAGE     36
-#define PB_IGNORE       37
-#define PB_IGNOREALL    38
-#define MB_ADDTODICT    39
-#define PB_CHANGE       40
-#define PB_CHANGEALL    41
-#define PB_AUTOCORR     42
-#define GB_BACKGROUND   43
-#define PB_OPTIONS      44
-#define PB_HELP         45
-#define PB_UNDO         46
-#define PB_CLOSE        47
-#define ST_NOSUGGESTIONS 48
-#define ST_RESUME       50
-#define ST_SPELLING                 51
-#define ST_SPELLING_AND_GRAMMAR     52
-#define CB_CHECK_GRAMMAR            54
-#define LINK_EXPLAIN                  55
-#define FT_EXPLAIN                  56
-#define PB_IGNORERULE               59
-#define PB_ADDTODICT    60

cui/source/dialogs/SpellDialog.src

-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <cuires.hrc>
-#include "helpid.hrc"
-#include "SpellDialog.hrc"
-
-// RID_SVXDLG_SPELLCHECK -------------------------------------------------
-
-#define STD_MASKCOLOR Color { Red=0xFFFF; Green=0x0000; Blue=0xFFFF; }
-
-ModelessDialog RID_SVXDLG_SPELLCHECK
-{
-    HelpId = HID_SPELLCHECK ;
-    Size = MAP_APPFONT( 270, 208 );
-    OutputSize = TRUE;
-    Closeable = TRUE ;
-    SVLook = TRUE;
-    Hide = TRUE;
-    Text [ en-US ] = "Spellcheck: " ;
-
-    Moveable = TRUE ;
-
-    FixedText FT_LANGUAGE
-    {
-        Pos = MAP_APPFONT(  6, 8 );
-        Size = MAP_APPFONT( 100, 8 );
-        Text [ en-US ] = "Text languag~e" ;
-    };
-    ListBox LB_LANGUAGE
-    {
-        HelpID = "cui:ListBox:RID_SVXDLG_SPELLCHECK:LB_LANGUAGE";
-        Pos = MAP_APPFONT( 110, 6 );
-        Size = MAP_APPFONT( 93, 55 );
-        Border = TRUE;
-        Sort = TRUE;
-        DropDown = TRUE;
-    };
-    FixedText FT_EXPLAIN
-    {
-        Pos = MAP_APPFONT( 1, 18 );
-        Size = MAP_APPFONT( 239, 20 );
-        VCenter = TRUE ;
-    };
-    FixedText LINK_EXPLAIN
-    {
-        Pos = MAP_APPFONT( 240, 18 );
-        Size = MAP_APPFONT( 29, 20 );
-        Text [ en-US ] = "More..." ;
-        Right = TRUE ;
-        VCenter = TRUE ;
-    };
-    FixedText FT_NOTINDICT
-    {
-        Pos = MAP_APPFONT(  6, 46 );
-        Size = MAP_APPFONT( 120, 8 );
-        Text [ en-US ] = "~Not in dictionary" ;
-    };
-
-    MultiLineEdit ED_NEWWORD
-    {
-        HelpID = "cui:MultiLineEdit:RID_SVXDLG_SPELLCHECK:ED_NEWWORD";
-        Pos = MAP_APPFONT( 6, 57 );
-        Size = MAP_APPFONT( 197, 48 );
-        Border = TRUE;
-        VScroll = TRUE;
-        IgnoreTab = TRUE;
-    };
-
-    FixedText FT_SUGGESTION
-    {
-        Pos = MAP_APPFONT( 6, 108 );
-        Size = MAP_APPFONT( 120, 8 );
-        Text [ en-US ] = "~Suggestions" ;
-    };
-    ListBox LB_SUGGESTION
-    {
-        HelpID = "cui:ListBox:RID_SVXDLG_SPELLCHECK:LB_SUGGESTION";
-        Pos = MAP_APPFONT( 6, 119 );
-        Size = MAP_APPFONT( 197, 48 );
-        Border = TRUE;
-    };
-
-    CheckBox CB_CHECK_GRAMMAR
-    {
-        HelpID = "cui:CheckBox:RID_SVXDLG_SPELLCHECK:CB_CHECK_GRAMMAR";
-        Pos = MAP_APPFONT(  6, 173 );
-        Size = MAP_APPFONT( 100, 10 );
-        Text [ en-US ] = "Check ~grammar" ;
-        Hide = TRUE;
-    };
-
-    PushButton PB_IGNORE
-    {
-        HelpID = "cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_IGNORE";
-        Pos = MAP_APPFONT( 209, 57 );
-        Size = MAP_APPFONT( 55, 14 );
-        Text [ en-US ] = "~Ignore Once" ;
-    };
-
-    PushButton PB_IGNOREALL
-    {
-        HelpID = "cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_IGNOREALL";
-        Pos = MAP_APPFONT( 209, 74 );
-        Size = MAP_APPFONT( 55, 14 );
-        Text [ en-US ] = "I~gnore All" ;
-    };
-
-    PushButton PB_IGNORERULE
-    {
-        HelpID = "cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_IGNORERULE";
-        Pos = MAP_APPFONT( 209, 74 );
-        Size = MAP_APPFONT( 55, 14 );
-        Text [ en-US ] = "I~gnore Rule" ;
-        Hide = TRUE;
-    };
-
-    MenuButton MB_ADDTODICT
-    {
-        HelpID = "cui:MenuButton:RID_SVXDLG_SPELLCHECK:MB_ADDTODICT";
-        Pos = MAP_APPFONT( 209, 91 );
-        Size = MAP_APPFONT( 55, 14 );
-        Text [ en-US ] = "~Add" ;
-    };
-
-    PushButton PB_ADDTODICT
-    {
-        HelpID = "cui:MenuButton:RID_SVXDLG_SPELLCHECK:MB_ADDTODICT";
-        Pos = MAP_APPFONT( 209, 91 );
-        Size = MAP_APPFONT( 55, 14 );
-        Text [ en-US ] = "~Add" ;
-    };
-
-    PushButton PB_CHANGE
-    {
-        HelpID = "cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_CHANGE";
-        Pos = MAP_APPFONT( 209, 119 );
-        Size = MAP_APPFONT( 55, 14 );
-        Text [ en-US ] = "~Change" ;
-        DefButton = TRUE ;
-    };
-
-    PushButton PB_CHANGEALL
-    {
-        HelpID = "cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_CHANGEALL";
-        Pos = MAP_APPFONT( 209, 137 );
-        Size = MAP_APPFONT( 55, 14 );
-        Text [ en-US ] = "Change A~ll" ;
-    };
-    PushButton PB_AUTOCORR
-    {
-        HelpID = "cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_AUTOCORR";
-        Pos = MAP_APPFONT( 209, 154 );
-        Size = MAP_APPFONT( 55, 14 );
-        Text [ en-US ] = "AutoCor~rect" ;
-    };
-    GroupBox GB_BACKGROUND
-    {
-        Pos = MAP_APPFONT( 1, 41 );
-        Size = MAP_APPFONT( 268, 146 );
-        Hide=TRUE;
-    };
-
-    HelpButton PB_HELP
-    {
-        Pos = MAP_APPFONT( 6, 191 );
-        Size = MAP_APPFONT( 55, 14 );
-    };
-    PushButton PB_OPTIONS
-    {
-        HelpID = "cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_OPTIONS";
-        Pos = MAP_APPFONT( 87, 191 );
-        Size = MAP_APPFONT( 55, 14 );
-        Text [ en-US ] = "O~ptions..." ;
-    };
-    PushButton PB_UNDO
-    {
-        HelpID = "cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_UNDO";
-        Pos = MAP_APPFONT( 148, 191 );
-        Size = MAP_APPFONT( 55, 14 );
-        Text [ en-US ] = "~Undo" ;
-    };
-
-    PushButton PB_CLOSE
-    {
-        HelpID = "cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_CLOSE";
-        Pos = MAP_APPFONT ( 209 , 191 ) ;
-        Size = MAP_APPFONT ( 55 , 14 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "Cl~ose" ;
-    };
-    String ST_RESUME
-    {
-        Text[ en-US ] = "Resu~me";
-    };
-    String ST_NOSUGGESTIONS
-    {
-        Text [en-US] = "(no suggestions)";
-    };
-    String ST_SPELLING
-    {
-        Text[ en-US ] = "Spelling: $LANGUAGE ($LOCATION)";
-    };
-    String ST_SPELLING_AND_GRAMMAR
-    {
-        Text[ en-US ] = "Spelling and Grammar: $LANGUAGE ($LOCATION)";
-    };
-};
- // ********************************************************************** EOF

cui/source/inc/SpellDialog.hxx

@@ -70,13 +70,14 @@ private:
 
     void            CallModifyLink() {m_aModifyLink.Call(this);}
 
-    SpellDialog*    GetSpellDialog() const {return (SpellDialog*)GetParent();}
+    SpellDialog*    GetSpellDialog() const {return (SpellDialog*)GetParentDialog();}
 protected:
     virtual long    PreNotify( NotifyEvent& rNEvt );
 
 public:
-                    SentenceEditWindow_Impl( SpellDialog* pParent, const ResId& rResId );
-                    ~SentenceEditWindow_Impl();
+    SentenceEditWindow_Impl(Window* pParent, const ResId& rResId);
+    SentenceEditWindow_Impl(Window* pParent, WinBits nBits);
+    ~SentenceEditWindow_Impl();
 
     void            SetModifyHdl(const Link& rLink) { m_aModifyLink = rLink;}
 
@@ -115,15 +116,6 @@ public:
     void            ResetIgnoreErrorsAt()   { m_aIgnoreErrorsAt.clear(); }
 };
 
-class HelpFixedText : public FixedText
-{
-    public:
-        HelpFixedText( Window* pParent, const ResId& rResId );
-
-        virtual void Paint( const Rectangle& rRect );
-        long GetActualHeight( );
-};
-
 // class SvxSpellDialog ---------------------------------------------
 class SpellDialogChildWindow;
 
@@ -134,47 +126,41 @@ class SpellDialog : public SfxModelessDialog
     friend class SentenceEditWindow_Impl;
 private:
 
-    FixedText       aLanguageFT;
-    SvxLanguageBox  aLanguageLB;
-
-    HelpFixedText   aExplainFT;
-    FixedHyperlink  aExplainLink;
-
-    FixedText       aNotInDictFT;
-    SentenceEditWindow_Impl  aSentenceED;
+    FixedText*      m_pLanguageFT;
+    SvxLanguageBox* m_pLanguageLB;
 
-    FixedText       aSuggestionFT;
-    ListBox         aSuggestionLB;
+    FixedText*      m_pExplainFT;
+    FixedHyperlink* m_pExplainLink;
 
-    PushButton      aIgnorePB;
-    PushButton      aIgnoreAllPB;
-    PushButton      aIgnoreRulePB;
-    MenuButton      aAddToDictMB;
-    PushButton      aAddToDictPB;
+    FixedText*      m_pNotInDictFT;
+    SentenceEditWindow_Impl* m_pSentenceED;
 
-    PushButton      aChangePB;
-    PushButton      aChangeAllPB;
-    PushButton      aAutoCorrPB;
+    FixedText*      m_pSuggestionFT;
+    ListBox*        m_pSuggestionLB;
 
-    CheckBox        aCheckGrammarCB;
+    PushButton*     m_pIgnorePB;
+    PushButton*     m_pIgnoreAllPB;
+    PushButton*     m_pIgnoreRulePB;
+    PushButton*     m_pAddToDictPB;
+    MenuButton*     m_pAddToDictMB;
 
-    HelpButton      aHelpPB;
-    PushButton      aOptionsPB;
-    PushButton      aUndoPB;
-    PushButton      aClosePB;
+    PushButton*     m_pChangePB;
+    PushButton*     m_pChangeAllPB;
+    PushButton*     m_pAutoCorrPB;
 
-    GroupBox        aBackgroundGB;
+    CheckBox*       m_pCheckGrammarCB;
 
-    Image           aVendorImage;
+    PushButton*     m_pOptionsPB;
+    PushButton*     m_pUndoPB;
+    PushButton*     m_pClosePB;
 
-    String          aResumeST;
-    String          aIgnoreOnceST;
-    String          aNoSuggestionsST;
+    OUString        m_sResumeST;
+    OUString        m_sIgnoreOnceST;
+    OUString        m_sNoSuggestionsST;
 
-    const String    m_sTitleSpelling;
-    const String    m_sTitleSpellingGrammar;
+    String          m_sTitleSpelling;
+    String          m_sTitleSpellingGrammar;
 
-    Size            aOldWordEDSize;
     Link            aDialogUndoLink;
 
     bool            bModified;
@@ -225,7 +211,6 @@ private:
     void            SetTitle_Impl(LanguageType nLang);
 
 protected:
-    virtual void    Paint( const Rectangle& rRect );
     virtual long    Notify( NotifyEvent& rNEvt );
 
     String getReplacementString() const;

cui/source/inc/helpid.hrc

@@ -187,12 +187,6 @@
 #define HID_HANGULDLG_EDIT_NEWWORD "CUI_HID_HANGULDLG_EDIT_NEWWORD"
 #define HID_OFA_SUBST_APPLY "CUI_HID_OFA_SUBST_APPLY"
 #define HID_OFA_SUBST_DELETE "CUI_HID_OFA_SUBST_DELETE"
-#define HID_SPLDLG_BUTTON_CLOSE "CUI_HID_SPLDLG_BUTTON_CLOSE"
-#define HID_SPLDLG_BUTTON_IGNORE "CUI_HID_SPLDLG_BUTTON_IGNORE"
-#define HID_SPLDLG_BUTTON_IGNOREALL "CUI_HID_SPLDLG_BUTTON_IGNOREALL"
-#define HID_SPLDLG_BUTTON_CHANGE "CUI_HID_SPLDLG_BUTTON_CHANGE"
-#define HID_SPLDLG_BUTTON_CHANGEALL "CUI_HID_SPLDLG_BUTTON_CHANGEALL"
-#define HID_SPLDLG_BUTTON_EXPLAIN "CUI_HID_SPLDLG_BUTTON_EXPLAIN"
 #define HID_CHARMAP_CTL_SHOWSET "CUI_HID_CHARMAP_CTL_SHOWSET"
 #define HID_CHARMAP_CTL_SHOWTEXT "CUI_HID_CHARMAP_CTL_SHOWTEXT"
 #define HID_CHARMAP_CTL_SHOWCHAR "CUI_HID_CHARMAP_CTL_SHOWCHAR"
@@ -236,7 +230,6 @@
 #define HID_GALLERY_BROWSER "CUI_HID_GALLERY_BROWSER"
 #define HID_GALLERY_SEARCH "CUI_HID_GALLERY_SEARCH"
 #define HID_GALLERY_APPLY "CUI_HID_GALLERY_APPLY"
-#define HID_SPLDLG_BUTTON_IGNORERULE "CUI_HID_SPLDLG_BUTTON_IGNORERULE"
 #define HID_CONFIG_ACCEL "CUI_HID_CONFIG_ACCEL"
 #define HID_ACCELCONFIG_LISTBOX "CUI_HID_ACCELCONFIG_LISTBOX"
 #define HID_CONFIGGROUP_ACC_LISTBOX "CUI_HID_CONFIGGROUP_ACC_LISTBOX"
@@ -250,7 +243,6 @@
 #define HID_HANGULHANJA_EDIT_DLG "CUI_HID_HANGULHANJA_EDIT_DLG"
 #define HID_HANGULHANJA_OPT_DICTS_LB "CUI_HID_HANGULHANJA_OPT_DICTS_LB"
 #define HID_MULTIPATH "CUI_HID_MULTIPATH"
-#define HID_SPELLCHECK "CUI_HID_SPELLCHECK"
 #define HID_TPSIZE_CTRL "CUI_HID_TPSIZE_CTRL"
 #define HID_TPROTATION_CTRL1 "CUI_HID_TPROTATION_CTRL1"
 #define HID_TPROTATION_CTRL2 "CUI_HID_TPROTATION_CTRL2"

cui/util/hidother.src

@@ -148,13 +148,6 @@ hidspecial HID_REDLINING_DLG                { HelpID = HID_REDLINING_DLG; };
 hidspecial HID_REDLINING_EDIT               { HelpID = HID_REDLINING_EDIT; };
 hidspecial HID_REDLINING_NEXT               { HelpID = HID_REDLINING_NEXT; };
 hidspecial HID_REDLINING_PREV               { HelpID = HID_REDLINING_PREV; };
-hidspecial HID_SPLDLG_BUTTON_CHANGE             { HelpID =  HID_SPLDLG_BUTTON_CHANGE      ; };
-hidspecial HID_SPLDLG_BUTTON_CHANGEALL          { HelpID =  HID_SPLDLG_BUTTON_CHANGEALL   ; };
-hidspecial HID_SPLDLG_BUTTON_CLOSE              { HelpID =  HID_SPLDLG_BUTTON_CLOSE       ; };
-hidspecial HID_SPLDLG_BUTTON_EXPLAIN            { HelpID =  HID_SPLDLG_BUTTON_EXPLAIN     ; };
-hidspecial HID_SPLDLG_BUTTON_IGNORE             { HelpID =  HID_SPLDLG_BUTTON_IGNORE      ; };
-hidspecial HID_SPLDLG_BUTTON_IGNOREALL          { HelpID =  HID_SPLDLG_BUTTON_IGNOREALL   ; };
-hidspecial HID_SPLDLG_BUTTON_IGNORERULE          { HelpID =  HID_SPLDLG_BUTTON_IGNORERULE   ; };
 hidspecial HID_SVX_CONFIG_EVENT       { HelpId = HID_SVX_CONFIG_EVENT; };
 hidspecial HID_SVX_CONFIG_ICON_SELECTOR { HelpId = HID_SVX_CONFIG_ICON_SELECTOR; };
 hidspecial HID_SVX_CONFIG_MENU        { HelpId = HID_SVX_CONFIG_MENU; };