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

Chr. Rossmanith ChrRossmanith at gmx.de
Thu Mar 28 16:09:07 PDT 2013


 filter/source/msfilter/escherex.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f998aec8972d2b6b226fb8d3bdd589f5ff233222
Author: Chr. Rossmanith <ChrRossmanith at gmx.de>
Date:   Thu Mar 28 21:58:18 2013 +0100

    indexOf returns -1 not STRING_NOTFOUND
    
    Change-Id: I2fed196572a0a5f5b006d1d653968729d6d75583
    Reviewed-on: https://gerrit.libreoffice.org/3115
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>

diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx
index f3944cf..0f99932 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -1208,7 +1208,7 @@ sal_Bool EscherPropertyContainer::CreateEmbeddedBitmapProperties(
     OUString aVndUrl( "vnd.sun.star.GraphicObject:" );
     OUString aBmpUrl( rBitmapUrl );
     sal_Int32 nIndex = aBmpUrl.indexOf( aVndUrl, 0 );
-    if( nIndex != STRING_NOTFOUND )
+    if( nIndex != -1 )
     {
         // note: += ist not defined for xub_StrLen -> conversion to int and back to xub_StrLen
         nIndex = nIndex + aVndUrl.getLength();
@@ -1376,7 +1376,7 @@ sal_Bool EscherPropertyContainer::CreateGraphicProperties(
         {
             OUString aVndUrl( "vnd.sun.star.GraphicObject:" );
             sal_Int32 nIndex = aGraphicUrl.indexOf( aVndUrl, 0 );
-            if ( nIndex != STRING_NOTFOUND )
+            if ( nIndex != -1 )
             {
                 nIndex = nIndex + aVndUrl.getLength();
                 if ( aGraphicUrl.getLength() > nIndex  )


More information about the Libreoffice-commits mailing list