[Libreoffice-commits] .: vcl/aqua

Stephan Bergmann sbergmann at kemper.freedesktop.org
Wed Apr 25 04:18:56 PDT 2012


 vcl/aqua/source/dtrans/DataFlavorMapping.cxx |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 004763101a7c5d70c735656e62ca351595da317b
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Apr 25 13:16:25 2012 +0200

    isOUStringType still used (from dbgutil code)

diff --git a/vcl/aqua/source/dtrans/DataFlavorMapping.cxx b/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
index 1f8595d..e0db688 100644
--- a/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
+++ b/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
@@ -153,6 +153,11 @@ namespace // private
     return (theType == CPPUTYPE_SEQINT8);
   }
 
+  inline bool isOUStringType(const Type& theType)
+  {
+    return (theType == CPPUTYPE_OUSTRING);
+  }
+
 } // namespace private
 
 
@@ -599,7 +604,9 @@ DataProviderPtr_t DataFlavorMapper::getDataProvider(NSString* systemFlavor, Refe
         }
       else // Must be OUString type
         {
-          BOOST_ASSERT(isOUStringType(data.getValueType()));
+          SAL_WARN_IF(
+              !isOUStringType(data.getValueType()), "vcl",
+              "must be OUString type");
           dp = DataProviderPtr_t(new UniDataProvider(data));
         }
     }


More information about the Libreoffice-commits mailing list