summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRüdiger Timm <rt@openoffice.org>2006-12-01 13:49:05 +0000
committerRüdiger Timm <rt@openoffice.org>2006-12-01 13:49:05 +0000
commite00870f56e42a50ed91b95f8dbe329a4854676f7 (patch)
tree3c0960c99b0b3b2c1bd086b331d534ef49e70e30
parent7a6a3df04ca1765cce63d16bf7271da001517bb9 (diff)
INTEGRATION: CWS sb23 (1.3.192); FILE MERGED
2006/08/18 16:02:48 sb 1.3.192.2: RESYNC: (1.3-1.5); FILE MERGED 2005/03/23 14:21:46 sb 1.3.192.1: #88601# Support for current context in binary UNO URP bridge.
-rw-r--r--bridges/source/remote/urp/urp_propertyobject.hxx7
1 files changed, 2 insertions, 5 deletions
diff --git a/bridges/source/remote/urp/urp_propertyobject.hxx b/bridges/source/remote/urp/urp_propertyobject.hxx
index 42df258f470c..b36fb19f3305 100644
--- a/bridges/source/remote/urp/urp_propertyobject.hxx
+++ b/bridges/source/remote/urp/urp_propertyobject.hxx
@@ -4,9 +4,9 @@
*
* $RCSfile: urp_propertyobject.hxx,v $
*
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
- * last change: $Author: hr $ $Date: 2006-06-19 23:53:35 $
+ * last change: $Author: rt $ $Date: 2006-12-01 14:49:05 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -83,7 +83,6 @@ private:
uno_Environment *m_pEnvRemote;
sal_Int32 m_nRandomNumberOfRequest;
sal_Bool m_bRequestChangeHasBeenCalled;
- sal_Bool m_bClientWaitingForCommit;
sal_Bool m_bServerWaitingForCommit;
sal_Bool m_bApplyProperties;
@@ -120,8 +119,6 @@ public: // local
{ return m_bApplyProperties; }
Properties SAL_CALL getCommitedChanges();
- inline sal_Bool SAL_CALL waitingForCommitChangeReply()
- { return m_bClientWaitingForCommit; }
void SAL_CALL waitUntilChangesAreCommitted();
protected: