summaryrefslogtreecommitdiff
path: root/dtrans
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2004-07-05 08:16:13 +0000
committerOliver Bolte <obo@openoffice.org>2004-07-05 08:16:13 +0000
commitf4b7fbc2ec4a058f309fa36883c6e7638c15a781 (patch)
tree3d5cb6a8da43386bda6c7c5e3e3eb399c03151f0 /dtrans
parent51cd62a64ce252b5efa3cc231555dfaa72099fa6 (diff)
INTEGRATION: CWS vcl22 (1.25.10); FILE MERGED
2004/04/28 09:51:41 pl 1.25.10.1: #i28193# larger threshold for incremental transfers, better handling for failed incrmental transfers
Diffstat (limited to 'dtrans')
-rw-r--r--dtrans/source/X11/X11_selection.hxx12
1 files changed, 5 insertions, 7 deletions
diff --git a/dtrans/source/X11/X11_selection.hxx b/dtrans/source/X11/X11_selection.hxx
index 7b9aa23b75e1..25feb0d6699f 100644
--- a/dtrans/source/X11/X11_selection.hxx
+++ b/dtrans/source/X11/X11_selection.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: X11_selection.hxx,v $
*
- * $Revision: 1.26 $
+ * $Revision: 1.27 $
*
- * last change: $Author: rt $ $Date: 2004-06-17 11:59:51 $
+ * last change: $Author: obo $ $Date: 2004-07-05 09:16:13 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -236,17 +236,15 @@ namespace x11 {
// property used to transfer the data
struct IncrementalTransfer
{
- Sequence< sal_Int8 >
- m_aData;
+ Sequence< sal_Int8 > m_aData;
int m_nBufferPos;
Window m_aRequestor;
Atom m_aProperty;
Atom m_aTarget;
int m_nFormat;
int m_nTransferStartTime;
-
- IncrementalTransfer( const Sequence< sal_Int8 >& rData, Window aRequestor, Atom aProperty, Atom aTarget, int nFormat );
};
+ int m_nIncrementalThreshold;
// a struct to hold the data associated with a selection
struct Selection
@@ -431,7 +429,7 @@ namespace x11 {
::std::hash_map< Atom, Selection* >
m_aSelections;
// IncrementalTransfers in progress
- ::std::hash_map< Window, ::std::list< IncrementalTransfer > >
+ std::hash_map< Window, std::hash_map< Atom, IncrementalTransfer > >
m_aIncrementals;
// do not use X11 multithreading capabilities