[Libreoffice-commits] core.git: starmath/inc starmath/source starmath/uiconfig

2023-11-22 Thread Balazs Varga (via logerrit) 
 starmath/inc/dialog.hxx |9 
 starmath/source/dialog.cxx  |   53 +++
 starmath/uiconfig/smath/ui/smathsettings.ui |  455 
 3 files changed, 393 insertions(+), 124 deletions(-)

New commits:
commit 278c5d22928a05cbfe887e38bc93a5051d0f59d4
Author: Balazs Varga 
AuthorDate: Wed Nov 22 14:21:00 2023 +0100
Commit: Balazs Varga 
CommitDate: Wed Nov 22 19:18:23 2023 +0100

tdf#158147 - UI: Part 38 - Unify lockdown behavior of Options dialog

for Math - Settings Page.

Change-Id: I05170a6c7edb6160e0e7804fa04325d329499854
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159819
Tested-by: Jenkins
Reviewed-by: Balazs Varga 

diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx
index 66db01d295f4..3b4f80b8e61c 100644
--- a/starmath/inc/dialog.hxx
+++ b/starmath/inc/dialog.hxx
@@ -40,17 +40,26 @@ void SetFontStyle(std::u16string_view rStyleName, vcl::Font 
);
 class SmPrintOptionsTabPage final : public SfxTabPage
 {
 std::unique_ptr  m_xTitle;
+std::unique_ptr  m_xTitleImg;
 std::unique_ptr  m_xText;
+std::unique_ptr  m_xTextImg;
 std::unique_ptr  m_xFrame;
+std::unique_ptr  m_xFrameImg;
 std::unique_ptr  m_xSizeNormal;
 std::unique_ptr  m_xSizeScaled;
 std::unique_ptr  m_xSizeZoomed;
+std::unique_ptr  m_xLockPrintImg;
 std::unique_ptr m_xZoom;
 std::unique_ptr  m_xEnableInlineEdit;
+std::unique_ptr  m_xEnableInlineEditImg;
 std::unique_ptr  m_xNoRightSpaces;
+std::unique_ptr  m_xNoRightSpacesImg;
 std::unique_ptr  m_xSaveOnlyUsedSymbols;
+std::unique_ptr  m_xSaveOnlyUsedSymbolsImg;
 std::unique_ptr  m_xAutoCloseBrackets;
+std::unique_ptr  m_xAutoCloseBracketsImg;
 std::unique_ptr m_xSmZoom;
+std::unique_ptr m_xSmZoomImg;
 
 DECL_LINK(SizeButtonClickHdl, weld::Toggleable&, void);
 
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index f96f43cfebba..1ad8376e5a7f 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -42,6 +42,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -179,17 +180,26 @@ IMPL_LINK_NOARG(SmPrintOptionsTabPage, 
SizeButtonClickHdl, weld::Toggleable&, vo
 SmPrintOptionsTabPage::SmPrintOptionsTabPage(weld::Container* pPage, 
weld::DialogController* pController, const SfxItemSet& rOptions)
 : SfxTabPage(pPage, pController, "modules/smath/ui/smathsettings.ui", 
"SmathSettings", )
 , m_xTitle(m_xBuilder->weld_check_button("title"))
+, m_xTitleImg(m_xBuilder->weld_widget("locktitle"))
 , m_xText(m_xBuilder->weld_check_button("text"))
+, m_xTextImg(m_xBuilder->weld_widget("locktext"))
 , m_xFrame(m_xBuilder->weld_check_button("frame"))
+, m_xFrameImg(m_xBuilder->weld_widget("lockframe"))
 , m_xSizeNormal(m_xBuilder->weld_radio_button("sizenormal"))
 , m_xSizeScaled(m_xBuilder->weld_radio_button("sizescaled"))
 , m_xSizeZoomed(m_xBuilder->weld_radio_button("sizezoomed"))
+, m_xLockPrintImg(m_xBuilder->weld_widget("lockprintformat"))
 , m_xZoom(m_xBuilder->weld_metric_spin_button("zoom", FieldUnit::PERCENT))
 , m_xEnableInlineEdit(m_xBuilder->weld_check_button("enableinlineedit"))
+, m_xEnableInlineEditImg(m_xBuilder->weld_widget("lockenableinlineedit"))
 , m_xNoRightSpaces(m_xBuilder->weld_check_button("norightspaces"))
+, m_xNoRightSpacesImg(m_xBuilder->weld_widget("locknorightspaces"))
 , 
m_xSaveOnlyUsedSymbols(m_xBuilder->weld_check_button("saveonlyusedsymbols"))
+, 
m_xSaveOnlyUsedSymbolsImg(m_xBuilder->weld_widget("locksaveonlyusedsymbols"))
 , m_xAutoCloseBrackets(m_xBuilder->weld_check_button("autoclosebrackets"))
+, m_xAutoCloseBracketsImg(m_xBuilder->weld_widget("lockautoclosebrackets"))
 , m_xSmZoom(m_xBuilder->weld_metric_spin_button("smzoom", 
FieldUnit::PERCENT))
+, m_xSmZoomImg(m_xBuilder->weld_widget("locksmzoom"))
 {
 m_xSizeNormal->connect_toggled(LINK(this, SmPrintOptionsTabPage, 
SizeButtonClickHdl));
 m_xSizeScaled->connect_toggled(LINK(this, SmPrintOptionsTabPage, 
SizeButtonClickHdl));
@@ -271,21 +281,58 @@ void SmPrintOptionsTabPage::Reset(const SfxItemSet* rSet)
 m_xSizeNormal->set_active(ePrintSize == PRINT_SIZE_NORMAL);
 m_xSizeScaled->set_active(ePrintSize == PRINT_SIZE_SCALED);
 m_xSizeZoomed->set_active(ePrintSize == PRINT_SIZE_ZOOMED);
+bool bReadOnly = officecfg::Office::Math::Print::Size::isReadOnly();
+if (bReadOnly)
+{
+m_xSizeNormal->set_sensitive(false);
+m_xSizeScaled->set_sensitive(false);
+m_xSizeZoomed->set_sensitive(false);
+m_xLockPrintImg->set_visible(true);
+}
 
-m_xZoom->set_sensitive(m_xSizeZoomed->get_active());
-
+bReadOnly = officecfg::Office::Math::Print::ZoomFactor::isReadOnly();
 m_xZoom->set_value(rSet->Get(SID_PRINTZOOM).GetValue(),

[Libreoffice-commits] core.git: starmath/inc starmath/source starmath/uiconfig

2023-08-25 Thread Khaled Hosny (via logerrit) 
 starmath/inc/cfgitem.hxx |2 
 starmath/inc/dialog.hxx  |1 
 starmath/source/dialog.cxx   |9 +++
 starmath/source/unomodel.cxx |   12 +
 starmath/uiconfig/smath/ui/fonttypedialog.ui |   61 ++-
 5 files changed, 73 insertions(+), 12 deletions(-)

New commits:
commit 900ce2fa32ae1726f64fc6959010650e93854ab3
Author: Khaled Hosny 
AuthorDate: Thu Aug 24 16:30:43 2023 +0300
Commit: خالد حسني 
CommitDate: Fri Aug 25 08:56:21 2023 +0200

tdf#101174: Add the ability to change math font in Math

The math font (default is OpenSymbol) can now be changed from the fonts
dialog like other fonts (variables, numbers, etc).

Change-Id: I57f416173abf7bef8bb66b5e5e393dd928e30652
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156053
Tested-by: Jenkins
Reviewed-by: خالد حسني 

diff --git a/starmath/inc/cfgitem.hxx b/starmath/inc/cfgitem.hxx
index 607f92d4e1b0..c81e9d086aed 100644
--- a/starmath/inc/cfgitem.hxx
+++ b/starmath/inc/cfgitem.hxx
@@ -102,7 +102,7 @@ class SmMathConfig final : public utl::ConfigItem, public 
SfxBroadcaster
 std::unique_ptr pSymbolMgr;
 bool bIsOtherModified;
 bool bIsFormatModified;
-SmFontPickList vFontPickList[7];
+SmFontPickList vFontPickList[8];
 sal_Int32 m_nCommitLock = 0;
 
 SmMathConfig(const SmMathConfig&) = delete;
diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx
index a595917d450d..f8fa5a9d66fa 100644
--- a/starmath/inc/dialog.hxx
+++ b/starmath/inc/dialog.hxx
@@ -131,6 +131,7 @@ class SmFontTypeDialog final : public 
weld::GenericDialogController
 {
 VclPtr pFontListDev;
 
+std::unique_ptr m_xMathFont;
 std::unique_ptr m_xVariableFont;
 std::unique_ptr m_xFunctionFont;
 std::unique_ptr m_xNumberFont;
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index 03bbc60da66a..7d8a837be77f 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -430,7 +430,9 @@ IMPL_LINK(SmFontTypeDialog, MenuSelectHdl, const OUString&, 
rIdent, void)
 SmFontPickListBox *pActiveListBox;
 
 bool bHideCheckboxes = false;
-if (rIdent == "variables")
+if (rIdent == "math")
+pActiveListBox = m_xMathFont.get();
+else if (rIdent == "variables")
 pActiveListBox = m_xVariableFont.get();
 else if (rIdent == "functions")
 pActiveListBox = m_xFunctionFont.get();
@@ -481,6 +483,7 @@ IMPL_LINK_NOARG(SmFontTypeDialog, DefaultButtonClickHdl, 
weld::Button&, void)
 SmFontTypeDialog::SmFontTypeDialog(weld::Window* pParent, OutputDevice 
*pFntListDevice)
 : GenericDialogController(pParent, "modules/smath/ui/fonttypedialog.ui", 
"FontsDialog")
 , pFontListDev(pFntListDevice)
+, m_xMathFont(new SmFontPickListBox(m_xBuilder->weld_combo_box("mathCB")))
 , m_xVariableFont(new 
SmFontPickListBox(m_xBuilder->weld_combo_box("variableCB")))
 , m_xFunctionFont(new 
SmFontPickListBox(m_xBuilder->weld_combo_box("functionCB")))
 , m_xNumberFont(new 
SmFontPickListBox(m_xBuilder->weld_combo_box("numberCB")))
@@ -503,6 +506,7 @@ void SmFontTypeDialog::ReadFrom(const SmFormat )
 {
 SmModule *pp = SM_MOD();
 
+*m_xMathFont = pp->GetConfig()->GetFontPickList(FNT_MATH);
 *m_xVariableFont = pp->GetConfig()->GetFontPickList(FNT_VARIABLE);
 *m_xFunctionFont = pp->GetConfig()->GetFontPickList(FNT_FUNCTION);
 *m_xNumberFont   = pp->GetConfig()->GetFontPickList(FNT_NUMBER);
@@ -511,6 +515,7 @@ void SmFontTypeDialog::ReadFrom(const SmFormat )
 *m_xSansFont = pp->GetConfig()->GetFontPickList(FNT_SANS);
 *m_xFixedFont= pp->GetConfig()->GetFontPickList(FNT_FIXED);
 
+m_xMathFont->Insert( rFormat.GetFont(FNT_MATH) );
 m_xVariableFont->Insert( rFormat.GetFont(FNT_VARIABLE) );
 m_xFunctionFont->Insert( rFormat.GetFont(FNT_FUNCTION) );
 m_xNumberFont->Insert( rFormat.GetFont(FNT_NUMBER) );
@@ -525,6 +530,7 @@ void SmFontTypeDialog::WriteTo(SmFormat ) const
 {
 SmModule *pp = SM_MOD();
 
+pp->GetConfig()->GetFontPickList(FNT_MATH) = *m_xMathFont;
 pp->GetConfig()->GetFontPickList(FNT_VARIABLE) = *m_xVariableFont;
 pp->GetConfig()->GetFontPickList(FNT_FUNCTION) = *m_xFunctionFont;
 pp->GetConfig()->GetFontPickList(FNT_NUMBER)   = *m_xNumberFont;
@@ -533,6 +539,7 @@ void SmFontTypeDialog::WriteTo(SmFormat ) const
 pp->GetConfig()->GetFontPickList(FNT_SANS) = *m_xSansFont;
 pp->GetConfig()->GetFontPickList(FNT_FIXED)= *m_xFixedFont;
 
+rFormat.SetFont( FNT_MATH, m_xMathFont->Get() );
 rFormat.SetFont( FNT_VARIABLE, m_xVariableFont->Get() );
 rFormat.SetFont( FNT_FUNCTION, m_xFunctionFont->Get() );
 rFormat.SetFont( FNT_NUMBER,   m_xNumberFont->Get() );
diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx
index f2f8abfb50e2..5857c3832579 100644
--- a/starmath/source/unomodel.cxx
+++

[Libreoffice-commits] core.git: starmath/inc starmath/source starmath/uiconfig

2021-05-28 Thread dante (via logerrit) 
 starmath/inc/dialog.hxx |1 
 starmath/inc/edit.hxx   |1 
 starmath/source/dialog.cxx  |7 +++
 starmath/source/edit.cxx|   10 +++--
 starmath/source/smmod.cxx   |3 +
 starmath/source/unomodel.cxx|1 
 starmath/uiconfig/smath/ui/smathsettings.ui |   53 
 7 files changed, 72 insertions(+), 4 deletions(-)

New commits:
commit 1a0fd1c1342969e5b4d08d13764483cd8bada589
Author: dante 
AuthorDate: Fri May 14 13:46:41 2021 +0200
Commit: Heiko Tietze 
CommitDate: Fri May 28 10:57:26 2021 +0200

tdf#130654 editable smeditwindow zoom UI

Change-Id: Ibedf060ea838876e3598ff449e6f200119570cc8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115605
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx
index ac1f65ac9913..016d13ea7e10 100644
--- a/starmath/inc/dialog.hxx
+++ b/starmath/inc/dialog.hxx
@@ -49,6 +49,7 @@ class SmPrintOptionsTabPage final : public SfxTabPage
 std::unique_ptr  m_xNoRightSpaces;
 std::unique_ptr  m_xSaveOnlyUsedSymbols;
 std::unique_ptr  m_xAutoCloseBrackets;
+std::unique_ptr m_xSmZoom;
 
 DECL_LINK(SizeButtonClickHdl, weld::Toggleable&, void);
 
diff --git a/starmath/inc/edit.hxx b/starmath/inc/edit.hxx
index 9a6ec77fdf95..a5dee85fdbd4 100644
--- a/starmath/inc/edit.hxx
+++ b/starmath/inc/edit.hxx
@@ -118,6 +118,7 @@ public:
 
 ESelection GetSelection() const;
 void SetSelection(const ESelection& rSel);
+void UpdateStatus(bool bSetDocModified);
 
 bool IsEmpty() const;
 bool IsSelected() const;
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index 802588f9c38c..ff1d001578de 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -170,6 +170,7 @@ 
SmPrintOptionsTabPage::SmPrintOptionsTabPage(weld::Container* pPage, weld::Dialo
 , m_xNoRightSpaces(m_xBuilder->weld_check_button("norightspaces"))
 , 
m_xSaveOnlyUsedSymbols(m_xBuilder->weld_check_button("saveonlyusedsymbols"))
 , m_xAutoCloseBrackets(m_xBuilder->weld_check_button("autoclosebrackets"))
+, m_xSmZoom(m_xBuilder->weld_metric_spin_button("smzoom", 
FieldUnit::PERCENT))
 {
 m_xSizeNormal->connect_toggled(LINK(this, SmPrintOptionsTabPage, 
SizeButtonClickHdl));
 m_xSizeScaled->connect_toggled(LINK(this, SmPrintOptionsTabPage, 
SizeButtonClickHdl));
@@ -180,6 +181,7 @@ 
SmPrintOptionsTabPage::SmPrintOptionsTabPage(weld::Container* pPage, weld::Dialo
 
 SmPrintOptionsTabPage::~SmPrintOptionsTabPage()
 {
+SmGetActiveView()->GetEditWindow()->UpdateStatus(false);
 }
 
 bool SmPrintOptionsTabPage::FillItemSet(SfxItemSet* rSet)
@@ -200,7 +202,9 @@ bool SmPrintOptionsTabPage::FillItemSet(SfxItemSet* rSet)
 rSet->Put(SfxBoolItem(GetWhich(SID_NO_RIGHT_SPACES), 
m_xNoRightSpaces->get_active()));
 rSet->Put(SfxBoolItem(GetWhich(SID_SAVE_ONLY_USED_SYMBOLS), 
m_xSaveOnlyUsedSymbols->get_active()));
 rSet->Put(SfxBoolItem(GetWhich(SID_AUTO_CLOSE_BRACKETS), 
m_xAutoCloseBrackets->get_active()));
+rSet->Put(SfxUInt16Item(GetWhich(SID_SMEDITWINDOWZOOM), 
sal::static_int_cast(m_xSmZoom->get_value(FieldUnit::PERCENT;
 
+SmGetActiveView()->GetEditWindow()->UpdateStatus(false);
 return true;
 }
 
@@ -216,6 +220,9 @@ void SmPrintOptionsTabPage::Reset(const SfxItemSet* rSet)
 
 m_xZoom->set_value(static_cast(rSet->Get(GetWhich(SID_PRINTZOOM))).GetValue(), FieldUnit::PERCENT);
 
+m_xSmZoom->set_sensitive(true);
+m_xSmZoom->set_value(static_cast(rSet->Get(GetWhich(SID_SMEDITWINDOWZOOM))).GetValue(), FieldUnit::PERCENT);
+
 m_xTitle->set_active(static_cast(rSet->Get(GetWhich(SID_PRINTTITLE))).GetValue());
 m_xNoRightSpaces->set_active(static_cast(rSet->Get(GetWhich(SID_NO_RIGHT_SPACES))).GetValue());
 m_xSaveOnlyUsedSymbols->set_active(static_cast(rSet->Get(GetWhich(SID_SAVE_ONLY_USED_SYMBOLS))).GetValue());
diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx
index 373d3e8349d7..079be31c88ae 100644
--- a/starmath/source/edit.cxx
+++ b/starmath/source/edit.cxx
@@ -711,13 +711,17 @@ void SmEditTextWindow::UpdateStatus(bool bSetDocModified)
 SmModule *pMod = SM_MOD();
 if (pMod && pMod->GetConfig()->IsAutoRedraw())
 Flush();
-SmDocShell* pDoc = bSetDocModified ? mrEditWindow.GetDoc() : nullptr;
-if (pDoc)
-pDoc->SetModified();
+if (bSetDocModified)
+mrEditWindow.GetDoc()->SetModified();
 
 static_cast(GetEditEngine())->executeZoom(GetEditView());
 }
 
+void SmEditWindow::UpdateStatus(bool bSetDocModified)
+{
+mxTextControl->UpdateStatus(bSetDocModified);
+}
+
 void SmEditWindow::Cut()
 {
 if (mxTextControl)
diff --git a/starmath/source/smmod.cxx b/starmath/source/smmod.cxx
index 640eba718a34..e3b6c041903e 100644
--- a/starmath/source/smmod.cxx
+++ b/starmath/source/smmod.cxx
@@ -211,7

[Libreoffice-commits] core.git: starmath/inc starmath/source starmath/uiconfig

2021-02-14 Thread Julien Nabet (via logerrit) 
 starmath/inc/strings.hrc   |1 +
 starmath/inc/strings.hxx   |1 +
 starmath/source/ElementsDockingWindow.cxx  |2 +-
 starmath/source/mathtype.cxx   |3 +++
 starmath/uiconfig/smath/popupmenu/edit.xml |1 +
 5 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 1fa83df607b9721c8f12125942de1c586a624bd0
Author: Julien Nabet 
AuthorDate: Sun Feb 14 10:36:29 2021 +0100
Commit: Noel Grandin 
CommitDate: Sun Feb 14 20:09:12 2021 +0100

tdf#140386: Math: Add 'backepsilon' symbol to elements panel

corresponds to GREEK REVERSED LUNATE EPSILON SYMBOL
see 
https://www.unicodepedia.com/unicode/greek-and-coptic/3f6/greek-reversed-lunate-epsilon-symbol/

Change-Id: I39628c55642e549174a0e59798c401976fdfaef2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110880
Reviewed-by: Dante DM 
Reviewed-by: Noel Grandin 
Tested-by: Jenkins

diff --git a/starmath/inc/strings.hrc b/starmath/inc/strings.hrc
index daa90f02545d..ab85c5b49aa6 100644
--- a/starmath/inc/strings.hrc
+++ b/starmath/inc/strings.hrc
@@ -269,6 +269,7 @@
 #define RID_NABLA_HELP  NC_("RID_NABLA_HELP", "Nabla" )
 #define RID_LAPLACE_HELPNC_("RID_LAPLACE_HELP", "Laplace 
transform" )
 #define RID_FOURIER_HELPNC_("RID_FOURIER_HELP", "Fourier 
transform" )
+#define RID_BACKEPSILON_HELPNC_("RID_BACKEPSILON_HELP", 
"Backwards epsilon" )
 #define RID_WP_HELP NC_("RID_WP_HELP", "Weierstrass p" 
)
 #define RID_DOTSAXIS_HELP   NC_("RID_DOTSAXIS_HELP", "Dots In 
Middle" )
 #define RID_DOTSUP_HELP NC_("RID_DOTSUP_HELP", "Dots To 
Top" )
diff --git a/starmath/inc/strings.hxx b/starmath/inc/strings.hxx
index db89180937d7..258e2b800403 100644
--- a/starmath/inc/strings.hxx
+++ b/starmath/inc/strings.hxx
@@ -261,6 +261,7 @@
 #define RID_NABLA   "nabla "
 #define RID_WP  "wp "
 #define RID_LAPLACE "laplace "
+#define RID_BACKEPSILON "backepsilon "
 #define RID_FOURIER "fourier "
 #define RID_DOTSAXIS"dotsaxis "
 #define RID_DOTSUP  "dotsup "
diff --git a/starmath/source/ElementsDockingWindow.cxx 
b/starmath/source/ElementsDockingWindow.cxx
index 1c3cf9deb9f1..754d819aa3f1 100644
--- a/starmath/source/ElementsDockingWindow.cxx
+++ b/starmath/source/ElementsDockingWindow.cxx
@@ -240,7 +240,7 @@ const SmElementDescr SmElementsControl::m_aOthersList[] =
 {RID_EXISTS, RID_EXISTS_HELP}, {RID_NOTEXISTS, RID_NOTEXISTS_HELP}, 
{RID_FORALL, RID_FORALL_HELP},
 {RID_HBAR, RID_HBAR_HELP}, {RID_LAMBDABAR, RID_LAMBDABAR_HELP}, {RID_RE, 
RID_RE_HELP},
 {RID_IM, RID_IM_HELP}, {RID_WP, RID_WP_HELP}, {RID_LAPLACE, 
RID_LAPLACE_HELP},
-{RID_FOURIER, RID_FOURIER_HELP},
+{RID_FOURIER, RID_FOURIER_HELP}, {RID_BACKEPSILON, RID_BACKEPSILON_HELP},
 {nullptr, nullptr},
 {RID_LEFTARROW, RID_LEFTARROW_HELP}, {RID_RIGHTARROW, 
RID_RIGHTARROW_HELP}, {RID_UPARROW, RID_UPARROW_HELP},
 {RID_DOWNARROW, RID_DOWNARROW_HELP},
diff --git a/starmath/source/mathtype.cxx b/starmath/source/mathtype.cxx
index 4bf9bcf0a7e2..e13dd7160f2e 100644
--- a/starmath/source/mathtype.cxx
+++ b/starmath/source/mathtype.cxx
@@ -314,6 +314,9 @@ bool MathType::LookupChar(sal_Unicode nChar,OUStringBuffer 
,sal_uInt8 nVers
 case 0x2112:
 pC = " laplace ";
 break;
+case 0x03F6:
+pC = " backepsilon ";
+break;
 case 0x2208: // in
 case 0x2209: // notin
 rRet.append(" func ").append(OUStringChar(nChar)).append(" ");
diff --git a/starmath/uiconfig/smath/popupmenu/edit.xml 
b/starmath/uiconfig/smath/popupmenu/edit.xml
index f5a7f0680d6c..c9626cc6a033 100644
--- a/starmath/uiconfig/smath/popupmenu/edit.xml
+++ b/starmath/uiconfig/smath/popupmenu/edit.xml
@@ -253,6 +253,7 @@
   
   
   
+  
   
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: starmath/inc starmath/source starmath/uiconfig

2020-06-24 Thread dante (via logerrit) 
 starmath/inc/strings.hrc   |3 +
 starmath/inc/strings.hxx   |2 
 starmath/inc/token.hxx |4 +
 starmath/inc/types.hxx |2 
 starmath/source/ElementsDockingWindow.cxx  |6 +-
 starmath/source/mathtype.cxx   |3 +
 starmath/source/node.cxx   |   29 ++
 starmath/source/parse.cxx  |   79 -
 starmath/uiconfig/smath/popupmenu/edit.xml |2 
 9 files changed, 103 insertions(+), 27 deletions(-)

New commits:
commit e7fee907fa8240c742bd8f6268768d1acad2774f
Author: dante 
AuthorDate: Mon Jun 22 17:22:49 2020 +0200
Commit: Noel Grandin 
CommitDate: Wed Jun 24 12:01:02 2020 +0200

tdf#40436 tdf#47914 RGB personalized color for math and laplace symbol 2

Change-Id: Id0791609ada5b9f5460e46b20cfc7ce600cd3043
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96890
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/starmath/inc/strings.hrc b/starmath/inc/strings.hrc
index f12677d26eca..b4a22c58e546 100644
--- a/starmath/inc/strings.hrc
+++ b/starmath/inc/strings.hrc
@@ -189,6 +189,7 @@
 #define RID_COLORX_SILVER_HELP  NC_("RID_COLORX_SILVER_HELP", 
"Color Silver" )
 #define RID_COLORX_TEAL_HELPNC_("RID_COLORX_TEAL_HELP", "Color 
Teal" )
 #define RID_COLORX_YELLOW_HELP  NC_("RID_COLORX_YELLOW_HELP", 
"Color Yellow" )
+#define RID_COLORX_RGB_HELP NC_("RID_COLORX_RGB_HELP", "Color 
RGB" )
 #define RID_LRGROUPX_HELP   NC_("RID_LRGROUPX_HELP", "Group 
Brackets" )
 #define RID_LRPARENTX_HELP  NC_("RID_LRPARENTX_HELP", "Round 
Brackets" )
 #define RID_LRBRACKETX_HELP NC_("RID_LRBRACKETX_HELP", "Square 
Brackets" )
@@ -235,6 +236,7 @@
 #define RID_INFINITY_HELP   NC_("RID_INFINITY_HELP", 
"Infinity" )
 #define RID_PARTIAL_HELPNC_("RID_PARTIAL_HELP", "Partial" )
 #define RID_NABLA_HELP  NC_("RID_NABLA_HELP", "Nabla" )
+#define RID_LAPLACE_HELPNC_("RID_LAPLACE_HELP", "Laplace" )
 #define RID_WP_HELP NC_("RID_WP_HELP", "Weierstrass p" 
)
 #define RID_DOTSAXIS_HELP   NC_("RID_DOTSAXIS_HELP", "Dots In 
Middle" )
 #define RID_DOTSUP_HELP NC_("RID_DOTSUP_HELP", "Dots To 
Top" )
@@ -308,6 +310,7 @@
 #define STR_SILVER  NC_("STR_SILVER", "silver" )
 #define STR_TEALNC_("STR_TEAL", "teal" )
 #define STR_YELLOW  NC_("STR_YELLOW", "yellow" )
+#define STR_RGB NC_("STR_RGB", "rgb" )
 #define STR_HIDENC_("STR_HIDE", "hide" )
 #define STR_SIZENC_("STR_SIZE", "size" )
 #define STR_FONTNC_("STR_FONT", "font" )
diff --git a/starmath/inc/strings.hxx b/starmath/inc/strings.hxx
index ba7826a3dd75..bedd9534716d 100644
--- a/starmath/inc/strings.hxx
+++ b/starmath/inc/strings.hxx
@@ -182,6 +182,7 @@
 #define RID_COLORX_SILVER   "color silver {} "
 #define RID_COLORX_TEAL "color teal {} "
 #define RID_COLORX_YELLOW   "color yellow {} "
+#define RID_COLORX_RGB  "color rgb 0 0 0 {} "
 #define RID_LRGROUPX"{} "
 #define RID_LRPARENTX   "() "
 #define RID_LRBRACKETX  "[] "
@@ -229,6 +230,7 @@
 #define RID_PARTIAL "partial "
 #define RID_NABLA   "nabla "
 #define RID_WP  "wp "
+#define RID_LAPLACE "laplace "
 #define RID_DOTSAXIS"dotsaxis "
 #define RID_DOTSUP  "dotsup "
 #define RID_DOTSDOWN"dotsdown "
diff --git a/starmath/inc/token.hxx b/starmath/inc/token.hxx
index 1bbe446fcca2..cdc91ddf4838 100644
--- a/starmath/inc/token.hxx
+++ b/starmath/inc/token.hxx
@@ -44,6 +44,7 @@ enum class TG {
 Limit = 0x01,
 FontAttr  = 0x02
 };
+
 namespace o3tl {
 template<> struct typed_flags : is_typed_flags {};
 }
@@ -100,7 +101,8 @@ enum SmTokenType
 TUNKNOWN,   TPRECEDES,  TSUCCEEDS,  TPRECEDESEQUAL, 
TSUCCEEDSEQUAL,
 TPRECEDESEQUIV, TSUCCEEDSEQUIV, TNOTPRECEDES,   TNOTSUCCEEDS,   TSILVER,
 TGRAY,  TMAROON,TPURPLE,TLIME,  TOLIVE,
-TNAVY,  TTEAL,  TAQUA,  TFUCHSIA,   TINTD
+TNAVY,  TTEAL,  TAQUA,  TFUCHSIA,   TINTD,
+TRGB,   TLAPLACE
 };
 
 struct SmToken
diff --git a/starmath/inc/types.hxx b/starmath/inc/types.hxx
index 5680e907c6e7..044b2fab05d1 100644
--- a/starmath/inc/types.hxx
+++ b/starmath/inc/types.hxx
@@ -78,6 +78,7 @@ sal_Unicode const MS_DEF = 0x225D;
 sal_Unicode const MS_EQUIV = 0x2261;
 sal_Unicode const MS_PROP = 0x221D;
 sal_Unicode const MS_PARTIAL = 0x2202;
+sal_Unicode const MS_LAPLACE = 0x2112;
 
 sal_Unicode const MS_SUBSET = 0x2282;
 sal_Unicode const MS_SUPSET =

[Libreoffice-commits] core.git: starmath/inc starmath/source starmath/uiconfig

2020-01-29 Thread Caolán McNamara (via logerrit) 
 starmath/inc/AccessibleSmElement.hxx|2 
 starmath/inc/AccessibleSmElementsControl.hxx|6 
 starmath/inc/ElementsDockingWindow.hxx  |   42 +-
 starmath/source/AccessibleSmElement.cxx |   10 
 starmath/source/AccessibleSmElementsControl.cxx |  117 +---
 starmath/source/ElementsDockingWindow.cxx   |  350 ++--
 starmath/source/uiobject.cxx|   35 +-
 starmath/source/uiobject.hxx|8 
 starmath/uiconfig/smath/ui/dockingelements.ui   |   53 ++-
 9 files changed, 253 insertions(+), 370 deletions(-)

New commits:
commit 644ebf7823c85973e2724cbfcf403cb63b054bfe
Author: Caolán McNamara 
AuthorDate: Tue Jan 28 20:40:15 2020 +
Commit: Caolán McNamara 
CommitDate: Wed Jan 29 12:56:49 2020 +0100

weld SmElementsDockingWindow

Change-Id: Ieeaa1f1e0deb708ec6d3daf261384c61d2ade22b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87659
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/starmath/inc/AccessibleSmElement.hxx 
b/starmath/inc/AccessibleSmElement.hxx
index 9f63d1607ef7..202de6690899 100644
--- a/starmath/inc/AccessibleSmElement.hxx
+++ b/starmath/inc/AccessibleSmElement.hxx
@@ -40,7 +40,7 @@ typedef ::cppu::ImplHelper3 m_pSmElementsControl;
+SmElementsControl* m_pSmElementsControl;
 const sal_Int32 m_nIndexInParent; ///< index in the parent XAccessible
 const sal_uInt16 m_nItemId; ///< index in the SmElementsControl
 bool m_bHasFocus;
diff --git a/starmath/inc/AccessibleSmElementsControl.hxx 
b/starmath/inc/AccessibleSmElementsControl.hxx
index ac0b68afa892..66cbd80bcef4 100644
--- a/starmath/inc/AccessibleSmElementsControl.hxx
+++ b/starmath/inc/AccessibleSmElementsControl.hxx
@@ -38,7 +38,7 @@ class AccessibleSmElementsControl final : public 
comphelper::OAccessibleComponen
   public 
AccessibleSmElementsControl_BASE
 {
 std::vector> m_aAccessibleChildren;
-VclPtr m_pControl;
+SmElementsControl* m_pControl;
 
 void UpdateFocus(sal_uInt16);
 inline void TestControl();
@@ -71,10 +71,6 @@ public:
 sal_Bool SAL_CALL containsPoint(const css::awt::Point& aPoint) override;
 css::uno::Reference
 SAL_CALL getAccessibleAtPoint(const css::awt::Point& aPoint) override;
-css::awt::Rectangle SAL_CALL getBounds() override;
-css::awt::Point SAL_CALL getLocation() override;
-css::awt::Point SAL_CALL getLocationOnScreen() override;
-css::awt::Size SAL_CALL getSize() override;
 void SAL_CALL grabFocus() override;
 sal_Int32 SAL_CALL getForeground() override;
 sal_Int32 SAL_CALL getBackground() override;
diff --git a/starmath/inc/ElementsDockingWindow.hxx 
b/starmath/inc/ElementsDockingWindow.hxx
index c5645b70894a..5a5a46836658 100644
--- a/starmath/inc/ElementsDockingWindow.hxx
+++ b/starmath/inc/ElementsDockingWindow.hxx
@@ -21,7 +21,8 @@
 #define INCLUDED_STARMATH_INC_ELEMENTSDOCKINGWINDOW_HXX
 
 #include 
-#include 
+#include 
+#include 
 
 #include "format.hxx"
 #include 
@@ -63,7 +64,7 @@ public:
 
 typedef std::pair SmElementDescr;
 
-class SmElementsControl : public Control
+class SmElementsControl : public weld::CustomWidgetController
 {
 friend class ElementSelectorUIObject;
 friend class ElementUIObject;
@@ -81,16 +82,14 @@ class SmElementsControl : public Control
 static const std::tuple 
m_aCategories[];
 static const size_t m_aCategoriesSize;
 
-virtual void ApplySettings(vcl::RenderContext&) override;
-virtual void DataChanged(const DataChangedEvent&) override;
 virtual void Paint(vcl::RenderContext& rRenderContext, const 
tools::Rectangle&) override;
-virtual void MouseButtonDown(const MouseEvent& rMEvt) override;
-virtual void MouseMove(const MouseEvent& rMEvt) override;
-virtual void RequestHelp(const HelpEvent& rHEvt) override;
+virtual bool MouseButtonDown(const MouseEvent& rMEvt) override;
+virtual bool MouseMove(const MouseEvent& rMEvt) override;
+virtual OUString RequestHelp(tools::Rectangle& rRect) override;
 virtual void Resize() override;
 virtual void GetFocus() override;
 virtual void LoseFocus() override;
-virtual void KeyInput(const KeyEvent& rKEvt) override;
+virtual bool KeyInput(const KeyEvent& rKEvt) override;
 css::uno::Reference CreateAccessible() 
override;
 
 SmDocShell*   mpDocShell;
@@ -104,7 +103,7 @@ class SmElementsControl : public Control
 std::vector< std::unique_ptr > maElementList;
 Size  maMaxElementDimensions;
 bool  mbVerticalMode;
-VclPtr< ScrollBar > mxScroll;
+std::unique_ptr mxScroll;
 bool m_bFirstPaintAfterLayout;
 rtl::Reference m_xAccessible;
 
@@ -122,14 +121,12 @@ class SmElementsControl : public Control
 
 void build();
 
-//if pContext is not NULL, then draw, otherwise
-//just layout
-void LayoutOrPaintContents(vcl::RenderContext *pContext =

[Libreoffice-commits] core.git: starmath/inc starmath/source starmath/uiconfig

2018-04-09 Thread Caolán McNamara 
 starmath/inc/dialog.hxx   |   15 +++
 starmath/source/dialog.cxx|   49 +++---
 starmath/source/document.cxx  |   10 ++---
 starmath/uiconfig/smath/ui/alignmentdialog.ui |   40 +++--
 4 files changed, 47 insertions(+), 67 deletions(-)

New commits:
commit 8c72e780694e86f84e1d5b5eab6b724e7ec06754
Author: Caolán McNamara 
Date:   Mon Apr 9 15:28:19 2018 +0100

weld SmAlignDialog

Change-Id: Ie17f8da3ee26b366d4c325ff9aa2dbc7b419d8cd
Reviewed-on: https://gerrit.libreoffice.org/52640
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx
index 2b5556a9ec97..d4452b86a427 100644
--- a/starmath/inc/dialog.hxx
+++ b/starmath/inc/dialog.hxx
@@ -245,19 +245,18 @@ public:
 /**/
 
 
-class SmAlignDialog : public ModalDialog
+class SmAlignDialog : public weld::GenericDialogController
 {
-VclPtr m_pLeft;
-VclPtr m_pCenter;
-VclPtr m_pRight;
-VclPtr  m_pDefaultButton;
+std::unique_ptr m_xLeft;
+std::unique_ptr m_xCenter;
+std::unique_ptr m_xRight;
+std::unique_ptr m_xDefaultButton;
 
-DECL_LINK(DefaultButtonClickHdl, Button *, void);
+DECL_LINK(DefaultButtonClickHdl, weld::Button&, void);
 
 public:
-SmAlignDialog(vcl::Window *pParent);
+SmAlignDialog(weld::Window *pParent);
 virtual ~SmAlignDialog() override;
-virtual void dispose() override;
 
 void ReadFrom(const SmFormat );
 void WriteTo (SmFormat ) const;
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index 176ad2352804..ad70b04e3402 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -992,9 +992,9 @@ void SmDistanceDialog::WriteTo(SmFormat ) /*const*/
 rFormat.RequestApplyChanges();
 }
 
-IMPL_LINK_NOARG( SmAlignDialog, DefaultButtonClickHdl, Button *, void )
+IMPL_LINK_NOARG( SmAlignDialog, DefaultButtonClickHdl, weld::Button&, void )
 {
-SaveDefaultsQuery aQuery(GetFrameWeld());
+SaveDefaultsQuery aQuery(m_xDialog.get());
 if (aQuery.run() == RET_YES)
 {
 SmModule *pp = SM_MOD();
@@ -1004,29 +1004,18 @@ IMPL_LINK_NOARG( SmAlignDialog, DefaultButtonClickHdl, 
Button *, void )
 }
 }
 
-SmAlignDialog::SmAlignDialog(vcl::Window * pParent)
-: ModalDialog(pParent, "AlignmentDialog",
-"modules/smath/ui/alignmentdialog.ui")
+SmAlignDialog::SmAlignDialog(weld::Window* pParent)
+: GenericDialogController(pParent, "modules/smath/ui/alignmentdialog.ui", 
"AlignmentDialog")
+, m_xLeft(m_xBuilder->weld_radio_button("left"))
+, m_xCenter(m_xBuilder->weld_radio_button("center"))
+, m_xRight(m_xBuilder->weld_radio_button("right"))
+, m_xDefaultButton(m_xBuilder->weld_button("default"))
 {
-get(m_pLeft, "left");
-get(m_pCenter, "center");
-get(m_pRight, "right");
-get(m_pDefaultButton, "default");
-m_pDefaultButton->SetClickHdl(LINK(this, SmAlignDialog, 
DefaultButtonClickHdl));
+m_xDefaultButton->connect_clicked(LINK(this, SmAlignDialog, 
DefaultButtonClickHdl));
 }
 
 SmAlignDialog::~SmAlignDialog()
 {
-disposeOnce();
-}
-
-void SmAlignDialog::dispose()
-{
-m_pLeft.clear();
-m_pCenter.clear();
-m_pRight.clear();
-m_pDefaultButton.clear();
-ModalDialog::dispose();
 }
 
 void SmAlignDialog::ReadFrom(const SmFormat )
@@ -1034,31 +1023,22 @@ void SmAlignDialog::ReadFrom(const SmFormat )
 switch (rFormat.GetHorAlign())
 {
 case SmHorAlign::Left:
-m_pLeft->Check();
-m_pCenter->Check(false);
-m_pRight->Check(false);
+m_xLeft->set_active(true);
 break;
-
 case SmHorAlign::Center:
-m_pLeft->Check(false);
-m_pCenter->Check();
-m_pRight->Check(false);
+m_xCenter->set_active(true);
 break;
-
 case SmHorAlign::Right:
-m_pLeft->Check(false);
-m_pCenter->Check(false);
-m_pRight->Check();
+m_xRight->set_active(true);
 break;
 }
 }
 
-
 void SmAlignDialog::WriteTo(SmFormat ) const
 {
-if (m_pLeft->IsChecked())
+if (m_xLeft->get_active())
 rFormat.SetHorAlign(SmHorAlign::Left);
-else if (m_pRight->IsChecked())
+else if (m_xRight->get_active())
 rFormat.SetHorAlign(SmHorAlign::Right);
 else
 rFormat.SetHorAlign(SmHorAlign::Center);
@@ -1066,7 +1046,6 @@ void SmAlignDialog::WriteTo(SmFormat ) const
 rFormat.RequestApplyChanges();
 }
 
-
 SmShowSymbolSetWindow::SmShowSymbolSetWindow(vcl::Window *pParent, WinBits 
nStyle)
 : Control(pParent, nStyle)
 , m_pVScrollBar(nullptr)
diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx
index

[Libreoffice-commits] core.git: starmath/inc starmath/source starmath/uiconfig starmath/UIConfig_smath.mk

2017-04-18 Thread Caolán McNamara 
 starmath/UIConfig_smath.mk|1 
 starmath/inc/helpids.h|  192 ---
 starmath/inc/starmath.hrc |   13 
 starmath/source/commands.src  | 1347 -
 starmath/source/edit.cxx  |   10 
 starmath/uiconfig/smath/ui/commandmenu.ui | 1599 ++
 6 files changed, 1605 insertions(+), 1557 deletions(-)

New commits:
commit 50f548d55bac700cf026edb6b86d5b95b303243e
Author: Caolán McNamara 
Date:   Tue Apr 18 15:12:36 2017 +0100

convert starmath context menu to .ui

Change-Id: I0ab984aac0103a0d2bbb3c7a7c0bbd797eba7454

diff --git a/starmath/UIConfig_smath.mk b/starmath/UIConfig_smath.mk
index 2df545d7a67b..52babf47879c 100644
--- a/starmath/UIConfig_smath.mk
+++ b/starmath/UIConfig_smath.mk
@@ -30,6 +30,7 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/smath,\
 $(eval $(call gb_UIConfig_add_uifiles,modules/smath,\
starmath/uiconfig/smath/ui/alignmentdialog \
starmath/uiconfig/smath/ui/catalogdialog \
+   starmath/uiconfig/smath/ui/commandmenu \
starmath/uiconfig/smath/ui/dockingelements \
starmath/uiconfig/smath/ui/fontdialog \
starmath/uiconfig/smath/ui/fontsizedialog \
diff --git a/starmath/inc/helpids.h b/starmath/inc/helpids.h
index d932d83f3b03..024141fc5915 100644
--- a/starmath/inc/helpids.h
+++ b/starmath/inc/helpids.h
@@ -22,199 +22,7 @@
 #define HID_SMA_WIN_DOCUMENT  
"STARMATH_HID_SMA_WIN_DOCUMENT"
 #define HID_SMA_COMMAND_WIN_EDIT  
"STARMATH_HID_SMA_COMMAND_WIN_EDIT"
 
-#define HID_SMA_PLUSX 
"STARMATH_HID_SMA_PLUSX"
-#define HID_SMA_MINUSX
"STARMATH_HID_SMA_MINUSX"
-#define HID_SMA_PLUSMINUSX
"STARMATH_HID_SMA_PLUSMINUSX"
-#define HID_SMA_MINUSPLUSX
"STARMATH_HID_SMA_MINUSPLUSX"
-#define HID_SMA_NEGX  
"STARMATH_HID_SMA_NEGX"
-#define HID_SMA_XPLUSY
"STARMATH_HID_SMA_XPLUSY"
-#define HID_SMA_XMINUSY   
"STARMATH_HID_SMA_XMINUSY"
-#define HID_SMA_XCDOTY
"STARMATH_HID_SMA_XCDOTY"
-#define HID_SMA_XTIMESY   
"STARMATH_HID_SMA_XTIMESY"
-#define HID_SMA_XSYMTIMESY
"STARMATH_HID_SMA_XSYMTIMESY"
-#define HID_SMA_XSYMDIVIDEY   
"STARMATH_HID_SMA_XSYMDIVIDEY"
-#define HID_SMA_XDIVY 
"STARMATH_HID_SMA_XDIVY"
-#define HID_SMA_XOVERY
"STARMATH_HID_SMA_XOVERY"
-#define HID_SMA_XANDY 
"STARMATH_HID_SMA_XANDY"
-#define HID_SMA_XORY  
"STARMATH_HID_SMA_XORY"
-#define HID_SMA_XEQY  
"STARMATH_HID_SMA_XEQY"
-#define HID_SMA_XNEQY 
"STARMATH_HID_SMA_XNEQY"
-#define HID_SMA_XLTY  
"STARMATH_HID_SMA_XLTY"
-#define HID_SMA_XGTY  
"STARMATH_HID_SMA_XGTY"
-#define HID_SMA_XLEY  
"STARMATH_HID_SMA_XLEY"
-#define HID_SMA_XGEY  
"STARMATH_HID_SMA_XGEY"
-#define HID_SMA_XLESLANTY 
"STARMATH_HID_SMA_XLESLANTY"
-#define HID_SMA_XGESLANTY 
"STARMATH_HID_SMA_XGESLANTY"
-#define HID_SMA_XEQUIVY   
"STARMATH_HID_SMA_XEQUIVY"
-#define HID_SMA_XAPPROXY  
"STARMATH_HID_SMA_XAPPROXY"
-#define HID_SMA_XSIMY 
"STARMATH_HID_SMA_XSIMY"
-#define HID_SMA_XSIMEQY   
"STARMATH_HID_SMA_XSIMEQY"
-#define HID_SMA_XPROPY
"STARMATH_HID_SMA_XPROPY"
-#define HID_SMA_XORTHOY   
"STARMATH_HID_SMA_XORTHOY"
-#define HID_SMA_XPARALLELY
"STARMATH_HID_SMA_XPARALLELY"
-#define HID_SMA_XTOWARDY  
"STARMATH_HID_SMA_XTOWARDY"
-#define HID_SMA_XINY  
"STARMATH_HID_SMA_XINY"
-#define HID_SMA_XNOTINY   
"STARMATH_HID_SMA_XNOTINY"
-#define HID_SMA_XOWNSY
"STARMATH_HID_SMA_XOWNSY"
-#define HID_SMA_XUNIONY   
"STARMATH_HID_SMA_XUNIONY"
-#define HID_SMA_XINTERSECTIONY
"STARMATH_HID_SMA_XINTERSECTIONY"
-#define HID_SMA_XSETMINUSY
"STARMATH_HID_SMA_XSETMINUSY"
-#define HID_SMA_XSLASHY   
"STARMATH_HID_SMA_XSLASHY"
-#define HID_SMA_XSUBSETY

[Libreoffice-commits] core.git: starmath/inc starmath/source starmath/uiconfig svx/source

2014-04-01 Thread Caolán McNamara 
 starmath/inc/dialog.hxx   |2 
 starmath/inc/helpids.h|1 
 starmath/source/dialog.cxx|   27 +---
 starmath/source/dialog.hrc|   29 
 starmath/uiconfig/smath/ui/symdefinedialog.ui |  168 +++---
 svx/source/dialog/charmap.cxx |2 
 6 files changed, 115 insertions(+), 114 deletions(-)

New commits:
commit 519f4b75a5f089b6ef98260ff6265f5000fe4659
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Apr 1 16:19:26 2014 +0100

teach SmShowChar how to resize

and other cleanups

Change-Id: I1f6a57a6cb7c06a37e9c845fa93815d31008e6e1

diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx
index 4df16cd..ae3d214 100644
--- a/starmath/inc/dialog.hxx
+++ b/starmath/inc/dialog.hxx
@@ -373,6 +373,7 @@ public:
 class SmShowChar : public Control
 {
 virtual voidPaint(const Rectangle) SAL_OVERRIDE;
+virtual voidResize() SAL_OVERRIDE;
 
 public:
 SmShowChar(Window *pParent, WinBits nStyle)
@@ -424,7 +425,6 @@ class SmSymDefineDialog : public ModalDialog
 DECL_LINK(AddClickHdl, Button *);
 DECL_LINK(ChangeClickHdl, Button *);
 DECL_LINK(DeleteClickHdl, Button *);
-DECL_LINK(HelpButtonClickHdl, Button *);
 
 voidFillSymbols(ComboBox rComboBox, bool bDeleteText = true);
 voidFillSymbolSets(ComboBox rComboBox, bool bDeleteText = true);
diff --git a/starmath/inc/helpids.h b/starmath/inc/helpids.h
index b6d554f..66d8189 100644
--- a/starmath/inc/helpids.h
+++ b/starmath/inc/helpids.h
@@ -21,7 +21,6 @@
 
 #define HID_SMA_FONTDIALOG
STARMATH_HID_SMA_FONTDIALOG
 #define HID_SMA_DISTANCEDIALOG
STARMATH_HID_SMA_DISTANCEDIALOG
-#define HID_SMA_SYMDEFINEDIALOG   
STARMATH_HID_SMA_SYMDEFINEDIALOG
 #define HID_SMA_WIN_DOCUMENT  
STARMATH_HID_SMA_WIN_DOCUMENT
 #define HID_SMA_COMMAND_WIN_EDIT  
STARMATH_HID_SMA_COMMAND_WIN_EDIT
 
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index 4c87f59..cc22063 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -269,7 +269,6 @@ void SmShowFont::SetFont(const Font rFont)
 SetTextColor( aTxtColor );
 }
 
-
 IMPL_LINK_INLINE_START( SmFontDialog, FontSelectHdl, ComboBox *, pComboBox )
 {
 Face.SetName(pComboBox-GetText());
@@ -1615,8 +1614,16 @@ void SmShowChar::SetSymbol( sal_UCS4 cChar, const Font 
rFont )
 Invalidate();
 }
 
-
-
+void SmShowChar::Resize()
+{
+Control::Resize();
+const OUString rText = GetText();
+if (rText.isEmpty())
+return;
+sal_Int32 nStrIndex = 0;
+sal_UCS4 cChar = rText.iterateCodePoints(nStrIndex);
+SetSymbol(cChar, GetFont()); //force recalculation of size
+}
 
 void SmSymDefineDialog::FillSymbols(ComboBox rComboBox, bool bDeleteText)
 {
@@ -1963,17 +1970,6 @@ void SmSymDefineDialog::UpdateButtons()
 pDeleteBtn-Enable(bDelete);
 }
 
-IMPL_LINK( SmSymDefineDialog, HelpButtonClickHdl, Button *, EMPTYARG 
/*pButton*/ )
-{
-// start help system
-Help* pHelp = Application::GetHelp();
-if( pHelp )
-{
-pHelp-Start( OUString( HID_SMA_SYMDEFINEDIALOG ), pHelpBtn );
-}
-return 0;
-}
-
 SmSymDefineDialog::SmSymDefineDialog(Window * pParent,
 OutputDevice *pFntListDevice, SmSymbolManager rMgr) :
 ModalDialog (pParent, EditSymbols, 
modules/smath/ui/symdefinedialog.ui),
@@ -1995,13 +1991,10 @@ SmSymDefineDialog::SmSymDefineDialog(Window * pParent,
 get(pSymbolName, symbolName);
 get(pSymbolDisplay, symbolDisplay);
 get(pSymbolSetName, symbolSetName);
-get(pHelpBtn, help);
 get(pAddBtn, add);
 get(pChangeBtn, modify);
 get(pDeleteBtn, delete);
 
-pHelpBtn-SetClickHdl(LINK(this, SmSymDefineDialog, HelpButtonClickHdl));
-
 pFontList = new FontList( pFntListDevice );
 
 pOrigSymbol = 0;
diff --git a/starmath/source/dialog.hrc b/starmath/source/dialog.hrc
deleted file mode 100644
index a726226..000
--- a/starmath/source/dialog.hrc
+++ /dev/null
@@ -1,29 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * 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.

[Libreoffice-commits] core.git: starmath/inc starmath/source starmath/uiconfig

2013-07-03 Thread Caolán McNamara 
 starmath/inc/dialog.hxx  |1 -
 starmath/inc/helpids.h   |1 -
 starmath/source/dialog.cxx   |   13 -
 starmath/uiconfig/smath/ui/fonttypedialog.ui |   27 ---
 4 files changed, 12 insertions(+), 30 deletions(-)

New commits:
commit 1ec3fac48866c27d0c4b6ffb44befcba66d1f229
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Jul 3 14:00:50 2013 +0100

don't need an explicit help handler, the default will be fine

Change-Id: I61643e507a68e66e1798c2d21a3f9372027fda1a

diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx
index 4274266..5f47fc9 100644
--- a/starmath/inc/dialog.hxx
+++ b/starmath/inc/dialog.hxx
@@ -149,7 +149,6 @@ class SmFontTypeDialog : public ModalDialog
 SmFontPickListBox* m_pSerifFont;
 SmFontPickListBox* m_pSansFont;
 SmFontPickListBox* m_pFixedFont;
-HelpButton* m_pHelpButton1;
 MenuButton* m_pMenuButton;
 PushButton* m_pDefaultButton;
 
diff --git a/starmath/inc/helpids.h b/starmath/inc/helpids.h
index 437fe42..8ee31c1 100644
--- a/starmath/inc/helpids.h
+++ b/starmath/inc/helpids.h
@@ -20,7 +20,6 @@
 #define STARMATH_HELPIDS_H
 
 #define HID_SMA_FONTDIALOG
STARMATH_HID_SMA_FONTDIALOG
-#define HID_SMA_FONTTYPEDIALOG
STARMATH_HID_SMA_FONTTYPEDIALOG
 #define HID_SMA_DISTANCEDIALOG
STARMATH_HID_SMA_DISTANCEDIALOG
 #define HID_SMA_SYMDEFINEDIALOG   
STARMATH_HID_SMA_SYMDEFINEDIALOG
 #define HID_SMA_WIN_DOCUMENT  
STARMATH_HID_SMA_WIN_DOCUMENT
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index b42a278..c445fb3 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -533,17 +533,6 @@ IMPL_LINK_INLINE_START( SmFontTypeDialog, 
DefaultButtonClickHdl, Button *, EMPTY
 }
 IMPL_LINK_INLINE_END( SmFontTypeDialog, DefaultButtonClickHdl, Button *, 
pButton )
 
-IMPL_LINK( SmFontTypeDialog, HelpButtonClickHdl, Button *, EMPTYARG 
/*pButton*/ )
-{
-// start help system
-Help* pHelp = Application::GetHelp();
-if( pHelp )
-{
-pHelp-Start( OUString( HID_SMA_FONTTYPEDIALOG ), m_pHelpButton1 );
-}
-return 0;
-}
-
 SmFontTypeDialog::SmFontTypeDialog(Window * pParent, OutputDevice 
*pFntListDevice)
 : ModalDialog(pParent, FontsDialog, 
modules/smath/ui/fonttypedialog.ui),
 pFontListDev(pFntListDevice)
@@ -555,12 +544,10 @@ SmFontTypeDialog::SmFontTypeDialog(Window * pParent, 
OutputDevice *pFntListDevic
 get(m_pSerifFont, serifCB);
 get(m_pSansFont, sansCB);
 get(m_pFixedFont, fixedCB);
-get(m_pHelpButton1, help);
 get(m_pMenuButton, modify);
 get(m_pDefaultButton, default);
 
 m_pDefaultButton-SetClickHdl(LINK(this, SmFontTypeDialog, 
DefaultButtonClickHdl));
-m_pHelpButton1-SetClickHdl(LINK(this, SmFontTypeDialog, 
HelpButtonClickHdl));
 
 m_pMenuButton-GetPopupMenu()-SetSelectHdl(LINK(this, SmFontTypeDialog, 
MenuSelectHdl));
 }
diff --git a/starmath/uiconfig/smath/ui/fonttypedialog.ui 
b/starmath/uiconfig/smath/ui/fonttypedialog.ui
index 92b10f0..b31f045 100644
--- a/starmath/uiconfig/smath/ui/fonttypedialog.ui
+++ b/starmath/uiconfig/smath/ui/fonttypedialog.ui
@@ -1,6 +1,7 @@
 ?xml version=1.0 encoding=UTF-8?
 interface
   !-- interface-requires gtk+ 3.0 --
+  !-- interface-requires LibreOffice 1.0 --
   object class=GtkDialog id=FontsDialog
 property name=can_focusFalse/property
 property name=border_width6/property
@@ -23,7 +24,6 @@
 property name=can_defaultTrue/property
 property name=has_defaultTrue/property
 property name=receives_defaultTrue/property
-property name=use_action_appearanceFalse/property
 property name=use_stockTrue/property
   /object
   packing
@@ -38,7 +38,6 @@
 property name=visibleTrue/property
 property name=can_focusTrue/property
 property name=receives_defaultTrue/property
-property name=use_action_appearanceFalse/property
 property name=use_stockTrue/property
   /object
   packing
@@ -53,7 +52,6 @@
 property name=visibleTrue/property
 property name=can_focusTrue/property
 property name=receives_defaultTrue/property
-property name=use_action_appearanceFalse/property
 property name=use_underlineTrue/property
   /object
   packing
@@ -68,7 +66,6 @@
 property name=visibleTrue/property
 property name=can_focusTrue/property
 property name=receives_defaultTrue/property
-property name=use_action_appearanceFalse/property
 property name=use_stockTrue/property
   /object

[Libreoffice-commits] core.git: starmath/inc starmath/source starmath/uiconfig starmath/UIConfig_smath.mk

2013-06-18 Thread Faisal M . Al-Otaibi 
 starmath/UIConfig_smath.mk  |1 
 starmath/inc/dialog.hxx |   21 --
 starmath/inc/starmath.hrc   |1 
 starmath/source/dialog.cxx  |   72 +++---
 starmath/source/dialog.hrc  |   16 -
 starmath/source/smres.src   |  105 --
 starmath/uiconfig/smath/ui/smathsettings.ui |  290 
 7 files changed, 334 insertions(+), 172 deletions(-)

New commits:
commit 4f99d56f929c1eac07217e0f80a501b4e3dbdc6c
Author: Faisal M. Al-Otaibi fmalota...@kacst.edu.sa
Date:   Tue Jun 18 14:26:00 2013 +0200

convert starmath settings option page to .ui format

Change-Id: I908a29713ca1e01ec3e742193bd4b49e1fa97bc9

diff --git a/starmath/UIConfig_smath.mk b/starmath/UIConfig_smath.mk
index d64abe8..2f26333 100644
--- a/starmath/UIConfig_smath.mk
+++ b/starmath/UIConfig_smath.mk
@@ -28,6 +28,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/smath,\
starmath/uiconfig/smath/ui/catalogdialog \
starmath/uiconfig/smath/ui/printeroptions \
starmath/uiconfig/smath/ui/savedefaultsdialog \
+   starmath/uiconfig/smath/ui/smathsettings \
starmath/uiconfig/smath/ui/spacingdialog \
 ))
 
diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx
index ca902b5..6c3586e 100644
--- a/starmath/inc/dialog.hxx
+++ b/starmath/inc/dialog.hxx
@@ -51,18 +51,15 @@ void SetFontStyle(const OUString rStyleName, Font rFont);
 
 class SmPrintOptionsTabPage : public SfxTabPage
 {
-FixedLine   aFixedLine1;
-CheckBoxaTitle;
-CheckBoxaText;
-CheckBoxaFrame;
-FixedLine   aFixedLine2;
-RadioButton aSizeNormal;
-RadioButton aSizeScaled;
-RadioButton aSizeZoomed;
-MetricField aZoom;
-FixedLine   aFixedLine3;
-CheckBoxaNoRightSpaces;
-CheckBoxaSaveOnlyUsedSymbols;
+CheckBox*   m_pTitle;
+CheckBox*   m_pText;
+CheckBox*   m_pFrame;
+RadioButton*m_pSizeNormal;
+RadioButton*m_pSizeScaled;
+RadioButton*m_pSizeZoomed;
+MetricField*m_pZoom;
+CheckBox*   m_pNoRightSpaces;
+CheckBox*   m_pSaveOnlyUsedSymbols;
 
 DECL_LINK(SizeButtonClickHdl, Button *);
 
diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc
index f03cd6d..dedc3f3 100644
--- a/starmath/inc/starmath.hrc
+++ b/starmath/inc/starmath.hrc
@@ -79,7 +79,6 @@
 #define RID_FONTDIALOG  (RID_APP_START + 2)
 #define RID_FONTSIZEDIALOG  (RID_APP_START + 3)
 #define RID_FONTTYPEDIALOG  (RID_APP_START + 4)
-#define RID_PRINTOPTIONPAGE (RID_APP_START + 7)
 #define RID_SYMDEFINEDIALOG (RID_APP_START + 9)
 #define RID_PRINTUIOPTIONS  (RID_APP_START + 11)
 
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index 86e2340..67c4a1d 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -152,32 +152,28 @@ void SetFontStyle(const OUString rStyleName, Font rFont)
 
 IMPL_LINK_INLINE_START( SmPrintOptionsTabPage, SizeButtonClickHdl, Button *, 
EMPTYARG/*pButton*/ )
 {
-aZoom.Enable(aSizeZoomed.IsChecked());
+m_pZoom-Enable(m_pSizeZoomed-IsChecked());
 return 0;
 }
 IMPL_LINK_INLINE_END( SmPrintOptionsTabPage, SizeButtonClickHdl, Button *, 
pButton )
 
 
 SmPrintOptionsTabPage::SmPrintOptionsTabPage(Window *pParent, const SfxItemSet 
rOptions)
-: SfxTabPage(pParent, SmResId(RID_PRINTOPTIONPAGE), rOptions),
-aFixedLine1 (this, SmResId( FL_PRINTOPTIONS )),
-aTitle  (this, SmResId( CB_TITLEROW )),
-aText   (this, SmResId( CB_EQUATION_TEXT )),
-aFrame  (this, SmResId( CB_FRAME )),
-aFixedLine2 (this, SmResId( FL_PRINT_FORMAT )),
-aSizeNormal (this, SmResId( RB_ORIGINAL_SIZE )),
-aSizeScaled (this, SmResId( RB_FIT_TO_PAGE )),
-aSizeZoomed (this, SmResId( RB_ZOOM )),
-aZoom   (this, SmResId( MF_ZOOM )),
-aFixedLine3 (this, SmResId( FL_MISC_OPTIONS )),
-aNoRightSpaces  (this, SmResId( CB_IGNORE_SPACING )),
-aSaveOnlyUsedSymbols  (this, SmResId( CB_SAVE_ONLY_USED_SYMBOLS ))
-{
-FreeResource();
-
-aSizeNormal.SetClickHdl(LINK(this, SmPrintOptionsTabPage, 
SizeButtonClickHdl));
-aSizeScaled.SetClickHdl(LINK(this, SmPrintOptionsTabPage, 
SizeButtonClickHdl));
-aSizeZoomed.SetClickHdl(LINK(this, SmPrintOptionsTabPage, 
SizeButtonClickHdl));
+: SfxTabPage(pParent, SmathSettings, 
modules/smath/ui/smathsettings.ui, rOptions)
+{
+get( m_pTitle,   title);
+get( m_pText,text);
+get( m_pFrame,   frame);
+get( m_pSizeNormal,  sizenormal);
+get( m_pSizeScaled,  sizescaled);
+get( m_pSizeZoomed,  sizezoomed);
+get( m_pZoom,zoom);
+get( m_pNoRightSpaces,   norightspaces);
+get( m_pSaveOnlyUsedSymbols, saveonlyusedsymbols);
+
+

[Libreoffice-commits] core.git: starmath/inc starmath/source starmath/uiconfig starmath/UIConfig_smath.mk

2013-05-22 Thread Caolán McNamara 
 starmath/UIConfig_smath.mk|1 
 starmath/inc/dialog.hxx   |   15 --
 starmath/inc/helpids.h|1 
 starmath/inc/starmath.hrc |1 
 starmath/source/dialog.cxx|   56 ++-
 starmath/source/smres.src |   69 -
 starmath/uiconfig/smath/ui/alignment.ui   |  172 ---
 starmath/uiconfig/smath/ui/alignmentdialog.ui |  190 ++
 8 files changed, 215 insertions(+), 290 deletions(-)

New commits:
commit 7c04626ec7b54d8db2ff9bac19df75dd668ad8f7
Author: Caolán McNamara caol...@redhat.com
Date:   Wed May 22 11:27:10 2013 +0100

adapt code to alignment dialog .ui conversion

Change-Id: I8a64ddc076e177deaa61a450716d7d3dd8043303

diff --git a/starmath/UIConfig_smath.mk b/starmath/UIConfig_smath.mk
index 9fe1f8f..83a127a 100644
--- a/starmath/UIConfig_smath.mk
+++ b/starmath/UIConfig_smath.mk
@@ -24,6 +24,7 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/smath,\
 ))
 
 $(eval $(call gb_UIConfig_add_uifiles,modules/smath,\
+   starmath/uiconfig/smath/ui/alignmentdialog \
starmath/uiconfig/smath/ui/printeroptions \
 ))
 
diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx
index ac0508f..34511b9 100644
--- a/starmath/inc/dialog.hxx
+++ b/starmath/inc/dialog.hxx
@@ -271,20 +271,15 @@ public:
 
 class SmAlignDialog : public ModalDialog
 {
-RadioButton  aLeft;
-RadioButton  aCenter;
-RadioButton  aRight;
-FixedLineaFixedLine1;
-OKButton aOKButton1;
-HelpButton   aHelpButton1;
-CancelButton aCancelButton1;
-PushButton   aDefaultButton;
+RadioButton* m_pLeft;
+RadioButton* m_pCenter;
+RadioButton* m_pRight;
+PushButton*  m_pDefaultButton;
 
 DECL_LINK(DefaultButtonClickHdl, Button *);
-DECL_LINK(HelpButtonClickHdl, Button *);
 
 public:
-SmAlignDialog(Window *pParent, bool bFreeRes = true);
+SmAlignDialog(Window *pParent);
 
 void ReadFrom(const SmFormat rFormat);
 void WriteTo (SmFormat rFormat) const;
diff --git a/starmath/inc/helpids.h b/starmath/inc/helpids.h
index 6d7f7bb..34fd0db 100644
--- a/starmath/inc/helpids.h
+++ b/starmath/inc/helpids.h
@@ -23,7 +23,6 @@
 #define HID_SMA_FONTSIZEDIALOG
STARMATH_HID_SMA_FONTSIZEDIALOG
 #define HID_SMA_FONTTYPEDIALOG
STARMATH_HID_SMA_FONTTYPEDIALOG
 #define HID_SMA_DISTANCEDIALOG
STARMATH_HID_SMA_DISTANCEDIALOG
-#define HID_SMA_ALIGNDIALOG   
STARMATH_HID_SMA_ALIGNDIALOG
 #define HID_SMA_SYMBOLDIALOG  
STARMATH_HID_SMA_SYMBOLDIALOG
 #define HID_SMA_SYMDEFINEDIALOG   
STARMATH_HID_SMA_SYMDEFINEDIALOG
 #define HID_SMA_WIN_DOCUMENT  
STARMATH_HID_SMA_WIN_DOCUMENT
diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc
index a9bfbfa..c9dc005 100644
--- a/starmath/inc/starmath.hrc
+++ b/starmath/inc/starmath.hrc
@@ -85,7 +85,6 @@
 #define RID_FONTSIZEDIALOG  (RID_APP_START + 3)
 #define RID_FONTTYPEDIALOG  (RID_APP_START + 4)
 #define RID_DISTANCEDIALOG  (RID_APP_START + 5)
-#define RID_ALIGNDIALOG (RID_APP_START + 6)
 #define RID_PRINTOPTIONPAGE (RID_APP_START + 7)
 #define RID_SYMBOLDIALOG(RID_APP_START + 8)
 #define RID_SYMDEFINEDIALOG (RID_APP_START + 9)
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index 005b41a..435911a 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -1077,33 +1077,15 @@ IMPL_LINK( SmAlignDialog, DefaultButtonClickHdl, Button 
*, EMPTYARG /*pButton*/
 }
 
 
-IMPL_LINK( SmAlignDialog, HelpButtonClickHdl, Button *, EMPTYARG /*pButton*/ )
+SmAlignDialog::SmAlignDialog(Window * pParent)
+: ModalDialog(pParent, AlignmentDialog,
+modules/smath/ui/alignmentdialog.ui)
 {
-// start help system
-Help* pHelp = Application::GetHelp();
-if( pHelp )
-{
-pHelp-Start( OUString( HID_SMA_ALIGNDIALOG ), aHelpButton1 );
-}
-return 0;
-}
-
-SmAlignDialog::SmAlignDialog(Window * pParent, bool bFreeRes)
-: ModalDialog(pParent, SmResId(RID_ALIGNDIALOG)),
-aLeft  (this, SmResId(1)),
-aCenter(this, SmResId(2)),
-aRight (this, SmResId(3)),
-aFixedLine1(this, SmResId(1)),
-aOKButton1 (this, SmResId(1)),
-aHelpButton1   (this, SmResId(1)),
-aCancelButton1 (this, SmResId(1)),
-aDefaultButton (this, SmResId(1))
-{
-if (bFreeRes)
-FreeResource();
-
-aDefaultButton.SetClickHdl(LINK(this, SmAlignDialog, 
DefaultButtonClickHdl));
-aHelpButton1.SetClickHdl(LINK(this, SmAlignDialog, HelpButtonClickHdl));
+get(m_pLeft, left);
+get(m_pCenter, center);
+get(m_pRight, right);
+get(m_pDefaultButton, default);
+