chart2/source/tools/InternalDataProvider.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 57c50b73a117924ad5f361badc88f58eac0c62d0
Author: Jochen Nitschke <j.nitschke+loger...@ok.de>
Date:   Sat Oct 22 18:43:15 2016 +0000

    fix for windows builds
    
    MSVC does not know and keyword
    > InternalDataProvider.cxx(552) : error C2065: ´and´ : undeclared 
identifier
    
    Change-Id: I7cac0719561b75e37e20534edd2efa5bf3a97fa8
    Reviewed-on: https://gerrit.libreoffice.org/30164
    Reviewed-by: Jochen Nitschke <j.nitschke+loger...@ok.de>
    Tested-by: Jochen Nitschke <j.nitschke+loger...@ok.de>

diff --git a/chart2/source/tools/InternalDataProvider.cxx 
b/chart2/source/tools/InternalDataProvider.cxx
index 7bcb65f0..668181f 100644
--- a/chart2/source/tools/InternalDataProvider.cxx
+++ b/chart2/source/tools/InternalDataProvider.cxx
@@ -549,7 +549,7 @@ InternalDataProvider::createDataSequenceFromArray( const 
OUString& rArrayStr, co
                     break;
             }
         }
-        else if (*p == ';' and !bInQuote)
+        else if (*p == ';' && !bInQuote)
         {
             // element separator.
             if (pElem)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to