sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx | 10 -
sc/source/ui/inc/CovarianceDialog.hxx | 6
sc/source/ui/inc/reffact.hxx | 2
sc/source/ui/view/tabvwshc.cxx | 11 -
sc/uiconfig/scalc/ui/covariancedialog.ui | 140 ++++++++++----------
solenv/sanitizers/ui/modules/scalc.suppr | 2
6 files changed, 90 insertions(+), 81 deletions(-)
New commits:
commit 364880e744398bf4e95eb9176819a870c1852e03
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Apr 10 10:23:49 2019 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Thu Apr 11 09:53:46 2019 +0200
weld ScCovarianceDialog
Change-Id: I7546aa234ee986701b9908f33a6c96e6779d654d
Reviewed-on: https://gerrit.libreoffice.org/70509
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx
b/sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx
index d5243745278b..522297cc731d 100644
--- a/sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx
@@ -15,10 +15,10 @@
ScCovarianceDialog::ScCovarianceDialog(
SfxBindings* pSfxBindings, SfxChildWindow*
pChildWindow,
- vcl::Window* pParent, ScViewData* pViewData ) :
- ScMatrixComparisonGenerator(
+ weld::Window* pParent, ScViewData* pViewData ) :
+ ScMatrixComparisonGeneratorController(
pSfxBindings, pChildWindow, pParent, pViewData,
- "CovarianceDialog", "modules/scalc/ui/covariancedialog.ui" )
+ "modules/scalc/ui/covariancedialog.ui", "CovarianceDialog")
{}
const char* ScCovarianceDialog::GetUndoNameId()
@@ -26,9 +26,9 @@ const char* ScCovarianceDialog::GetUndoNameId()
return STR_COVARIANCE_UNDO_NAME;
}
-bool ScCovarianceDialog::Close()
+void ScCovarianceDialog::Close()
{
- return DoClose( ScCovarianceDialogWrapper::GetChildWindowId() );
+ DoClose( ScCovarianceDialogWrapper::GetChildWindowId() );
}
const OUString ScCovarianceDialog::getLabel()
diff --git a/sc/source/ui/inc/CovarianceDialog.hxx
b/sc/source/ui/inc/CovarianceDialog.hxx
index 3bd5a9e2657b..99052c51b644 100644
--- a/sc/source/ui/inc/CovarianceDialog.hxx
+++ b/sc/source/ui/inc/CovarianceDialog.hxx
@@ -13,14 +13,14 @@
#include "MatrixComparisonGenerator.hxx"
-class ScCovarianceDialog : public ScMatrixComparisonGenerator
+class ScCovarianceDialog : public ScMatrixComparisonGeneratorController
{
public:
ScCovarianceDialog(
SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow,
- vcl::Window* pParent, ScViewData* pViewData);
+ weld::Window* pParent, ScViewData* pViewData);
- virtual bool Close() override;
+ virtual void Close() override;
protected:
virtual const OUString getLabel() override;
diff --git a/sc/source/ui/inc/reffact.hxx b/sc/source/ui/inc/reffact.hxx
index b1dda37d1249..fe9070e61771 100644
--- a/sc/source/ui/inc/reffact.hxx
+++ b/sc/source/ui/inc/reffact.hxx
@@ -86,7 +86,7 @@ private:
};
class ScCovarianceDialogWrapper :
- public ChildWindowWrapper<SID_COVARIANCE_DIALOG>
+ public ChildControllerWrapper<SID_COVARIANCE_DIALOG>
{
private:
ScCovarianceDialogWrapper() = delete;
diff --git a/sc/source/ui/view/tabvwshc.cxx b/sc/source/ui/view/tabvwshc.cxx
index 379bf2ad3f1f..818a1f610b28 100644
--- a/sc/source/ui/view/tabvwshc.cxx
+++ b/sc/source/ui/view/tabvwshc.cxx
@@ -330,12 +330,6 @@ VclPtr<SfxModelessDialog> ScTabViewShell::CreateRefDialog(
}
break;
- case SID_COVARIANCE_DIALOG:
- {
- pResult = VclPtr<ScCovarianceDialog>::Create( pB, pCW, pParent,
&GetViewData() );
- }
- break;
-
case SID_EXPONENTIAL_SMOOTHING_DIALOG:
{
pResult = VclPtr<ScExponentialSmoothingDialog>::Create( pB, pCW,
pParent, &GetViewData() );
@@ -535,6 +529,11 @@ std::unique_ptr<SfxModelessDialogController>
ScTabViewShell::CreateRefDialogCont
xResult.reset(new ScAnalysisOfVarianceDialog(pB, pCW, pParent,
&GetViewData()));
}
break;
+ case SID_COVARIANCE_DIALOG:
+ {
+ xResult.reset(new ScCovarianceDialog(pB, pCW, pParent,
&GetViewData()));
+ }
+ break;
}
if (xResult)
diff --git a/sc/uiconfig/scalc/ui/covariancedialog.ui
b/sc/uiconfig/scalc/ui/covariancedialog.ui
index f8a92854221b..07a766a13dd4 100644
--- a/sc/uiconfig/scalc/ui/covariancedialog.ui
+++ b/sc/uiconfig/scalc/ui/covariancedialog.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.22.1 -->
<interface domain="sc">
<requires lib="gtk+" version="3.18"/>
<requires lib="LibreOffice" version="1.0"/>
@@ -8,12 +8,76 @@
<property name="border_width">6</property>
<property name="title" translatable="yes"
context="covariancedialog|CovarianceDialog">Covariance</property>
<property name="resizable">False</property>
+ <property name="default_width">0</property>
+ <property name="default_height">0</property>
<property name="type_hint">dialog</property>
+ <child>
+ <placeholder/>
+ </child>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">12</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area1">
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="ok">
+ <property name="label">gtk-ok</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="cancel">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="help">
+ <property name="label">gtk-help</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ <property name="secondary">True</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
<child>
<object class="GtkFrame" id="frame1">
<property name="visible">True</property>
@@ -37,10 +101,10 @@
<object class="GtkLabel" id="input-range-label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes"
context="covariancedialog|input-range-label">Input range:</property>
<property name="use_underline">True</property>
<property
name="mnemonic_widget">input-range-edit</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -48,11 +112,12 @@
</packing>
</child>
<child>
- <object class="foruilo-RefEdit" id="input-range-edit">
+ <object class="GtkEntry" id="input-range-edit">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="valign">center</property>
<property name="hexpand">True</property>
+ <property name="activates_default">True</property>
<property name="width_chars">30</property>
</object>
<packing>
@@ -61,7 +126,7 @@
</packing>
</child>
<child>
- <object class="foruilo-RefButton"
id="input-range-button">
+ <object class="GtkButton" id="input-range-button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -75,10 +140,10 @@
<object class="GtkLabel" id="output-range-label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes"
context="covariancedialog|output-range-label">Results to:</property>
<property name="use_underline">True</property>
<property
name="mnemonic_widget">output-range-edit</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -86,11 +151,12 @@
</packing>
</child>
<child>
- <object class="foruilo-RefEdit" id="output-range-edit">
+ <object class="GtkEntry" id="output-range-edit">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="valign">center</property>
<property name="hexpand">True</property>
+ <property name="activates_default">True</property>
<property name="width_chars">30</property>
</object>
<packing>
@@ -99,7 +165,7 @@
</packing>
</child>
<child>
- <object class="foruilo-RefButton"
id="output-range-button">
+ <object class="GtkButton" id="output-range-button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -130,65 +196,6 @@
<property name="position">0</property>
</packing>
</child>
- <child internal-child="action_area">
- <object class="GtkButtonBox" id="dialog-action_area1">
- <property name="can_focus">False</property>
- <property name="layout_style">end</property>
- <child>
- <object class="GtkButton" id="ok">
- <property name="label">gtk-ok</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="has_default">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="cancel">
- <property name="label">gtk-cancel</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="has_default">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="help">
- <property name="label">gtk-help</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- <property name="secondary">True</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
<child>
<object class="GtkFrame" id="frame2">
<property name="visible">True</property>
@@ -266,6 +273,7 @@
</child>
<action-widgets>
<action-widget response="-5">ok</action-widget>
+ <action-widget response="-6">cancel</action-widget>
<action-widget response="-11">help</action-widget>
</action-widgets>
</object>
diff --git a/solenv/sanitizers/ui/modules/scalc.suppr
b/solenv/sanitizers/ui/modules/scalc.suppr
index cdd2c5f3f2bb..ad0488618b36 100644
--- a/solenv/sanitizers/ui/modules/scalc.suppr
+++ b/solenv/sanitizers/ui/modules/scalc.suppr
@@ -35,6 +35,8 @@
sc/uiconfig/scalc/ui/consolidatedialog.ui://foruilo-RefEdit[@id='eddataarea'] no
sc/uiconfig/scalc/ui/consolidatedialog.ui://foruilo-RefEdit[@id='eddestarea']
no-labelled-by
sc/uiconfig/scalc/ui/correlationdialog.ui://GtkButton[@id='input-range-button']
button-no-label
sc/uiconfig/scalc/ui/correlationdialog.ui://GtkButton[@id='output-range-button']
button-no-label
+sc/uiconfig/scalc/ui/covariancedialog.ui://GtkButton[@id='input-range-button']
button-no-label
+sc/uiconfig/scalc/ui/covariancedialog.ui://GtkButton[@id='output-range-button']
button-no-label
sc/uiconfig/scalc/ui/dapiservicedialog.ui://GtkLabel[@id='label2'] orphan-label
sc/uiconfig/scalc/ui/dapiservicedialog.ui://GtkLabel[@id='label3'] orphan-label
sc/uiconfig/scalc/ui/dapiservicedialog.ui://GtkLabel[@id='label4'] orphan-label
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
