[Libreoffice-commits] core.git: 2 commits - chart2/source cui/uiconfig solenv/sanitizers

[Caolán McNamara (via logerrit)]

 chart2/source/controller/main/ShapeController.cxx |    2 +-
 cui/uiconfig/ui/effectspage.ui                    |    8 +++++---
 solenv/sanitizers/ui/cui.suppr                    |    2 --
 3 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 0a0a413e3a9c2a7a039847d70f61a77f3774bd0c
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Oct 30 10:58:31 2019 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Oct 31 11:36:47 2019 +0100

    pChartWindow cannot be null here
    
    Change-Id: I8cd994b7d948c1c59b178e8b9b520bc76f5b5632
    Reviewed-on: https://gerrit.libreoffice.org/81759
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/chart2/source/controller/main/ShapeController.cxx b/chart2/source/controller/main/ShapeController.cxx
index 3dddcbd465c5..7f0eb271fc94 100644
--- a/chart2/source/controller/main/ShapeController.cxx
+++ b/chart2/source/controller/main/ShapeController.cxx
@@ -377,7 +377,7 @@ void ShapeController::executeDispatch_TransformDialog()
                 SfxItemSet aGeoAttr( pDrawViewWrapper->GetGeoAttrFromMarked() );
                 SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
                 ScopedVclPtr< SfxAbstractTabDialog > pDlg(
-                    pFact->CreateSvxTransformTabDialog(pChartWindow ? pChartWindow->GetFrameWeld() : nullptr, &aGeoAttr, pDrawViewWrapper));
+                    pFact->CreateSvxTransformTabDialog(pChartWindow->GetFrameWeld(), &aGeoAttr, pDrawViewWrapper));
                 if ( pDlg->Execute() == RET_OK )
                 {
                     const SfxItemSet* pOutAttr = pDlg->GetOutputItemSet();
commit 5dcf6ff6b9f4f8b33c59cc98ccde853a927bc8cd
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Oct 30 13:06:49 2019 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Oct 31 11:36:34 2019 +0100

    fix label alignment
    
    Change-Id: Ic2fa0432d5bbba6f1e520e36cada4743dcd8e4af
    Reviewed-on: https://gerrit.libreoffice.org/81770
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/cui/uiconfig/ui/effectspage.ui b/cui/uiconfig/ui/effectspage.ui
index 12ab1834f0a0..cdea5a4e2580 100644
--- a/cui/uiconfig/ui/effectspage.ui
+++ b/cui/uiconfig/ui/effectspage.ui
@@ -611,12 +611,14 @@
   <object class="GtkSizeGroup" id="sizegroup1">
     <property name="ignore_hidden">True</property>
     <widgets>
-      <widget name="fontcolorft"/>
+      <widget name="effectsft"/>
+      <widget name="reliefft"/>
+      <widget name="positionft"/>
+      <widget name="emphasisft"/>
       <widget name="label3"/>
       <widget name="label4"/>
       <widget name="label5"/>
-      <widget name="effectsft"/>
-      <widget name="reliefft"/>
+      <widget name="fontcolorft"/>
     </widgets>
   </object>
   <object class="GtkSizeGroup" id="sizegroup2">
diff --git a/solenv/sanitizers/ui/cui.suppr b/solenv/sanitizers/ui/cui.suppr
index d417663db12c..8be8a6a251d6 100644
--- a/solenv/sanitizers/ui/cui.suppr
+++ b/solenv/sanitizers/ui/cui.suppr
@@ -122,8 +122,6 @@ cui/uiconfig/ui/fmsearchdialog.ui://GtkLabel[@id='ftHint'] orphan-label
 cui/uiconfig/ui/gradientpage.ui://GtkLabel[@id='centerft'] orphan-label
 cui/uiconfig/ui/gradientpage.ui://GtkScale[@id='angleslider'] no-labelled-by
 cui/uiconfig/ui/gradientpage.ui://GtkScale[@id='borderslider'] no-labelled-by
-cui/uiconfig/ui/effectspage.ui://GtkLabel[@id='label1'] orphan-label
-cui/uiconfig/ui/effectspage.ui://GtkLabel[@id='label2'] orphan-label
 cui/uiconfig/ui/effectspage.ui://GtkLabel[@id='a11ywarning'] orphan-label
 cui/uiconfig/ui/eventsconfigpage.ui://GtkLabel[@id='label1'] orphan-label
 cui/uiconfig/ui/galleryapplyprogress.ui://GtkLabel[@id='file'] orphan-label