[Libreoffice-commits] core.git: 2 commits - dbaccess/source dbaccess/uiconfig solenv/gbuild
Caolán McNamara
caolanm at redhat.com
Tue Apr 17 14:37:53 UTC 2018
dbaccess/source/core/inc/warndlg.hxx | 4 ----
dbaccess/source/core/misc/warndlg.cxx | 2 --
dbaccess/source/ui/dlg/migrwarndlg.cxx | 2 --
dbaccess/source/ui/inc/migrwarndlg.hxx | 4 ----
dbaccess/uiconfig/ui/migrwarndlg.ui | 33 +++++++++++++--------------------
solenv/gbuild/platform/macosx.mk | 2 --
6 files changed, 13 insertions(+), 34 deletions(-)
New commits:
commit 4b5f85447fd17d18f05f8d4a292ee6ac381f4252
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Apr 17 11:48:13 2018 +0100
Resolves: tdf#117057 use same style warning as elsewhere
Change-Id: I3072c7725d0769c0a4a1974664b1546ca3ee35ad
Reviewed-on: https://gerrit.libreoffice.org/53036
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/dbaccess/source/core/inc/warndlg.hxx b/dbaccess/source/core/inc/warndlg.hxx
index 54cfe88cb6a4..3e0935bd732c 100644
--- a/dbaccess/source/core/inc/warndlg.hxx
+++ b/dbaccess/source/core/inc/warndlg.hxx
@@ -15,10 +15,6 @@ namespace dbaccess
{
class MigrationWarnDialog : public weld::MessageDialogController
{
-private:
- std::unique_ptr<weld::Button> m_xOkBtn;
- std::unique_ptr<weld::Button> m_xLaterBtn;
-
public:
MigrationWarnDialog(weld::Window* pParent);
};
diff --git a/dbaccess/source/core/misc/warndlg.cxx b/dbaccess/source/core/misc/warndlg.cxx
index e8446b6e7539..985c892eb9fa 100644
--- a/dbaccess/source/core/misc/warndlg.cxx
+++ b/dbaccess/source/core/misc/warndlg.cxx
@@ -13,8 +13,6 @@ namespace dbaccess
{
MigrationWarnDialog::MigrationWarnDialog(weld::Window* pParent)
: MessageDialogController(pParent, "TODOUIfile", "MigrationWarnDialog", "ask")
- , m_xOkBtn(m_xBuilder->weld_button("yes"))
- , m_xLaterBtn(m_xBuilder->weld_button("later"))
{
}
}
diff --git a/dbaccess/source/ui/dlg/migrwarndlg.cxx b/dbaccess/source/ui/dlg/migrwarndlg.cxx
index 9281dc11a941..ef3fa007303c 100644
--- a/dbaccess/source/ui/dlg/migrwarndlg.cxx
+++ b/dbaccess/source/ui/dlg/migrwarndlg.cxx
@@ -13,8 +13,6 @@ namespace dbaui
{
MigrationWarnDialog::MigrationWarnDialog(weld::Window* pParent)
: MessageDialogController(pParent, "dbaccess/ui/migrwarndlg.ui", "MigrationWarnDialog")
- , m_xOkBtn(m_xBuilder->weld_button("yes"))
- , m_xLaterBtn(m_xBuilder->weld_button("later"))
{
}
}
diff --git a/dbaccess/source/ui/inc/migrwarndlg.hxx b/dbaccess/source/ui/inc/migrwarndlg.hxx
index 7f18ad02f446..25e31046ce57 100644
--- a/dbaccess/source/ui/inc/migrwarndlg.hxx
+++ b/dbaccess/source/ui/inc/migrwarndlg.hxx
@@ -15,10 +15,6 @@ namespace dbaui
{
class MigrationWarnDialog : public weld::MessageDialogController
{
-private:
- std::unique_ptr<weld::Button> m_xOkBtn;
- std::unique_ptr<weld::Button> m_xLaterBtn;
-
public:
MigrationWarnDialog(weld::Window* pParent);
};
diff --git a/dbaccess/uiconfig/ui/migrwarndlg.ui b/dbaccess/uiconfig/ui/migrwarndlg.ui
index 8fa8e4934520..c504f9b2ac9f 100644
--- a/dbaccess/uiconfig/ui/migrwarndlg.ui
+++ b/dbaccess/uiconfig/ui/migrwarndlg.ui
@@ -1,13 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.2 -->
+<!-- Generated with glade 3.20.4 -->
<interface domain="sfx">
<requires lib="gtk+" version="3.18"/>
<object class="GtkMessageDialog" id="MigrationWarnDialog">
<property name="can_focus">False</property>
- <property name="type_hint">dialog</property>
<property name="title" translatable="yes" context="migrationwarndialog|MigrationWarnDialog">Confirm Migration</property>
<property name="resizable">False</property>
<property name="modal">True</property>
+ <property name="type_hint">dialog</property>
+ <property name="text" translatable="yes" context="migrationwarndialog|MigrationWarnDialog">The document contains embedded HSQL data, which is deprecated.</property>
+ <property name="secondary_text" translatable="yes" context="migrationwarndialog|MigrationWarnDialog">Would you like to migrate to Firebird now?</property>
<child internal-child="vbox">
<object class="GtkBox">
<property name="can_focus">False</property>
@@ -16,13 +18,13 @@
<child internal-child="action_area">
<object class="GtkButtonBox">
<property name="can_focus">False</property>
- <property name="layout_style">end</property>
<child>
<object class="GtkButton" id="yes">
- <property name="label" translatable="yes" context="migrationwarndialog|yes">yes</property>
+ <property name="label">gtk-yes</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">True</property>
@@ -31,11 +33,12 @@
</packing>
</child>
<child>
- <object class="GtkButton" id="later">
- <property name="label" translatable="yes" context="migrationwarndialog|later">later</property>
+ <object class="GtkButton" id="no">
+ <property name="label" translatable="yes" context="migrationwarndialog|later">_Later</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">True</property>
@@ -50,24 +53,14 @@
<property name="position">0</property>
</packing>
</child>
- <child>
- <object class="GtkLabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="migrationwarndialog|dialogmessage">The document contains embedded HSQL data, which is deprecated.
-Would you like to migrate to Firebird now?</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
</object>
</child>
<action-widgets>
<action-widget response="-5">yes</action-widget>
- <action-widget response="-6">later</action-widget>
+ <action-widget response="-6">no</action-widget>
</action-widgets>
+ <child>
+ <placeholder/>
+ </child>
</object>
</interface>
commit 201ec4edb0bb8e0baad04ee3a1a19bdef29e2c2b
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue Apr 17 09:38:45 2018 +0300
No need to restrict optimization to -O1 level
Works fine with -O2 as far as I see. At least with current Xcode.
Change-Id: Id28e1bb905efffa3e3b548eb34f3455c8a021f63
Reviewed-on: https://gerrit.libreoffice.org/53041
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Tor Lillqvist <tml at collabora.com>
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 781af67f2268..37ff092ef4cb 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -22,8 +22,6 @@ export VCL_HIDE_WINDOWS=1
gb_SDKDIR := $(MACOSX_SDK_PATH)
-gb_COMPILEROPTFLAGS := -O1
-
include $(GBUILDDIR)/platform/com_GCC_defs.mk
# Darwin mktemp -t expects a prefix, not a pattern
More information about the Libreoffice-commits
mailing list