[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sw/source

[Michael Stahl]

 sw/source/ui/config/optload.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4e45ae074b56922da08d21142c4465730f024954
Author: Michael Stahl <mst...@redhat.com>
Date:   Wed Nov 12 17:20:58 2014 +0100

    fdo#80328: sw: fix inverted conditional in AutoCaption dialog
    
    (regression from af2d474ff9a91645043c1d4292891c313cceef5e)
    
    Change-Id: Ib22be881c82024e545752715bb9eeb2851a64f88
    (cherry picked from commit 6e3c823f591365c94b22932f08f0884d372e083e)
    Reviewed-on: https://gerrit.libreoffice.org/12389
    Reviewed-by: Caolán McNamara <caol...@redhat.com>
    Tested-by: Caolán McNamara <caol...@redhat.com>

diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx
index af52de9..6f758f4 100644
--- a/sw/source/ui/config/optload.cxx
+++ b/sw/source/ui/config/optload.cxx
@@ -589,9 +589,9 @@ void SwCaptionOptPage::Reset( const SfxItemSet& rSet)
         const SvGlobalName &rOleId = aObjS[i].GetClassName();
         OUString sClass;
         if (rOleId == SvGlobalName(SO3_OUT_CLASSID))
-            sClass = aObjS[i].GetHumanName();
-        else
             sClass = m_sOLE;
+        else
+            sClass = aObjS[i].GetHumanName();
         // don't show product version
         sClass = sClass.replaceFirst( sComplete, sWithoutVersion );
         m_pCheckLB->InsertEntry( sClass );

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits