Mon May 21 12:22:19 UTC 2018

Rebased ref, commits from common ancestor:
commit 8d6a00d879f6cdbe6ead36552ef749367f86b299
Author: Olivier Hallot <olivier.hallot at libreoffice.org>
Date:   Thu May 17 15:46:18 2018 -0300

    Updated core
    Project: help  28138ff018a1ee48dc659b6d0ef0073b0a00a14e
    
    tdf#115599 Add signature line help page
    
    Refactor digital signatures help pages.
    
    Fix some typos.
    And more typos
    
    Change-Id: I2db4e3a73fcdd716d32e6c271205d0ae12c28975
    Reviewed-on: https://gerrit.libreoffice.org/54502
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Olivier Hallot <olivier.hallot at libreoffice.org>

diff --git a/helpcontent2 b/helpcontent2
index e819fccbbc0f..28138ff018a1 160000
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit e819fccbbc0fd5430f5d99e575f648a89a97007e
+Subproject commit 28138ff018a1ee48dc659b6d0ef0073b0a00a14e
commit b00dea44c3210901ac70b8ad86fdbac8384837a6
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat May 19 14:58:20 2018 +0100

    ofz#8375 Abrt
    
    Change-Id: I2793ff9512bd651e1446bc9a99e1312164c96b7f
    Reviewed-on: https://gerrit.libreoffice.org/54564
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/starmath/source/mathtype.cxx b/starmath/source/mathtype.cxx
index 2d25623bdc8b..611ea68d3019 100644
--- a/starmath/source/mathtype.cxx
+++ b/starmath/source/mathtype.cxx
@@ -2723,7 +2723,8 @@ bool MathType::HandleTemplate(int nLevel, sal_uInt8 &rSelector,
 
     if (bRemove)
     {
-        rRet.remove(rLastTemplateBracket, 1);
+        if (rLastTemplateBracket < rRet.getLength())
+            rRet.remove(rLastTemplateBracket, 1);
         rRet.append("} ");
         rLastTemplateBracket = -1;
     }
commit c488328fd27a883e730d1eda47c4a4d2c07f3585
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Sat May 19 15:55:40 2018 +0200

    explicitly enable avahi
    
    Change-Id: I8d3c639bfeb6797a5d61ea21e55ac23da1504120

diff --git a/distro-configs/LibreOfficeLinux.conf b/distro-configs/LibreOfficeLinux.conf
index 711d6c3aca6e..c0b43e16b087 100644
--- a/distro-configs/LibreOfficeLinux.conf
+++ b/distro-configs/LibreOfficeLinux.conf
@@ -16,6 +16,7 @@
 --with-external-thes-dir=/usr/share/mythes
 --with-external-hyph-dir=/usr/share/hyphen
 --with-external-dict-dir=/usr/share/hunspell
+--enable-avahi
 --enable-dbus
 --enable-extension-integration
 --enable-odk
commit bc6dd64fe2d8347e20ef4d560024c5e861f07aca
Author: Armin Le Grand <Armin.Le.Grand at cib.de>
Date:   Fri May 18 20:08:39 2018 +0200

    tdf#117506: Add using correct StyleSheet on ::Clone
    
    There was an error/missing implementation on Cloning
    SdrPage(s)/SdrObject(s) to a new target-SdrModel. See
    comments in the code-change and in the tdf-task for more
    info.
    
    Change-Id: Ibe673a4b14e1c44102f80f05ebbeae5b6a1bae8f
    Reviewed-on: https://gerrit.libreoffice.org/54555
    Reviewed-by: Armin Le Grand <Armin.Le.Grand at cib.de>
    Tested-by: Armin Le Grand <Armin.Le.Grand at cib.de>

diff --git a/svx/source/sdr/properties/attributeproperties.cxx b/svx/source/sdr/properties/attributeproperties.cxx
index 7367abfbcb3d..424f4b49291d 100644
--- a/svx/source/sdr/properties/attributeproperties.cxx
+++ b/svx/source/sdr/properties/attributeproperties.cxx
@@ -179,28 +179,45 @@ namespace sdr
         {
             SfxStyleSheet* pTargetStyleSheet(rProps.GetStyleSheet());
 
-            if(pTargetStyleSheet && &rObj.getSdrModelFromSdrObject() != &GetSdrObject().getSdrModelFromSdrObject())
+            if(pTargetStyleSheet &&
+                &rObj.getSdrModelFromSdrObject() != &rProps.GetSdrObject().getSdrModelFromSdrObject())
             {
-                // TTTT It is a clone to another model, thus the TargetStyleSheet
-                // is probably also from another SdrModel, so do *not* simply use it.
-                //
-                // The DefaultProperties::Clone already has cloned the ::SET items
-                // to a new SfxItemSet in the new SfxItemPool. There are quite some
-                // possibilities to continue:
-                // - Do not use StyleSheet (will do this for now)
-                // - Search for same StyleSheet in Target-SdrModel and use if found
-                //   (use e.g. Name)
-                // - Clone used StyleSheet(s) to Target-SdrModel and use
-                // - Set all Attributes from the StyleSheet as hard attributes at the
-                //   SfxItemSet
-                // The original AW080 uses 'ImpModelChange' (see there) which Clones
-                // and uses the used StyleSheets if there is a Target-SfxItemPool
-                // and sets to hard attributes if not. This may be used later if needed,
-                // but for now only a single UnitTest uses this Clone-scenario and works
-                // well with not using the TargetStyleSheet. The logic Cloning
-                // StyleSheets *should* - if needed - be on a higher level where it is
-                // potentially better known what would be the correct thing to do.
+                // tdf#117506
+                // The error shows that it is definitely necessary to solve this problem.
+                // Interestingly I already had a note here for 'work needed'.
+                // Checked in libreoffice-6-0 what happened there. In principle, the whole
+                // ::Clone of SdrPage and SdrObject happened in the same SdrModel, only
+                // afterwards a ::SetModel was used at the cloned SdrPage which went through
+                // all layers. The StyleSheet-problem was solved in
+                // AttributeProperties::MoveToItemPool at the end. There, a StyleSheet with the
+                // same name was searched for in the target-SdrModel.
+                // Start by retetting the current TargetStyleSheet so that nothing goes wrong
+                // when we do not find a fitting TargetStyleSheet.
+                // Note: The test for SdrModelChange above was wrong (compared the already set
+                // new SdrObject), so this never triggered and pTargetStyleSheet was never set to
+                // nullptr before. This means that a StyleSheet from another SdrModel was used
+                // what of course is very dangerous. Interestingly did not crash since when that
+                // other SdrModel was destroyed the ::Notify mechanism still worked reliably
+                // and de-connected this Properties successfully from the alien-StyleSheet.
                 pTargetStyleSheet = nullptr;
+
+                // Check if we have a TargetStyleSheetPool at the target-SdrModel. This *should*
+                // be the case already (SdrModel::Merge and SdDrawDocument::InsertBookmarkAsPage)
+                // have already cloned the StyleSheets to the target-SdrModel.
+                // If none is found, ImpGetDefaultStyleSheet will be used to set a 'default'
+                // StyleSheet as StyleSheet (that's what happened in the task, thus the FillStyle
+                // changed to the 'default' Blue).
+                SfxStyleSheetBasePool* pTargetStyleSheetPool(rObj.getSdrModelFromSdrObject().GetStyleSheetPool());
+
+                if(nullptr != pTargetStyleSheetPool)
+                {
+                    // If we have a TargetStyleSheetPool, search for the StyleSheet used
+                    // in the original Properties in the source-SdrModel.
+                    pTargetStyleSheet = dynamic_cast< SfxStyleSheet* >(
+                        pTargetStyleSheetPool->Find(
+                            rProps.GetStyleSheet()->GetName(),
+                            SfxStyleFamily::All));
+                }
             }
 
             if(pTargetStyleSheet)
commit ff590683f9ac5956d95c519cb54b4ea5634dcb63
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Wed May 16 08:50:47 2018 +0100

    Revert "tools: test Pair"
    
    This reverts commit 99dbaba70afb91ed3961f9ff627c35bf54d66bef.
    
    Let's land this again once Stephan's comments in
       https://gerrit.libreoffice.org/#/c/54189/
    have been addressed
    
    Change-Id: I4230e4ce59a46379548bb510e433c68b021e896c
    Reviewed-on: https://gerrit.libreoffice.org/54414
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/include/tools/Pair.hxx b/include/tools/Pair.hxx
deleted file mode 100644
index 87fdd810c88f..000000000000
--- a/include/tools/Pair.hxx
+++ /dev/null
@@ -1,80 +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. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_TOOLS_PAIR_HXX
-#define INCLUDED_TOOLS_PAIR_HXX
-
-#include <tools/toolsdllapi.h>
-
-class Point;
-class Size;
-class SvStream;
-
-namespace rtl
-{
-class OString;
-}
-
-class SAL_WARN_UNUSED Pair
-{
-public:
-    Pair()
-        : nA(0)
-        , nB(0)
-    {
-    }
-    Pair(long _nA, long _nB)
-        : nA(_nA)
-        , nB(_nB)
-    {
-    }
-
-    long A() const { return nA; }
-    long B() const { return nB; }
-
-    long& A() { return nA; }
-    long& B() { return nB; }
-
-    TOOLS_DLLPUBLIC rtl::OString toString() const;
-    TOOLS_DLLPUBLIC friend SvStream& ReadPair(SvStream& rIStream, Pair& rPair);
-    TOOLS_DLLPUBLIC friend SvStream& WritePair(SvStream& rOStream, const Pair& rPair);
-
-protected:
-    long nA;
-    long nB;
-};
-
-namespace tools
-{
-namespace detail
-{
-// Used to implement operator == for subclasses of Pair:
-inline bool equal(Pair const& p1, Pair const& p2) { return p1.A() == p2.A() && p1.B() == p2.B(); }
-
-} // namespace detail
-} // namespace tools
-
-SAL_DLLPUBLIC_EXPORT SvStream& ReadPair(SvStream& rIStream, Point& v);
-SAL_DLLPUBLIC_EXPORT SvStream& WritePair(SvStream& rOStream, const Point& v);
-SAL_DLLPUBLIC_EXPORT SvStream& ReadPair(SvStream& rIStream, Size& v);
-SAL_DLLPUBLIC_EXPORT SvStream& WritePair(SvStream& rOStream, const Size& v);
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/tools/gen.hxx b/include/tools/gen.hxx
index 1b117a642e6b..90486536c401 100644
--- a/include/tools/gen.hxx
+++ b/include/tools/gen.hxx
@@ -20,7 +20,6 @@
 #define INCLUDED_TOOLS_GEN_HXX
 
 #include <tools/toolsdllapi.h>
-#include <tools/Pair.hxx>
 
 #include <limits.h>
 #include <algorithm>
@@ -35,6 +34,39 @@ namespace rtl
 
 enum TriState { TRISTATE_FALSE, TRISTATE_TRUE, TRISTATE_INDET };
 
+// Pair
+
+class SAL_WARN_UNUSED Pair
+{
+public:
+                        Pair() : nA(0), nB(0) {}
+                        Pair( long _nA, long _nB ) : nA(_nA), nB(_nB) {}
+
+    long                A() const { return nA; }
+    long                B() const { return nB; }
+
+    long&               A() { return nA; }
+    long&               B() { return nB; }
+
+    TOOLS_DLLPUBLIC rtl::OString        toString() const;
+    TOOLS_DLLPUBLIC friend SvStream&    ReadPair( SvStream& rIStream, Pair& rPair );
+    TOOLS_DLLPUBLIC friend SvStream&    WritePair( SvStream& rOStream, const Pair& rPair );
+
+protected:
+    long                nA;
+    long                nB;
+};
+
+namespace tools { namespace detail {
+
+// Used to implement operator == for subclasses of Pair:
+inline bool equal(Pair const & p1, Pair const & p2)
+{
+    return p1.A() == p2.A() && p1.B() == p2.B();
+}
+
+} }
+
 // Point
 
 class Size;
@@ -712,6 +744,11 @@ inline std::basic_ostream<charT, traits> & operator <<(
                       << "@(" << rectangle.getX() << ',' << rectangle.getY() << ")";
 }
 
+inline SvStream& ReadPair( SvStream& rIStream, Point& v ) { return ReadPair(rIStream, v.toPair()); }
+inline SvStream& WritePair( SvStream& rOStream, const Point& v ) { return WritePair(rOStream, v.toPair()); }
+inline SvStream& ReadPair( SvStream& rIStream, Size& v ) { return ReadPair(rIStream, v.toPair()); }
+inline SvStream& WritePair( SvStream& rOStream, const Size& v ) { return WritePair(rOStream, v.toPair()); }
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/tools/CppunitTest_tools_test.mk b/tools/CppunitTest_tools_test.mk
index ad393f8347c6..7cf5657e68ec 100644
--- a/tools/CppunitTest_tools_test.mk
+++ b/tools/CppunitTest_tools_test.mk
@@ -28,7 +28,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,tools_test, \
     tools/qa/cppunit/test_minmax \
     tools/qa/cppunit/test_100mm2twips \
     tools/qa/cppunit/test_fround \
-    tools/qa/cppunit/test_pair \
 ))
 
 $(eval $(call gb_CppunitTest_use_sdk_api,tools_test))
diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk
index 539bee3e5b2a..c524a38084aa 100644
--- a/tools/Library_tl.mk
+++ b/tools/Library_tl.mk
@@ -57,7 +57,6 @@ $(eval $(call gb_Library_add_exception_objects,tl,\
     tools/source/generic/config \
     tools/source/generic/fract \
     tools/source/generic/gen \
-	tools/source/generic/pair \
     tools/source/generic/line \
     tools/source/generic/point \
     tools/source/generic/poly \
diff --git a/tools/qa/cppunit/test_pair.cxx b/tools/qa/cppunit/test_pair.cxx
deleted file mode 100644
index 31812963f754..000000000000
--- a/tools/qa/cppunit/test_pair.cxx
+++ /dev/null
@@ -1,126 +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. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <sal/types.h>
-#include <cppunit/TestFixture.h>
-#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/plugin/TestPlugIn.h>
-
-#include <tools/stream.hxx>
-#include <tools/Pair.hxx>
-
-namespace tools
-{
-class PairTest : public CppUnit::TestFixture
-{
-public:
-    void testPair()
-    {
-        long nExpectedA = 0;
-        long nExpectedB = 0;
-        long nActualA = 0;
-        long nActualB = 0;
-
-        {
-            Pair aPair;
-            nActualA = aPair.A();
-            nActualB = aPair.B();
-
-            CPPUNIT_ASSERT_EQUAL(nExpectedA, nActualA);
-            CPPUNIT_ASSERT_EQUAL(nExpectedB, nActualB);
-        }
-
-        {
-            Pair aPair(1, 2);
-            nExpectedA = 1;
-            nExpectedB = 2;
-            nActualA = aPair.A();
-            nActualB = aPair.B();
-
-            CPPUNIT_ASSERT_EQUAL(nExpectedA, nActualA);
-            CPPUNIT_ASSERT_EQUAL(nExpectedB, nActualB);
-        }
-    }
-
-    void testToString()
-    {
-        OString sExpectedString("1, 2");
-        Pair aPair(1, 2);
-        CPPUNIT_ASSERT_EQUAL(sExpectedString, aPair.toString());
-    }
-
-    void testReadStream()
-    {
-        TestPair* pData = new TestPair(1, 2);
-        SvMemoryStream aMemStm(pData, 8, StreamMode::READ);
-
-        Pair aPair;
-        ReadPair(aMemStm, aPair);
-
-        sal_Int32 nExpectedA = 1;
-        sal_Int32 nExpectedB = 2;
-        sal_Int32 nActualA = aPair.A();
-        sal_Int32 nActualB = aPair.B();
-
-        CPPUNIT_ASSERT_EQUAL(nExpectedA, nActualA);
-        CPPUNIT_ASSERT_EQUAL(nExpectedB, nActualB);
-    }
-
-    void testWriteStream()
-    {
-        SvMemoryStream aMemStm;
-
-        WritePair(aMemStm, Pair(1, 2));
-
-        Pair aPair;
-        aMemStm.Seek(0); // reset to the beginning of the stream
-        ReadPair(aMemStm, aPair);
-
-        sal_Int32 nExpectedA = 1;
-        sal_Int32 nExpectedB = 2;
-        sal_Int32 nActualA = aPair.A();
-        sal_Int32 nActualB = aPair.B();
-
-        CPPUNIT_ASSERT_EQUAL(nExpectedA, nActualA);
-        CPPUNIT_ASSERT_EQUAL(nExpectedB, nActualB);
-    }
-
-    CPPUNIT_TEST_SUITE(PairTest);
-    CPPUNIT_TEST(testPair);
-    CPPUNIT_TEST(testToString);
-    CPPUNIT_TEST(testReadStream);
-    CPPUNIT_TEST(testWriteStream);
-    CPPUNIT_TEST_SUITE_END();
-
-private:
-    struct TestPair
-    {
-        sal_Int32 mnA;
-        sal_Int32 mnB;
-
-        TestPair(sal_Int32 nA, sal_Int32 nB)
-            : mnA(nA)
-            , mnB(nB){};
-    };
-};
-
-CPPUNIT_TEST_SUITE_REGISTRATION(PairTest);
-} // namespace tools
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/tools/source/generic/pair.cxx b/tools/source/generic/pair.cxx
deleted file mode 100644
index 6e998592ce5d..000000000000
--- a/tools/source/generic/pair.cxx
+++ /dev/null
@@ -1,28 +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. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <tools/gen.hxx>
-#include <tools/Pair.hxx>
-
-SvStream& ReadPair(SvStream& rIStream, Point& v) { return ReadPair(rIStream, v.toPair()); }
-SvStream& WritePair(SvStream& rOStream, const Point& v) { return WritePair(rOStream, v.toPair()); }
-SvStream& ReadPair(SvStream& rIStream, Size& v) { return ReadPair(rIStream, v.toPair()); }
-SvStream& WritePair(SvStream& rOStream, const Size& v) { return WritePair(rOStream, v.toPair()); }
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit c72280c1e9a77e0175d8bb2452ee6a535aa8fb99
Author: Gabor Kelemen <kelemeng at ubuntu.com>
Date:   Mon May 14 00:35:50 2018 +0200

    tdf#42949 Fix IWYU warnings in sc/inc/l*
    
    Found with bin/find-unneeded-includes
    Only removal proposals are dealt with here.
    
    Change-Id: Ib19d239ac3f48192461aeeb1b1456bda986c11e3
    Reviewed-on: https://gerrit.libreoffice.org/54462
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/sc/inc/lookupcache.hxx b/sc/inc/lookupcache.hxx
index 0997f6542811..fa55c2bcbced 100644
--- a/sc/inc/lookupcache.hxx
+++ b/sc/inc/lookupcache.hxx
@@ -21,8 +21,6 @@
 #define INCLUDED_SC_INC_LOOKUPCACHE_HXX
 
 #include "address.hxx"
-#include "global.hxx"
-#include <formula/token.hxx>
 #include <svl/listener.hxx>
 
 #include <unordered_map>
commit d20cf3e4b61ec05a39da5079a17234653d9c45c6
Author: andreas kainz <kainz.a at gmail.com>
Date:   Sat May 19 10:22:14 2018 +0200

    NB Calc update IDs
    
    Change-Id: Ia117cf44d0a7be5798be1fb51c63003b8c64bc86
    Reviewed-on: https://gerrit.libreoffice.org/54561
    Reviewed-by: andreas_kainz <kainz.a at gmail.com>
    Tested-by: andreas_kainz <kainz.a at gmail.com>

diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui b/sc/uiconfig/scalc/ui/notebookbar.ui
index 8d18c754b15d..8021bf50a3ec 100644
--- a/sc/uiconfig/scalc/ui/notebookbar.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar.ui
@@ -4580,7 +4580,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="DataDataPilotRun">
+                              <object class="GtkToolButton" id="Insert-DataDataPilotRun">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="margin_left">5</property>
@@ -4592,7 +4592,7 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkToolButton" id="FunctionBox">
+                              <object class="GtkToolButton" id="Insert-FunctionBox">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:FunctionBox</property>
@@ -4647,7 +4647,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="InsertObjectChart">
+                              <object class="GtkToolButton" id="Insert-InsertObjectChart">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:InsertObjectChart</property>
@@ -4677,7 +4677,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="InsertObjectChartFromFile">
+                                  <object class="GtkToolButton" id="Insert-InsertObjectChartFromFile">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:InsertObjectChartFromFile</property>
@@ -4701,7 +4701,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="InsertObject">
+                                  <object class="GtkToolButton" id="Insert-InsertObject">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:InsertObject</property>
@@ -4763,7 +4763,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="InsertGraphic1">
+                              <object class="GtkToolButton" id="Insert-InsertGraphic">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:InsertGraphic</property>
@@ -4793,7 +4793,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="Gallery">
+                                  <object class="GtkToolButton" id="Insert-Gallery">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:Gallery</property>
@@ -4817,7 +4817,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="InsertAVMedia">
+                                  <object class="GtkToolButton" id="Insert-InsertAVMedia">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:InsertAVMedia</property>
@@ -4879,7 +4879,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="HyperlinkDialog">
+                              <object class="GtkToolButton" id="Insert-HyperlinkDialog">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:HyperlinkDialog</property>
@@ -4909,7 +4909,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="AddName">
+                                  <object class="GtkToolButton" id="Insert-AddName">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:AddName</property>
@@ -4933,7 +4933,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="DefineName">
+                                  <object class="GtkToolButton" id="Insert-DefineName">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:DefineName</property>
@@ -5047,7 +5047,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="DrawText4">
+                              <object class="GtkToolButton" id="Insert-DrawText">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:DrawText</property>
@@ -5077,7 +5077,7 @@
                                 <property name="toolbar_style">icons</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="Line2">
+                                  <object class="GtkToolButton" id="Insert-Line">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:Line</property>
@@ -5088,7 +5088,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkToolButton" id="Polygon_Unfilled2">
+                                  <object class="GtkToolButton" id="Insert-Polygon_Unfilled">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:Polygon_Unfilled</property>
@@ -5099,7 +5099,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkToolButton" id="Bezier_Unfilled1">
+                                  <object class="GtkToolButton" id="Insert-Bezier_Unfilled">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:Bezier_Unfilled</property>
@@ -5110,7 +5110,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkToolButton" id="ArrowsToolbox1">
+                                  <object class="GtkToolButton" id="Insert-ArrowsToolbox">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ArrowsToolbox</property>
@@ -5134,7 +5134,7 @@
                                 <property name="toolbar_style">icons</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="rectangle2">
+                                  <object class="GtkToolButton" id="Insert-BasicShapes.rectangle">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:BasicShapes.rectangle</property>
@@ -5145,7 +5145,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkToolButton" id="BasicShapes.round-rectangle1">
+                                  <object class="GtkToolButton" id="Insert-BasicShapes.round-rectangle">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:BasicShapes.round-rectangle</property>
@@ -5156,7 +5156,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkToolButton" id="ellipse2">
+                                  <object class="GtkToolButton" id="Insert-BasicShapes.ellipse">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:BasicShapes.ellipse</property>
@@ -5167,7 +5167,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkToolButton" id="LineToolbox1">
+                                  <object class="GtkToolButton" id="Insert-LineToolbox">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:LineToolbox</property>
@@ -5233,7 +5233,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="BasicShapes3">
+                                  <object class="GtkToolButton" id="Insert-BasicShapes">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:BasicShapes</property>
@@ -5244,7 +5244,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkToolButton" id="SymbolShapes3">
+                                  <object class="GtkToolButton" id="Insert-SymbolShapes">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:SymbolShapes</property>
@@ -5255,7 +5255,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkToolButton" id="ArrowShapes3">
+                                  <object class="GtkToolButton" id="Insert-ArrowShapes">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ArrowShapes</property>
@@ -5277,7 +5277,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="StarShapes3">
+                                  <object class="GtkToolButton" id="Insert-StarShapes">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:StarShapes</property>
@@ -5288,7 +5288,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkToolButton" id="CalloutShapes3">
+                                  <object class="GtkToolButton" id="Insert-CalloutShapes">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:CalloutShapes</property>
@@ -5299,7 +5299,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkToolButton" id="FlowChartShapes2">
+                                  <object class="GtkToolButton" id="Insert-FlowChartShapes">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:FlowChartShapes</property>
@@ -5364,7 +5364,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="InsertGraphic2">
+                              <object class="GtkToolButton" id="Insert-InsertSymbol">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:InsertSymbol</property>
@@ -5394,7 +5394,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="InsertObjectStarMath2">
+                                  <object class="GtkToolButton" id="Insert-InsertObjectStarMath">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:InsertObjectStarMath</property>
@@ -5418,7 +5418,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="EmojiControl2">
+                                  <object class="GtkToolButton" id="Insert-EmojiControl">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:EmojiControl</property>
@@ -5519,7 +5519,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">1</property>
                             <child>
-                              <object class="GtkToolButton" id="InsertDraw">
+                              <object class="GtkToolButton" id="Insert-InsertDraw">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="valign">center</property>
@@ -5606,7 +5606,7 @@
                         <property name="vexpand">True</property>
                         <property name="orientation">vertical</property>
                         <child>
-                          <object class="svtlo-ManagedMenuButton" id="reviewb:MenuPage">
+                          <object class="svtlo-ManagedMenuButton" id="Layout-LayoutButton:MenuPage">
                             <property name="label" translatable="yes" context="notebookbar|reviewb">Pag_e</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
@@ -5633,7 +5633,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">1</property>
                             <child>
-                              <object class="GtkToolButton" id="PageFormatDialog1">
+                              <object class="GtkToolButton" id="Layout-PageFormatDialog">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:PageFormatDialog</property>
@@ -5714,7 +5714,7 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkToolButton" id="EditHeaderAndFooter">
+                              <object class="GtkToolButton" id="Layout-EditHeaderAndFooter">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:EditHeaderAndFooter</property>
@@ -5744,7 +5744,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="InsertBreak2">
+                                  <object class="GtkToolButton" id="Layout-NormalViewMode">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="halign">start</property>
@@ -5769,7 +5769,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="InsertPagebreak2">
+                                  <object class="GtkToolButton" id="Layout-PagebreakMode">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:PagebreakMode</property>
@@ -5829,7 +5829,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="DefinePrintArea">
+                              <object class="GtkToolButton" id="Layout-DefinePrintArea">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="valign">center</property>
@@ -5864,7 +5864,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="EditPrintArea">
+                                  <object class="GtkToolButton" id="Layout-EditPrintArea">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="valign">center</property>
@@ -5892,7 +5892,7 @@
                                 <property name="toolbar_style">icons</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="AddPrintArea">
+                                  <object class="GtkToolButton" id="Layout-AddPrintArea">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="valign">center</property>
@@ -5905,7 +5905,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkToolButton" id="DeletePrintArea">
+                                  <object class="GtkToolButton" id="Layout-DeletePrintArea">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="valign">center</property>
@@ -5970,7 +5970,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="AutoFormat">
+                              <object class="GtkToolButton" id="Layout-AutoFormat">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:AutoFormat</property>
@@ -6031,7 +6031,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="SelectObject2">
+                                  <object class="GtkToolButton" id="Layout-SelectObject">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:SelectObject</property>
@@ -6055,7 +6055,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="FormatGroup2">
+                                  <object class="GtkToolButton" id="Layout-FormatGroup">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:FormatGroup</property>
@@ -6123,7 +6123,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="ToggleObjectRotateMode">
+                                  <object class="GtkToolButton" id="Layout-ToggleObjectRotateMode">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ToggleObjectRotateMode</property>
@@ -6147,7 +6147,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkMenuToolButton" id="ObjectAlign">
+                                  <object class="GtkMenuToolButton" id="Layout-ObjectAlign">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="has_tooltip">True</property>
@@ -6218,7 +6218,7 @@
                                 <property name="toolbar_style">icons</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="AlignBottom5">
+                                  <object class="GtkToolButton" id="Layout-ObjectForwardOne">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ObjectForwardOne</property>
@@ -6229,7 +6229,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkToolButton" id="BringToFront4">
+                                  <object class="GtkToolButton" id="Layout-BringToFront">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:BringToFront</property>
@@ -6253,7 +6253,7 @@
                                 <property name="toolbar_style">icons</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="ObjectBackOne3">
+                                  <object class="GtkToolButton" id="Layout-ObjectBackOne">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ObjectBackOne</property>
@@ -6264,7 +6264,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkToolButton" id="SendToBack3">
+                                  <object class="GtkToolButton" id="Layout-SendToBack">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:SendToBack</property>
@@ -6367,7 +6367,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="InsertExternalDataSource">
+                              <object class="GtkToolButton" id="Data-InsertExternalDataSource">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:InsertExternalDataSource</property>
@@ -6378,7 +6378,7 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkToolButton" id="DataStreams1">
+                              <object class="GtkToolButton" id="Data-DataStreams">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:DataStreams</property>
@@ -6411,7 +6411,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="DataProvider1">
+                                  <object class="GtkToolButton" id="Data-DataProvider">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:DataProvider</property>
@@ -6437,7 +6437,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="ManageXMLSource1">
+                                  <object class="GtkToolButton" id="Data-ManageXMLSource">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ManageXMLSource</property>
@@ -6499,7 +6499,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="Calculate1">
+                              <object class="GtkToolButton" id="Data-Calculate">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:Calculate</property>
@@ -6532,7 +6532,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="RecalcPivotTable">
+                                  <object class="GtkToolButton" id="Data-RecalcPivotTable">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:RecalcPivotTable</property>
@@ -6558,7 +6558,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="DataProviderRefresh">
+                                  <object class="GtkToolButton" id="Data-DataProviderRefresh">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:DataProviderRefresh</property>
@@ -6623,7 +6623,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="DataSort">
+                              <object class="GtkToolButton" id="Data-DataSort">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:DataSort</property>
@@ -6656,7 +6656,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="SortAscending1">
+                                  <object class="GtkToolButton" id="Data-SortAscending">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:SortAscending</property>
@@ -6682,7 +6682,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="SortDescending1">
+                                  <object class="GtkToolButton" id="Data-SortDescending">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:SortDescending</property>
@@ -6747,7 +6747,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="DataFilterAutoFilter1">
+                              <object class="GtkToolButton" id="Data-DataFilterAutoFilter">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:DataFilterAutoFilter</property>
@@ -6780,7 +6780,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="DataFilterStandardFilter1">
+                                  <object class="GtkToolButton" id="Data-DataFilterStandardFilter">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:DataFilterStandardFilter</property>
@@ -6806,7 +6806,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="DataFilterHideAutoFilter">
+                                  <object class="GtkToolButton" id="Data-DataFilterHideAutoFilter">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:DataFilterHideAutoFilter</property>
@@ -6871,7 +6871,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="Group">
+                              <object class="GtkToolButton" id="Data-Group">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:Group</property>
@@ -6904,7 +6904,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="AutoOutline">
+                                  <object class="GtkToolButton" id="Data-AutoOutline">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:AutoOutline</property>
@@ -6930,7 +6930,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="Ungroup">
+                                  <object class="GtkToolButton" id="Data-Ungroup">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:Ungroup</property>
@@ -6970,7 +6970,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="HideDetail">
+                                  <object class="GtkToolButton" id="Data-HideDetail">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:HideDetail</property>
@@ -6996,7 +6996,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="ShowDetail">
+                                  <object class="GtkToolButton" id="Data-ShowDetail">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ShowDetail</property>
@@ -7061,7 +7061,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="DefineDBName">
+                              <object class="GtkToolButton" id="Data-DefineDBName">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:DefineDBName</property>
@@ -7094,7 +7094,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="SelectDB">
+                                  <object class="GtkToolButton" id="Data-SelectDB">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:SelectDB</property>
@@ -7120,7 +7120,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="DataAreaRefresh">
+                                  <object class="GtkToolButton" id="Data-DataAreaRefresh">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:DataAreaRefresh</property>
@@ -7185,7 +7185,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="TextToColumns">
+                              <object class="GtkToolButton" id="Data-TextToColumns">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:TextToColumns</property>
@@ -7232,7 +7232,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
-                          <object class="svtlo-ManagedMenuButton" id="data:MenuStatistic">
+                          <object class="svtlo-ManagedMenuButton" id="Data-StatisticsMenu:MenuStatistic">
                             <property name="label" translatable="yes" context="notebookbar|Statistics">_Statistics</property>
                             <property name="width_request">80</property>
                             <property name="visible">True</property>
@@ -7327,7 +7327,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">1</property>
                             <child>
-                              <object class="GtkToolButton" id="SearchDialog3">
+                              <object class="GtkToolButton" id="Data-SearchDialog">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:SearchDialog</property>
@@ -7338,7 +7338,7 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkToolButton" id="SortAscending4">
+                              <object class="GtkToolButton" id="SortAscending">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="valign">center</property>
@@ -7350,7 +7350,7 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkToolButton" id="DataFilterAutoFilter4">
+                              <object class="GtkToolButton" id="DataFilterAutoFilter">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="valign">center</property>
@@ -7442,7 +7442,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="SpellDialog">
+                              <object class="GtkToolButton" id="Review-SpellDialog">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:SpellDialog</property>
@@ -7453,7 +7453,7 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkToolButton" id="ThesaurusDialog3">
+                              <object class="GtkToolButton" id="Review-ThesaurusDialog">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:ThesaurusDialog</property>
@@ -7484,7 +7484,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="SpellOnline1">
+                                  <object class="GtkToolButton" id="Review-SpellOnline">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:SpellOnline</property>
@@ -7508,7 +7508,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="Hyphenate2">
+                                  <object class="GtkToolButton" id="Review-Hyphenate">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:Hyphenate</property>
@@ -7570,7 +7570,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="InsertAnnotation1">
+                              <object class="GtkToolButton" id="Review-InsertAnnotation">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:InsertAnnotation</property>
@@ -7581,7 +7581,7 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkToolButton" id="EditAnnotation1">
+                              <object class="GtkToolButton" id="Review-EditAnnotation">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:EditAnnotation</property>
@@ -7614,7 +7614,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="ShowAllNotes">
+                                  <object class="GtkToolButton" id="Review-ShowAllNotes">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ShowAllNotes</property>
@@ -7640,7 +7640,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="HideAllNotes">
+                                  <object class="GtkToolButton" id="Review-HideAllNotes">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:HideAllNotes</property>
@@ -7680,7 +7680,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="DeleteNote">
+                                  <object class="GtkToolButton" id="Review-DeleteNote">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:DeleteNote</property>
@@ -7706,7 +7706,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="DeleteAllNotes">
+                                  <object class="GtkToolButton" id="Review-DeleteAllNotes">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:DeleteAllNotes</property>
@@ -7771,7 +7771,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="TraceChangeMode">
+                              <object class="GtkToolButton" id="Review-TraceChangeMode">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:TraceChangeMode</property>
@@ -7782,7 +7782,7 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkToolButton" id="AcceptChanges">
+                              <object class="GtkToolButton" id="Review-AcceptChanges">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:AcceptChanges</property>
@@ -7840,7 +7840,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="Protect">
+                              <object class="GtkToolButton" id="Review-Protect">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:Protect</property>
@@ -7871,7 +7871,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="ToolProtectionDocument">
+                                  <object class="GtkToolButton" id="Review-ToolProtectionDocument">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ToolProtectionDocument</property>
@@ -7895,7 +7895,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="ShareDocument">
+                                  <object class="GtkToolButton" id="Review-ShareDocument">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ShareDocument</property>
@@ -7933,7 +7933,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="CompareDocuments1">
+                                  <object class="GtkToolButton" id="Review-CompareDocuments">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:CompareDocuments</property>
@@ -7957,7 +7957,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="MergeDocuments1">
+                                  <object class="GtkToolButton" id="Review-MergeDocuments">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:MergeDocuments</property>
@@ -8058,7 +8058,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">1</property>
                             <child>
-                              <object class="GtkToolButton" id="AcceptChanges1">
+                              <object class="GtkToolButton" id="AcceptChanges">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="valign">center</property>
@@ -8151,7 +8151,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="NormalViewMode">
+                              <object class="GtkToolButton" id="View-NormalViewMode">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:NormalViewMode</property>
@@ -8162,7 +8162,7 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkToolButton" id="PagebreakMode">
+                              <object class="GtkToolButton" id="View-PagebreakMode">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:PagebreakMode</property>
@@ -8173,7 +8173,7 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkToolButton" id="PrintPreview2">
+                              <object class="GtkToolButton" id="View-PrintPreview">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:PrintPreview</property>
@@ -8204,7 +8204,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="ViewValueHighlighting">
+                                  <object class="GtkToolButton" id="View-ViewValueHighlighting">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ViewValueHighlighting</property>
@@ -8228,7 +8228,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="ToggleFormula">
+                                  <object class="GtkToolButton" id="View-ToggleFormula">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ToggleFormula</property>
@@ -8290,7 +8290,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="ZoomOptimal1">
+                              <object class="GtkToolButton" id="View-ZoomOptimal">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:ZoomOptimal</property>
@@ -8321,7 +8321,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="Zoom100Percent">
+                                  <object class="GtkToolButton" id="View-Zoom100Percent">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:Zoom100Percent</property>
@@ -8345,7 +8345,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="ZoomPage">
+                                  <object class="GtkToolButton" id="View-ZoomPage">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ZoomPage</property>
@@ -8383,7 +8383,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="FullScreen1">
+                                  <object class="GtkToolButton" id="View-FullScreen">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:FullScreen</property>
@@ -8407,7 +8407,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="ZoomPageWidth">
+                                  <object class="GtkToolButton" id="View-ZoomPageWidth">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ZoomPageWidth</property>
@@ -8472,7 +8472,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="FreezePanes">
+                              <object class="GtkToolButton" id="View-FreezePanes">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:FreezePanes</property>
@@ -8505,7 +8505,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="SplitWindow">
+                                  <object class="GtkToolButton" id="View-SplitWindow">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:SplitWindow</property>
@@ -8537,7 +8537,7 @@
                                     <property name="toolbar_style">icons</property>
                                     <property name="show_arrow">False</property>
                                     <child>
-                                      <object class="GtkToolButton" id="FreezePanesFirstColumn">
+                                      <object class="GtkToolButton" id="View-FreezePanesFirstColumn">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:FreezePanesFirstColumn</property>
@@ -8563,7 +8563,7 @@
                                     <property name="toolbar_style">both-horiz</property>
                                     <property name="show_arrow">False</property>
                                     <child>
-                                      <object class="GtkToolButton" id="FreezePanesFirstRow">
+                                      <object class="GtkToolButton" id="View-FreezePanesFirstRow">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:FreezePanesFirstRow</property>
@@ -8635,7 +8635,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="Sidebar2">
+                              <object class="GtkToolButton" id="View-Sidebar">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:Sidebar</property>
@@ -8668,7 +8668,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="ViewRowColumnHeaders">
+                                  <object class="GtkToolButton" id="View-ViewRowColumnHeaders">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ViewRowColumnHeaders</property>
@@ -8694,7 +8694,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="ToggleSheetGrid">
+                                  <object class="GtkToolButton" id="View-ToggleSheetGrid">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ToggleSheetGrid</property>
@@ -8734,7 +8734,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="Menubar">
+                                  <object class="GtkToolButton" id="View-Menubar">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:Menubar</property>
@@ -8760,7 +8760,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="InputLineVisible">
+                                  <object class="GtkToolButton" id="View-InputLineVisible">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:InputLineVisible</property>
@@ -8825,7 +8825,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="NewWindow1">
+                              <object class="GtkToolButton" id="View-NewWindow">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="action_name">.uno:NewWindow</property>
@@ -8919,7 +8919,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">1</property>
                             <child>
-                              <object class="GtkToolButton" id="Zoom">
+                              <object class="GtkToolButton" id="View-Zoom">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="valign">center</property>
@@ -9030,7 +9030,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">1</property>
                             <child>
-                              <object class="GtkToolButton" id="FormatArea3">
+                              <object class="GtkToolButton" id="Image-FormatArea">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="valign">center</property>
@@ -9043,7 +9043,7 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkToolButton" id="FormatLine3">
+                              <object class="GtkToolButton" id="Image-FormatLine">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="valign">center</property>
@@ -9056,7 +9056,7 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkToolButton" id="TransformDialog3">
+                              <object class="GtkToolButton" id="Image-TransformDialog">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="valign">center</property>
@@ -9130,7 +9130,7 @@
                             <property name="show_arrow">False</property>
                             <property name="icon_size">3</property>
                             <child>
-                              <object class="GtkToolButton" id="InsertCaptionDialog4">
+                              <object class="GtkToolButton" id="Image-ObjectTitleDescription">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="valign">center</property>
@@ -9162,7 +9162,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="Crop">
+                                  <object class="GtkToolButton" id="Image-Crop">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:Crop</property>
@@ -9186,7 +9186,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="SaveGraphic">
+                                  <object class="GtkToolButton" id="Image-SaveGraphic">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:SaveGraphic</property>
@@ -9223,7 +9223,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="CompressGraphic1">
+                                  <object class="GtkToolButton" id="Image-CompressGraphic">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:CompressGraphic</property>
@@ -9247,7 +9247,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="ChangePicture1">
+                                  <object class="GtkToolButton" id="Image-ChangePicture">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:ChangePicture</property>
@@ -9284,7 +9284,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="FlipHorizontal4">
+                                  <object class="GtkToolButton" id="Image-FlipHorizontal">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:FlipHorizontal</property>
@@ -9308,7 +9308,7 @@
                                 <property name="toolbar_style">both-horiz</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="FlipVertical3">
+                                  <object class="GtkToolButton" id="Image-FlipVertical">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:FlipVertical</property>
@@ -9373,7 +9373,7 @@
                                 <property name="toolbar_style">icons</property>
                                 <property name="show_arrow">False</property>
                                 <child>
-                                  <object class="GtkToolButton" id="GrafMode1">
+                                  <object class="GtkToolButton" id="Image-GrafMode">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="action_name">.uno:GrafMode</property>
@@ -9402,7 +9402,7 @@
                                     <property name="toolbar_style">both-horiz</property>
                                     <property name="show_arrow">False</property>
                                     <child>
-                                      <object class="GtkMenuToolButton" id="GraphicFilterToolbox1">
+                                      <object class="GtkMenuToolButton" id="Image-GraphicFilterToolbox">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:GraphicFilterToolbox</property>
@@ -9426,7 +9426,7 @@
                                     <property name="toolbar_style">icons</property>
                                     <property name="show_arrow">False</property>
                                     <child>
-                                      <object class="GtkToolButton" id="FormatLineD">
+                                      <object class="GtkToolButton" id="Image-FormatLineD">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="action_name">.uno:FormatLine</property>
@@ -9437,7 +9437,7 @@
                                       </packing>
                                     </child>
                                     <child>

... etc. - the rest is truncated
