[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - cui/source cui/uiconfig

[Caolán McNamara]

 cui/source/options/optgdlg.cxx    |    1 +
 cui/uiconfig/ui/optgeneralpage.ui |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 7fb9252b7f1f060d7afa6f3959be2f25a46e096c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Apr 29 14:51:21 2014 +0100

    coverity#1210177 Uninitialized pointer field
    
    Change-Id: If4e8ddfa0a4dcb9875ce82fc82d196ff3dbd9657
    (cherry picked from commit f670aaaabf23f13ae5ebf61ba61824794137c597)
    Reviewed-on: https://gerrit.libreoffice.org/9201
    Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 6b3a1a1..5e826bd30 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -197,6 +197,7 @@ OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const SfxItemSet& rSet)
     }
 #endif
     get(m_pFileDlgCB, "filedlg");
+    get(m_pFileDlgROImage, "lockimage");
     get(m_pPrintDlgCB, "printdlg");
     get(m_pDocStatusCB, "docstatus");
     get(m_pSaveAlwaysCB, "savealways");
diff --git a/cui/uiconfig/ui/optgeneralpage.ui b/cui/uiconfig/ui/optgeneralpage.ui
index 4888d95..bbe08e2 100644
--- a/cui/uiconfig/ui/optgeneralpage.ui
+++ b/cui/uiconfig/ui/optgeneralpage.ui
@@ -116,7 +116,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkImage" id="image1">
+                  <object class="GtkImage" id="lockimage">
                     <property name="can_focus">False</property>
                     <property name="no_show_all">True</property>
                     <property name="halign">center</property>