[Libreoffice-commits] .: 4 commits - binfilter/bf_sc binfilter/bf_sd binfilter/bf_svx binfilter/bf_sw binfilter/inc
Joseph Powers
jpowers at kemper.freedesktop.org
Thu Oct 13 18:51:36 PDT 2011
binfilter/bf_sc/source/ui/inc/printfun.hxx | 1
binfilter/bf_sc/source/ui/view/sc_printfun.cxx | 1
binfilter/bf_sd/source/ui/inc/optsitem.hxx | 8
binfilter/bf_sd/source/ui/unoidl/sd_unopage.cxx | 2
binfilter/bf_svx/source/engine3d/svx_camera3d.cxx | 3
binfilter/bf_svx/source/engine3d/svx_viewpt3d.cxx | 5
binfilter/bf_svx/source/inc/fmobj.hxx | 1
binfilter/bf_svx/source/inc/fmpgeimp.hxx | 1
binfilter/bf_svx/source/svdraw/svx_svdcrtv.cxx | 1
binfilter/bf_svx/source/svdraw/svx_svdmodel.cxx | 3
binfilter/bf_svx/source/svdraw/svx_svdmrkv.cxx | 3
binfilter/bf_svx/source/svdraw/svx_svdobj.cxx | 6
binfilter/bf_svx/source/svdraw/svx_svdograf.cxx | 103 ------
binfilter/bf_svx/source/svdraw/svx_svdogrp.cxx | 136 --------
binfilter/bf_svx/source/svdraw/svx_svdouno.cxx | 8
binfilter/bf_svx/source/svdraw/svx_svdpage.cxx | 52 ---
binfilter/bf_svx/source/svdraw/svx_svdpagv.cxx | 132 --------
binfilter/bf_svx/source/svdraw/svx_svdpntv.cxx | 204 ------------
binfilter/bf_svx/source/unodraw/svx_unoshap2.cxx | 1
binfilter/bf_svx/source/unodraw/svx_unoshap3.cxx | 1
binfilter/bf_svx/source/unodraw/svx_unoshtxt.cxx | 2
binfilter/bf_svx/source/xoutdev/svx__xfont.cxx | 27 -
binfilter/bf_svx/source/xoutdev/svx__ximp.cxx | 41 --
binfilter/bf_svx/source/xoutdev/svx_xattrbmp.cxx | 19 -
binfilter/bf_svx/source/xoutdev/svx_xline.cxx | 359 ++++++++--------------
binfilter/bf_sw/source/core/inc/viewimp.hxx | 11
binfilter/bf_sw/source/core/view/sw_vprint.cxx | 1
binfilter/inc/bf_goodies/b3dlight.hxx | 6
binfilter/inc/bf_goodies/matril3d.hxx | 2
binfilter/inc/bf_sc/userdat.hxx | 2
binfilter/inc/bf_sch/axisid.hxx | 1
binfilter/inc/bf_sch/chtscene.hxx | 2
binfilter/inc/bf_sch/datapoin.hxx | 1
binfilter/inc/bf_sch/datarow.hxx | 1
binfilter/inc/bf_sch/objadj.hxx | 1
binfilter/inc/bf_sch/objid.hxx | 3
binfilter/inc/bf_sd/anminfo.hxx | 1
binfilter/inc/bf_sd/imapinfo.hxx | 1
binfilter/inc/bf_sd/sdpage.hxx | 4
binfilter/inc/bf_svx/camera3d.hxx | 2
binfilter/inc/bf_svx/cube3d.hxx | 1
binfilter/inc/bf_svx/dlight3d.hxx | 1
binfilter/inc/bf_svx/extrud3d.hxx | 1
binfilter/inc/bf_svx/fmmodel.hxx | 1
binfilter/inc/bf_svx/fmpage.hxx | 17 -
binfilter/inc/bf_svx/fmshell.hxx | 13
binfilter/inc/bf_svx/fmview.hxx | 1
binfilter/inc/bf_svx/label3d.hxx | 1
binfilter/inc/bf_svx/lathe3d.hxx | 1
binfilter/inc/bf_svx/light3d.hxx | 1
binfilter/inc/bf_svx/obj3d.hxx | 4
binfilter/inc/bf_svx/pntobj3d.hxx | 1
binfilter/inc/bf_svx/polygn3d.hxx | 5
binfilter/inc/bf_svx/polyob3d.hxx | 6
binfilter/inc/bf_svx/scene3d.hxx | 5
binfilter/inc/bf_svx/sphere3d.hxx | 1
binfilter/inc/bf_svx/svdmodel.hxx | 13
binfilter/inc/bf_svx/svdoattr.hxx | 5
binfilter/inc/bf_svx/svdobj.hxx | 17 -
binfilter/inc/bf_svx/svdocapt.hxx | 7
binfilter/inc/bf_svx/svdocirc.hxx | 6
binfilter/inc/bf_svx/svdoedge.hxx | 5
binfilter/inc/bf_svx/svdograf.hxx | 30 -
binfilter/inc/bf_svx/svdogrp.hxx | 19 -
binfilter/inc/bf_svx/svdomeas.hxx | 5
binfilter/inc/bf_svx/svdoole2.hxx | 1
binfilter/inc/bf_svx/svdopage.hxx | 1
binfilter/inc/bf_svx/svdopath.hxx | 1
binfilter/inc/bf_svx/svdorect.hxx | 1
binfilter/inc/bf_svx/svdotext.hxx | 5
binfilter/inc/bf_svx/svdouno.hxx | 1
binfilter/inc/bf_svx/svdovirt.hxx | 11
binfilter/inc/bf_svx/svdpage.hxx | 48 --
binfilter/inc/bf_svx/svdpagv.hxx | 100 +-----
binfilter/inc/bf_svx/svdpntv.hxx | 256 ---------------
binfilter/inc/bf_svx/svdview.hxx | 8
binfilter/inc/bf_svx/viewpt3d.hxx | 4
77 files changed, 234 insertions(+), 1529 deletions(-)
New commits:
commit 28155a169d6b6cd007838ffcfa1b784bedd2d56b
Author: Joseph Powers <jpowers27 at cox.net>
Date: Wed Oct 12 21:52:41 2011 -0700
WriteData(), PreSave(), & PostSave() didn't do anything.
diff --git a/binfilter/bf_sd/source/ui/inc/optsitem.hxx b/binfilter/bf_sd/source/ui/inc/optsitem.hxx
index 6bba1bc..a99818f 100644
--- a/binfilter/bf_sd/source/ui/inc/optsitem.hxx
+++ b/binfilter/bf_sd/source/ui/inc/optsitem.hxx
@@ -116,7 +116,6 @@ protected:
virtual void GetPropNameArray( const char**& ppNames, ULONG& rCount ) const = 0;
virtual BOOL ReadData( const ::com::sun::star::uno::Any* pValues ) = 0;
- virtual BOOL WriteData( ::com::sun::star::uno::Any* pValues ) const = 0;
public:
@@ -153,7 +152,6 @@ protected:
virtual void GetPropNameArray( const char**& ppNames, ULONG& rCount ) const;
virtual BOOL ReadData( const ::com::sun::star::uno::Any* pValues );
- virtual BOOL WriteData( ::com::sun::star::uno::Any* ) const {return FALSE;}
public:
SdOptionsLayout( USHORT nConfigId, BOOL bUseConfig );
@@ -198,7 +196,6 @@ protected:
virtual void GetPropNameArray( const char**& ppNames, ULONG& rCount ) const;
virtual BOOL ReadData( const ::com::sun::star::uno::Any* pValues );
- virtual BOOL WriteData( ::com::sun::star::uno::Any* ) const {return FALSE;}
public:
@@ -265,7 +262,6 @@ protected:
virtual void GetPropNameArray( const char**& ppNames, ULONG& rCount ) const;
virtual BOOL ReadData( const ::com::sun::star::uno::Any* pValues );
- virtual BOOL WriteData( ::com::sun::star::uno::Any* ) const {return FALSE;}
public:
@@ -358,7 +354,6 @@ protected:
virtual void GetPropNameArray( const char**& ppNames, ULONG& rCount ) const;
virtual BOOL ReadData( const ::com::sun::star::uno::Any* pValues );
- virtual BOOL WriteData( ::com::sun::star::uno::Any* ) const {return FALSE;}
public:
@@ -409,7 +404,6 @@ protected:
virtual void GetPropNameArray( const char**& ppNames, ULONG& rCount ) const;
virtual BOOL ReadData( const ::com::sun::star::uno::Any* pValues );
- virtual BOOL WriteData( ::com::sun::star::uno::Any* ) const {return FALSE;}
public:
@@ -434,7 +428,6 @@ protected:
virtual void GetPropNameArray( const char**& ppNames, ULONG& rCount ) const;
virtual BOOL ReadData( const ::com::sun::star::uno::Any* pValues );
- virtual BOOL WriteData( ::com::sun::star::uno::Any* ) const {return FALSE;}
public:
@@ -501,7 +494,6 @@ protected:
virtual void GetPropNameArray( const char**& ppNames, ULONG& rCount ) const;
virtual BOOL ReadData( const ::com::sun::star::uno::Any* pValues );
- virtual BOOL WriteData( ::com::sun::star::uno::Any* ) const {return FALSE;}
public:
diff --git a/binfilter/bf_svx/source/engine3d/svx_camera3d.cxx b/binfilter/bf_svx/source/engine3d/svx_camera3d.cxx
index d930042..9c6c130 100644
--- a/binfilter/bf_svx/source/engine3d/svx_camera3d.cxx
+++ b/binfilter/bf_svx/source/engine3d/svx_camera3d.cxx
@@ -312,9 +312,8 @@ namespace binfilter {
|*
\************************************************************************/
-/*N*/ SvStream& operator<<(SvStream& rOStream, const Camera3D& rCam)
+/*N*/ SvStream& operator<<(SvStream& rOStream, const Camera3D&)
/*N*/ {
-/*N*/ rCam.WriteData31(rOStream);
/*N*/ return rOStream;
/*N*/ }
diff --git a/binfilter/bf_svx/source/engine3d/svx_viewpt3d.cxx b/binfilter/bf_svx/source/engine3d/svx_viewpt3d.cxx
index c304592..87c64cf 100644
--- a/binfilter/bf_svx/source/engine3d/svx_viewpt3d.cxx
+++ b/binfilter/bf_svx/source/engine3d/svx_viewpt3d.cxx
@@ -456,7 +456,7 @@ namespace binfilter {
// FG: eigentlich sollten die Stream-Funktionen in der 3D-Engine nicht verwendet werden
-// sondern WriteData und ReadData, da man insbesondere bei ReadData einen
+// sondern ReadData, da man insbesondere bei ReadData einen
// zusaetzlichen Parameter hat der die File-Revision enthaelt.
/*************************************************************************
@@ -466,9 +466,8 @@ namespace binfilter {
\************************************************************************/
/*N*/ #ifndef SVX_LIGHT
-/*N*/ SvStream& operator<<(SvStream& rOStream, const Viewport3D& rViewpt)
+/*N*/ SvStream& operator<<(SvStream& rOStream, const Viewport3D& )
/*N*/ {
-/*N*/ rViewpt.WriteData31(rOStream);
/*N*/ return rOStream;
/*N*/ }
/*N*/ #endif
diff --git a/binfilter/bf_svx/source/inc/fmobj.hxx b/binfilter/bf_svx/source/inc/fmobj.hxx
index 01f890d..96dc5f5 100644
--- a/binfilter/bf_svx/source/inc/fmobj.hxx
+++ b/binfilter/bf_svx/source/inc/fmobj.hxx
@@ -91,7 +91,6 @@ public:
sal_Int32 getType() const;
protected:
- virtual void WriteData(SvStream& ) const {}
virtual void ReadData(const SdrObjIOHeader& rHead, SvStream& rIn);
DECL_LINK(OnCreate, void* );
diff --git a/binfilter/bf_svx/source/inc/fmpgeimp.hxx b/binfilter/bf_svx/source/inc/fmpgeimp.hxx
index e2379bf..2414ae5 100644
--- a/binfilter/bf_svx/source/inc/fmpgeimp.hxx
+++ b/binfilter/bf_svx/source/inc/fmpgeimp.hxx
@@ -102,7 +102,6 @@ public:
protected:
// lesen und schreiben der Objecte
- void WriteData(SvStream& ) const {}
void ReadData(const SdrIOHeader& rHead, SvStream& rIn); //
void read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& InStream);
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdmodel.cxx b/binfilter/bf_svx/source/svdraw/svx_svdmodel.cxx
index e4e2a2b..a72acb6 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdmodel.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdmodel.cxx
@@ -1651,9 +1651,6 @@ using namespace ::com::sun::star;
/*N*/ ((SdrModel*)&rMod)->nProgressMax=rMod.ImpCountAllSteamComponents(); // Hier passenden Wert einsetzen
/*N*/ ((SdrModel*)&rMod)->DoProgress(0);
/*N*/ SdrIOHeader aHead(rOut,STREAM_WRITE,SdrIOModlID);
-/*N*/ USHORT nCompressMerk=rOut.GetCompressMode(); // Der CompressMode wird von SdrModel::ReadData() gesetzt
-/*N*/ rMod.WriteData(rOut);
-/*N*/ rOut.SetCompressMode(nCompressMerk); // CompressMode wieder restaurieren
/*N*/ ((SdrModel*)&rMod)->DoProgress(0xFFFFFFFF);
/*N*/ ((SdrModel*)&rMod)->Broadcast(SdrHint(HINT_MODELSAVED)); // #43095#
/*N*/ return rOut;
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdobj.cxx b/binfilter/bf_svx/source/svdraw/svx_svdobj.cxx
index b93ae59..ce31226 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdobj.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdobj.cxx
@@ -2634,14 +2634,8 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
/*N*/
/*N*/ if(rObj.ISA(SdrVirtObj))
/*N*/ {
-/*N*/ // #108784#
/*N*/ // force to write a naked SdrObj
/*N*/ aHead.nIdentifier = OBJ_NONE;
-/*N*/ rObj.SdrObject::WriteData(rOut);
-/*N*/ }
-/*N*/ else
-/*N*/ {
-/*N*/ rObj.WriteData(rOut);
/*N*/ }
/*N*/
/*N*/ return rOut;
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdpage.cxx b/binfilter/bf_svx/source/svdraw/svx_svdpage.cxx
index 8c8c4af..452c9e9 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdpage.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdpage.cxx
@@ -1374,7 +1374,6 @@ using namespace ::com::sun::star;
/*N*/ SvStream& operator<<(SvStream& rOut, const SdrPage& rPg)
/*N*/ {
/*N*/ SdrIOHeader aHead(rOut,STREAM_WRITE,!rPg.bMaster ? SdrIOPageID : SdrIOMaPgID);
-/*N*/ rPg.WriteData(rOut);
/*N*/ return rOut;
/*N*/ }
diff --git a/binfilter/inc/bf_goodies/b3dlight.hxx b/binfilter/inc/bf_goodies/b3dlight.hxx
index beb24ca..e4a42e7 100644
--- a/binfilter/inc/bf_goodies/b3dlight.hxx
+++ b/binfilter/inc/bf_goodies/b3dlight.hxx
@@ -155,10 +155,7 @@ public:
void Init();
// Laden/Speichern in StarView
- virtual void WriteData(SvStream& ) const {}
virtual void ReadData(SvStream& rIn);
-
-protected:
};
/*************************************************************************
@@ -214,10 +211,7 @@ public:
B3dLight& GetLightObject(Base3DLightNumber=Base3DLight0);
// Laden/Speichern in StarView
- virtual void WriteData(SvStream& ) const {}
virtual void ReadData(SvStream& rIn);
-
-protected:
};
}//end of namespace binfilter
diff --git a/binfilter/inc/bf_goodies/matril3d.hxx b/binfilter/inc/bf_goodies/matril3d.hxx
index 2768c7c..2bb9b30 100644
--- a/binfilter/inc/bf_goodies/matril3d.hxx
+++ b/binfilter/inc/bf_goodies/matril3d.hxx
@@ -86,13 +86,11 @@ public:
B3dMaterial();
// Laden/Speichern in StarView
- virtual void WriteData(SvStream& ) const {}
virtual void ReadData(SvStream& rIn);
// Vergleichsoperator
BOOL operator==(const B3dMaterial&);
BOOL operator!=(const B3dMaterial& rMat) { return (!((*this) == rMat)); }
-protected:
};
}//end of namespace binfilter
diff --git a/binfilter/inc/bf_sc/userdat.hxx b/binfilter/inc/bf_sc/userdat.hxx
index 85ec9ee..de051cc 100644
--- a/binfilter/inc/bf_sc/userdat.hxx
+++ b/binfilter/inc/bf_sc/userdat.hxx
@@ -62,7 +62,6 @@ public:
class ScDrawObjData : public SdrObjUserData
{
virtual SdrObjUserData* Clone(SdrObject* pObj) const;
- virtual void WriteData(SvStream& ) {}
virtual void ReadData(SvStream& rIn);
public:
ScTripel aStt, aEnd;
@@ -86,7 +85,6 @@ public:
virtual SdrObjUserData* Clone( SdrObject* pObj ) const;
- virtual void WriteData( SvStream& ) {}
virtual void ReadData( SvStream& rIStm );
void SetImageMap( const ImageMap& rIMap ) { aImageMap = rIMap; }
diff --git a/binfilter/inc/bf_sch/axisid.hxx b/binfilter/inc/bf_sch/axisid.hxx
index 764907c..a638c49 100644
--- a/binfilter/inc/bf_sch/axisid.hxx
+++ b/binfilter/inc/bf_sch/axisid.hxx
@@ -54,7 +54,6 @@ public:
virtual SdrObjUserData* Clone(SdrObject *) const { return NULL; } // DBG_BF_ASSERT
- virtual void WriteData(SvStream& ) {}
virtual void ReadData(SvStream& rIn);
long &AxisId ()
diff --git a/binfilter/inc/bf_sch/chtscene.hxx b/binfilter/inc/bf_sch/chtscene.hxx
index 264a3f2..423162b 100644
--- a/binfilter/inc/bf_sch/chtscene.hxx
+++ b/binfilter/inc/bf_sch/chtscene.hxx
@@ -65,8 +65,6 @@ class ChartScene : public E3dPolyScene
BOOL GetAskForLogicRect() {return bAskForLogicRect;}
void SetAskForLogicRect(BOOL value) {bAskForLogicRect = value;}
- virtual void WriteData(SvStream& ) const {}
-
void InsertAllTitleText (DescrList &rList,
E3dObject *pGroup,
long nAxisId);
diff --git a/binfilter/inc/bf_sch/datapoin.hxx b/binfilter/inc/bf_sch/datapoin.hxx
index 91e5999..c2bbe62 100644
--- a/binfilter/inc/bf_sch/datapoin.hxx
+++ b/binfilter/inc/bf_sch/datapoin.hxx
@@ -50,7 +50,6 @@ public:
virtual SdrObjUserData* Clone(SdrObject *) const { return NULL; } // DBG_BF_ASSERT
- virtual void WriteData(SvStream& ) {}
virtual void ReadData(SvStream& rIn);
void SetCol(short nC) { nCol = nC; }
diff --git a/binfilter/inc/bf_sch/datarow.hxx b/binfilter/inc/bf_sch/datarow.hxx
index 1b41eec..4c5c534 100644
--- a/binfilter/inc/bf_sch/datarow.hxx
+++ b/binfilter/inc/bf_sch/datarow.hxx
@@ -49,7 +49,6 @@ public:
virtual SdrObjUserData* Clone(SdrObject *) const { return NULL; } // DBG_BF_ASSERT
- virtual void WriteData(SvStream& ) {}
virtual void ReadData(SvStream& rIn);
void SetRow(short nR) { nRow = nR; }
diff --git a/binfilter/inc/bf_sch/objadj.hxx b/binfilter/inc/bf_sch/objadj.hxx
index ef50bdf..e614c6f 100644
--- a/binfilter/inc/bf_sch/objadj.hxx
+++ b/binfilter/inc/bf_sch/objadj.hxx
@@ -54,7 +54,6 @@ public:
virtual SdrObjUserData* Clone(SdrObject *) const { return NULL; } // DBG_BF_ASSERT
- virtual void WriteData(SvStream& ) {}
virtual void ReadData(SvStream& rIn);
void SetAdjust(ChartAdjust eAdj) { eAdjust = eAdj; }
diff --git a/binfilter/inc/bf_sch/objid.hxx b/binfilter/inc/bf_sch/objid.hxx
index 59ae428..e200508 100644
--- a/binfilter/inc/bf_sch/objid.hxx
+++ b/binfilter/inc/bf_sch/objid.hxx
@@ -51,10 +51,9 @@ public:
virtual SdrObjUserData* Clone(SdrObject *) const { return NULL; } // DBG_BF_ASSERT
- virtual void WriteData(SvStream& ) {}
virtual void ReadData(SvStream& rIn);
- void SetObjId(UINT16 nId) { nObjId = nId; }
+ void SetObjId(UINT16 nId) { nObjId = nId; }
UINT16 GetObjId() { return nObjId; }
};
diff --git a/binfilter/inc/bf_sd/anminfo.hxx b/binfilter/inc/bf_sd/anminfo.hxx
index 39c19d6..5f2c6c7 100644
--- a/binfilter/inc/bf_sd/anminfo.hxx
+++ b/binfilter/inc/bf_sd/anminfo.hxx
@@ -96,7 +96,6 @@ public:
virtual SdrObjUserData* Clone(SdrObject* /*pObj*/) const {DBG_BF_ASSERT(0, "STRIP"); return NULL;}
- virtual void WriteData(SvStream& ) {}
virtual void ReadData(SvStream& rIn);
// NULL loest die Verbindung zum Pfadobjekt
diff --git a/binfilter/inc/bf_sd/imapinfo.hxx b/binfilter/inc/bf_sd/imapinfo.hxx
index 690743e..809487b 100644
--- a/binfilter/inc/bf_sd/imapinfo.hxx
+++ b/binfilter/inc/bf_sd/imapinfo.hxx
@@ -67,7 +67,6 @@ public:
virtual SdrObjUserData* Clone( SdrObject* /*pObj*/ ) const { return new SdIMapInfo( *this ); }
- virtual void WriteData( SvStream& ) {}
virtual void ReadData( SvStream& rIStm );
void SetImageMap( const ImageMap& rIMap ) { aImageMap = rIMap; }
diff --git a/binfilter/inc/bf_sd/sdpage.hxx b/binfilter/inc/bf_sd/sdpage.hxx
index 2ef0d5c..0401c90 100644
--- a/binfilter/inc/bf_sd/sdpage.hxx
+++ b/binfilter/inc/bf_sd/sdpage.hxx
@@ -179,10 +179,8 @@ public:
// Virtuelle Methoden von SdrObjUserCall
virtual void Changed(const SdrObject& rObj, SdrUserCallType eType,
const Rectangle& rOldBoundRect);
-
-
- virtual void WriteData(SvStream& ) const {}
#endif
+
virtual void ReadData(const SdrIOHeader& rHead, SvStream& rIn);
void SetLayoutName(String aName);
diff --git a/binfilter/inc/bf_svx/camera3d.hxx b/binfilter/inc/bf_svx/camera3d.hxx
index 40d8160..7869979 100644
--- a/binfilter/inc/bf_svx/camera3d.hxx
+++ b/binfilter/inc/bf_svx/camera3d.hxx
@@ -92,10 +92,8 @@ class Camera3D : public Viewport3D
// Die Umstellung von Filerevision 12 auf 13 erfolgte zur 355
// 5.2.1997 Franz Gotsis, ReadData31 kann also auch die
// zur 4.0 gehoerigen Filrevisionen bis zu 12 lesen.
- virtual void WriteData31(SvStream& ) const {}
virtual void ReadData31(SvStream& rIn);
- virtual void WriteData(SvStream& ) const {}
virtual void ReadData(const SdrObjIOHeader& rHead, SvStream& rIn);
};
diff --git a/binfilter/inc/bf_svx/cube3d.hxx b/binfilter/inc/bf_svx/cube3d.hxx
index 9b1795f..023fba0 100644
--- a/binfilter/inc/bf_svx/cube3d.hxx
+++ b/binfilter/inc/bf_svx/cube3d.hxx
@@ -76,7 +76,6 @@ public:
virtual UINT16 GetObjIdentifier() const;
virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const;
- virtual void WriteData(SvStream& ) const {}
virtual void ReadData(const SdrObjIOHeader& rHead, SvStream& rIn);
// Geometrieerzeugung
diff --git a/binfilter/inc/bf_svx/dlight3d.hxx b/binfilter/inc/bf_svx/dlight3d.hxx
index efdab41..f2f1ebc 100644
--- a/binfilter/inc/bf_svx/dlight3d.hxx
+++ b/binfilter/inc/bf_svx/dlight3d.hxx
@@ -71,7 +71,6 @@ class E3dDistantLight : public E3dLight
const Vector3D& GetDirection() const { return aDirection; }
- virtual void WriteData(SvStream& ) const {}
virtual void ReadData(const SdrObjIOHeader& rHead, SvStream& rIn);
};
diff --git a/binfilter/inc/bf_svx/extrud3d.hxx b/binfilter/inc/bf_svx/extrud3d.hxx
index bf9ff78..9f22bb2 100644
--- a/binfilter/inc/bf_svx/extrud3d.hxx
+++ b/binfilter/inc/bf_svx/extrud3d.hxx
@@ -111,7 +111,6 @@ public:
virtual void CreateWireframe(Polygon3D& rWirePoly, const Matrix4D* pTf = NULL,
E3dDragDetail eDetail = E3DDETAIL_DEFAULT);
- virtual void WriteData(SvStream& ) const {}
virtual void ReadData(const SdrObjIOHeader& rHead, SvStream& rIn);
// TakeObjName...() ist fuer die Anzeige in der UI, z.B. "3 Rahmen selektiert".
diff --git a/binfilter/inc/bf_svx/fmmodel.hxx b/binfilter/inc/bf_svx/fmmodel.hxx
index b886309..26894dc 100644
--- a/binfilter/inc/bf_svx/fmmodel.hxx
+++ b/binfilter/inc/bf_svx/fmmodel.hxx
@@ -74,7 +74,6 @@ public:
virtual void InsertMasterPage(SdrPage* pPage, sal_uInt16 nPos=0xFFFF);
virtual SdrPage* RemoveMasterPage(sal_uInt16 nPgNum);
- virtual void WriteData(SvStream& ) const {}
virtual void ReadData(const SdrIOHeader& rHead, SvStream& rIn);
virtual SdrLayerID GetControlExportLayerId( const SdrObject& rObj ) const;
diff --git a/binfilter/inc/bf_svx/fmpage.hxx b/binfilter/inc/bf_svx/fmpage.hxx
index d46af56..e209157 100644
--- a/binfilter/inc/bf_svx/fmpage.hxx
+++ b/binfilter/inc/bf_svx/fmpage.hxx
@@ -62,7 +62,6 @@ public:
using SdrPage::NbcInsertObject;
using SdrPage::ReplaceObject;
- virtual void WriteData(SvStream& ) const {}
virtual void ReadData(const SdrIOHeader& rHead, SvStream& rIn);
virtual void SetModel(SdrModel* pNewModel);
@@ -73,22 +72,6 @@ public:
virtual SdrObject* RemoveObject(ULONG nObjNum);
- /** Insert _pClone into the page.
- If _pClone is no form object, InsertObject will be called.
- If _pClone is a form object, the page will create forms as needed to properly place the control model of the new object
- (so it is located within the forms hierarchy in an position analogous to the source objects model with it's hierarchy).
- If _pClone is NULL, it will be created via _pSourceObject->Clone(SdrPage*, SdrModel*).
- If bTryPreserveName is sal_True, the property value for "Name" will be restored after calling the InsertObject (which otherwise
- may alter the name to ensure uniqueness).
- */
-
- /** Create an environment (within the forms hierarchy of the page) for inserting a form object which is a clone
- of the given form object (which has to belong to a foreign page).
- "environment" means that the UnoControlModel of the given object may be inserted into our forms hierarchy
- without (to much) structure loss.
- If _pObj isn't a form object, nothing happens.
- */
-
// Zugriff auf alle Formulare
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer>& GetForms() const;
diff --git a/binfilter/inc/bf_svx/label3d.hxx b/binfilter/inc/bf_svx/label3d.hxx
index 355ec4f..3a545d0 100644
--- a/binfilter/inc/bf_svx/label3d.hxx
+++ b/binfilter/inc/bf_svx/label3d.hxx
@@ -90,7 +90,6 @@ class E3dLabelObj : public E3dPointObj
const SdrObject* Get2DLabelObj() const { return p2DLabelObj; }
- virtual void WriteData(SvStream& ) const {}
virtual void ReadData(const SdrObjIOHeader& rHead, SvStream& rIn);
// TakeObjName...() ist fuer die Anzeige in der UI, z.B. "3 Rahmen selektiert".
diff --git a/binfilter/inc/bf_svx/lathe3d.hxx b/binfilter/inc/bf_svx/lathe3d.hxx
index 28a0bef..ab33481 100644
--- a/binfilter/inc/bf_svx/lathe3d.hxx
+++ b/binfilter/inc/bf_svx/lathe3d.hxx
@@ -116,7 +116,6 @@ class E3dLatheObj : public E3dCompoundObject
const PolyPolygon3D& GetPolyPolygon() const { return aPolyPoly3D; }
- virtual void WriteData(SvStream& ) const {}
virtual void ReadData(const SdrObjIOHeader& rHead, SvStream& rIn);
diff --git a/binfilter/inc/bf_svx/light3d.hxx b/binfilter/inc/bf_svx/light3d.hxx
index be6b182..4defb38 100644
--- a/binfilter/inc/bf_svx/light3d.hxx
+++ b/binfilter/inc/bf_svx/light3d.hxx
@@ -90,7 +90,6 @@ class E3dLight : public E3dPointObj
double GetGreen() const { return fGreen; }
double GetBlue() const { return fBlue; }
- virtual void WriteData(SvStream& ) const {}
virtual void ReadData(const SdrObjIOHeader& rHead, SvStream& rIn);
virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr);
diff --git a/binfilter/inc/bf_svx/obj3d.hxx b/binfilter/inc/bf_svx/obj3d.hxx
index 53d7e7f..4f58fc1 100644
--- a/binfilter/inc/bf_svx/obj3d.hxx
+++ b/binfilter/inc/bf_svx/obj3d.hxx
@@ -246,7 +246,6 @@ class E3dObject : public SdrAttrObj
virtual void NbcSetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr);
- virtual void WriteData(SvStream& ) const {}
virtual void ReadData(const SdrObjIOHeader& rHead, SvStream& rIn);
virtual void AfterRead();
@@ -474,7 +473,6 @@ public :
virtual SdrObject* CheckHit(const Point& rPnt, USHORT nTol,
const SetOfByte* pVisiLayer) const;
- virtual void WriteData(SvStream& ) const {}
virtual void ReadData(const SdrObjIOHeader& rHead, SvStream& rIn);
// Geometrieerzeugung
@@ -492,8 +490,6 @@ public :
// Unterstuetzung Objekte lesen
BOOL AreBytesLeft() const { return bBytesLeft; }
-private:
-
public:
// DisplayGeometry rausruecken
B3dGeometry& GetDisplayGeometry();
diff --git a/binfilter/inc/bf_svx/pntobj3d.hxx b/binfilter/inc/bf_svx/pntobj3d.hxx
index 7554b11..ba6924e 100644
--- a/binfilter/inc/bf_svx/pntobj3d.hxx
+++ b/binfilter/inc/bf_svx/pntobj3d.hxx
@@ -62,7 +62,6 @@ class E3dPointObj : public E3dObject
const Vector3D& GetPosition() const { return aPosition; }
const Vector3D& GetTransPosition();
- virtual void WriteData(SvStream& ) const {}
virtual void ReadData(const SdrObjIOHeader& rHead, SvStream& rIn);
};
diff --git a/binfilter/inc/bf_svx/polygn3d.hxx b/binfilter/inc/bf_svx/polygn3d.hxx
index b1722f3..8c94b2b 100644
--- a/binfilter/inc/bf_svx/polygn3d.hxx
+++ b/binfilter/inc/bf_svx/polygn3d.hxx
@@ -73,13 +73,8 @@ public:
virtual UINT16 GetObjIdentifier() const;
- virtual void WriteData(SvStream& ) const {}
virtual void ReadData(const SdrObjIOHeader& rHead, SvStream& rIn);
- // Geometrieerzeugung
-
- // Give out simple line geometry
-
// LineOnly?
BOOL GetLineOnly() { return bLineOnly; }
};
diff --git a/binfilter/inc/bf_svx/polyob3d.hxx b/binfilter/inc/bf_svx/polyob3d.hxx
index e2d2a5e..1084f79 100644
--- a/binfilter/inc/bf_svx/polyob3d.hxx
+++ b/binfilter/inc/bf_svx/polyob3d.hxx
@@ -55,9 +55,8 @@ class E3dPolyObj : public E3dObject
long nObjectnumber; // default ist -1;
// [FG]: Zwecks schreiben des Formates der 3.1 Version
- // Diese Funktionen werden nur von ReadData31 und WriteData31
+ // Diese Funktionen werden nur von ReadData31
// aufgerufen.
- void WriteData31(SvStream& ) const {}
void ReadData31(const SdrObjIOHeader& rHead, SvStream& rIn);
public:
@@ -90,11 +89,8 @@ public:
virtual const Rectangle& GetBoundRect() const;
- virtual void WriteData(SvStream& ) const {}
virtual void ReadData(const SdrObjIOHeader& rHead, SvStream& rIn);
-
-
virtual SdrObjGeoData *NewGeoData() const;
virtual void SaveGeoData(SdrObjGeoData &rGeo) const;
virtual void RestGeoData(const SdrObjGeoData &rGeo);
diff --git a/binfilter/inc/bf_svx/scene3d.hxx b/binfilter/inc/bf_svx/scene3d.hxx
index e2663f9..97ce732 100644
--- a/binfilter/inc/bf_svx/scene3d.hxx
+++ b/binfilter/inc/bf_svx/scene3d.hxx
@@ -261,7 +261,6 @@ public:
bool IsFitInSnapRect() const { return bFitInSnapRect; }
void FitSnapRectToBoundVol();
- virtual void WriteData(SvStream& ) const {}
virtual void ReadData(const SdrObjIOHeader& rHead, SvStream& rIn);
@@ -277,10 +276,6 @@ public:
virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0);
virtual void PostItemChange(const sal_uInt16 nWhich);
- // pre- and postprocessing for objects for saving
- virtual void PreSave() {}
- virtual void PostSave() {}
-
virtual void NbcSetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr);
virtual SfxStyleSheet* GetStyleSheet() const;
diff --git a/binfilter/inc/bf_svx/sphere3d.hxx b/binfilter/inc/bf_svx/sphere3d.hxx
index 705836c..89e9572 100644
--- a/binfilter/inc/bf_svx/sphere3d.hxx
+++ b/binfilter/inc/bf_svx/sphere3d.hxx
@@ -65,7 +65,6 @@ public:
virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const;
- virtual void WriteData(SvStream& ) const {}
virtual void ReadData(const SdrObjIOHeader& rHead, SvStream& rIn);
const Vector3D Center() const { return aCenter; }
diff --git a/binfilter/inc/bf_svx/svdmodel.hxx b/binfilter/inc/bf_svx/svdmodel.hxx
index 2ff1569..d0d1abd 100644
--- a/binfilter/inc/bf_svx/svdmodel.hxx
+++ b/binfilter/inc/bf_svx/svdmodel.hxx
@@ -649,24 +649,23 @@ public:
// Strings werden beim rausstreamen in den am Stream eingestellten
// StreamCharSet konvertiert.
// Abgeleitete Klassen mit eigenen persistenten Membern ueberladen
- // die virtuellen Methoden ReadData() und WriteData().
+ // die virtuellen Methoden ReadData().
friend SvStream& operator<<(SvStream& rOut, const SdrModel& rMod);
// Wenn das Model im Stream in einem fremden CharSet vorliegt
// wird beim einstreamen implizit auf den SystemCharSet konvertiert.
// Abgeleitete Klassen mit eigenen persistenten Membern ueberladen
- // die virtuellen Methoden ReadData() und WriteData().
+ // die virtuellen Methoden ReadData().
friend SvStream& operator>>(SvStream& rIn, SdrModel& rMod);
// Stream muss am Anfang des SdrModel stehen. Die FileVersion des im
// Stream befindlichen Models muss >=11 sein, ansonsten wird die
// ModelInfo nicht geschrieben.
- // Abgeleitete Klassen ueberladen lediglich die Methoden ReadData() und
- // WriteData(). Diese werden von den Streamoperatoren des Model gerufen.
+ // Abgeleitete Klassen ueberladen lediglich die Methoden ReadData().
+ // Diese werden von den Streamoperatoren des Model gerufen.
// Wichtig ist, dass die ueberladen Methoden der abgeleiteten Klasse
// als erstes die Methode der Basisklasse rufen, da sonst der CharSet
// am Stream nicht korrekt gesetzt wird, ...
- virtual void WriteData(SvStream& ) const {}
virtual void ReadData(const SdrIOHeader& rHead, SvStream& rIn);
// AfterRead wird gerufen, nachdem das gesamte Model eingestreamt
// worden ist. Damit ist ein PostProcessing moeglich um beispielsweise
@@ -689,10 +688,6 @@ public:
SotStorage* GetModelStorage() const { return pModelStorage; }
void SetModelStorage( SotStorage* pStor ) { pModelStorage = pStor; }
- // pre- and postprocessing for objects for saving
- void PreSave() {}
- void PostSave() {}
-
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getUnoModel();
void setUnoModel( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xModel ) { mxUnoModel = xModel; }
diff --git a/binfilter/inc/bf_svx/svdoattr.hxx b/binfilter/inc/bf_svx/svdoattr.hxx
index 1d1aee2..7e04f61 100644
--- a/binfilter/inc/bf_svx/svdoattr.hxx
+++ b/binfilter/inc/bf_svx/svdoattr.hxx
@@ -112,14 +112,9 @@ public:
virtual const Rectangle& GetSnapRect() const;
virtual void operator=(const SdrObject& rObj);
- virtual void WriteData(SvStream& ) const {}
virtual void ReadData(const SdrObjIOHeader& rHead, SvStream& rIn);
virtual void SetModel(SdrModel* pNewModel);
- // pre- and postprocessing for objects for saving
- virtual void PreSave() {}
- virtual void PostSave() {}
-
// ItemSet access
virtual const SfxItemSet& GetItemSet() const;
virtual SfxItemSet* CreateNewItemSet(SfxItemPool& rPool);
diff --git a/binfilter/inc/bf_svx/svdobj.hxx b/binfilter/inc/bf_svx/svdobj.hxx
index 15295a7..e015b38 100644
--- a/binfilter/inc/bf_svx/svdobj.hxx
+++ b/binfilter/inc/bf_svx/svdobj.hxx
@@ -227,7 +227,6 @@ public:
virtual SdrObjUserData* Clone(SdrObject* pObj1) const = 0;
UINT32 GetInventor() const { return nInventor; }
UINT16 GetId() const { return nIdentifier; }
- virtual void WriteData(SvStream& ) {}
virtual void ReadData(SvStream& rIn);
// z.B. fuer die Wiederherstellung von Surrogaten.
@@ -307,7 +306,6 @@ public:
TYPEINFO();
SdrObjPlusData();
virtual ~SdrObjPlusData();
- // Keine Streamoperatoren. Jede Obj streamt seinen Teil in Obj::WriteData().
};
//************************************************************
@@ -837,10 +835,6 @@ public:
virtual void ItemChange(const sal_uInt16, const SfxPoolItem* = 0) {} // DBG_BF_ASSERT
virtual void PostItemChange(const sal_uInt16) {} // DBG_BF_ASSERT
- // pre- and postprocessing for objects for saving
- virtual void PreSave() {}
- virtual void PostSave() {}
-
// bDontRemoveHardAttr=FALSE: alle in der Vorlage gesetzten Attribute werden am
// Zeichenobjekt auf Default gesetzt; TRUE: alle harten Attribute bleiben erhalten.
virtual void SetStyleSheet(SfxStyleSheet*, bool) {} // DBG_BF_ASSERT
@@ -933,17 +927,6 @@ public:
virtual SdrObject* DoConvertToPolyObj(BOOL /*bBezier*/) const { return NULL; } // DBG_BF_ASSERT
SdrObject* ConvertToPolyObj(BOOL bBezier, BOOL bLineToArea) const;
- // convert this path object to contour object; bForceLineDash converts even
- // when there is no filled new polygon created from line-to-polygon conversion,
- // specially used for XLINE_DASH and 3D conversion
-
- // Schreiben in einen Stream: Der Operator << schreibt zunaest den 28 Bytes
- // langen SdrObjIOHeader in den Stream und ruft anschliessend die vMethode
- // WriteData() auf. Zum Schluss wird noch das vorerst auf 0 initiallisierte
- // Feld nByteAnz des SdrObjIOHeader gefuellt. Die geerbte Methode WriteData
- // ist in ueberlagerten Methoden stets am Anfang zu rufen.
- virtual void WriteData(SvStream& ) const {} // DBG_BF_ASSERT
-
// Lesen aus einem Stream: Zunaest wird der SdrIOHeader von einem Reader am
// SdrModel gelesen (Read und SeekBack). Der Reader versucht dann eine
// Instanz der entsprechenden Klasse entweder selbst zu erzeugen oder bei
diff --git a/binfilter/inc/bf_svx/svdocapt.hxx b/binfilter/inc/bf_svx/svdocapt.hxx
index 78365c1..ccf1667 100644
--- a/binfilter/inc/bf_svx/svdocapt.hxx
+++ b/binfilter/inc/bf_svx/svdocapt.hxx
@@ -92,10 +92,6 @@ public:
// private support routines for ItemSet access. NULL pointer means clear item.
virtual void ItemSetChanged(const SfxItemSet& rSet);
- // pre- and postprocessing for objects for saving
- virtual void PreSave() {}
- virtual void PostSave() {}
-
virtual void NbcSetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr);
virtual void NbcMove(const Size& rSiz);
@@ -109,11 +105,8 @@ public:
virtual void NbcSetSnapRect(const Rectangle& rRect);
-protected:
-
public:
- virtual void WriteData(SvStream& ) const {}
virtual void ReadData(const SdrObjIOHeader& rHead, SvStream& rIn);
const Point& GetTailPos() const;
diff --git a/binfilter/inc/bf_svx/svdocirc.hxx b/binfilter/inc/bf_svx/svdocirc.hxx
index e96433b..cd5dd53 100644
--- a/binfilter/inc/bf_svx/svdocirc.hxx
+++ b/binfilter/inc/bf_svx/svdocirc.hxx
@@ -112,9 +112,7 @@ public:
virtual void NbcShear (const Point& rRef, double tn, bool bVShear);
virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const;
-protected:
public:
- virtual void WriteData(SvStream& ) const {}
virtual void ReadData(const SdrObjIOHeader& rHead, SvStream& rIn);
long GetStartWink() const { return nStartWink; }
@@ -126,10 +124,6 @@ public:
// private support routines for ItemSet access. NULL pointer means clear item.
virtual void ItemSetChanged(const SfxItemSet& rSet);
-
- // pre- and postprocessing for objects for saving
- virtual void PreSave() {}
- virtual void PostSave() {}
};
}//end of namespace binfilter
diff --git a/binfilter/inc/bf_svx/svdoedge.hxx b/binfilter/inc/bf_svx/svdoedge.hxx
index a3c5f4c..b0220f9 100644
--- a/binfilter/inc/bf_svx/svdoedge.hxx
+++ b/binfilter/inc/bf_svx/svdoedge.hxx
@@ -206,10 +206,6 @@ public:
// private support routines for ItemSet access. NULL pointer means clear item.
virtual void ItemSetChanged(const SfxItemSet& rSet);
- // pre- and postprocessing for objects for saving
- virtual void PreSave() {}
- virtual void PostSave() {}
-
virtual void NbcSetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr);
// bTail1=TRUE: Linienanfang, sonst LinienEnde
@@ -238,7 +234,6 @@ public:
virtual void NbcSetPoint(const Point& rPnt, USHORT i);
- virtual void WriteData(SvStream& ) const {}
virtual void ReadData(const SdrObjIOHeader& rHead, SvStream& rIn);
virtual void AfterRead();
diff --git a/binfilter/inc/bf_svx/svdograf.hxx b/binfilter/inc/bf_svx/svdograf.hxx
index 1a02e28..65e2d48 100644
--- a/binfilter/inc/bf_svx/svdograf.hxx
+++ b/binfilter/inc/bf_svx/svdograf.hxx
@@ -155,7 +155,6 @@ public:
virtual void SetPage(SdrPage* pNewPage);
virtual void SetModel(SdrModel* pNewModel);
- virtual void WriteData(SvStream& ) const {}
virtual void ReadData(const SdrObjIOHeader& rHead, SvStream& rIn);
void ReadDataTilV10(const SdrObjIOHeader& rHead, SvStream& rIn);
diff --git a/binfilter/inc/bf_svx/svdogrp.hxx b/binfilter/inc/bf_svx/svdogrp.hxx
index fe5581b..7411089 100644
--- a/binfilter/inc/bf_svx/svdogrp.hxx
+++ b/binfilter/inc/bf_svx/svdogrp.hxx
@@ -86,7 +86,6 @@ public:
virtual ~ImpSdrObjGroupLinkUserData();
virtual SdrObjUserData* Clone(SdrObject* pObj1) const;
- virtual void WriteData(SvStream& ) {} // DBG_BF_ASSERT
virtual void ReadData(SvStream& rIn);
virtual void AfterRead() {} // DBG_BF_ASSERT
};
@@ -197,7 +196,6 @@ public:
virtual void RestartAnimation(SdrPageView* pPageView) const;
- virtual void WriteData(SvStream& ) const {} // DBG_BF_ASSERT
virtual void ReadData(const SdrObjIOHeader& rHead, SvStream& rIn);
virtual void AfterRead();
diff --git a/binfilter/inc/bf_svx/svdomeas.hxx b/binfilter/inc/bf_svx/svdomeas.hxx
index a072a6b..d7af16c 100644
--- a/binfilter/inc/bf_svx/svdomeas.hxx
+++ b/binfilter/inc/bf_svx/svdomeas.hxx
@@ -127,11 +127,6 @@ public:
// private support routines for ItemSet access. NULL pointer means clear item.
virtual void ItemSetChanged(const SfxItemSet& rSet);
- // pre- and postprocessing for objects for saving
- virtual void PreSave() {}
- virtual void PostSave() {}
-
- virtual void WriteData(SvStream& ) const {}
virtual void ReadData(const SdrObjIOHeader& rHead, SvStream& rIn);
};
diff --git a/binfilter/inc/bf_svx/svdoole2.hxx b/binfilter/inc/bf_svx/svdoole2.hxx
index 4e14791..5750135 100644
--- a/binfilter/inc/bf_svx/svdoole2.hxx
+++ b/binfilter/inc/bf_svx/svdoole2.hxx
@@ -131,7 +131,6 @@ public:
bool HasGDIMetaFile() const;
const GDIMetaFile* GetGDIMetaFile() const;
- virtual void WriteData(SvStream& ) const {}
virtual void ReadData(const SdrObjIOHeader& rHead, SvStream& rIn);
BOOL Unload();
diff --git a/binfilter/inc/bf_svx/svdopage.hxx b/binfilter/inc/bf_svx/svdopage.hxx
index 1c9ae18..57eface 100644
--- a/binfilter/inc/bf_svx/svdopage.hxx
+++ b/binfilter/inc/bf_svx/svdopage.hxx
@@ -66,7 +66,6 @@ public:
virtual const Rectangle& GetLogicRect() const;
virtual void NbcSetSnapRect(const Rectangle& rRect);
virtual void NbcSetLogicRect(const Rectangle& rRect);
- virtual void WriteData(SvStream& ) const {}
virtual void ReadData(const SdrObjIOHeader& rHead, SvStream& rIn);
// ItemSet access
diff --git a/binfilter/inc/bf_svx/svdopath.hxx b/binfilter/inc/bf_svx/svdopath.hxx
index 4e3c27a..cce4324 100644
--- a/binfilter/inc/bf_svx/svdopath.hxx
+++ b/binfilter/inc/bf_svx/svdopath.hxx
@@ -122,7 +122,6 @@ protected:
public:
- virtual void WriteData(SvStream& ) const {}
virtual void ReadData(const SdrObjIOHeader& rHead, SvStream& rIn);
// Bezierpolygon holen/setzen
diff --git a/binfilter/inc/bf_svx/svdorect.hxx b/binfilter/inc/bf_svx/svdorect.hxx
index f2d4875..53e63e9 100644
--- a/binfilter/inc/bf_svx/svdorect.hxx
+++ b/binfilter/inc/bf_svx/svdorect.hxx
@@ -126,7 +126,6 @@ public:
virtual SdrGluePoint GetVertexGluePoint(USHORT nNum) const;
- virtual void WriteData(SvStream& ) const {}
virtual void ReadData(const SdrObjIOHeader& rHead, SvStream& rIn);
virtual void SFX_NOTIFY(SfxBroadcaster& rBC, const TypeId& rBCType, const SfxHint& rHint, const TypeId& rHintType);
diff --git a/binfilter/inc/bf_svx/svdotext.hxx b/binfilter/inc/bf_svx/svdotext.hxx
index 91037f0..224b6b2 100644
--- a/binfilter/inc/bf_svx/svdotext.hxx
+++ b/binfilter/inc/bf_svx/svdotext.hxx
@@ -95,7 +95,6 @@ public:
virtual ~ImpSdrObjTextLinkUserData();
virtual SdrObjUserData* Clone(SdrObject* pObj1) const;
- virtual void WriteData(SvStream& ) {}
virtual void ReadData(SvStream& rIn);
virtual void AfterRead();
};
@@ -353,7 +352,6 @@ public:
virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0);
- virtual void WriteData(SvStream& ) const {}
virtual void ReadData(const SdrObjIOHeader& rHead, SvStream& rIn);
void SetTextEditOutliner(SdrOutliner* pOutl) { pEdtOutl=pOutl; }
@@ -390,9 +388,6 @@ public:
*/
void UpdateOutlinerFormatting( SdrOutliner& /*rOutl*/, Rectangle& /*rPaintRect*/ ){DBG_BF_ASSERT(0, "STRIP");}
- // pre- and postprocessing for objects for saving
- virtual void PreSave() {}
-
void ForceOutlinerParaObject();
BOOL IsVerticalWriting() const;
void SetVerticalWriting( BOOL bVertical );
diff --git a/binfilter/inc/bf_svx/svdouno.hxx b/binfilter/inc/bf_svx/svdouno.hxx
index ed9a91d..1dac766 100644
--- a/binfilter/inc/bf_svx/svdouno.hxx
+++ b/binfilter/inc/bf_svx/svdouno.hxx
@@ -83,7 +83,6 @@ public:
virtual void NbcSetLogicRect(const Rectangle& rRect);
virtual void NbcSetLayer(SdrLayerID nLayer);
- virtual void WriteData(SvStream& ) const {}
virtual void ReadData(const SdrObjIOHeader& rHead, SvStream& rIn);
diff --git a/binfilter/inc/bf_svx/svdovirt.hxx b/binfilter/inc/bf_svx/svdovirt.hxx
index ca03289..23cbabc 100644
--- a/binfilter/inc/bf_svx/svdovirt.hxx
+++ b/binfilter/inc/bf_svx/svdovirt.hxx
@@ -74,10 +74,6 @@ public:
virtual void SetChanged();
-
-
-
-
virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact);
virtual void Resize(const Point& rRef, const Fraction& xFact, const Fraction& yFact);
@@ -98,16 +94,9 @@ public:
// private support routines for ItemSet access. NULL pointer means clear item.
- // pre- and postprocessing for objects for saving
- virtual void PreSave() {}
- virtual void PostSave() {}
-
virtual void NbcSetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr);
virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr);
-
-
- virtual void WriteData(SvStream& ) const {}
virtual void ReadData(const SdrObjIOHeader& rHead, SvStream& rIn);
virtual void AfterRead();
diff --git a/binfilter/inc/bf_svx/svdpage.hxx b/binfilter/inc/bf_svx/svdpage.hxx
index c95086d..809b8d9 100644
--- a/binfilter/inc/bf_svx/svdpage.hxx
+++ b/binfilter/inc/bf_svx/svdpage.hxx
@@ -427,12 +427,11 @@ public:
SdrObject* GetBackgroundObj() const { return pBackgroundObj; }
void SetBackgroundObj( SdrObject* pObj );
- // Abgeleitete Klassen ueberlagern ggf. WriteData() und ReadData(). Diese
+ // Abgeleitete Klassen ueberlagern ggf. ReadData(). Diese
// Methoden werden dann von den Stream-Operatoren gerufen.
// Ausserdem muss man sich in diesem Fall von SdrModel ableiten und die
// vMethode AllocPage() ueberladen, damit das Model beim reinstreamen die
// richtige Page erzeugen kann.
- virtual void WriteData(SvStream& ) const {}
virtual void ReadData(const SdrIOHeader& rHead, SvStream& rIn);
friend SvStream& operator<<(SvStream& rOut, const SdrPage& rPg);
friend SvStream& operator>>(SvStream& rIn, SdrPage& rPg);
diff --git a/binfilter/inc/bf_svx/svdview.hxx b/binfilter/inc/bf_svx/svdview.hxx
index 68f59ee..7dffa8b 100644
--- a/binfilter/inc/bf_svx/svdview.hxx
+++ b/binfilter/inc/bf_svx/svdview.hxx
@@ -120,8 +120,8 @@ class SdrView: public SdrCreateView
unsigned bTextEditOnObjectsWithoutTextIfTextTool : 1;
protected:
- // Abgeleitete Klassen ueberladen lediglich die Methoden ReadData() und
- // WriteData(). Diese werden von den Streamoperatoren der View gerufen.
+ // Abgeleitete Klassen ueberladen lediglich die Methoden ReadData().
+ // Diese werden von den Streamoperatoren der View gerufen.
// Wichtig ist, dass die ueberladen Methoden der abgeleiteten Klasse
// als erstes die Methode der Basisklasse rufen, da sonst der CharSet
// am Stream nicht korrekt gesetzt wird, ...
@@ -173,13 +173,13 @@ public:
// Strings werden beim rausstreamen in den am Stream eingestellten
// StreamCharSet konvertiert.
// Abgeleitete Klassen mit eigenen persistenten Membern ueberladen
- // die virtuellen Methoden ReadData() und WriteData().
+ // die virtuellen Methoden ReadData()
friend SvStream& operator<<(SvStream& rOut, const SdrView& rView);
// Wenn das Model im Stream in einem fremden CharSet vorliegt
// wird beim einstreamen implizit auf den SystemCharSet konvertiert.
// Abgeleitete Klassen mit eigenen persistenten Membern ueberladen
- // die virtuellen Methoden ReadData() und WriteData().
+ // die virtuellen Methoden ReadData()
friend SvStream& operator>>(SvStream& rIn, SdrView& rView);
diff --git a/binfilter/inc/bf_svx/viewpt3d.hxx b/binfilter/inc/bf_svx/viewpt3d.hxx
index b83714e..0bdd06e 100644
--- a/binfilter/inc/bf_svx/viewpt3d.hxx
+++ b/binfilter/inc/bf_svx/viewpt3d.hxx
@@ -128,16 +128,14 @@ class Viewport3D
Vector3D MapToDevice(const Vector3D&) const;
- virtual void WriteData(SvStream& ) const {}
virtual void ReadData(const SdrObjIOHeader& rHead, SvStream& rIn);
// Wird nur vom Stream-Operator gerufen
virtual void ReadData31(SvStream& rIn);
- virtual void WriteData31(SvStream& ) const {}
};
// FG: eigentlich sollten die Stream-Funktionen in der 3D-Engine nicht verwendet werden
-// sondern WriteData und ReadData, da man insbesondere bei ReadData einen
+// sondern ReadData, da man insbesondere bei ReadData einen
// zusaetzlichen Parameter hat der die File-Revision enthaelt.
// Sie sind aus Kompatibilitaetsgruenden noch vorhanden.
SvStream& operator<<(SvStream& rOStream, const Viewport3D&);
commit fa0f14006f14a982398a94ece12a49595f9f3da6
Author: Joseph Powers <jpowers27 at cox.net>
Date: Wed Oct 12 21:04:52 2011 -0700
Cleanup classes SdrGrafObj & SdrObjGroup
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdograf.cxx b/binfilter/bf_svx/source/svdraw/svx_svdograf.cxx
index bfde976..0175872 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdograf.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdograf.cxx
@@ -286,21 +286,6 @@ namespace binfilter {
// -----------------------------------------------------------------------------
-/*N*/ String SdrGrafObj::GetGrafStreamURL() const
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); String aString; return aString;
-/*N*/ }
-
-// -----------------------------------------------------------------------------
-
-
-// -----------------------------------------------------------------------------
-
-
-// -----------------------------------------------------------------------------
-
-
-// -----------------------------------------------------------------------------
-
/*N*/ void SdrGrafObj::SetName(const XubString& rStr)
/*N*/ {
/*N*/ aName = rStr;
@@ -683,23 +668,19 @@ namespace binfilter {
/*N*/ }
/*N*/
/*N*/ bool bDraft = ( 0 != ( rInfoRec.nPaintMode & SDRPAINTMODE_DRAFTGRAF ) );
-/*N*/ bool bSwappedOut = pGraphic->IsSwappedOut() || ( pGraphic->GetType() == GRAPHIC_NONE );
/*N*/ bool bLoading = FALSE;
/*N*/ OutputDevice* pOutDev = rOut.GetOutDev();
/*N*/ /*GDIMetaFile* pRecMetaFile =*/ pOutDev->GetConnectMetaFile();
/*N*/ const SdrView* pView = ( rInfoRec.pPV ? &rInfoRec.pPV->GetView() : NULL );
/*N*/
-/*N*/ if( bSwappedOut && !bDraft )
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/ if( pGraphic->IsSwappedOut() || ( pGraphic->GetType() == GRAPHIC_NONE ) || ( pGraphic->GetType() == GRAPHIC_DEFAULT ) )
/*?*/ bDraft=TRUE;
/*N*/
-/*N*/ long nDrehWink = aGeo.nDrehWink;
+/*N*/ long nDrehWink = aGeo.nDrehWink;
/*N*/ bool bRotate = ( nDrehWink != 0 && nDrehWink != 18000 );
/*N*/ bool bRota180 = nDrehWink == 18000;
-/*N*/ USHORT nMirrorCase = ( bRota180 ? ( bMirrored ? 3 : 4 ) : ( bMirrored ? 2 : 1 ) ); // 4 | 3 H&V gespiegelt | nur Vertikal
+/*N*/ USHORT nMirrorCase = ( bRota180 ? ( bMirrored ? 3 : 4 ) : ( bMirrored ? 2 : 1 ) ); // 4 | 3 H&V gespiegelt | nur Vertikal
/*N*/ bool bHMirr = ( ( 2 == nMirrorCase ) || ( 4 == nMirrorCase ) ); // ---+--- ---------------+-----------------
/*N*/ bool bVMirr = ( ( 3 == nMirrorCase ) || ( 4 == nMirrorCase ) ); // 2 | 1 nur Horizontal | nicht gespiegelt
/*N*/
@@ -729,18 +710,11 @@ namespace binfilter {
/*?*/ {
/*?*/ eAnimMode= pView->GetAnimationMode();
/*?*/ bEnable = ( eAnimMode != SDR_ANIMATION_DISABLE );
-/*?*/
-/*?*/ if( bEnable )
-/*?*/ {{DBG_BF_ASSERT(0, "STRIP"); }
-/*?*/ }
/*?*/ }
/*?*/
/*?*/ if( bEnable )
/*?*/ {
-/*?*/ if( eAnimMode == SDR_ANIMATION_ANIMATE )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
-/*?*/ else if( eAnimMode == SDR_ANIMATION_DONT_ANIMATE )
+/*?*/ if( eAnimMode == SDR_ANIMATION_DONT_ANIMATE )
/*?*/ pGraphic->Draw( pOutDev, aLogPos, aLogSize, &aAttr, nGraphicManagerDrawMode );
/*?*/ }
/*?*/ }
@@ -778,10 +752,7 @@ namespace binfilter {
/*N*/ {
/*N*/ XubString aText;
/*N*/ Bitmap* pBmp = NULL;
-/*N*/ bool bFill = FALSE;
-/*N*/
-/*N*/ if( bEmptyPresObj )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }
+/*N*/ bool bFill = FALSE;
/*N*/
/*N*/ // und nun noch einen grauen Rahmen drum herum, Text rein, ...
/*N*/ if( !bEmptyPresObj )
@@ -826,12 +797,6 @@ namespace binfilter {
// -----------------------------------------------------------------------------
-
-// -----------------------------------------------------------------------------
-
-
-// -----------------------------------------------------------------------------
-
/*N*/ void SdrGrafObj::operator=( const SdrObject& rObj )
/*N*/ {
/*N*/ SdrRectObj::operator=( rObj );
@@ -845,27 +810,11 @@ namespace binfilter {
/*N*/ aName = rGraf.aName;
/*N*/ bMirrored = rGraf.bMirrored;
/*N*/
-/*N*/ #ifndef SVX_LIGHT
-/*N*/ if( rGraf.pGraphicLink != NULL)
-/*N*/ #else
-/*N*/ if( rGraf.aFileName.Len() )
-/*N*/ #endif
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }
-/*N*/
/*N*/ ImpSetAttrToGrafInfo();
/*N*/ }
// -----------------------------------------------------------------------------
-
-// -----------------------------------------------------------------------------
-
-
-// -----------------------------------------------------------------------------
-
-
-// -----------------------------------------------------------------------------
-
/*N*/ void SdrGrafObj::NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact)
/*N*/ {
/*N*/ SdrRectObj::NbcResize( rRef, xFact, yFact );
@@ -886,12 +835,6 @@ namespace binfilter {
// -----------------------------------------------------------------------------
-
-// -----------------------------------------------------------------------------
-
-
-// -----------------------------------------------------------------------------
-
/*N*/ void SdrGrafObj::NbcSetSnapRect(const Rectangle& rRect)
/*N*/ {
/*N*/ SdrRectObj::NbcSetSnapRect(rRect);
@@ -922,13 +865,9 @@ namespace binfilter {
// -----------------------------------------------------------------------------
-
-// -----------------------------------------------------------------------------
-
/*N*/ void SdrGrafObj::SetPage( SdrPage* pNewPage )
/*N*/ {
/*N*/ bool bRemove = pNewPage == NULL && pPage != NULL;
-/*N*/ bool bInsert = pNewPage != NULL && pPage == NULL;
/*N*/
/*N*/ if( bRemove )
/*N*/ {
@@ -941,9 +880,6 @@ namespace binfilter {
/*N*/ }
/*N*/
/*N*/ SdrRectObj::SetPage( pNewPage );
-/*N*/
-/*N*/ if(aFileName.Len() && bInsert)
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }
/*N*/ }
// -----------------------------------------------------------------------------
@@ -965,11 +901,8 @@ namespace binfilter {
/*?*/ ImpLinkAbmeldung();
/*N*/ }
- // Model umsetzen
+ // Model umsetzen
/*N*/ SdrRectObj::SetModel(pNewModel);
-/*N*/
-/*N*/ if( bChg && aFileName.Len() )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }
/*N*/ }
/*N*/ void SdrGrafObj::ReadDataTilV10( const SdrObjIOHeader& rHead, SvStream& rIn )
@@ -1161,15 +1094,6 @@ namespace binfilter {
// -----------------------------------------------------------------------------
-
-// -----------------------------------------------------------------------------
-
-
-// -----------------------------------------------------------------------------
-
-
-// -----------------------------------------------------------------------------
-
/*N*/ void SdrGrafObj::RestartAnimation(SdrPageView* pPageView) const
/*N*/ {
/*N*/ // ToDo: hier noch entsprechend implementieren wie im TextObj
@@ -1178,9 +1102,6 @@ namespace binfilter {
// -----------------------------------------------------------------------------
-
-// -----------------------------------------------------------------------------
-
/*N*/ void SdrGrafObj::AfterRead()
/*N*/ {
/*N*/ SdrRectObj::AfterRead();
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdogrp.cxx b/binfilter/bf_svx/source/svdraw/svx_svdogrp.cxx
index 0fdf476..d48b9a1 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdogrp.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdogrp.cxx
@@ -78,9 +78,6 @@ namespace binfilter {
/*N*/ ImpSdrObjGroupLinkUserData::~ImpSdrObjGroupLinkUserData()
/*N*/ {
-/*N*/ #ifndef SVX_LIGHT
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ #endif
/*N*/ }
@@ -101,7 +98,6 @@ namespace binfilter {
/*N*/ pData->bOrigRotate=bOrigRotate;
/*N*/ pData->bOrigShear =bOrigShear;
/*N*/ pData->pLink=NULL;
-/*N*/ //pObj1->ImpLinkAnmeldung();
/*N*/ return pData;
/*N*/ }
@@ -148,15 +144,6 @@ namespace binfilter {
/*N*/ }
-/*N*/ void ImpSdrObjGroupLinkUserData::AfterRead()
-/*N*/ {
-/*N*/ if (pObj!=NULL) {
-/*N*/ ((SdrObjGroup*)pObj)->ImpLinkAnmeldung();
-/*N*/ // lt. Anweisung von MB kein automatisches Reload mehr
-/*N*/ //((SdrObjGroup*)pObj)->ReloadLinkedGroup();
-/*N*/ }
-/*N*/ }
-
////////////////////////////////////////////////////////////////////////////////////////////////////
//
// @@@@ @@@@@ @@@@@@ @@@@ @@@@@ @@@@ @@ @@ @@@@@
@@ -185,28 +172,12 @@ namespace binfilter {
/*N*/ SdrObjGroup::~SdrObjGroup()
/*N*/ {
-/*N*/ ReleaseGroupLink();
/*N*/ delete pSub;
/*N*/ if(mpGroupItemSet)
/*?*/ delete mpGroupItemSet;
/*N*/ }
-
-
-/*N*/ void SdrObjGroup::ReleaseGroupLink()
-/*N*/ {
-/*N*/ ImpLinkAbmeldung();
-/*N*/ USHORT nAnz=GetUserDataCount();
-/*N*/ for (USHORT nNum=nAnz; nNum>0;) {
-/*N*/ nNum--;
-/*N*/ SdrObjUserData* pData=GetUserData(nNum);
-/*N*/ if (pData->GetInventor()==SdrInventor && pData->GetId()==SDRUSERDATA_OBJGROUPLINK) {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ }
-/*N*/ }
-
-
/*N*/ ImpSdrObjGroupLinkUserData* SdrObjGroup::GetLinkUserData() const
/*N*/ {
/*N*/ ImpSdrObjGroupLinkUserData* pData=NULL;
@@ -222,36 +193,6 @@ namespace binfilter {
/*N*/ }
-
-
-
-
-/*N*/ void SdrObjGroup::ImpLinkAnmeldung()
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
-
-/*N*/ void SdrObjGroup::ImpLinkAbmeldung()
-/*N*/ {
-/*N*/ #ifndef SVX_LIGHT
-/*N*/ ImpSdrObjGroupLinkUserData* pData=GetLinkUserData();
-/*N*/ SvxLinkManager* pLinkManager=pModel!=NULL ? pModel->GetLinkManager() : NULL;
-/*N*/ if (pLinkManager!=NULL && pData!=NULL && pData->pLink!=NULL) { // Nicht 2x Abmelden
-/*N*/ // Bei Remove wird *pLink implizit deleted
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ #endif // SVX_LIGHT
-/*N*/ }
-
-
-
-
-/*N*/ UINT16 SdrObjGroup::GetObjIdentifier() const
-/*N*/ {
-/*N*/ return UINT16(OBJ_GRUP);
-/*N*/ }
-
-
/*N*/ SdrLayerID SdrObjGroup::GetLayer() const
/*N*/ {
/*N*/ bool b1st=TRUE;
@@ -287,46 +228,18 @@ namespace binfilter {
/*N*/ void SdrObjGroup::SetPage(SdrPage* pNewPage)
/*N*/ {
-/*N*/ bool bLinked=IsLinkedGroup();
-/*N*/ bool bRemove=pNewPage==NULL && pPage!=NULL;
-/*N*/ bool bInsert=pNewPage!=NULL && pPage==NULL;
-/*N*/
-/*N*/ if (bLinked && bRemove) {
-/*?*/ ImpLinkAbmeldung();
-/*N*/ }
-/*N*/
/*N*/ SdrObject::SetPage(pNewPage);
/*N*/ pSub->SetPage(pNewPage);
-/*N*/
-/*N*/ if (bLinked && bInsert) {
-/*?*/ ImpLinkAnmeldung();
-/*N*/ }
/*N*/ }
/*N*/ void SdrObjGroup::SetModel(SdrModel* pNewModel)
/*N*/ {
-/*N*/ bool bLinked=IsLinkedGroup();
-/*N*/ bool bChg=pNewModel!=pModel;
-/*N*/ if (bLinked && bChg) {
-/*N*/ ImpLinkAbmeldung();
-/*N*/ }
-/*N*/
/*N*/ SdrObject::SetModel(pNewModel);
/*N*/ pSub->SetModel(pNewModel);
-/*N*/
-/*N*/ if (bLinked && bChg) {
-/*?*/ ImpLinkAnmeldung();
-/*N*/ }
/*N*/ }
-
-
-
-
-
-
/*N*/ SdrObjList* SdrObjGroup::GetSubList() const
/*N*/ {
/*N*/ return pSub;
@@ -380,8 +293,6 @@ namespace binfilter {
/*?*/ pOutDev->DrawRect(aOutRect);
/*N*/ }
/*N*/ }
-/*N*/ if (bOk && (rInfoRec.nPaintMode & SDRPAINTMODE_GLUEPOINTS) !=0) {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/ return bOk;
/*N*/ }
@@ -401,17 +312,6 @@ namespace binfilter {
/*N*/ }
-
-
-
-
-/*N*/ void SdrObjGroup::RecalcSnapRect()
-/*N*/ {
-/*N*/ // nicht erforderlich, da die Rects von der SubList verwendet werden.
- DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
-
/*N*/ void MergePoly(XPolyPolygon& rDst, const XPolyPolygon& rSrc)
/*N*/ {
/*N*/ USHORT nAnz=rSrc.Count();
@@ -458,8 +358,6 @@ namespace binfilter {
/*N*/ long nDivY=aOld.Bottom()-aOld.Top();
/*N*/ if (nDivX==0) { nMulX=1; nDivX=1; }
/*N*/ if (nDivY==0) { nMulY=1; nDivY=1; }
-/*N*/ if (nMulX!=nDivX || nMulY!=nDivY) {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/ if (rRect.Left()!=aOld.Left() || rRect.Top()!=aOld.Top()) {
/*N*/ NbcMove(Size(rRect.Left()-aOld.Left(),rRect.Top()-aOld.Top()));
/*N*/ }
@@ -506,12 +404,6 @@ namespace binfilter {
/*N*/ }
-
-
-
-
-
-
/*N*/ void SdrObjGroup::NbcSetAnchorPos(const Point& rPnt)
/*N*/ {
/*N*/ aAnchor=rPnt;
@@ -550,8 +442,6 @@ namespace binfilter {
/*N*/ }
-
-
/*N*/ void SdrObjGroup::Move(const Size& rSiz)
/*N*/ {
/*N*/ if (rSiz.Width()!=0 || rSiz.Height()!=0) {
@@ -614,12 +504,6 @@ namespace binfilter {
/*N*/ }
-
-
-
-
-
-
/*N*/ void SdrObjGroup::SetAnchorPos(const Point& rPnt)
/*N*/ {
/*N*/ Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetBoundRect();
@@ -647,9 +531,6 @@ namespace binfilter {
/*N*/ }
-
-
-
/*N*/ void SdrObjGroup::SetRelativePos(const Point& rPnt)
/*N*/ {
/*N*/ Point aRelPos0(GetSnapRect().TopLeft()-aAnchor);
@@ -774,27 +655,12 @@ namespace binfilter {
/*N*/ }
-/*N*/ void SdrObjGroup::SetStyleSheet(SfxStyleSheet* /*pNewStyleSheet*/, bool /*bDontRemoveHardAttr*/)
-/*N*/ {
-/*N*/ if (!IsLinkedGroup()) {
-/*N*/ SdrObjList* pOL=pSub;
-/*N*/ ULONG nObjAnz=pOL->GetObjCount();
-/*N*/ for (ULONG i=0; i<nObjAnz; i++) {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ }
-/*N*/ }
-
-
-
-
/*N*/ void SdrObjGroup::ReformatText()
/*N*/ {
/*N*/ pSub->ReformatAllTextObjects();
/*N*/ }
-
-
/*N*/ void SdrObjGroup::RestartAnimation(SdrPageView* pPageView) const
/*N*/ {
/*N*/ pSub->RestartAllAnimations(pPageView);
@@ -840,8 +706,6 @@ namespace binfilter {
/*N*/ NbcSetAnchorPos(aAnchor);
/*N*/ }
-// ItemPool fuer dieses Objekt wechseln
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/inc/bf_svx/svdograf.hxx b/binfilter/inc/bf_svx/svdograf.hxx
index 35d5c80..1a02e28 100644
--- a/binfilter/inc/bf_svx/svdograf.hxx
+++ b/binfilter/inc/bf_svx/svdograf.hxx
@@ -67,7 +67,6 @@ public:
// - SdrGrafObj -
// --------------
-class SdrGrafSetItem;
class SdrGraphicLink;
class SdrGrafObj: public SdrRectObj
@@ -80,7 +79,7 @@ protected:
void ImpSetAttrToGrafInfo(); // Werte vom Pool kopieren
void ImpSetGrafInfoToAttr(); // Werte in den Pool kopieren
BfGraphicAttr aGrafInfo;
- bool bCopyToPoolOnAfterRead;
+ bool bCopyToPoolOnAfterRead;
String aName;
@@ -88,17 +87,10 @@ protected:
// Ausschnitt der Grafik in logischen Eingeiten der Grafik! Also Bitmap->=Pixel
String aFileName; // Wenn es sich um einen Link handelt, steht hier der Dateiname drin.
String aFilterName;
- BfGraphicObject* pGraphic; // Zur Beschleunigung von Bitmapausgaben, besonders von gedrehten.
- void* pReserve1;
- void* pReserve2;
- void* pReserve3;
- void* pReserve4;
- void* pReserve5;
+ BfGraphicObject* pGraphic; // Zur Beschleunigung von Bitmapausgaben, besonders von gedrehten.
SdrGraphicLink* pGraphicLink; // Und hier noch ein Pointer fuer gelinkte Grafiken
- bool bMirrored; // True bedeutet, die Grafik ist horizontal, d.h. ueber die Y-Achse gespiegelt auszugeben.
+ bool bMirrored; // True bedeutet, die Grafik ist horizontal, d.h. ueber die Y-Achse gespiegelt auszugeben.
ULONG nGrafStreamPos;
- bool bDummy1:1;
- bool bDummy2:1;
#if _SOLAR__PRIVATE
@@ -129,14 +121,14 @@ public:
GraphicType GetGraphicType() const;
void SetGrafStreamURL( const String& rGraphicStreamURL );
- String GetGrafStreamURL() const;
+ String GetGrafStreamURL() const { return String(); } // DBG_BF_ASSERT
void ForceSwapIn() const;
void ForceSwapOut() const;
void SetGraphicLink(const String& rFileName, const String& rFilterName);
void ReleaseGraphicLink();
- bool IsLinkedGraphic() const { return (BOOL)aFileName.Len(); }
+ bool IsLinkedGraphic() const { return (BOOL)aFileName.Len(); }
const String& GetFileName() const { return aFileName; }
const String& GetFilterName() const { return aFilterName; }
@@ -147,7 +139,7 @@ public:
virtual String GetName() const;
virtual UINT16 GetObjIdentifier() const;
- virtual bool Paint(ExtOutputDevice& rOut, const SdrPaintInfoRec& rInfoRec) const;
+ virtual bool Paint(ExtOutputDevice& rOut, const SdrPaintInfoRec& rInfoRec) const;
virtual SdrObject* CheckHit(const Point& rPnt, USHORT nTol, const SetOfByte* pVisiLayer) const;
@@ -163,11 +155,10 @@ public:
virtual void SetPage(SdrPage* pNewPage);
virtual void SetModel(SdrModel* pNewModel);
- virtual void WriteData(SvStream& ) const {}
+ virtual void WriteData(SvStream& ) const {}
virtual void ReadData(const SdrObjIOHeader& rHead, SvStream& rIn);
void ReadDataTilV10(const SdrObjIOHeader& rHead, SvStream& rIn);
-
void AdjustToMaxRect( const Rectangle& rMaxRect, BOOL bShrinkOnly );
virtual void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
@@ -176,14 +167,10 @@ public:
virtual void NbcSetStyleSheet( SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr );
// ItemSet access
- virtual SfxItemSet* CreateNewItemSet(SfxItemPool& rPool);
+ virtual SfxItemSet* CreateNewItemSet(SfxItemPool& rPool);
// private support routines for ItemSet access. NULL pointer means clear item.
- virtual void ItemSetChanged(const SfxItemSet& rSet);
-
- // pre- and postprocessing for objects for saving
- virtual void PreSave() {}
- virtual void PostSave() {}
+ virtual void ItemSetChanged(const SfxItemSet& rSet);
virtual void AfterRead();
diff --git a/binfilter/inc/bf_svx/svdogrp.hxx b/binfilter/inc/bf_svx/svdogrp.hxx
index 37abe08..fe5581b 100644
--- a/binfilter/inc/bf_svx/svdogrp.hxx
+++ b/binfilter/inc/bf_svx/svdogrp.hxx
@@ -86,9 +86,9 @@ public:
virtual ~ImpSdrObjGroupLinkUserData();
virtual SdrObjUserData* Clone(SdrObject* pObj1) const;
- virtual void WriteData(SvStream& ) {}
+ virtual void WriteData(SvStream& ) {} // DBG_BF_ASSERT
virtual void ReadData(SvStream& rIn);
- virtual void AfterRead();
+ virtual void AfterRead() {} // DBG_BF_ASSERT
};
//************************************************************
@@ -109,12 +109,10 @@ protected:
String aName;
Point aRefPoint; // Referenzpunkt innerhalb der Objektgruppe
- bool bRefPoint; // Ist ein RefPoint gesetzt?
+ bool bRefPoint; // Ist ein RefPoint gesetzt?
private:
ImpSdrObjGroupLinkUserData* GetLinkUserData() const;
- void ImpLinkAnmeldung();
- void ImpLinkAbmeldung();
public:
TYPEINFO();
@@ -140,12 +138,11 @@ public:
// von selbst (SfxLinkManager). Die Methode LoadGroup() kann ausserdem
// verwendet werden, um eine benannte Gruppe aus einem fremden Dokument zu
// laden (ohne Verknuepfung).
- void ReleaseGroupLink();
bool IsLinkedGroup() const { return pPlusData!=NULL && GetLinkUserData()!=NULL; }
// pnPgNum, etc. ist zum schnelleren wiederauffinden gedacht
- virtual UINT16 GetObjIdentifier() const;
+ virtual UINT16 GetObjIdentifier() const { return UINT16(OBJ_GRUP); } // DBG_BF_ASSERT
using SdrObject::GetLayer;
virtual SdrLayerID GetLayer() const;
virtual void NbcSetLayer(SdrLayerID nLayer);
@@ -164,7 +161,7 @@ public:
virtual void SetName(const String& rStr);
virtual String GetName() const;
- virtual void RecalcSnapRect();
+ virtual void RecalcSnapRect() {} // DBG_BF_ASSERT
virtual void TakeXorPoly(XPolyPolygon& rPoly, bool bDetail) const;
@@ -191,12 +188,8 @@ public:
// private support routines for ItemSet access. NULL pointer means clear item.
virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0);
- // pre- and postprocessing for objects for saving
- virtual void PreSave() {}
- virtual void PostSave() {};
-
virtual void NbcSetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr);
- virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr);
+ virtual void SetStyleSheet(SfxStyleSheet*, bool ) {} // DBG_BF_ASSERT
virtual SfxStyleSheet* GetStyleSheet() const;
virtual void ReformatText();
@@ -204,7 +197,7 @@ public:
virtual void RestartAnimation(SdrPageView* pPageView) const;
- virtual void WriteData(SvStream& ) const {}
+ virtual void WriteData(SvStream& ) const {} // DBG_BF_ASSERT
virtual void ReadData(const SdrObjIOHeader& rHead, SvStream& rIn);
virtual void AfterRead();
commit 3218e3cbc7649900e8c9cd9317b93a7a2968a60a
Author: Joseph Powers <jpowers27 at cox.net>
Date: Wed Oct 12 20:10:50 2011 -0700
Do a little cleanup on class SdrPaintView
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdcrtv.cxx b/binfilter/bf_svx/source/svdraw/svx_svdcrtv.cxx
index 0fb5e4a..7a19e6f 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdcrtv.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdcrtv.cxx
@@ -167,7 +167,6 @@ namespace binfilter {
/*N*/ }
/*N*/
/*N*/ CheckEdgeMode();
-/*N*/ ImpSetGlueVisible3(IsEdgeTool());
/*N*/ }
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdmrkv.cxx b/binfilter/bf_svx/source/svdraw/svx_svdmrkv.cxx
index 9c153c9..0a3c3f7 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdmrkv.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdmrkv.cxx
@@ -417,8 +417,6 @@ namespace binfilter {
/*N*/ bEdgesOfMarkedNodesDirty=TRUE;
/*N*/ bMarkedObjRectDirty=TRUE;
/*N*/ bMarkedPointsRectsDirty=TRUE;
-/*N*/ BOOL bOneEdgeMarked=FALSE;
-/*N*/ ImpSetGlueVisible4(bOneEdgeMarked);
/*N*/ }
/*N*/
////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -471,7 +469,6 @@ namespace binfilter {
/*N*/ rIn>>nTmpUShort;
/*N*/ eEditMode=(SdrViewEditMode)nTmpUShort;
/*N*/ }
-/*N*/ bGlueVisible2=eEditMode==SDREDITMODE_GLUEPOINTEDIT;
/*N*/ if (rSubHead.GetBytesLeft()!=0) {
/*N*/ rIn>>bTmpBool;
/*N*/ bMarkHdlWhenTextEdit=bTmpBool;
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdograf.cxx b/binfilter/bf_svx/source/svdraw/svx_svdograf.cxx
index ab77c78..bfde976 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdograf.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdograf.cxx
@@ -718,8 +718,6 @@ namespace binfilter {
/*?*/ aLogPos.Y() -= ( aLogSize.Height() - 1L );
/*?*/ }
/*?*/
-/*?*/ bool bDidPaint( false );
-/*?*/
/*?*/ if( pGraphic->GetType() == GRAPHIC_BITMAP )
/*?*/ {
/*?*/ if( pGraphic->IsAnimated() )
@@ -744,8 +742,6 @@ namespace binfilter {
/*?*/ }
/*?*/ else if( eAnimMode == SDR_ANIMATION_DONT_ANIMATE )
/*?*/ pGraphic->Draw( pOutDev, aLogPos, aLogSize, &aAttr, nGraphicManagerDrawMode );
-/*?*/
-/*?*/ bDidPaint = true;
/*?*/ }
/*?*/ }
/*?*/ else
@@ -754,7 +750,6 @@ namespace binfilter {
/*?*/ aAttr.SetRotation( nDrehWink / 10 );
/*?*/
/*?*/ pGraphic->Draw( pOutDev, aLogPos, aLogSize, &aAttr, nGraphicManagerDrawMode );
-/*?*/ bDidPaint = true;
/*?*/ }
/*?*/ }
/*?*/ else
@@ -775,16 +770,7 @@ namespace binfilter {
/*?*/
/*?*/ pGraphic->Draw( pOutDev, aLogPos, aLogSize, &aAttr, nGraphicManagerDrawMode );
/*?*/ pOutDev->SetDrawMode( nOldDrawMode );
-/*?*/
-/*?*/ bDidPaint = true;
/*?*/ }
-/*?*/
-/*?*/ // #110290# Remove the SdrGraphObj from the list of objects to be removed on
-/*?*/ // page switch. This is permissible, as the Draw above reenabled the swapout
-/*?*/ // timer.
-/*?*/ // #110573# Occasionally, the view is NULL (e.g. previews in impress and calc)
-/*?*/ if( bDidPaint && pView )
-/*?*/ ( (SdrView*) pView )->ImpAsyncPaintDone( this );
/*N*/ }
// auch GRAPHIC_NONE oder SwappedOut( AsyncSwap )
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdpage.cxx b/binfilter/bf_svx/source/svdraw/svx_svdpage.cxx
index 3554a1e..8c8c4af 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdpage.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdpage.cxx
@@ -491,12 +491,8 @@ using namespace ::com::sun::star;
/*N*/
/*N*/ if(rInfoRec.pPV && rInfoRec.bNotActive)
/*N*/ {
-/*?*/ if(rInfoRec.pPV->GetView().DoVisualizeEnteredGroup())
-/*?*/ {
-/*?*/ // Darstellung schmal
-/*?*/ rXOut.GetOutDev()->SetDrawMode(nWasDrawMode | (
-/*?*/ DRAWMODE_GHOSTEDLINE|DRAWMODE_GHOSTEDFILL|DRAWMODE_GHOSTEDTEXT|DRAWMODE_GHOSTEDBITMAP|DRAWMODE_GHOSTEDGRADIENT));
-/*?*/ }
+/*?*/ rXOut.GetOutDev()->SetDrawMode( nWasDrawMode | (
+/*?*/ DRAWMODE_GHOSTEDLINE|DRAWMODE_GHOSTEDFILL|DRAWMODE_GHOSTEDTEXT|DRAWMODE_GHOSTEDBITMAP|DRAWMODE_GHOSTEDGRADIENT));
/*N*/ }
/*N*/ else
/*N*/ {
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdpagv.cxx b/binfilter/bf_svx/source/svdraw/svx_svdpagv.cxx
index ff8c375..f07c5ea 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdpagv.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdpagv.cxx
@@ -628,9 +628,7 @@ using namespace ::com::sun::star;
/*?*/
/*?*/ rView.AdjustMarkHdl();
/*?*/
-/*?*/ // invalidate only when view wants to visualize group entering
-/*?*/ if(rView.DoVisualizeEnteredGroup())
-/*?*/ InvalidateAllWin();
+/*?*/ InvalidateAllWin();
/*N*/ }
/*N*/ }
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdpntv.cxx b/binfilter/bf_svx/source/svdraw/svx_svdpntv.cxx
index bf9468c..4856781 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdpntv.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdpntv.cxx
@@ -57,11 +57,7 @@ using namespace ::com::sun::star;
/*N*/ pOut=NULL;
/*N*/ }
-/*N*/ IMPL_LINK(FrameAnimator,Hdl,AutoTimer*,EMPTYARG)
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ return 0;
-/*N*/ }
-
+IMPL_LINK(FrameAnimator,Hdl,AutoTimer*,EMPTYARG) { return 0; } // DBG_BF_ASSERT
/*N*/ SdrViewWinRec::SdrViewWinRec(OutputDevice* pW)
/*N*/ : pWin(pW),
@@ -110,57 +106,29 @@ using namespace ::com::sun::star;
/*N*/ void SdrPaintView::ImpClearVars()
/*N*/ {
/*N*/ pXOut=NULL;
-/*N*/ bForeignXOut=FALSE;
-/*N*/ pItemBrowser=NULL;
/*N*/ bLayerSortedRedraw=FALSE;
/*N*/ bPageVisible=TRUE;
-/*N*/ bPageBorderVisible=TRUE;
/*N*/ bBordVisible=TRUE;
/*N*/ bGridVisible=TRUE;
/*N*/ bGridFront =FALSE;
/*N*/ bHlplVisible=TRUE;
/*N*/ bHlplFront =TRUE;
/*N*/ bGlueVisible=FALSE;
-/*N*/ bGlueVisible2=FALSE;
-/*N*/ bGlueVisible3=FALSE;
-/*N*/ bGlueVisible4=FALSE;
/*N*/ bSwapAsynchron=FALSE;
/*N*/ bPrintPreview=FALSE;
/*N*/ bLineDraft=FALSE;
/*N*/ bFillDraft=FALSE;
/*N*/ bGrafDraft=FALSE;
-/*N*/ bHideGrafDraft=FALSE;
/*N*/ bTextDraft=FALSE;
-/*N*/ bLineDraftPrn=FALSE;
-/*N*/ bFillDraftPrn=FALSE;
-/*N*/ bGrafDraftPrn=FALSE;
-/*N*/ bTextDraftPrn=FALSE;
-/*N*/
-/*N*/ bObjectPaintIgnoresClipping=FALSE;
/*N*/
/*N*/ eAnimationMode = SDR_ANIMATION_ANIMATE;
-/*N*/ bAnimationPause = FALSE;
-/*N*/
-/*N*/ nHitTolPix=2;
-/*N*/ nMinMovPix=3;
-/*N*/ nHitTolLog=0;
-/*N*/ nMinMovLog=0;
-/*N*/ pActualOutDev=NULL;
/*N*/
-/*N*/ bSaveHiddenPages=FALSE;
-/*N*/ bPageTwice=FALSE;
-/*N*/ pDragWin=NULL;
-/*N*/ bRestoreColors=TRUE;
-/*N*/ pDisabledAttr=NULL;
/*N*/ pDefaultStyleSheet=NULL;
-/*N*/ bEncircle=FALSE;
/*N*/ bSomeObjChgdFlag=FALSE;
/*N*/
/*N*/ bMasterBmp=FALSE;
-/*N*/ pMasterBmp=NULL;
-/*N*/ nMasterCacheMode = SDR_MASTERPAGECACHE_DEFAULT;
/*N*/
-/*N*/ nGraphicManagerDrawMode = GRFMGR_DRAW_STANDARD;
+/*N*/ nGraphicManagerDrawMode = GRFMGR_DRAW_STANDARD;
/*N*/
/*N*/ aComeBackTimer.SetTimeout(1);
/*N*/ aComeBackTimer.SetTimeoutHdl(LINK(this,SdrPaintView,ImpComeBackHdl));
@@ -193,9 +161,6 @@ using namespace ::com::sun::star;
/*N*/ if (pOut!=NULL) AddWin(pOut);
/*N*/ pXOut=new ExtOutputDevice(pOut);
/*N*/
-/*N*/ // Flag zur Visualisierung von Gruppen
-/*N*/ bVisualizeEnteredGroup = TRUE;
-/*N*/
/*N*/ StartListening( maColorConfig );
/*N*/ onChangeColorConfig();
/*N*/ }
@@ -208,20 +173,9 @@ using namespace ::com::sun::star;
/*N*/ EndListening( maColorConfig );
/*N*/
/*N*/ ClearAll();
-/*N*/ if (!bForeignXOut && pXOut!=NULL) {
+/*N*/ if (pXOut!=NULL) {
/*N*/ delete pXOut;
/*N*/ }
-/*N*/ if (pDisabledAttr!=NULL) {
-/*?*/ delete pDisabledAttr;
-/*N*/ }
-/*N*/ if (pMasterBmp!=NULL) {
-/*?*/ delete pMasterBmp;
-/*N*/ }
-/*N*/ #ifndef SVX_LIGHT
-/*N*/ if (pItemBrowser!=NULL) {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ #endif
/*N*/ USHORT nAnz=ImpGetUserMarkerCount();
/*N*/ for (USHORT nNum=0; nNum<nAnz; nNum++) {
/*?*/ SdrViewUserMarker* pUM=ImpGetUserMarker(nNum);
@@ -234,8 +188,7 @@ using namespace ::com::sun::star;
/*N*/ void SdrPaintView::SFX_NOTIFY(SfxBroadcaster& /*rBC*/, const TypeId& rBCType, const SfxHint& rHint, const TypeId& rHintType)
/*N*/ {
/*N*/ BOOL bObjChg=!bSomeObjChgdFlag; // TRUE= auswerten fuer ComeBack-Timer
-/*N*/ BOOL bMaster=pMasterBmp!=NULL; // TRUE= auswerten fuer MasterPagePaintCache
-/*N*/ if (bObjChg || bMaster) {
+/*N*/ if ( bObjChg ) {
/*N*/ SdrHint* pSdrHint=PTR_CAST(SdrHint,&rHint);
/*N*/ if (pSdrHint!=NULL) {
/*N*/ SdrHintKind eKind=pSdrHint->GetKind();
@@ -244,12 +197,6 @@ using namespace ::com::sun::star;
/*N*/ bSomeObjChgdFlag=TRUE;
/*N*/ aComeBackTimer.Start();
/*N*/ }
-/*N*/ if (bMaster) {
-/*?*/ const SdrPage* pPg=pSdrHint->GetPage();
-/*?*/ if (pPg!=NULL && pPg->IsMasterPage() && pPg->GetPageNum()==pMasterBmp->GetMasterPageNum()) {
-/*?*/ ReleaseMasterPagePaintCache();
-/*N*/ }
-/*N*/ }
/*N*/ }
/*N*/ if (eKind==HINT_PAGEORDERCHG) {
/*N*/ const SdrPage* pPg=pSdrHint->GetPage();
@@ -264,10 +211,6 @@ using namespace ::com::sun::star;
/*N*/ }
/*N*/ }
/*N*/ }
-/*N*/ if (bMaster) ReleaseMasterPagePaintCache();
-/*N*/ }
-/*N*/ if (eKind==HINT_PAGECHG) {
-/*N*/ if (bMaster) ReleaseMasterPagePaintCache();
/*N*/ }
/*N*/ }
/*N*/ }
@@ -294,14 +237,7 @@ using namespace ::com::sun::star;
////////////////////////////////////////////////////////////////////////////////////////////////////
-/*?*/ void SdrPaintView::ImpAsyncPaintDone( const SdrObject* /*pObj*/ )
-/*?*/ {{DBG_BF_ASSERT(0, "STRIP");}
-/*?*/ }
-
-/*N*/ IMPL_LINK(SdrPaintView,ImpAfterPaintHdl,Timer*,EMPTYARG)
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ return 0;
-/*N*/ }
+IMPL_LINK(SdrPaintView,ImpAfterPaintHdl,Timer*,EMPTYARG) { return 0; } // DBG_BF_ASSERT
/*N*/ void SdrPaintView::ModelHasChanged()
/*N*/ {
@@ -326,22 +262,11 @@ using namespace ::com::sun::star;
/*?*/ SdrPageView* pPV=GetPageHidePvNum(nv);
/*?*/ pPV->ModelHasChanged();
/*N*/ }
-/*N*/ #ifndef SVX_LIGHT
-/*N*/ if (pItemBrowser!=NULL) {DBG_BF_ASSERT(0, "STRIP"); }
-/*N*/ #endif
/*N*/ }
////////////////////////////////////////////////////////////////////////////////////////////////////
-/*N*/ IMPL_LINK_INLINE_START(SdrPaintView,ImpUserMarkerAnimatorHdl,AutoTimer*,EMPTYARG)
-/*N*/ {
-/*N*/ USHORT nAnz=ImpGetUserMarkerCount();
-/*N*/ for (USHORT nNum=0; nNum<nAnz; nNum++) {
-/*N*/ SdrViewUserMarker* pUM=ImpGetUserMarker(nNum);
-/*N*/ if (pUM->IsAnimate() && pUM->IsVisible()) {DBG_BF_ASSERT(0, "STRIP");}
-/*N*/ }
-/*N*/ return 0;
-/*N*/ }
+IMPL_LINK_INLINE_START(SdrPaintView,ImpUserMarkerAnimatorHdl,AutoTimer*,EMPTYARG) { return 0; } // DBG_BF_ASSERT
/*N*/ IMPL_LINK_INLINE_END(SdrPaintView,ImpUserMarkerAnimatorHdl,AutoTimer*,pTimer)
@@ -371,38 +296,6 @@ using namespace ::com::sun::star;
////////////////////////////////////////////////////////////////////////////////////////////////////
-/*N*/ BOOL SdrPaintView::IsAction() const
-/*N*/ {
-/*N*/ return IsEncirclement();
-/*N*/ }
-
-/*N*/ void SdrPaintView::BrkAction()
-/*N*/ {
-/*N*/ BrkEncirclement();
-/*N*/ }
-
-
-/*N*/ void SdrPaintView::ToggleShownXor(OutputDevice* /*pOut*/, const Region* /*pRegion*/) const
-/*N*/ {
-/*N*/ if (IsEncirclement() && aDragStat.IsShown()) {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ USHORT nAnz=ImpGetUserMarkerCount();
-/*N*/ for (USHORT nNum=0; nNum<nAnz; nNum++) {
-/*N*/ SdrViewUserMarker* pUM=ImpGetUserMarker(nNum);
-/*N*/ if (pUM->IsVisible()) {DBG_BF_ASSERT(0, "STRIP");}
-/*N*/ }
-/*N*/ }
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-/*N*/ void SdrPaintView::BrkEncirclement()
-/*N*/ {
-/*N*/ if (IsEncirclement()) {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ }
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
/*N*/ void SdrPaintView::ClearPageViews()
/*N*/ {
/*N*/ BrkAction();
@@ -431,33 +324,23 @@ using namespace ::com::sun::star;
/*N*/ void SdrPaintView::ClearAll()
/*N*/ {
-/*N*/ for( void* p = aAsyncPaintList.First(); p; p = aAsyncPaintList.Next() )
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/
-/*N*/ aAsyncPaintList.Clear();
/*N*/ ClearPageViews();
/*N*/ ClearHideViews();
-/*N*/ ImpForceSwapOut();
/*N*/ }
/*N*/ SdrPageView* SdrPaintView::ShowPage(SdrPage* pPage, const Point& rOffs)
/*N*/ {
/*N*/ SdrPageView* pPV=NULL;
/*N*/ if (pPage!=NULL) {
-/*N*/ SdrPageView* pTmpPV=NULL;
-/*N*/ if (!bPageTwice) pTmpPV=GetPageView(pPage); // Evtl. jede Seite nur einmal!
+/*N*/ SdrPageView* pTmpPV = GetPageView(pPage); // Evtl. jede Seite nur einmal!
/*N*/ if (pTmpPV==NULL) {
/*N*/ USHORT nPos=GetHiddenPV(pPage); // War die schon mal da?
-/*N*/ if (nPos<GetPageHideCount()) {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ } else {
+/*N*/ if ( !(nPos<GetPageHideCount()) ) {
/*N*/ pPV=new SdrPageView(pPage,rOffs,*((SdrView*)this));
/*N*/ }
/*N*/ if (pPV!=NULL) {
/*N*/ aPagV.Insert(pPV,CONTAINER_APPEND);
/*N*/ pPV->Show();
-/*N*/
-/*N*/ // #110290# Swap out graphics when switching pages
-/*N*/ ImpForceSwapOut();
/*N*/ }
/*N*/ }
/*N*/ }
@@ -471,22 +354,12 @@ using namespace ::com::sun::star;
/*N*/ if (nPos!=CONTAINER_ENTRY_NOTFOUND) {
/*N*/ aPagV.Remove(nPos);
/*N*/ pPV->Hide();
-/*N*/ if (bSaveHiddenPages) {
-/*?*/ aPagHide.Insert(pPV,CONTAINER_APPEND);
-/*N*/ } else {
-/*N*/ delete pPV;
-/*N*/ }
+/*N*/ delete pPV;
/*N*/ }
/*N*/ }
/*N*/ }
-/*N*/ void SdrPaintView::HideAllPages()
-/*N*/ {
-/*N*/ while (GetPageViewCount()>0) HidePagePvNum(0);
-/*N*/ }
-
-
/*N*/ SdrPageView* SdrPaintView::GetPageView(const SdrPage* pPage) const
/*N*/ {
/*N*/ if (pPage==NULL) return NULL;
@@ -523,9 +396,6 @@ using namespace ::com::sun::star;
/*N*/ for (USHORT i=0; i<GetPageViewCount(); i++) {
/*?*/ GetPageViewPvNum(i)->AddWin(pWin1);
/*N*/ }
-/*N*/ #ifndef SVX_LIGHT
-/*N*/ if (pItemBrowser!=NULL) {DBG_BF_ASSERT(0, "STRIP");}
-/*N*/ #endif
/*N*/ }
/*N*/ void SdrPaintView::DelWin(OutputDevice* pWin1)
@@ -537,25 +407,10 @@ using namespace ::com::sun::star;
/*N*/ }
/*N*/ aWinList.Delete(nPos);
/*N*/ }
-/*N*/ #ifndef SVX_LIGHT
-/*N*/ if (pItemBrowser!=NULL) {DBG_BF_ASSERT(0, "STRIP"); }
-/*N*/ #endif
-/*N*/ }
-
-/*N*/ Rectangle SdrPaintView::GetVisibleArea( USHORT )
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return Rectangle();
/*N*/ }
////////////////////////////////////////////////////////////////////////////////////////////////////
-/*N*/ void SdrPaintView::InitRedraw(OutputDevice*, const Region&, USHORT)
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
-/*N*/ void SdrPaintView::GlueInvalidate() const
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
/*N*/ void SdrPaintView::InvalidateAllWin()
/*N*/ {
/*N*/ for (USHORT i=0; i<GetWinCount(); i++) {
@@ -613,32 +468,9 @@ using namespace ::com::sun::star;
/*N*/ void SdrPaintView::SetMasterPagePaintCaching( BOOL bOn, ULONG nCacheMode )
/*N*/ {
/*N*/ bMasterBmp = bOn;
-/*N*/
-/*N*/ if( bOn )
-/*N*/ {
-/*N*/ if( SDR_MASTERPAGECACHE_DEFAULT == nCacheMode || SDR_MASTERPAGECACHE_NONE == nCacheMode )
-/*N*/ nMasterCacheMode = SDR_MASTERPAGECACHE_FULL;
-/*N*/ else
-/*N*/ nMasterCacheMode = nCacheMode;
-/*N*/
-/*N*/ ReleaseMasterPagePaintCache();
-/*N*/ }
-/*N*/ else
-/*N*/ nMasterCacheMode = SDR_MASTERPAGECACHE_NONE;
-/*N*/ }
-
-// z.B. rufen, wenn Obj der MPg geaendert
-/*N*/ void SdrPaintView::ReleaseMasterPagePaintCache()
-/*N*/ {
-/*N*/ if (pMasterBmp!=NULL) {
-/*?*/ delete pMasterBmp;
-/*?*/ pMasterBmp=NULL;
-/*N*/ }
/*N*/ }
-
-
/*N*/ void SdrPaintView::SetDefaultStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr)
/*N*/ {
/*N*/ pDefaultStyleSheet=pStyleSheet;
@@ -652,9 +484,6 @@ using namespace ::com::sun::star;
/*?*/ nWhich=aIter.NextWhich();
/*?*/ }
/*N*/ }
-#ifndef SVX_LIGHT
-/*N*/ if (pItemBrowser!=NULL) {DBG_BF_ASSERT(0, "STRIP"); }
-#endif
/*N*/ }
////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -775,21 +604,6 @@ using namespace ::com::sun::star;
/*N*/ maGridColor = aColor;
/*N*/ }
-
-// #103834# Set background color for svx at SdrPageViews
-
-/*N*/ void SdrPaintView::ImpForceSwapOut()
-/*N*/ {
-/*N*/ // #110290# Force swap out all graphics on this page. There might be
-/*N*/ // some left, since every graphic that has not received a Draw yet,
-/*N*/ // but is swapped in, has its swapout handler disabled.
-/*N*/ while( !maSwappedInGraphicsStack.empty() )
-/*N*/ {
-/*N*/ maSwappedInGraphicsStack.front()->ForceSwapOut();
-/*N*/ maSwappedInGraphicsStack.pop_front();
-/*N*/ }
-/*N*/ }
-
// eof
}
diff --git a/binfilter/bf_svx/source/unodraw/svx_unoshtxt.cxx b/binfilter/bf_svx/source/unodraw/svx_unoshtxt.cxx
index 24c8698..818e8d9 100644
--- a/binfilter/bf_svx/source/unodraw/svx_unoshtxt.cxx
+++ b/binfilter/bf_svx/source/unodraw/svx_unoshtxt.cxx
@@ -729,7 +729,7 @@ Rectangle SvxTextEditSourceImpl::GetVisArea()
{
if( IsValid() )
{
- Rectangle aVisArea = mpView->GetVisibleArea( mpView->FindWin( const_cast< Window* > (mpWindow) ) );
+ Rectangle aVisArea;
// offset vis area by edit engine left-top position
SdrTextObj* pTextObj = PTR_CAST( SdrTextObj, mpObject );
diff --git a/binfilter/inc/bf_svx/fmshell.hxx b/binfilter/inc/bf_svx/fmshell.hxx
index 458062f..7a9c80b 100644
--- a/binfilter/inc/bf_svx/fmshell.hxx
+++ b/binfilter/inc/bf_svx/fmshell.hxx
@@ -87,19 +87,6 @@ class FmFormShell : public SfxShell
// Ereignis interesiert, nicht sauber verstaendigen (sie koennte sich lediglich von der Application
// das Navigator-Fenster geben lassen, aber das wollen wir ja nicht, ge ? ...))
-//#ifdef NOOLDSV
-// class FormShellWaitObject
-// {
-// Window* m_pWindow;
-// public:
-// FormShellWaitObject(const FmFormShell* _pShell);
-// ~FormShellWaitObject();
-// };
-// friend class FormShellWaitObject;
-//
-// const OutputDevice* GetCurrentViewDevice() const { return m_pFormView ? m_pFormView->GetActualOutDev() : NULL; }
-//#endif
-
public:
SFX_DECL_INTERFACE(SVX_INTERFACE_FORM_SH);
TYPEINFO();
diff --git a/binfilter/inc/bf_svx/fmview.hxx b/binfilter/inc/bf_svx/fmview.hxx
index 85fe876..a3961a9 100644
--- a/binfilter/inc/bf_svx/fmview.hxx
+++ b/binfilter/inc/bf_svx/fmview.hxx
@@ -119,7 +119,6 @@ public:
FmXFormView* GetImpl() const {return pImpl;}
private:
- const OutputDevice* GetActualOutDev() const {return pActualOutDev;}
void AdjustMarks(const SdrMarkList& rMarkList);
sal_Bool checkUnMarkAll(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xSource);
FmFormObj* getMarkedGrid() const;
diff --git a/binfilter/inc/bf_svx/svdpntv.hxx b/binfilter/inc/bf_svx/svdpntv.hxx
index c7b1b63..7df73d7 100644
--- a/binfilter/inc/bf_svx/svdpntv.hxx
+++ b/binfilter/inc/bf_svx/svdpntv.hxx
@@ -69,7 +69,6 @@ class SdrNamedSubRecord;
class SdrIOHeader;
class SdrOle2Obj;
class ImpMasterBmp;
-class SdrItemBrowser;
class SdrObject;
//************************************************************
@@ -129,8 +128,6 @@ public:
BOOL IsStripes() const { return bStripes; }
void SetCrossHair(BOOL bOn) { bCrossHair=bOn; }
void SetStripes(BOOL bOn) { bStripes=bOn; }
-
-protected:
};
//************************************************************
@@ -149,31 +146,6 @@ public:
};
//************************************************************
-// Hilfsklasse ImpMasterBmp
-//************************************************************
-
-class ImpMasterBmp
-{
- friend class SdrPageView;
-
- Fraction aMapX;
- Fraction aMapY;
- Rectangle aLogBound;
- Rectangle aPixBound;
- VirtualDevice aVD;
- SetOfByte aVisLayers;
- ULONG nDrawMode;
- USHORT nMasterPageNum;
-
-public:
- ImpMasterBmp(): nDrawMode(0), nMasterPageNum(0) {}
- ImpMasterBmp(const OutputDevice& rCompDev): aVD(rCompDev), nDrawMode(0), nMasterPageNum(0) {}
- VirtualDevice& GetVirtDev() { return aVD; }
- const VirtualDevice& GetVirtDev() const { return aVD; }
- USHORT GetMasterPageNum() const { return nMasterPageNum; }
-};
-
-//************************************************************
// Hilfsklasse SdrViewWinRec
//************************************************************
@@ -239,12 +211,7 @@ class SdrPaintView: public SfxListener, public SfxRepeatTarget, public SfxBroadc
protected:
SdrModel* pMod;
ExtOutputDevice* pXOut;
- SdrItemBrowser* pItemBrowser;
- const OutputDevice* pActualOutDev; // Nur zum vergleichen
- OutputDevice* pDragWin;
SfxStyleSheet* pDefaultStyleSheet;
- SfxItemSet* pDisabledAttr;
- ImpMasterBmp* pMasterBmp; // gemerkte MasterPage
String aAktLayer; // Aktueller Zeichenlayer
String aMeasureLayer; // Aktueller Layer fuer Bemassung
@@ -252,105 +219,57 @@ protected:
Container aPagV; // Liste von SdrPageViews
Container aPagHide; // Liste von nicht angezeigten SdrPageViews
SdrViewWinList aWinList; // Alle Fenster, in der die View angezeigt ist
- MapMode aActualMapMode;
Size aGridBig; // muss dann mal raus
Size aGridFin; // muss dann mal raus
Size aGridSubdiv;
Fraction aGridWdtX;
Fraction aGridWdtY;
FrameAnimator aAni;
- SdrDragStat aDragStat;
- Rectangle aMaxWorkArea;
SfxItemSet aDefaultAttr;
Timer aComeBackTimer;
Timer aAfterPaintTimer;
AutoTimer aUserMarkerAnimator;
Container aUserMarkers;
- List aAsyncPaintList;
- Timer aAsyncPaintTimer;
SdrAnimationMode eAnimationMode;
- USHORT nHitTolPix;
- USHORT nMinMovPix;
- USHORT nHitTolLog;
- USHORT nMinMovLog;
- ULONG nMasterCacheMode;
ULONG nGraphicManagerDrawMode;
- unsigned bForeignXOut : 1;
unsigned bLayerSortedRedraw : 1;
unsigned bPageVisible : 1;
- unsigned bPageBorderVisible : 1;
unsigned bBordVisible : 1;
unsigned bGridVisible : 1;
unsigned bGridFront : 1;
unsigned bHlplVisible : 1;
unsigned bHlplFront : 1;
unsigned bGlueVisible : 1; // Persistent. Klebepunkte anzeigen
- unsigned bGlueVisible2 : 1; // Klebepunkte auch bei GluePointEdit anzeigen
- unsigned bGlueVisible3 : 1; // Klebepunkte auch bei EdgeTool anzeigen
- unsigned bGlueVisible4 : 1; // Klebepunkte anzeigen, wenn 1 Edge markiert
unsigned bLineDraft : 1;
unsigned bFillDraft : 1;
unsigned bTextDraft : 1;
unsigned bGrafDraft : 1;
- unsigned bLineDraftPrn : 1;
- unsigned bFillDraftPrn : 1;
- unsigned bTextDraftPrn : 1;
- unsigned bGrafDraftPrn : 1;
- unsigned bSaveHiddenPages : 1; // den View-Status von nicht angezeigten Seiten merken ?
- unsigned bPageTwice : 1; // TRUE=Dieselbe Page kann mehrfach angezeigt werden.
- unsigned bRestoreColors : 1; // Pens und Brushes werden zurueckgesetzt.
- unsigned bObjectPaintIgnoresClipping : 1;
- unsigned bEncircle : 1;
unsigned bSomeObjChgdFlag : 1;
unsigned bMasterBmp : 1; // MasterPages als Bitmap merken?
unsigned bSwapAsynchron : 1;
unsigned bPrintPreview : 1;
- // BOOL fuer die Verwaltung des anzuzeigenden Status
- // Gruppe Betreten/Verlassen. Default ist TRUE, wird aber
- // beispielsweise beim Chart auf FALSE gesetzt, da dort
- // die Ghosted-Effekte zur Darstellug unerwuenscht sind.
- unsigned bVisualizeEnteredGroup : 1;
- unsigned bHideGrafDraft : 1;
- unsigned bAnimationPause : 1;
-
- ColorConfig maColorConfig;
+ ColorConfig maColorConfig;
Color maGridColor;
private:
- typedef ::std::list< SdrGrafObj* > GraphicsStack;
- GraphicsStack maSwappedInGraphicsStack;
-
- void ImpForceSwapOut();
- void ImpClearVars();
DECL_LINK(ImpComeBackHdl,Timer*);
DECL_LINK(ImpAfterPaintHdl,Timer*);
DECL_LINK(ImpUserMarkerAnimatorHdl,AutoTimer*);
+
+ void ImpClearVars();
void ImpInsertUserMarker(SdrViewUserMarker* pMarker);
void ImpRemoveUserMarker(SdrViewUserMarker* pMarker);
void ImpCheckMarkerAnimator();
USHORT ImpGetUserMarkerCount() const { return (USHORT)aUserMarkers.Count(); }
SdrViewUserMarker* ImpGetUserMarker(USHORT nNum) const { return (SdrViewUserMarker*)aUserMarkers.GetObject(nNum); }
- void ImpAsyncPaintDone( const SdrObject* pObj );
protected:
- // Wenn man den IdleStatus des Systems nicht abwarten will (auf const geschummelt):
- void ImpSetGlueVisible2(BOOL bOn) { if (bGlueVisible2!=bOn) { bGlueVisible2=bOn; if (!bGlueVisible && !bGlueVisible3 && !bGlueVisible4) GlueInvalidate(); } }
- void ImpSetGlueVisible3(BOOL bOn) { if (bGlueVisible3!=bOn) { bGlueVisible3=bOn; if (!bGlueVisible && !bGlueVisible2 && !bGlueVisible4) GlueInvalidate(); } }
- void ImpSetGlueVisible4(BOOL bOn) { if (bGlueVisible4!=bOn) { bGlueVisible4=bOn; if (!bGlueVisible && !bGlueVisible2 && !bGlueVisible3) GlueInvalidate(); } }
- BOOL ImpIsGlueVisible2() const { return bGlueVisible2; }
- BOOL ImpIsGlueVisible3() const { return bGlueVisible3; }
- BOOL ImpIsGlueVisible4() const { return bGlueVisible4; }
- BOOL ImpIsGlueVisible() { return bGlueVisible || bGlueVisible2 || bGlueVisible3 || bGlueVisible4; }
-
virtual void SFX_NOTIFY(SfxBroadcaster& rBC, const TypeId& rBCType, const SfxHint& rHint, const TypeId& rHintType);
- BOOL IsShownXorVisibleWinNum(USHORT nNum) const { return aWinList[nNum].bXorVisible; }
- void SetShownXorVisible(USHORT nNum, BOOL bAn) { aWinList[nNum].bXorVisible=bAn; }
USHORT GetHiddenPV(const SdrPage* pPage) const;
- void GlueInvalidate() const;
virtual void WriteRecords(SvStream& rOut) const;
@@ -371,25 +290,10 @@ public:
virtual void Clear(); // PageViews loeschen, Markierungen weg, ...
SdrModel* GetModel() const { return pMod; }
- virtual BOOL IsAction() const;
- virtual void BrkAction(); // Alle Actions z.B. Draggen abbrechen.
-
- // Muss dann bei jedem Fensterwechsel (wenn die SdrView in mehreren
- // Fenstern gleichzeitig dargestellt wird (->z.B. Splitter)) und bei
- // jedem MapMode(Scaling)-wechsel gerufen werden, damit ich aus meinen
- // Pixelwerten logische Werte berechnen kann.
- USHORT GetMinMoveDistancePixel() const { return (USHORT)nMinMovPix; }
- USHORT GetHitTolerancePixel() const { return (USHORT)nHitTolPix; }
-
- // Flag zur Visualisierung von Gruppen abfragen/testen
- BOOL DoVisualizeEnteredGroup() const { return bVisualizeEnteredGroup; }
- void SetVisualizeEnteredGroup(BOOL bNew) { bVisualizeEnteredGroup = bNew; }
+ virtual BOOL IsAction() const { return FALSE; } // DBG_BF_ASSERT
+ virtual void BrkAction() {} // DBG_BF_ASSERT Alle Actions z.B. Draggen abbrechen.
- virtual void ToggleShownXor(OutputDevice* pOut, const Region* pRegion) const; // Alles togglen was als Xor im Win, nix merken! NULL=alle OutDev
-
- // Am DragStatus laesst sich beispielsweise erfragen, welche
- // entfernung bereits gedraggd wurde, etc.
- const SdrDragStat& GetDragStat() const { return aDragStat; }
+ virtual void ToggleShownXor(OutputDevice*, const Region*) const {} // DBG_BF_ASSERT
// Anmelden/Abmelden einer PageView an der View.
// Dieselbe // Seite kann nicht mehrfach angemeldet werden.
@@ -401,7 +305,6 @@ public:
virtual void HidePage(SdrPageView* pPV);
void HidePage(const SdrPage* pPage) { HidePage(GetPageView(pPage)); }
void HidePagePvNum(USHORT nPvNum) { HidePage(GetPageViewPvNum(nPvNum)); }
- virtual void HideAllPages();
// Iterieren ueber alle angemeldeten PageViews
USHORT GetPageViewCount() const { return USHORT(aPagV.Count()); }
@@ -426,19 +329,6 @@ public:
USHORT GetWinCount() const { return aWinList.GetCount(); }
OutputDevice* GetWin(USHORT nNum) const { return nNum<aWinList.GetCount() ? aWinList[nNum].pWin : NULL; }
- USHORT FindWin( OutputDevice* pWin ) { return aWinList.Find( pWin ); }
-
- const SdrViewWinRec& GetWinRec(USHORT nNum) const { return aWinList[nNum]; }
- SdrViewWinRec& GetWinRec(USHORT nNum) { return aWinList[nNum]; }
-
- /** Query visible area of the view in the given window
-
- @param nNum
- The window number (same as in the GetWin() method)
-
- @return the visible area in logical coordinates
- */
- Rectangle GetVisibleArea(USHORT nNum);
// Einen Satz von Layern hinzu-sichtbarmachen.
// bShow=FALSE werden alle Memberlayer des Set ausgeblendet.
@@ -451,62 +341,32 @@ public:
// des Set unsichtbar.
- virtual void InitRedraw(OutputDevice* pOut, const Region& rReg, USHORT nPaintMode=0);
-
- BOOL IsPageVisible() const { return bPageVisible; } // Seite (weisse Flaeche) malen oder nicht
- BOOL IsPageBorderVisible() const { return bPageBorderVisible; } // Seite (weisse Flaeche) malen oder nicht
- BOOL IsBordVisible() const { return bBordVisible; } // Seitenrandlinie malen oder nicht
BOOL IsGridVisible() const { return bGridVisible; } // Rastergitter malen oder nicht
BOOL IsGridFront() const { return bGridFront ; } // Rastergitter ueber die Objekte druebermalen oder dahinter
- BOOL IsHlplVisible() const { return bHlplVisible; } // Hilfslinien der Seiten malen oder nicht
BOOL IsHlplFront() const { return bHlplFront ; } // Hilfslinie ueber die Objekte druebermalen oder dahinter
- BOOL IsGlueVisible() const { return bGlueVisible; } // Konnektoren der objekte sichtbar oder nicht
void SetPageVisible(BOOL bOn=TRUE) { bPageVisible=bOn; InvalidateAllWin(); }
- void SetPageBorderVisible(BOOL bOn=TRUE) { bPageBorderVisible=bOn; InvalidateAllWin(); }
void SetBordVisible(BOOL bOn=TRUE) { bBordVisible=bOn; InvalidateAllWin(); }
void SetGridVisible(BOOL bOn=TRUE) { bGridVisible=bOn; InvalidateAllWin(); }
void SetGridFront(BOOL bOn=TRUE) { bGridFront =bOn; InvalidateAllWin(); }
void SetHlplVisible(BOOL bOn=TRUE) { bHlplVisible=bOn; InvalidateAllWin(); }
- void SetHlplFront(BOOL bOn=TRUE) { bHlplFront =bOn; InvalidateAllWin(); }
- void SetGlueVisible(BOOL bOn=TRUE) { if (bGlueVisible!=bOn) { bGlueVisible=bOn; if (!bGlueVisible2 && !bGlueVisible3 && !bGlueVisible4) GlueInvalidate(); } }
+ void SetGlueVisible(BOOL bOn=TRUE) { if (bGlueVisible!=bOn) { bGlueVisible=bOn; } }
void SetGridColor( Color aColor );
BOOL IsLineDraft() const { return bLineDraft; } // Linien nur andeuten (alle Linien als Haarlinien)
BOOL IsFillDraft() const { return bFillDraft; } // Ersatzdarstellung fuer Bitmapfuellungen und Farbverlaeufe
BOOL IsTextDraft() const { return bTextDraft; } // Ersatzdarstellung fuer Text
BOOL IsGrafDraft() const { return bGrafDraft; } // Ersatzdarstellung fuer Grafiken und OLE
- BOOL IsHideGrafDraft() const { return bHideGrafDraft; } // Ersatzdarstellung fuer Grafiken und OLE nicht anzeigen
- BOOL IsLineDraftPrn() const { return bLineDraftPrn; } // Beim drucken: Linien nur andeuten (alle Linien als Haarlinien)
- BOOL IsFillDraftPrn() const { return bFillDraftPrn; } // Beim drucken: Ersatzdarstellung fuer Bitmapfuellungen und Farbverlaeufe
- BOOL IsTextDraftPrn() const { return bTextDraftPrn; } // Beim drucken: Ersatzdarstellung fuer Text
- BOOL IsGrafDraftPrn() const { return bGrafDraftPrn; } // Beim drucken: Ersatzdarstellung fuer Grafiken und OLE
void SetLineDraft(BOOL bOn) { bLineDraft=bOn; InvalidateAllWin(); }
void SetFillDraft(BOOL bOn) { bFillDraft=bOn; InvalidateAllWin(); }
void SetTextDraft(BOOL bOn) { bTextDraft=bOn; InvalidateAllWin(); }
void SetGrafDraft(BOOL bOn) { bGrafDraft=bOn; InvalidateAllWin(); }
- void SetHideGrafDraft(BOOL bOn) { bHideGrafDraft=bOn; InvalidateAllWin(); }
- void SetLineDraftPrn(BOOL bOn) { bLineDraftPrn=bOn; }
- void SetFillDraftPrn(BOOL bOn) { bFillDraftPrn=bOn; }
- void SetTextDraftPrn(BOOL bOn) { bTextDraftPrn=bOn; }
- void SetGrafDraftPrn(BOOL bOn) { bGrafDraftPrn=bOn; }
/*alt*/void SetGridCoarse(const Size& rSiz) { aGridBig=rSiz; SetGridWidth(Fraction(rSiz.Width(),1),Fraction(rSiz.Height(),1)); }
/*alt*/void SetGridFine(const Size& rSiz) { aGridFin=rSiz; if (aGridFin.Height()==0) aGridFin.Height()=aGridFin.Width(); if (bGridVisible) InvalidateAllWin(); } // #40479#
/*alt*/const Size& GetGridCoarse() const { return aGridBig; }
/*alt*/const Size& GetGridFine() const { return aGridFin; }
- // SetGridSubdivision(): Werte fuer X und Y sind die Anzahl der
- // Zwischenraeume, also = Anzahl der Zwischenpunkte+1
void SetGridWidth(const Fraction& rX, const Fraction& rY) { aGridWdtX=rX; aGridWdtY=rY; if (bGridVisible) InvalidateAllWin(); }
- void SetGridSubdivision(const Size& rSubdiv) { aGridSubdiv=rSubdiv; if (bGridVisible) InvalidateAllWin(); }
- const Fraction& GetGridWidthX() const { return aGridWdtX; }
- const Fraction& GetGridWidthY() const { return aGridWdtY; }
- const Size& GetGridSubdivision() const { return aGridSubdiv; }
-
- // Status der nicht angezeigten Seiten merken?
- // (LayerVisible-Settings)
- BOOL IsHiddenPageSaveMode() const { return bSaveHiddenPages; }
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list