summaryrefslogtreecommitdiff
path: root/dtrans
diff options
context:
space:
mode:
authorPhilipp Lohmann <pl@openoffice.org>2002-01-29 12:30:32 +0000
committerPhilipp Lohmann <pl@openoffice.org>2002-01-29 12:30:32 +0000
commit0c442393eda00965c5de3dc54ffa53be1c1d28a7 (patch)
tree696d7963fcf4913168252a1c169138fa905cd485 /dtrans
parenteb0e9af6874f7313dfe44e671d38f7d514f1eac8 (diff)
#97070# workaround for a bug in XmbTextListToTextProperty
Diffstat (limited to 'dtrans')
-rw-r--r--dtrans/source/X11/X11_selection.cxx14
1 files changed, 12 insertions, 2 deletions
diff --git a/dtrans/source/X11/X11_selection.cxx b/dtrans/source/X11/X11_selection.cxx
index 65def8d0910c..7ca996c03ea2 100644
--- a/dtrans/source/X11/X11_selection.cxx
+++ b/dtrans/source/X11/X11_selection.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: X11_selection.cxx,v $
*
- * $Revision: 1.46 $
+ * $Revision: 1.47 $
*
- * last change: $Author: pl $ $Date: 2002-01-17 14:51:44 $
+ * last change: $Author: pl $ $Date: 2002-01-29 13:30:32 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -574,6 +574,16 @@ OString SelectionManager::convertToCompound( const OUString& rText )
{
aRet = (char*)aProp.value;
XFree( aProp.value );
+#ifdef SOLARIS
+ /* #97070#
+ * for currently unknown reasons XmbTextListToTextProperty on Solaris returns
+ * no data in ISO8859-n encodings (at least for n = 1, 15)
+ * in these encodings the directly converted text does the
+ * trick, also.
+ */
+ if( ! aRet.getLength() && rText.getLength() )
+ aRet = OUStringToOString( rText, osl_getThreadTextEncoding() );
+#endif
}
else
aRet = OString();