Convert RID_SYMDEFINEDIALOG to .ui

Change-Id: I03e2518c66fef4e40f95a9b68d68f9bb19a947b1
Reviewed-on: https://gerrit.libreoffice.org/8807
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

3 files changed, 25 insertions, 40 deletions

diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx
index e84093ffe9ff..4df16cdb760f 100644
--- a/starmath/inc/dialog.hxx
+++ b/starmath/inc/dialog.hxx
@@ -375,8 +375,8 @@ class SmShowChar : public Control
     virtual void    Paint(const Rectangle&) SAL_OVERRIDE;
 
 public:
-    SmShowChar(Window *pParent, const ResId& rResId)
-    : Control(pParent, rResId)
+    SmShowChar(Window *pParent, WinBits nStyle)
+    : Control(pParent, nStyle)
     {
     }
 
@@ -388,35 +388,24 @@ public:
 
 class SmSymDefineDialog : public ModalDialog
 {
-    FixedText       aOldSymbolText;
-    ComboBox        aOldSymbols;
-    FixedText       aOldSymbolSetText;
-    ComboBox        aOldSymbolSets;
-    SvxShowCharSet  aCharsetDisplay;
-    FixedText       aSymbolText;
-    ComboBox        aSymbols;
-    FixedText       aSymbolSetText;
-    ComboBox        aSymbolSets;
-    FixedText       aFontText;
-    ListBox         aFonts;
-    FixedText       aFontsSubsetFT;
-    ListBox         aFontsSubsetLB;
-    FixedText       aStyleText;
-    FontStyleBox    aStyles;
-    FixedText       aOldSymbolName;
-    SmShowChar      aOldSymbolDisplay;
-    FixedText       aOldSymbolSetName;
-    FixedText       aSymbolName;
-    SmShowChar      aSymbolDisplay;
-    FixedText       aSymbolSetName;
-    OKButton        aOkBtn;
-    HelpButton      aHelpBtn;
-    CancelButton    aCancelBtn;
-    PushButton      aAddBtn;
-    PushButton      aChangeBtn;
-    PushButton      aDeleteBtn;
-    FixedImage      aRightArrow;
-    Image           aRightArrow_Im;
+    ComboBox*        pOldSymbols;
+    ComboBox*        pOldSymbolSets;
+    SvxShowCharSet*  pCharsetDisplay;
+    ComboBox*        pSymbols;
+    ComboBox*        pSymbolSets;
+    ListBox*         pFonts;
+    ListBox*         pFontsSubsetLB;
+    FontStyleBox*    pStyles;
+    FixedText*       pOldSymbolName;
+    SmShowChar*     pOldSymbolDisplay;
+    FixedText*       pOldSymbolSetName;
+    FixedText*       pSymbolName;
+    SmShowChar*     pSymbolDisplay;
+    FixedText*       pSymbolSetName;
+    HelpButton*      pHelpBtn;
+    PushButton*      pAddBtn;
+    PushButton*      pChangeBtn;
+    PushButton*      pDeleteBtn;
 
     SmSymbolManager     aSymbolMgrCopy,
                        &rSymbolMgr;
@@ -465,7 +454,7 @@ class SmSymDefineDialog : public ModalDialog
     virtual void    DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
 
 public:
-    SmSymDefineDialog(Window *pParent, OutputDevice *pFntListDevice, SmSymbolManager &rMgr, bool bFreeRes = true);
+    SmSymDefineDialog(Window *pParent, OutputDevice *pFntListDevice, SmSymbolManager &rMgr);
     ~SmSymDefineDialog();
 
     using OutputDevice::SetFont;
@@ -475,22 +464,22 @@ public:
 
     bool SelectOldSymbolSet(const OUString &rSymbolSetName)
     {
-        return SelectSymbolSet(aOldSymbolSets, rSymbolSetName, false);
+        return SelectSymbolSet(*pOldSymbolSets, rSymbolSetName, false);
     }
 
     bool SelectOldSymbol(const OUString &rSymbolName)
     {
-        return SelectSymbol(aOldSymbols, rSymbolName, false);
+        return SelectSymbol(*pOldSymbols, rSymbolName, false);
     }
 
     bool SelectSymbolSet(const OUString &rSymbolSetName)
     {
-        return SelectSymbolSet(aSymbolSets, rSymbolSetName, false);
+        return SelectSymbolSet(*pSymbolSets, rSymbolSetName, false);
     }
 
     bool SelectSymbol(const OUString &rSymbolName)
     {
-        return SelectSymbol(aSymbols, rSymbolName, false);
+        return SelectSymbol(*pSymbols, rSymbolName, false);
     }
 
     bool        SelectFont(const OUString &rFontName)   { return SelectFont(rFontName, true); }
diff --git a/starmath/inc/helpids.h b/starmath/inc/helpids.h
index 785f5e0c6d64..b6d554f10e30 100644
--- a/starmath/inc/helpids.h
+++ b/starmath/inc/helpids.h
@@ -265,7 +265,6 @@
 #define HID_SMA_SLRDBRACKETX                              "STARMATH_HID_SMA_SLRDBRACKETX"
 
 #define HID_SMA_CONTROL_SYMBOLSET_VIEW                    "STARMATH_HID_SMA_CONTROL_SYMBOLSET_VIEW"
-#define HID_SMA_CONTROL_FONTCHAR_VIEW                     "STARMATH_HID_SMA_CONTROL_FONTCHAR_VIEW"
 
 #define HID_SMA_NOSPACE                                   "STARMATH_HID_SMA_NOSPACE"
 
diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc
index cb3ad6b5d9d6..3575b6e6f6cb 100644
--- a/starmath/inc/starmath.hrc
+++ b/starmath/inc/starmath.hrc
@@ -75,7 +75,6 @@
 #define SID_SAVE_ONLY_USED_SYMBOLS  (SID_SMA_START + 125)
 #define SID_ELEMENTSDOCKINGWINDOW   (SID_SMA_START + 126)
 
-#define RID_SYMDEFINEDIALOG         (RID_APP_START + 9)
 #define RID_PRINTUIOPTIONS          (RID_APP_START + 11)
 
 #define RID_MATH_TOOLBOX            (RID_APP_START + 50)
@@ -683,8 +682,6 @@
 #define RID_ALIGNCX_HELP                  (RID_APP_START + 4276)
 #define RID_ALIGNRX_HELP                  (RID_APP_START + 4277)
 
-#define BMP_ARROW_RIGHT     1
-
 // 342 == SCH_IF_SMAVIEWSHELL, because SFX_INTERFACE_LIB is no
 // Define but latterly an Enum
 #define HID_SMA_VIEWSHELL_DOCUMENT      (342)