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

[Michael Stahl]

 sw/source/core/unocore/unofield.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1609eb8d6e9b8d9b4d82be5c46656d4d43256125
Author: Michael Stahl <mstahl at redhat.com>
Date:   Sat Mar 1 23:13:39 2014 +0100

    fdo#47811: fix setPropertyValue("Name") of Database fieldmaster
    
    This one is assigning to the wrong pType variable.
    
    (regression from CWS swwarnings)
    
    Change-Id: I9a74734d22313f215ed69c9a57edf7eb035736ea
    (cherry picked from commit c06f686fe001392ceb7f606f5dc3c775997cc7de)
    Reviewed-on: https://gerrit.libreoffice.org/8441
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx
index 11f347f..f49595c 100644
--- a/sw/source/core/unocore/unofield.cxx
+++ b/sw/source/core/unocore/unofield.cxx
@@ -652,7 +652,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
             case RES_DBFLD :
             {
                 rValue >>= m_pImpl->m_sParam3;
-                pType = GetFldType();
+                pType2 = GetFldType();
             }
             break;
         }