summaryrefslogtreecommitdiff
path: root/sw/inc/dcontact.hxx
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2005-01-21 09:26:50 +0000
committerKurt Zenker <kz@openoffice.org>2005-01-21 09:26:50 +0000
commit8e293925cceccfa4fe1adff27cf6a03821f58cea (patch)
tree5d553d64cdc65fe8c3f2e79c22a578c616fe57b7 /sw/inc/dcontact.hxx
parent8b180340e773651c70b6a011c11b5f9e2d5eff89 (diff)
INTEGRATION: CWS swqbugfixes12 (1.14.100); FILE MERGED
2005/01/07 15:36:23 od 1.14.100.1: #i30669# - correct methods <SwDrawContact::GetAnchoredObj(..)>
Diffstat (limited to 'sw/inc/dcontact.hxx')
-rw-r--r--sw/inc/dcontact.hxx10
1 files changed, 6 insertions, 4 deletions
diff --git a/sw/inc/dcontact.hxx b/sw/inc/dcontact.hxx
index 5316d6401ee3..b3f668bf612b 100644
--- a/sw/inc/dcontact.hxx
+++ b/sw/inc/dcontact.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: dcontact.hxx,v $
*
- * $Revision: 1.14 $
+ * $Revision: 1.15 $
*
- * last change: $Author: pjunck $ $Date: 2004-11-03 09:51:03 $
+ * last change: $Author: kz $ $Date: 2005-01-21 10:26:50 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -492,8 +492,10 @@ class SwDrawContact : public SwContact
virtual ~SwDrawContact();
// OD 2004-03-29 #i26791#
- virtual const SwAnchoredObject* GetAnchoredObj( const SdrObject* _pSdrObj = 0L ) const;
- virtual SwAnchoredObject* GetAnchoredObj( SdrObject* _pSdrObj = 0L );
+ // --> OD 2005-01-06 #i30669# - no default value for parameter <_pSdrObj>
+ virtual const SwAnchoredObject* GetAnchoredObj( const SdrObject* _pSdrObj ) const;
+ virtual SwAnchoredObject* GetAnchoredObj( SdrObject* _pSdrObj );
+ // <--
// OD 2004-04-01 #i26791#
virtual const SdrObject* GetMaster() const;