[Libreoffice-commits] core.git: 3 commits - helpcompiler/source sw/source sw/uiconfig

[Jan Holesovsky]

 helpcompiler/source/HelpCompiler.cxx     |    2 +-
 sw/source/ui/dbui/mmpreparemergepage.cxx |    9 +++++----
 sw/uiconfig/swriter/ui/mmmergepage.ui    |    2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

New commits:
commit d8c02ffd0f37c946e5a07f1062390714da26b8d0
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Thu Dec 10 23:47:00 2015 +0100

    tdf#96042: Oops, fix a typo.
    
    This fixes a regression from commit 4c4999d944bbf8a34f8a320b8de6f4a325bd5d97.
    
    Change-Id: Ie8496392f4811cc1ff146d7a5c43988da0d539c2

diff --git a/helpcompiler/source/HelpCompiler.cxx b/helpcompiler/source/HelpCompiler.cxx
index 6d821e4..276394a 100644
--- a/helpcompiler/source/HelpCompiler.cxx
+++ b/helpcompiler/source/HelpCompiler.cxx
@@ -334,7 +334,7 @@ void myparser::traverse( xmlNodePtr parentNode )
 
             std::string hid;
 
-            if (branch.compare(0, 3, "hid") != 0)
+            if (branch.compare(0, 3, "hid") == 0)
             {
                 size_t index = branch.find('/');
                 if (index != std::string::npos)
commit 2ac8a544e7d22fd30c31870e5b3cbd22f52ce875
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Thu Dec 10 18:59:00 2015 +0100

    mailmerge: Make this more readable, and prefer a constructor over assignment.
    
    Change-Id: I9296964902c3490c73ecf7ee9c2a3623c195c386

diff --git a/sw/source/ui/dbui/mmpreparemergepage.cxx b/sw/source/ui/dbui/mmpreparemergepage.cxx
index 7b8d649..662f94f 100644
--- a/sw/source/ui/dbui/mmpreparemergepage.cxx
+++ b/sw/source/ui/dbui/mmpreparemergepage.cxx
@@ -123,19 +123,20 @@ void SwMailMergePrepareMergePage:: MoveHdl_Impl(Control* pCtrl)
     m_pNextPB->Enable(bValid && !bIsLast);
     m_pLastPB->Enable(bValid && !bIsLast);
     m_pExcludeCB->Check(rConfigItem.IsRecordExcluded( rConfigItem.GetResultSetPosition() ));
+
     //now the record has to be merged into the source document
     const SwDBData& rDBData = rConfigItem.GetCurrentDBData();
-    Sequence<Any> vSelection = { makeAny(rConfigItem.GetResultSetPosition()) };
-    auto aArgs(::comphelper::InitPropertySequence({
+    Sequence<Any> vSelection({ makeAny(rConfigItem.GetResultSetPosition()) });
+    svx::ODataAccessDescriptor aDescriptor(::comphelper::InitPropertySequence({
         {"Selection",        makeAny(vSelection)},
-        {"DataSourceName",  makeAny(rDBData.sDataSource)},
+        {"DataSourceName",   makeAny(rDBData.sDataSource)},
         {"Command",          makeAny(rDBData.sCommand)},
         {"CommandType",      makeAny(rDBData.nCommandType)},
         {"ActiveConnection", makeAny(rConfigItem.GetConnection().getTyped())},
         {"Filter",           makeAny(rConfigItem.GetFilter())},
         {"Cursor",           makeAny(rConfigItem.GetResultSet())}
     }));
-    svx::ODataAccessDescriptor aDescriptor(aArgs);
+
     SwWrtShell& rSh = m_pWizard->GetSwView()->GetWrtShell();
     SwMergeDescriptor aMergeDesc( DBMGR_MERGE, rSh, aDescriptor );
     rSh.GetDBManager()->MergeNew(aMergeDesc);
commit 115761cb1aa554890015aeb2062f0d645f4cb0a5
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Thu Dec 10 10:15:25 2015 +0100

    mailmerge: We are going to edit a document consisting of multiple ones.
    
    Change-Id: I31f297156c776e12b34969aad38573365d10981a

diff --git a/sw/uiconfig/swriter/ui/mmmergepage.ui b/sw/uiconfig/swriter/ui/mmmergepage.ui
index a308f1d..79ca071 100644
--- a/sw/uiconfig/swriter/ui/mmmergepage.ui
+++ b/sw/uiconfig/swriter/ui/mmmergepage.ui
@@ -59,7 +59,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="edit">
-                        <property name="label" translatable="yes">_Edit individual document...</property>
+                        <property name="label" translatable="yes">_Edit individual documents...</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>