[Libreoffice-commits] core.git: editeng/source

[Rosemary Sebastian]

 editeng/source/uno/unofield.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 87cccfbf7e9c3031bb12dd966626f28e134c8f75
Author: Rosemary Sebastian <rosemaryseb8 at gmail.com>
Date:   Sun May 1 14:53:20 2016 +0530

    Replace '||' with '&&'
    
    so that the condition doesn't always evaluate to true
    
    Change-Id: I66ba3d4c7985e1fad60f12836e44167f19216588
    Reviewed-on: https://gerrit.libreoffice.org/24548
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/editeng/source/uno/unofield.cxx b/editeng/source/uno/unofield.cxx
index 5339875..1ae11c5 100644
--- a/editeng/source/uno/unofield.cxx
+++ b/editeng/source/uno/unofield.cxx
@@ -481,7 +481,7 @@ SvxFieldData* SvxUnoTextField::CreateFieldData() const throw()
         {
             static_cast<SvxAuthorField*>(pData)->SetFormat( SVXAUTHORFORMAT_SHORTNAME );
         }
-        else if( mpImpl->mnInt16 >= SVXAUTHORFORMAT_FULLNAME || mpImpl->mnInt16 <= SVXAUTHORFORMAT_SHORTNAME )
+        else if( mpImpl->mnInt16 >= SVXAUTHORFORMAT_FULLNAME && mpImpl->mnInt16 <= SVXAUTHORFORMAT_SHORTNAME )
         {
             static_cast<SvxAuthorField*>(pData)->SetFormat( (SvxAuthorFormat) mpImpl->mnInt16 );
         }