core.git: 2 commits - include/vcl svx/source

[Mike Kaganski (via logerrit)]

 include/vcl/builder.hxx      |    2 +-
 svx/source/svdraw/svdobj.cxx |   11 +++--------
 2 files changed, 4 insertions(+), 9 deletions(-)

New commits:
commit 859f66b6dc37e3192161e1c5cff6afbd83f3b616
Author:     Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Tue Nov 12 10:32:56 2024 +0100
Commit:     Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Tue Nov 12 12:33:06 2024 +0100

    Simplify a bit
    
    Change-Id: I970ae0afd01ceb4651c0e7bc722ac43b4e9aa0b1
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176469
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>

diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index fabc748c1975..fb1040eb6b4e 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -1834,15 +1834,10 @@ void 
SdrObject::SetOutlinerParaObject(std::optional<OutlinerParaObject> pTextObj
         return;
 
     // Don't do this during import.
-    SdrObject* pTopGroupObj = nullptr;
-    SdrObject* pParent = getParentSdrObjectFromSdrObject();
-    while(pParent)
-    {
-        pTopGroupObj = pParent;
-        pParent = pTopGroupObj->getParentSdrObjectFromSdrObject();
-    }
-    if (pTopGroupObj)
+    if (SdrObject* pTopGroupObj = getParentSdrObjectFromSdrObject())
     {
+        while (SdrObject* pParent = 
pTopGroupObj->getParentSdrObjectFromSdrObject())
+            pTopGroupObj = pParent;
         // A shape was modified, which is in a group shape. Empty the group 
shape's grab-bag,
         // which potentially contains the old text of the shapes in case of 
diagrams.
         
pTopGroupObj->SetGrabBagItem(uno::Any(uno::Sequence<beans::PropertyValue>()));
commit cb112c1730dc5adb472c48bc2b619a1713397dbe
Author:     Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Tue Nov 12 14:52:32 2024 +0500
Commit:     Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Tue Nov 12 12:32:55 2024 +0100

    Fix no-pch build
    
    After commit df3483fa74baa0ee73b981df0c106d03dc964a68 "tdf#130857
    VclBuilder: Make MenuAndId a template", 2024-11-10
    
      [CXX] vcl/jsdialog/executor.cxx
      C:\lo      C:\lo      C:\lo      C:\lo      C:\lo      with
      [
      reference_type=PopupMenu
      ]
      C:\lo      with
      [
      reference_type=PopupMenu
      ]
      C:\lo      with
      [
      reference_type=PopupMenu
      ]
    
    Change-Id: Ifa2f8e55135faf8864a157aeddcf2764f4b2db4b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176471
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>

diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx
index 8a8995482c35..9f062448d97f 100644
--- a/include/vcl/builder.hxx
+++ b/include/vcl/builder.hxx
@@ -15,6 +15,7 @@
 #include <tools/fldunit.hxx>
 #include <vcl/dllapi.h>
 #include <utility>
+#include <vcl/menu.hxx>
 #include <vcl/widgetbuilder.hxx>
 #include <vcl/window.hxx>
 #include <vcl/vclptr.hxx>
@@ -38,7 +39,6 @@ class ListBox;
 class Menu;
 class MessageDialog;
 class NumericFormatter;
-class PopupMenu;
 class SalInstanceBuilder;
 class ScreenshotTest;
 class ScrollBar;