[Libreoffice-commits] core.git: vcl/aqua

Christian Lohmaier lohmaier+LibreOffice at googlemail.com
Fri Mar 22 10:11:49 PDT 2013


 vcl/aqua/source/dtrans/DataFlavorMapping.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 683142294f291a77329a2d266124432aeba8522b
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Fri Mar 22 14:00:19 2013 +0100

    get rid of two-argument compareToAscii
    
    As I don't see a point in comparing a mimetype with only a
    substring, it probably could be a simple compareToAscii, but
    play it save and use startsWith.
    
    Change-Id: Ic33c8089283def615999ddf80cd12f6fe219ed17
    Reviewed-on: https://gerrit.libreoffice.org/2907
    Reviewed-by: Thomas Arnhold <thomas at arnhold.org>
    Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
    Tested-by: Fridrich Strba <fridrich at documentfoundation.org>

diff --git a/vcl/aqua/source/dtrans/DataFlavorMapping.cxx b/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
index a1a69ff..6cfc2c9 100644
--- a/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
+++ b/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
@@ -526,7 +526,7 @@ NSString* DataFlavorMapper::openOfficeToSystemFlavor(const DataFlavor& oOOFlavor
 
   for (size_t i = 0; i < SIZE_FLAVOR_MAP; i++)
     {
-      if (oOOFlavor.MimeType.compareToAscii(flavorMap[i].OOoFlavor, strlen(flavorMap[i].OOoFlavor)) == 0)
+      if (oOOFlavor.MimeType.startsWith(flavorMap[i].OOoFlavor))
         {
           sysFlavor = flavorMap[i].SystemFlavor;
         }


More information about the Libreoffice-commits mailing list