[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - vcl/aqua

Tor Lillqvist tml at iki.fi
Mon Jul 29 09:08:09 PDT 2013


 vcl/aqua/source/dtrans/DataFlavorMapping.cxx |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 409d83a2fee9e170c5604707900d1d005ba9d513
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Jul 29 14:16:05 2013 +0300

    Avoid an unnecessary static initialisation
    
    (cherry picked from commit 70f56860e4a9ee2a25abf64142a7f0ed4d446bfb)
    
    Change-Id: I204158ef6965cc9aa19c458f514e265ede8587f4
    Reviewed-on: https://gerrit.libreoffice.org/5169
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
    Tested-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/vcl/aqua/source/dtrans/DataFlavorMapping.cxx b/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
index 7b57871..4d07185 100644
--- a/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
+++ b/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
@@ -47,8 +47,6 @@ using namespace std;
 
 namespace // private
 {
-  const Type CPPUTYPE_SEQINT8  = getCppuType((Sequence<sal_Int8>*)0);
-
   /* Determine whether or not a DataFlavor is valid.
    */
   bool isValidFlavor(const DataFlavor& aFlavor)
@@ -546,7 +544,7 @@ DataFlavor DataFlavorMapper::systemToOpenOfficeFlavor(NSString* systemDataFlavor
     {
         oOOFlavor.MimeType = aTryFlavor;
         oOOFlavor.HumanPresentableName = OUString();
-        oOOFlavor.DataType = CPPUTYPE_SEQINT8;
+        oOOFlavor.DataType = getCppuType((Sequence<sal_Int8>*)0);
     }
 
     return oOOFlavor;


More information about the Libreoffice-commits mailing list