diff options
| author | Pascal Junck <pjunck@openoffice.org> | 2004-11-03 10:03:20 +0000 |
|---|---|---|
| committer | Pascal Junck <pjunck@openoffice.org> | 2004-11-03 10:03:20 +0000 |
| commit | 718fe6ac81d3308fa6e01ec1988b679bb586e2f0 (patch) | |
| tree | f663d5a4ef2da7470a2c48171033400eaa2f93f3 /svx | |
| parent | 9798dcc2d07441dcdbe88282f6303ebb5cbbf00d (diff) | |
INTEGRATION: CWS aw019 (1.16.16); FILE MERGED
2004/10/06 16:18:21 aw 1.16.16.2: #i34831#
2004/09/28 15:53:23 aw 1.16.16.1: #i11190#
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/svdraw/svdouno.cxx | 80 |
1 files changed, 40 insertions, 40 deletions
diff --git a/svx/source/svdraw/svdouno.cxx b/svx/source/svdraw/svdouno.cxx index 90bb1c212a6c..48c8651fb787 100644 --- a/svx/source/svdraw/svdouno.cxx +++ b/svx/source/svdraw/svdouno.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svdouno.cxx,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: pjunck $ $Date: 2004-10-28 10:27:48 $ + * last change: $Author: pjunck $ $Date: 2004-11-03 11:03:20 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -366,7 +366,7 @@ namespace }; } -sal_Bool SdrUnoObj::DoPaintObject(ExtOutputDevice& rXOut, const SdrPaintInfoRec& rInfoRec) const +sal_Bool SdrUnoObj::DoPaintObject(XOutputDevice& rXOut, const SdrPaintInfoRec& rInfoRec) const { const SdrPageView* pPV = rInfoRec.pPV; OutputDevice* pOut = rXOut.GetOutDev(); @@ -928,43 +928,43 @@ void SdrUnoObj::CreateUnoControlModel(const String& rModelName, SetUnoControlModel(xModel); } -void SdrUnoObj::WriteData(SvStream& rOut) const -{ - SdrRectObj::WriteData(rOut); - SdrDownCompat aCompat(rOut, STREAM_WRITE); // Fuer Abwaertskompatibilitaet (Lesen neuer Daten mit altem Code) - -#ifdef DBG_UTIL - aCompat.SetID("SdrUnoObj"); -#endif - - if (bOwnUnoControlModel) // nur als besitzt des Models dieses auch schreiben - { - // UNICODE: rOut << aUnoControlModelTypeName; - rOut.WriteByteString(aUnoControlModelTypeName); - } -} - -void SdrUnoObj::ReadData(const SdrObjIOHeader& rHead, SvStream& rIn) -{ - if (rIn.GetError() != 0) - return; - - SdrRectObj::ReadData(rHead,rIn); - - SdrDownCompat aCompat(rIn, STREAM_READ); // Fuer Abwaertskompatibilitaet (Lesen neuer Daten mit altem Code) - -#ifdef DBG_UTIL - aCompat.SetID("SdrUnoObj"); -#endif - - if (bOwnUnoControlModel) // nur als besitzt des Models dieses auch lesen - { - // UNICODE: rIn >> aUnoControlModelTypeName; - rIn.ReadByteString(aUnoControlModelTypeName); - - CreateUnoControlModel(aUnoControlModelTypeName); - } -} +//BFS01void SdrUnoObj::WriteData(SvStream& rOut) const +//BFS01{ +//BFS01 SdrRectObj::WriteData(rOut); +//BFS01 SdrDownCompat aCompat(rOut, STREAM_WRITE); // Fuer Abwaertskompatibilitaet (Lesen neuer Daten mit altem Code) +//BFS01 +//BFS01#ifdef DBG_UTIL +//BFS01 aCompat.SetID("SdrUnoObj"); +//BFS01#endif +//BFS01 +//BFS01 if (bOwnUnoControlModel) // nur als besitzt des Models dieses auch schreiben +//BFS01 { +//BFS01 // UNICODE: rOut << aUnoControlModelTypeName; +//BFS01 rOut.WriteByteString(aUnoControlModelTypeName); +//BFS01 } +//BFS01} + +//BFS01void SdrUnoObj::ReadData(const SdrObjIOHeader& rHead, SvStream& rIn) +//BFS01{ +//BFS01 if (rIn.GetError() != 0) +//BFS01 return; +//BFS01 +//BFS01 SdrRectObj::ReadData(rHead,rIn); +//BFS01 +//BFS01 SdrDownCompat aCompat(rIn, STREAM_READ); // Fuer Abwaertskompatibilitaet (Lesen neuer Daten mit altem Code) +//BFS01 +//BFS01#ifdef DBG_UTIL +//BFS01 aCompat.SetID("SdrUnoObj"); +//BFS01#endif +//BFS01 +//BFS01 if (bOwnUnoControlModel) // nur als besitzt des Models dieses auch lesen +//BFS01 { +//BFS01 // UNICODE: rIn >> aUnoControlModelTypeName; +//BFS01 rIn.ReadByteString(aUnoControlModelTypeName); +//BFS01 +//BFS01 CreateUnoControlModel(aUnoControlModelTypeName); +//BFS01 } +//BFS01} void SdrUnoObj::SetUnoControlModel( uno::Reference< awt::XControlModel > xModel) { |