[Libreoffice-commits] core.git: 2 commits - framework/uiconfig sw/qa

[Jan Holesovsky]

 framework/uiconfig/startmodule/menubar/menubar.xml |    9 +++++++++
 sw/qa/extras/inc/swmodeltestbase.hxx               |    6 ++++++
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx           |    9 +--------
 3 files changed, 16 insertions(+), 8 deletions(-)

New commits:
commit 5a23dee0648d5ca177e07e9da150d159fa40831f
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Tue Dec 3 12:30:45 2013 +0100

    sw unit tests: Introduce hasProperty(), make the redlining check more elegant.
    
    Change-Id: I123bdfd7f21b78cbee6db2ceb9b98c2e473415d1

diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx b/sw/qa/extras/inc/swmodeltestbase.hxx
index a5a4ed7..57d40c6 100644
--- a/sw/qa/extras/inc/swmodeltestbase.hxx
+++ b/sw/qa/extras/inc/swmodeltestbase.hxx
@@ -300,6 +300,12 @@ protected:
         return data;
     }
 
+    bool hasProperty(const uno::Reference<uno::XInterface>& obj, const OUString& name) const
+    {
+        uno::Reference<beans::XPropertySet> properties(obj, uno::UNO_QUERY_THROW);
+        return properties->getPropertySetInfo()->hasPropertyByName(name);
+    }
+
     /// Get number of paragraphs of the document.
     int getParagraphs()
     {
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index bc04e9c..0bb2359 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -1175,14 +1175,7 @@ DECLARE_OOXMLEXPORT_TEST(testBnc837302, "bnc837302.docx")
 
     // make sure we don't introduce a redlined delete in the 2nd paragraph
     xParagraph = getParagraph(2);
-    OUString aProperty;
-    try
-    {
-        // throws when not present
-        aProperty = getProperty<OUString>(getRun(xParagraph, 1), "RedlineType");
-    }
-    catch (const beans::UnknownPropertyException&) {}
-    CPPUNIT_ASSERT_EQUAL(OUString(), aProperty);
+    CPPUNIT_ASSERT_EQUAL(false, hasProperty(getRun(xParagraph, 1), "RedlineType"));
 }
 
 DECLARE_OOXMLEXPORT_TEST(testFdo68418, "fdo68418.docx")
commit fb51e1cc4090bdee6417537faa423de48bcb59d1
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Tue Dec 3 12:28:48 2013 +0100

    Start center: Re-introduce the Macros menu, people use it.
    
    Change-Id: I99da1fbbd158622933445f7e97f4266a24a2d85d

diff --git a/framework/uiconfig/startmodule/menubar/menubar.xml b/framework/uiconfig/startmodule/menubar/menubar.xml
index 1df6209..248b88c 100644
--- a/framework/uiconfig/startmodule/menubar/menubar.xml
+++ b/framework/uiconfig/startmodule/menubar/menubar.xml
@@ -30,6 +30,15 @@
     </menu:menu>
     <menu:menu menu:id=".uno:ToolsMenu">
         <menu:menupopup>
+            <menu:menu menu:id=".uno:MacrosMenu">
+                <menu:menupopup>
+                    <menu:menuitem menu:id=".uno:MacroRecorder"/>
+                    <menu:menuitem menu:id=".uno:RunMacro"/>
+                    <menu:menu menu:id=".uno:ScriptOrganizer"/>
+                    <menu:menuseparator/>
+                    <menu:menuitem menu:id=".uno:MacroOrganizer?TabId:short=1"/>
+                </menu:menupopup>
+            </menu:menu>
             <menu:menuitem menu:id="service:com.sun.star.deployment.ui.PackageManagerDialog"/>
             <menu:menuitem menu:id=".uno:OptionsTreeDialog"/>
         </menu:menupopup>