summaryrefslogtreecommitdiff
path: root/dtrans/source/win32/ftransl/ftransl.cxx
diff options
context:
space:
mode:
authorTino Rachui <tra@openoffice.org>2001-03-16 08:02:25 +0000
committerTino Rachui <tra@openoffice.org>2001-03-16 08:02:25 +0000
commit3c0b46ee8ec56ee9a4cc8eb771e708c523d9f5c5 (patch)
tree049e50bd52648f19dc9f5370485c5e31a55ef9da /dtrans/source/win32/ftransl/ftransl.cxx
parentb4bc248aac66dc37e65fba0304f1cfd433e4cf96 (diff)
*** empty log message ***
Diffstat (limited to 'dtrans/source/win32/ftransl/ftransl.cxx')
-rw-r--r--dtrans/source/win32/ftransl/ftransl.cxx10
1 files changed, 5 insertions, 5 deletions
diff --git a/dtrans/source/win32/ftransl/ftransl.cxx b/dtrans/source/win32/ftransl/ftransl.cxx
index 67abd9183492..da90d81ebf25 100644
--- a/dtrans/source/win32/ftransl/ftransl.cxx
+++ b/dtrans/source/win32/ftransl/ftransl.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: ftransl.cxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: tra $ $Date: 2001-03-09 08:48:02 $
+ * last change: $Author: tra $ $Date: 2001-03-16 09:01:38 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -214,8 +214,8 @@ DataFlavor SAL_CALL CDataFormatTranslator::getDataFlavorFromSystemDataType( cons
{
sal_Int32 clipformat;
aSysDataType >>= clipformat;
-
- findDataFlavorForStandardFormatId( clipformat, aFlavor );
+ if ( CF_INVALID != clipformat )
+ findDataFlavorForStandardFormatId( clipformat, aFlavor );
}
else if ( aSysDataType.getValueType( ) == CPPUTYPE_OUSTR )
{
@@ -225,7 +225,7 @@ DataFlavor SAL_CALL CDataFormatTranslator::getDataFlavorFromSystemDataType( cons
findDataFlavorForNativeFormatName( nativeFormatName, aFlavor );
}
else
- OSL_ASSERT( false );
+ OSL_ENSURE( sal_False, "Invalid data type received" );
return aFlavor;
}