[Libreoffice-commits] .: 9 commits - binfilter/bf_goodies binfilter/bf_sc binfilter/bf_sch binfilter/bf_sd binfilter/bf_svx binfilter/inc
Pierre-André Jacquod
pjacquod at kemper.freedesktop.org
Mon Apr 25 01:08:45 PDT 2011
binfilter/bf_goodies/source/base3d/goodies_b3dlight.cxx | 43 --
binfilter/bf_goodies/source/base3d/goodies_matril3d.cxx | 9
binfilter/bf_sc/source/core/data/sc_userdat.cxx | 24 -
binfilter/bf_sch/source/core/sch_axisid.cxx | 22 -
binfilter/bf_sch/source/core/sch_chtmode9.cxx | 50 +-
binfilter/bf_sch/source/core/sch_chtscene.cxx | 61 ---
binfilter/bf_sch/source/core/sch_datapoin.cxx | 14
binfilter/bf_sch/source/core/sch_datarow.cxx | 20 -
binfilter/bf_sch/source/core/sch_objadj.cxx | 21 -
binfilter/bf_sch/source/core/sch_objid.cxx | 14
binfilter/bf_sd/source/core/sd_anminfo.cxx | 92 -----
binfilter/bf_sd/source/core/sd_sdpage2.cxx | 104 -----
binfilter/bf_sd/source/ui/app/sd_optsitem.cxx | 251 --------------
binfilter/bf_sd/source/ui/inc/optsitem.hxx | 16
binfilter/bf_svx/source/engine3d/svx_camera3d.cxx | 59 ---
binfilter/bf_svx/source/engine3d/svx_cube3d.cxx | 33 -
binfilter/bf_svx/source/engine3d/svx_dlight3d.cxx | 22 -
binfilter/bf_svx/source/engine3d/svx_extrud3d.cxx | 46 --
binfilter/bf_svx/source/engine3d/svx_label3d.cxx | 24 -
binfilter/bf_svx/source/engine3d/svx_lathe3d.cxx | 126 -------
binfilter/bf_svx/source/engine3d/svx_light3d.cxx | 29 -
binfilter/bf_svx/source/engine3d/svx_obj3d.cxx | 112 ------
binfilter/bf_svx/source/engine3d/svx_pntobj3d.cxx | 23 -
binfilter/bf_svx/source/engine3d/svx_polygn3d.cxx | 51 --
binfilter/bf_svx/source/engine3d/svx_polyob3d.cxx | 112 ------
binfilter/bf_svx/source/engine3d/svx_scene3d.cxx | 110 ------
binfilter/bf_svx/source/engine3d/svx_sphere3d.cxx | 127 -------
binfilter/bf_svx/source/engine3d/svx_viewpt3d.cxx | 77 ----
binfilter/bf_svx/source/form/svx_fmmodel.cxx | 59 ---
binfilter/bf_svx/source/form/svx_fmobj.cxx | 32 -
binfilter/bf_svx/source/form/svx_fmpage.cxx | 40 --
binfilter/bf_svx/source/form/svx_fmpgeimp.cxx | 57 ---
binfilter/bf_svx/source/inc/fmobj.hxx | 2
binfilter/bf_svx/source/inc/fmpgeimp.hxx | 2
binfilter/bf_svx/source/svdraw/svx_svdmodel.cxx | 285 ----------------
binfilter/bf_svx/source/svdraw/svx_svdoattr.cxx | 109 ------
binfilter/bf_svx/source/svdraw/svx_svdobj.cxx | 71 ---
binfilter/bf_svx/source/svdraw/svx_svdocapt.cxx | 56 ---
binfilter/bf_svx/source/svdraw/svx_svdocirc.cxx | 55 ---
binfilter/bf_svx/source/svdraw/svx_svdoedge.cxx | 78 ----
binfilter/bf_svx/source/svdraw/svx_svdograf.cxx | 115 ------
binfilter/bf_svx/source/svdraw/svx_svdogrp.cxx | 97 -----
binfilter/bf_svx/source/svdraw/svx_svdomeas.cxx | 56 ---
binfilter/bf_svx/source/svdraw/svx_svdoole2.cxx | 53 --
binfilter/bf_svx/source/svdraw/svx_svdopage.cxx | 16
binfilter/bf_svx/source/svdraw/svx_svdopath.cxx | 17
binfilter/bf_svx/source/svdraw/svx_svdorect.cxx | 9
binfilter/bf_svx/source/svdraw/svx_svdotext.cxx | 63 ---
binfilter/bf_svx/source/svdraw/svx_svdotxln.cxx | 31 -
binfilter/bf_svx/source/svdraw/svx_svdouno.cxx | 18 -
binfilter/bf_svx/source/svdraw/svx_svdovirt.cxx | 48 --
binfilter/bf_svx/source/svdraw/svx_svdpage.cxx | 39 --
binfilter/inc/bf_goodies/b3dlight.hxx | 4
binfilter/inc/bf_goodies/matril3d.hxx | 2
binfilter/inc/bf_sc/userdat.hxx | 4
binfilter/inc/bf_sch/axisid.hxx | 2
binfilter/inc/bf_sch/chtscene.hxx | 13
binfilter/inc/bf_sch/datapoin.hxx | 2
binfilter/inc/bf_sch/datarow.hxx | 2
binfilter/inc/bf_sch/objadj.hxx | 2
binfilter/inc/bf_sch/objid.hxx | 2
binfilter/inc/bf_sd/anminfo.hxx | 2
binfilter/inc/bf_sd/imapinfo.hxx | 25 -
binfilter/inc/bf_sd/sdpage.hxx | 2
binfilter/inc/bf_svx/camera3d.hxx | 4
binfilter/inc/bf_svx/cube3d.hxx | 2
binfilter/inc/bf_svx/dlight3d.hxx | 2
binfilter/inc/bf_svx/extrud3d.hxx | 2
binfilter/inc/bf_svx/fmmodel.hxx | 2
binfilter/inc/bf_svx/fmpage.hxx | 2
binfilter/inc/bf_svx/label3d.hxx | 2
binfilter/inc/bf_svx/lathe3d.hxx | 2
binfilter/inc/bf_svx/light3d.hxx | 2
binfilter/inc/bf_svx/obj3d.hxx | 4
binfilter/inc/bf_svx/pntobj3d.hxx | 2
binfilter/inc/bf_svx/polygn3d.hxx | 2
binfilter/inc/bf_svx/polyob3d.hxx | 4
binfilter/inc/bf_svx/scene3d.hxx | 6
binfilter/inc/bf_svx/sphere3d.hxx | 2
binfilter/inc/bf_svx/svdmodel.hxx | 10
binfilter/inc/bf_svx/svdoattr.hxx | 6
binfilter/inc/bf_svx/svdobj.hxx | 10
binfilter/inc/bf_svx/svdocapt.hxx | 9
binfilter/inc/bf_svx/svdocirc.hxx | 6
binfilter/inc/bf_svx/svdoedge.hxx | 6
binfilter/inc/bf_svx/svdograf.hxx | 6
binfilter/inc/bf_svx/svdogrp.hxx | 8
binfilter/inc/bf_svx/svdomeas.hxx | 14
binfilter/inc/bf_svx/svdoole2.hxx | 2
binfilter/inc/bf_svx/svdopage.hxx | 2
binfilter/inc/bf_svx/svdopath.hxx | 2
binfilter/inc/bf_svx/svdorect.hxx | 2
binfilter/inc/bf_svx/svdotext.hxx | 6
binfilter/inc/bf_svx/svdouno.hxx | 2
binfilter/inc/bf_svx/svdovirt.hxx | 6
binfilter/inc/bf_svx/svdpage.hxx | 2
binfilter/inc/bf_svx/viewpt3d.hxx | 4
97 files changed, 140 insertions(+), 3165 deletions(-)
New commits:
commit 683f767504053dc768fbd9118b4834e45fc5dcf7
Author: Pierre-André Jacquod <pjacquod at alumni.ethz.ch>
Date: Sun Apr 24 21:21:24 2011 +0200
deactivate PreSave function in binfilter/bf_svx
and just return, without doing anyting
diff --git a/binfilter/bf_svx/source/engine3d/svx_scene3d.cxx b/binfilter/bf_svx/source/engine3d/svx_scene3d.cxx
index 7ba7289..2ef728e 100644
--- a/binfilter/bf_svx/source/engine3d/svx_scene3d.cxx
+++ b/binfilter/bf_svx/source/engine3d/svx_scene3d.cxx
@@ -1292,20 +1292,6 @@ namespace binfilter {
/*N*/ pSub->GetObj(a)->ItemSetChanged( rSet );
/*N*/ }
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// pre- and postprocessing for objects for saving
-
-/*N*/ void E3dScene::PreSave()
-/*N*/ {
-/*N*/ // call parent
-/*N*/ E3dObject::PreSave();
-/*N*/
-/*N*/ // set at all contained objects
-/*N*/ sal_uInt32 nCount(pSub->GetObjCount());
-/*N*/ for(sal_uInt32 a(0); a < nCount; a++)
-/*N*/ pSub->GetObj(a)->PreSave();
-/*N*/ }
-
/*************************************************************************
|*
|* ItemPool fuer dieses Objekt wechseln
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdmodel.cxx b/binfilter/bf_svx/source/svdraw/svx_svdmodel.cxx
index 2d3eddb..25fd575 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdmodel.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdmodel.cxx
@@ -1707,36 +1707,6 @@ using namespace ::com::sun::star;
/*N*/ return rIn;
/*N*/ }
-/*N*/ void SdrModel::PreSave()
-/*N*/ {
-/*N*/ sal_uInt16 nCnt(GetMasterPageCount());
-/*N*/
-/*N*/ sal_uInt16 a; for(a=0; a < nCnt; a++)
-/*N*/ {
-/*N*/ // MasterPages
-/*N*/ const SdrPage& rPage = *GetMasterPage(a);
-/*N*/ SdrObject* pObj = rPage.GetBackgroundObj();
-/*N*/ if( pObj )
-/*?*/ pObj->PreSave();
-/*N*/
-/*N*/ for(sal_uInt32 b(0); b < rPage.GetObjCount(); b++)
-/*N*/ rPage.GetObj(b)->PreSave();
-/*N*/ }
-/*N*/
-/*N*/ nCnt = GetPageCount();
-/*N*/ for(a = 0; a < nCnt; a++)
-/*N*/ {
-/*N*/ // Pages
-/*N*/ const SdrPage& rPage = *GetPage(a);
-/*N*/ SdrObject* pObj = rPage.GetBackgroundObj();
-/*N*/ if( pObj )
-/*N*/ pObj->PreSave();
-/*N*/
-/*N*/ for(sal_uInt32 b(0); b < rPage.GetObjCount(); b++)
-/*N*/ rPage.GetObj(b)->PreSave();
-/*N*/ }
-/*N*/ }
-
/*N*/ uno::Reference< uno::XInterface > SdrModel::getUnoModel()
/*N*/ {
/*N*/ // try weak reference first
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdoattr.cxx b/binfilter/bf_svx/source/svdraw/svx_svdoattr.cxx
index 5dbfbd8..a5e9c18 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdoattr.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdoattr.cxx
@@ -270,49 +270,6 @@ namespace binfilter {
/*N*/ }
/*N*/ }
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// pre- and postprocessing for objects for saving
-
-/*N*/ void SdrAttrObj::PreSave()
-/*N*/ {
-/*N*/ // call parent
-/*N*/ SdrObject::PreSave();
-/*N*/
-/*N*/ // prepare SetItems for storage
-/*N*/ const SfxItemSet& rSet = GetUnmergedItemSet();
-/*N*/ const SfxItemSet* pParent = GetStyleSheet() ? &GetStyleSheet()->GetItemSet() : 0L;
-/*N*/
-/*N*/ XLineAttrSetItem aLineAttr(rSet.GetPool());
-/*N*/ aLineAttr.GetItemSet().Put(rSet);
-/*N*/ aLineAttr.GetItemSet().SetParent(pParent);
-/*N*/ mpObjectItemSet->Put(aLineAttr);
-/*N*/
-/*N*/ XFillAttrSetItem aFillAttr(rSet.GetPool());
-/*N*/ aFillAttr.GetItemSet().Put(rSet);
-/*N*/ aFillAttr.GetItemSet().SetParent(pParent);
-/*N*/ mpObjectItemSet->Put(aFillAttr);
-/*N*/
-/*N*/ XTextAttrSetItem aTextAttr(rSet.GetPool());
-/*N*/ aTextAttr.GetItemSet().Put(rSet);
-/*N*/ aTextAttr.GetItemSet().SetParent(pParent);
-/*N*/ mpObjectItemSet->Put(aTextAttr);
-/*N*/
-/*N*/ SdrShadowSetItem aShadAttr(rSet.GetPool());
-/*N*/ aShadAttr.GetItemSet().Put(rSet);
-/*N*/ aShadAttr.GetItemSet().SetParent(pParent);
-/*N*/ mpObjectItemSet->Put(aShadAttr);
-/*N*/
-/*N*/ SdrOutlinerSetItem aOutlAttr(rSet.GetPool());
-/*N*/ aOutlAttr.GetItemSet().Put(rSet);
-/*N*/ aOutlAttr.GetItemSet().SetParent(pParent);
-/*N*/ mpObjectItemSet->Put(aOutlAttr);
-/*N*/
-/*N*/ SdrMiscSetItem aMiscAttr(rSet.GetPool());
-/*N*/ aMiscAttr.GetItemSet().Put(rSet);
-/*N*/ aMiscAttr.GetItemSet().SetParent(pParent);
-/*N*/ mpObjectItemSet->Put(aMiscAttr);
-/*N*/ }
-
/*N*/ void SdrAttrObj::SetModel(SdrModel* pNewModel)
/*N*/ {
/*N*/ SdrModel* pOldModel = pModel;
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdobj.cxx b/binfilter/bf_svx/source/svdraw/svx_svdobj.cxx
index 011e918..219d4e6 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdobj.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdobj.cxx
@@ -2619,14 +2619,6 @@ class ImpSkeleton;
/*N*/ {
/*N*/ }
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// pre- and postprocessing for objects for saving
-
-/*N*/ void SdrObject::PreSave()
-/*N*/ {
-/*N*/ }
-
-
/*N*/ void SdrObject::ApplyNotPersistAttr(const SfxItemSet& /*rAttr*/)
/*N*/ {DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdocapt.cxx b/binfilter/bf_svx/source/svdraw/svx_svdocapt.cxx
index 4110516..768aeef 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdocapt.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdocapt.cxx
@@ -451,28 +451,6 @@ namespace binfilter {
/*N*/ ImpRecalcTail();
/*N*/ }
-
-
-
-
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// pre- and postprocessing for objects for saving
-
-/*?*/ void SdrCaptionObj::PreSave()
-/*?*/ {
-/*?*/ // call parent
-/*?*/ SdrRectObj::PreSave();
-/*?*/
-/*?*/ // prepare SetItems for storage
-/*?*/ const SfxItemSet& rSet = GetUnmergedItemSet();
-/*?*/ const SfxItemSet* pParent = GetStyleSheet() ? &GetStyleSheet()->GetItemSet() : 0L;
-/*?*/ SdrCaptionSetItem aCaptAttr(rSet.GetPool());
-/*?*/ aCaptAttr.GetItemSet().Put(rSet);
-/*?*/ aCaptAttr.GetItemSet().SetParent(pParent);
-/*?*/ mpObjectItemSet->Put(aCaptAttr);
-/*?*/ }
-
/*N*/ void SdrCaptionObj::ReadData(const SdrObjIOHeader& rHead, SvStream& rIn)
/*N*/ {
/*N*/ if(rIn.GetError())
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdocirc.cxx b/binfilter/bf_svx/source/svdraw/svx_svdocirc.cxx
index 1d1ae33..d4ae296 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdocirc.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdocirc.cxx
@@ -780,23 +780,6 @@ namespace binfilter {
/*N*/ return pRet;
/*N*/ }
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// pre- and postprocessing for objects for saving
-
-/*N*/ void SdrCircObj::PreSave()
-/*N*/ {
-/*N*/ // call parent
-/*N*/ SdrRectObj::PreSave();
-/*N*/
-/*N*/ // prepare SetItems for storage
-/*N*/ const SfxItemSet& rSet = GetUnmergedItemSet();
-/*N*/ const SfxItemSet* pParent = GetStyleSheet() ? &GetStyleSheet()->GetItemSet() : 0L;
-/*N*/ SdrCircSetItem aCircAttr(rSet.GetPool());
-/*N*/ aCircAttr.GetItemSet().Put(rSet);
-/*N*/ aCircAttr.GetItemSet().SetParent(pParent);
-/*N*/ mpObjectItemSet->Put(aCircAttr);
-/*N*/ }
-
/*N*/ void SdrCircObj::ReadData(const SdrObjIOHeader& rHead, SvStream& rIn)
/*N*/ {
/*N*/ if(rIn.GetError())
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdoedge.cxx b/binfilter/bf_svx/source/svdraw/svx_svdoedge.cxx
index 32f8ea7..08be3ba 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdoedge.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdoedge.cxx
@@ -1676,39 +1676,11 @@ je Objekt variiert von 0-3:
/*N*/ }
/*N*/ }
-
-
-
-
-
-
/*N*/ void SdrEdgeObj::NbcSetPoint(const Point&, USHORT)
/*N*/ {DBG_BF_ASSERT(0, "STRIP");
/*N*/ // ToDo: Umconnekten fehlt noch
/*N*/ }
-
-
-
-
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// pre- and postprocessing for objects for saving
-
-/*N*/ void SdrEdgeObj::PreSave()
-/*N*/ {
-/*N*/ // call parent
-/*N*/ SdrTextObj::PreSave();
-/*N*/
-/*N*/ // prepare SetItems for storage
-/*N*/ const SfxItemSet& rSet = GetUnmergedItemSet();
-/*N*/ const SfxItemSet* pParent = GetStyleSheet() ? &GetStyleSheet()->GetItemSet() : 0L;
-/*N*/ SdrEdgeSetItem aEdgeAttr(rSet.GetPool());
-/*N*/ aEdgeAttr.GetItemSet().Put(rSet);
-/*N*/ aEdgeAttr.GetItemSet().SetParent(pParent);
-/*N*/ mpObjectItemSet->Put(aEdgeAttr);
-/*N*/ }
-
/*N*/ void SdrEdgeObj::ReadData(const SdrObjIOHeader& rHead, SvStream& rIn)
/*N*/ {
/*N*/ if (rIn.GetError()!=0) return;
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdograf.cxx b/binfilter/bf_svx/source/svdraw/svx_svdograf.cxx
index d6c875b..ac08163 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdograf.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdograf.cxx
@@ -986,23 +986,6 @@ namespace binfilter {
/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }
/*N*/ }
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// pre- and postprocessing for objects for saving
-
-/*N*/ void SdrGrafObj::PreSave()
-/*N*/ {
-/*N*/ // call parent
-/*N*/ SdrRectObj::PreSave();
-/*N*/
-/*N*/ // prepare SetItems for storage
-/*N*/ const SfxItemSet& rSet = GetUnmergedItemSet();
-/*N*/ const SfxItemSet* pParent = GetStyleSheet() ? &GetStyleSheet()->GetItemSet() : 0L;
-/*N*/ SdrGrafSetItem aGrafAttr(rSet.GetPool());
-/*N*/ aGrafAttr.GetItemSet().Put(rSet);
-/*N*/ aGrafAttr.GetItemSet().SetParent(pParent);
-/*N*/ mpObjectItemSet->Put(aGrafAttr);
-/*N*/ }
-
/*N*/ void SdrGrafObj::ReadDataTilV10( const SdrObjIOHeader& rHead, SvStream& rIn )
/*N*/ {
/*N*/ Graphic aGraphic;
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdogrp.cxx b/binfilter/bf_svx/source/svdraw/svx_svdogrp.cxx
index 4631710..cfa5770 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdogrp.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdogrp.cxx
@@ -820,22 +820,6 @@ namespace binfilter {
/*N*/ }
/*N*/ }
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// pre- and postprocessing for objects for saving
-
-/*N*/ void SdrObjGroup::PreSave()
-/*N*/ {
-/*N*/ // call parent
-/*N*/ SdrObject::PreSave();
-/*N*/
-/*N*/ if(!IsLinkedGroup())
-/*N*/ {
-/*N*/ sal_uInt32 nCount(pSub->GetObjCount());
-/*N*/ for(sal_uInt32 a(0); a < nCount; a++)
-/*N*/ pSub->GetObj(a)->PreSave();
-/*N*/ }
-/*N*/ }
-
/*N*/ SfxStyleSheet* SdrObjGroup::GetStyleSheet() const
/*N*/ {
/*N*/ // Hier mit 'nem Iterator. Es koennte sonst passieren dass ein
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdomeas.cxx b/binfilter/bf_svx/source/svdraw/svx_svdomeas.cxx
index cc97081..13e60e7 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdomeas.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdomeas.cxx
@@ -874,23 +874,6 @@ namespace binfilter {
/*N*/ SetTextDirty();
/*N*/ }
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// pre- and postprocessing for objects for saving
-
-/*N*/ void SdrMeasureObj::PreSave()
-/*N*/ {
-/*N*/ // call parent
-/*N*/ SdrTextObj::PreSave();
-/*N*/
-/*N*/ // prepare SetItems for storage
-/*N*/ const SfxItemSet& rSet = GetUnmergedItemSet();
-/*N*/ const SfxItemSet* pParent = GetStyleSheet() ? &GetStyleSheet()->GetItemSet() : 0L;
-/*N*/ SdrMeasureSetItem aMeasAttr(rSet.GetPool());
-/*N*/ aMeasAttr.GetItemSet().Put(rSet);
-/*N*/ aMeasAttr.GetItemSet().SetParent(pParent);
-/*N*/ mpObjectItemSet->Put(aMeasAttr);
-/*N*/ }
-
/*N*/ void SdrMeasureObj::ReadData(const SdrObjIOHeader& rHead, SvStream& rIn)
/*N*/ {
/*N*/ if (rIn.GetError()!=0) return;
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdotext.cxx b/binfilter/bf_svx/source/svdraw/svx_svdotext.cxx
index e2286d8..5a76d7a 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdotext.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdotext.cxx
@@ -957,22 +957,6 @@ inline double ImplMMToTwips(double fVal) { return (fVal * (72.0 / 127.0)); }
/*N*/ {DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// pre- and postprocessing for objects for saving
-
-/*N*/ void SdrTextObj::PreSave()
-/*N*/ {
-/*N*/ // call parent
-/*N*/ SdrAttrObj::PreSave();
-/*N*/
-/*N*/ // Prepare OutlinerParaObjects for storing
-/*N*/ OutlinerParaObject* pParaObj = GetOutlinerParaObject();
-/*N*/ if(pParaObj && GetModel())
-/*N*/ pParaObj->PrepareStore((SfxStyleSheetPool*)GetModel()->GetStyleSheetPool());
-/*N*/ }
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
/*N*/ OutlinerParaObject* SdrTextObj::GetOutlinerParaObject() const
/*N*/ {
/*N*/ return pOutlinerParaObject;
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdovirt.cxx b/binfilter/bf_svx/source/svdraw/svx_svdovirt.cxx
index 994984c..1c25622 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdovirt.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdovirt.cxx
@@ -232,13 +232,6 @@ namespace binfilter {
/*N*/ return rRefObj.CreateNewItemSet(rPool);
/*N*/ }
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// pre- and postprocessing for objects for saving
-
-/*N*/ void SdrVirtObj::PreSave()
-/*N*/ {
-/*N*/ }
-
/*N*/ void SdrVirtObj::SetStyleSheet(SfxStyleSheet* /*pNewStyleSheet*/, bool /*bDontRemoveHardAttr*/)
/*N*/ {DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
diff --git a/binfilter/inc/bf_svx/scene3d.hxx b/binfilter/inc/bf_svx/scene3d.hxx
index fb5e1d1..9944c04 100644
--- a/binfilter/inc/bf_svx/scene3d.hxx
+++ b/binfilter/inc/bf_svx/scene3d.hxx
@@ -278,7 +278,7 @@ public:
virtual void PostItemChange(const sal_uInt16 nWhich);
// pre- and postprocessing for objects for saving
- virtual void PreSave();
+ virtual void PreSave() {}
virtual void PostSave() {}
virtual void NbcSetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr);
diff --git a/binfilter/inc/bf_svx/svdmodel.hxx b/binfilter/inc/bf_svx/svdmodel.hxx
index b75a37b..484cba5 100644
--- a/binfilter/inc/bf_svx/svdmodel.hxx
+++ b/binfilter/inc/bf_svx/svdmodel.hxx
@@ -695,7 +695,7 @@ public:
void SetModelStorage( SotStorage* pStor ) { pModelStorage = pStor; }
// pre- and postprocessing for objects for saving
- void PreSave();
+ void PreSave() {}
void PostSave() {}
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getUnoModel();
diff --git a/binfilter/inc/bf_svx/svdoattr.hxx b/binfilter/inc/bf_svx/svdoattr.hxx
index ec7c02a..b28a999 100644
--- a/binfilter/inc/bf_svx/svdoattr.hxx
+++ b/binfilter/inc/bf_svx/svdoattr.hxx
@@ -117,7 +117,7 @@ public:
virtual void SetModel(SdrModel* pNewModel);
// pre- and postprocessing for objects for saving
- virtual void PreSave();
+ virtual void PreSave() {}
virtual void PostSave() {}
// ItemSet access
diff --git a/binfilter/inc/bf_svx/svdobj.hxx b/binfilter/inc/bf_svx/svdobj.hxx
index ead0776..24bb60d 100644
--- a/binfilter/inc/bf_svx/svdobj.hxx
+++ b/binfilter/inc/bf_svx/svdobj.hxx
@@ -843,7 +843,7 @@ public:
virtual void PostItemChange(const sal_uInt16 nWhich);
// pre- and postprocessing for objects for saving
- virtual void PreSave();
+ virtual void PreSave() {}
virtual void PostSave() {}
// NotPersistAttr fuer Layer, ObjName, geometrische Transformationen, ...
diff --git a/binfilter/inc/bf_svx/svdocapt.hxx b/binfilter/inc/bf_svx/svdocapt.hxx
index 0aec424..9702b59 100644
--- a/binfilter/inc/bf_svx/svdocapt.hxx
+++ b/binfilter/inc/bf_svx/svdocapt.hxx
@@ -93,7 +93,7 @@ public:
virtual void ItemSetChanged(const SfxItemSet& rSet);
// pre- and postprocessing for objects for saving
- virtual void PreSave();
+ virtual void PreSave() {}
virtual void PostSave() {}
virtual void NbcSetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr);
diff --git a/binfilter/inc/bf_svx/svdocirc.hxx b/binfilter/inc/bf_svx/svdocirc.hxx
index 850c787..f8d9790 100644
--- a/binfilter/inc/bf_svx/svdocirc.hxx
+++ b/binfilter/inc/bf_svx/svdocirc.hxx
@@ -128,7 +128,7 @@ public:
virtual void ItemSetChanged(const SfxItemSet& rSet);
// pre- and postprocessing for objects for saving
- virtual void PreSave();
+ virtual void PreSave() {}
virtual void PostSave() {}
};
diff --git a/binfilter/inc/bf_svx/svdoedge.hxx b/binfilter/inc/bf_svx/svdoedge.hxx
index eaa101b..7a6d853 100644
--- a/binfilter/inc/bf_svx/svdoedge.hxx
+++ b/binfilter/inc/bf_svx/svdoedge.hxx
@@ -208,7 +208,7 @@ public:
virtual void ItemSetChanged(const SfxItemSet& rSet);
// pre- and postprocessing for objects for saving
- virtual void PreSave();
+ virtual void PreSave() {}
virtual void PostSave() {}
virtual void NbcSetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr);
diff --git a/binfilter/inc/bf_svx/svdograf.hxx b/binfilter/inc/bf_svx/svdograf.hxx
index 4525388..1bd320b 100644
--- a/binfilter/inc/bf_svx/svdograf.hxx
+++ b/binfilter/inc/bf_svx/svdograf.hxx
@@ -182,7 +182,7 @@ public:
virtual void ItemSetChanged(const SfxItemSet& rSet);
// pre- and postprocessing for objects for saving
- virtual void PreSave();
+ virtual void PreSave() {}
virtual void PostSave() {}
virtual void AfterRead();
diff --git a/binfilter/inc/bf_svx/svdogrp.hxx b/binfilter/inc/bf_svx/svdogrp.hxx
index 278ff79..da88d44 100644
--- a/binfilter/inc/bf_svx/svdogrp.hxx
+++ b/binfilter/inc/bf_svx/svdogrp.hxx
@@ -192,7 +192,7 @@ public:
virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0);
// pre- and postprocessing for objects for saving
- virtual void PreSave();
+ virtual void PreSave() {}
virtual void PostSave() {};
virtual void NbcSetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr);
diff --git a/binfilter/inc/bf_svx/svdomeas.hxx b/binfilter/inc/bf_svx/svdomeas.hxx
index 7bc3486..cd104d8 100644
--- a/binfilter/inc/bf_svx/svdomeas.hxx
+++ b/binfilter/inc/bf_svx/svdomeas.hxx
@@ -128,7 +128,7 @@ public:
virtual void ItemSetChanged(const SfxItemSet& rSet);
// pre- and postprocessing for objects for saving
- virtual void PreSave();
+ virtual void PreSave() {}
virtual void PostSave() {}
virtual void WriteData(SvStream& ) const {}
diff --git a/binfilter/inc/bf_svx/svdotext.hxx b/binfilter/inc/bf_svx/svdotext.hxx
index 2ae21e7..458b882 100644
--- a/binfilter/inc/bf_svx/svdotext.hxx
+++ b/binfilter/inc/bf_svx/svdotext.hxx
@@ -391,7 +391,7 @@ public:
void UpdateOutlinerFormatting( SdrOutliner& /*rOutl*/, Rectangle& /*rPaintRect*/ ){DBG_BF_ASSERT(0, "STRIP");}
// pre- and postprocessing for objects for saving
- virtual void PreSave();
+ virtual void PreSave() {}
void ForceOutlinerParaObject();
BOOL IsVerticalWriting() const;
diff --git a/binfilter/inc/bf_svx/svdovirt.hxx b/binfilter/inc/bf_svx/svdovirt.hxx
index dd052bb..f7e417e 100644
--- a/binfilter/inc/bf_svx/svdovirt.hxx
+++ b/binfilter/inc/bf_svx/svdovirt.hxx
@@ -99,7 +99,7 @@ public:
// private support routines for ItemSet access. NULL pointer means clear item.
// pre- and postprocessing for objects for saving
- virtual void PreSave();
+ virtual void PreSave() {}
virtual void PostSave() {}
virtual void NbcSetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr);
commit 319264a8494ea84c7fd3a058c9470379e9864b57
Author: Pierre-André Jacquod <pjacquod at alumni.ethz.ch>
Date: Sun Apr 24 20:39:17 2011 +0200
deactivate PostSave in binfilter/bf_svx
just return, do not perform anything.
diff --git a/binfilter/bf_svx/source/engine3d/svx_scene3d.cxx b/binfilter/bf_svx/source/engine3d/svx_scene3d.cxx
index f446c19..7ba7289 100644
--- a/binfilter/bf_svx/source/engine3d/svx_scene3d.cxx
+++ b/binfilter/bf_svx/source/engine3d/svx_scene3d.cxx
@@ -1306,17 +1306,6 @@ namespace binfilter {
/*N*/ pSub->GetObj(a)->PreSave();
/*N*/ }
-/*N*/ void E3dScene::PostSave()
-/*N*/ {
-/*N*/ // call parent
-/*N*/ E3dObject::PostSave();
-/*N*/
-/*N*/ // set at all contained objects
-/*N*/ sal_uInt32 nCount(pSub->GetObjCount());
-/*N*/ for(sal_uInt32 a(0); a < nCount; a++)
-/*N*/ pSub->GetObj(a)->PostSave();
-/*N*/ }
-
/*************************************************************************
|*
|* ItemPool fuer dieses Objekt wechseln
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdmodel.cxx b/binfilter/bf_svx/source/svdraw/svx_svdmodel.cxx
index 1c797a4..2d3eddb 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdmodel.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdmodel.cxx
@@ -1737,36 +1737,6 @@ using namespace ::com::sun::star;
/*N*/ }
/*N*/ }
-/*N*/ void SdrModel::PostSave()
-/*N*/ {
-/*N*/ sal_uInt16 nCnt(GetMasterPageCount());
-/*N*/
-/*N*/ sal_uInt16 a; for(a=0; a < nCnt; a++)
-/*N*/ {
-/*N*/ // MasterPages
-/*N*/ const SdrPage& rPage = *GetMasterPage(a);
-/*N*/ SdrObject* pObj = rPage.GetBackgroundObj();
-/*N*/ if( pObj )
-/*?*/ pObj->PostSave();
-/*N*/
-/*N*/ for(sal_uInt32 b(0); b < rPage.GetObjCount(); b++)
-/*N*/ rPage.GetObj(b)->PostSave();
-/*N*/ }
-/*N*/
-/*N*/ nCnt = GetPageCount();
-/*N*/ for(a = 0; a < nCnt; a++)
-/*N*/ {
-/*N*/ // Pages
-/*N*/ const SdrPage& rPage = *GetPage(a);
-/*N*/ SdrObject* pObj = rPage.GetBackgroundObj();
-/*N*/ if( pObj )
-/*N*/ pObj->PostSave();
-/*N*/
-/*N*/ for(sal_uInt32 b(0); b < rPage.GetObjCount(); b++)
-/*N*/ rPage.GetObj(b)->PostSave();
-/*N*/ }
-/*N*/ }
-
/*N*/ uno::Reference< uno::XInterface > SdrModel::getUnoModel()
/*N*/ {
/*N*/ // try weak reference first
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdoattr.cxx b/binfilter/bf_svx/source/svdraw/svx_svdoattr.cxx
index c7dd6f9..5dbfbd8 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdoattr.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdoattr.cxx
@@ -313,21 +313,6 @@ namespace binfilter {
/*N*/ mpObjectItemSet->Put(aMiscAttr);
/*N*/ }
-/*N*/ void SdrAttrObj::PostSave()
-/*N*/ {
-/*N*/ // call parent
-/*N*/ SdrObject::PostSave();
-/*N*/
-/*N*/ // remove SetItems from local itemset
-/*N*/ ((SdrAttrObj*)this)->ImpForceItemSet();
-/*N*/ mpObjectItemSet->ClearItem(XATTRSET_LINE);
-/*N*/ mpObjectItemSet->ClearItem(XATTRSET_FILL);
-/*N*/ mpObjectItemSet->ClearItem(XATTRSET_TEXT);
-/*N*/ mpObjectItemSet->ClearItem(SDRATTRSET_SHADOW);
-/*N*/ mpObjectItemSet->ClearItem(SDRATTRSET_OUTLINER);
-/*N*/ mpObjectItemSet->ClearItem(SDRATTRSET_MISC);
-/*N*/ }
-
/*N*/ void SdrAttrObj::SetModel(SdrModel* pNewModel)
/*N*/ {
/*N*/ SdrModel* pOldModel = pModel;
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdobj.cxx b/binfilter/bf_svx/source/svdraw/svx_svdobj.cxx
index 5542b84..011e918 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdobj.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdobj.cxx
@@ -2626,11 +2626,6 @@ class ImpSkeleton;
/*N*/ {
/*N*/ }
-/*N*/ void SdrObject::PostSave()
-/*N*/ {
-/*N*/ }
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
/*N*/ void SdrObject::ApplyNotPersistAttr(const SfxItemSet& /*rAttr*/)
/*N*/ {DBG_BF_ASSERT(0, "STRIP");
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdocapt.cxx b/binfilter/bf_svx/source/svdraw/svx_svdocapt.cxx
index 4039eb6..4110516 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdocapt.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdocapt.cxx
@@ -473,15 +473,6 @@ namespace binfilter {
/*?*/ mpObjectItemSet->Put(aCaptAttr);
/*?*/ }
-/*?*/ void SdrCaptionObj::PostSave()
-/*?*/ {
-/*?*/ // call parent
-/*?*/ SdrRectObj::PostSave();
-/*?*/
-/*?*/ // remove SetItems from local itemset
-/*?*/ mpObjectItemSet->ClearItem(SDRATTRSET_CAPTION);
-/*?*/ }
-
/*N*/ void SdrCaptionObj::ReadData(const SdrObjIOHeader& rHead, SvStream& rIn)
/*N*/ {
/*N*/ if(rIn.GetError())
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdocirc.cxx b/binfilter/bf_svx/source/svdraw/svx_svdocirc.cxx
index e6f9f1a..1d1ae33 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdocirc.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdocirc.cxx
@@ -797,15 +797,6 @@ namespace binfilter {
/*N*/ mpObjectItemSet->Put(aCircAttr);
/*N*/ }
-/*N*/ void SdrCircObj::PostSave()
-/*N*/ {
-/*N*/ // call parent
-/*N*/ SdrRectObj::PostSave();
-/*N*/
-/*N*/ // remove SetItems from local itemset
-/*N*/ mpObjectItemSet->ClearItem(SDRATTRSET_CIRC);
-/*N*/ }
-
/*N*/ void SdrCircObj::ReadData(const SdrObjIOHeader& rHead, SvStream& rIn)
/*N*/ {
/*N*/ if(rIn.GetError())
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdoedge.cxx b/binfilter/bf_svx/source/svdraw/svx_svdoedge.cxx
index fdae30b..32f8ea7 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdoedge.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdoedge.cxx
@@ -1709,15 +1709,6 @@ je Objekt variiert von 0-3:
/*N*/ mpObjectItemSet->Put(aEdgeAttr);
/*N*/ }
-/*N*/ void SdrEdgeObj::PostSave()
-/*N*/ {
-/*N*/ // call parent
-/*N*/ SdrTextObj::PostSave();
-/*N*/
-/*N*/ // remove SetItems from local itemset
-/*N*/ mpObjectItemSet->ClearItem(SDRATTRSET_EDGE);
-/*N*/ }
-/*N*/
/*N*/ void SdrEdgeObj::ReadData(const SdrObjIOHeader& rHead, SvStream& rIn)
/*N*/ {
/*N*/ if (rIn.GetError()!=0) return;
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdograf.cxx b/binfilter/bf_svx/source/svdraw/svx_svdograf.cxx
index 10b5e57..d6c875b 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdograf.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdograf.cxx
@@ -1003,15 +1003,6 @@ namespace binfilter {
/*N*/ mpObjectItemSet->Put(aGrafAttr);
/*N*/ }
-/*N*/ void SdrGrafObj::PostSave()
-/*N*/ {
-/*N*/ // call parent
-/*N*/ SdrRectObj::PostSave();
-/*N*/
-/*N*/ // remove SetItems from local itemset
-/*N*/ mpObjectItemSet->ClearItem(SDRATTRSET_GRAF);
-/*N*/ }
-
/*N*/ void SdrGrafObj::ReadDataTilV10( const SdrObjIOHeader& rHead, SvStream& rIn )
/*N*/ {
/*N*/ Graphic aGraphic;
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdogrp.cxx b/binfilter/bf_svx/source/svdraw/svx_svdogrp.cxx
index 0d91fc9..4631710 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdogrp.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdogrp.cxx
@@ -836,21 +836,6 @@ namespace binfilter {
/*N*/ }
/*N*/ }
-/*N*/ void SdrObjGroup::PostSave()
-/*N*/ {
-/*N*/ // call parent
-/*N*/ SdrObject::PostSave();
-/*N*/
-/*N*/ if(!IsLinkedGroup())
-/*N*/ {
-/*N*/ sal_uInt32 nCount(pSub->GetObjCount());
-/*N*/ for(sal_uInt32 a(0); a < nCount; a++)
-/*N*/ pSub->GetObj(a)->PostSave();
-/*N*/ }
-/*N*/ }
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
/*N*/ SfxStyleSheet* SdrObjGroup::GetStyleSheet() const
/*N*/ {
/*N*/ // Hier mit 'nem Iterator. Es koennte sonst passieren dass ein
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdomeas.cxx b/binfilter/bf_svx/source/svdraw/svx_svdomeas.cxx
index 58fa22c..cc97081 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdomeas.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdomeas.cxx
@@ -891,15 +891,6 @@ namespace binfilter {
/*N*/ mpObjectItemSet->Put(aMeasAttr);
/*N*/ }
-/*N*/ void SdrMeasureObj::PostSave()
-/*N*/ {
-/*N*/ // call parent
-/*N*/ SdrTextObj::PostSave();
-/*N*/
-/*N*/ // remove SetItems from local itemset
-/*N*/ mpObjectItemSet->ClearItem(SDRATTRSET_MEASURE);
-/*N*/ }
-
/*N*/ void SdrMeasureObj::ReadData(const SdrObjIOHeader& rHead, SvStream& rIn)
/*N*/ {
/*N*/ if (rIn.GetError()!=0) return;
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdovirt.cxx b/binfilter/bf_svx/source/svdraw/svx_svdovirt.cxx
index 6f63a8a..994984c 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdovirt.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdovirt.cxx
@@ -232,16 +232,6 @@ namespace binfilter {
/*N*/ return rRefObj.CreateNewItemSet(rPool);
/*N*/ }
-
-
-
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// private support routines for ItemSet access
-
-
-
-
////////////////////////////////////////////////////////////////////////////////////////////////////
// pre- and postprocessing for objects for saving
@@ -249,13 +239,6 @@ namespace binfilter {
/*N*/ {
/*N*/ }
-/*N*/ void SdrVirtObj::PostSave()
-/*N*/ {
-/*N*/ }
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
/*N*/ void SdrVirtObj::SetStyleSheet(SfxStyleSheet* /*pNewStyleSheet*/, bool /*bDontRemoveHardAttr*/)
/*N*/ {DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
@@ -265,20 +248,6 @@ namespace binfilter {
/*N*/ rRefObj.NbcSetStyleSheet(pNewStyleSheet,bDontRemoveHardAttr);
/*N*/ }
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-
-
-
-
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
/*?*/ void SdrVirtObj::ReadData(const SdrObjIOHeader& rHead, SvStream& rIn)
/*?*/ {
/*?*/ if (rIn.GetError()!=0) return;
diff --git a/binfilter/inc/bf_svx/scene3d.hxx b/binfilter/inc/bf_svx/scene3d.hxx
index 80d406c..fb5e1d1 100644
--- a/binfilter/inc/bf_svx/scene3d.hxx
+++ b/binfilter/inc/bf_svx/scene3d.hxx
@@ -279,7 +279,7 @@ public:
// pre- and postprocessing for objects for saving
virtual void PreSave();
- virtual void PostSave();
+ virtual void PostSave() {}
virtual void NbcSetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr);
virtual SfxStyleSheet* GetStyleSheet() const;
diff --git a/binfilter/inc/bf_svx/svdmodel.hxx b/binfilter/inc/bf_svx/svdmodel.hxx
index 6a1ce77..b75a37b 100644
--- a/binfilter/inc/bf_svx/svdmodel.hxx
+++ b/binfilter/inc/bf_svx/svdmodel.hxx
@@ -696,7 +696,7 @@ public:
// pre- and postprocessing for objects for saving
void PreSave();
- void PostSave();
+ 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 c7b01a9..ec7c02a 100644
--- a/binfilter/inc/bf_svx/svdoattr.hxx
+++ b/binfilter/inc/bf_svx/svdoattr.hxx
@@ -118,7 +118,7 @@ public:
// pre- and postprocessing for objects for saving
virtual void PreSave();
- virtual void PostSave();
+ virtual void PostSave() {}
// ItemSet access
virtual const SfxItemSet& GetItemSet() const;
diff --git a/binfilter/inc/bf_svx/svdobj.hxx b/binfilter/inc/bf_svx/svdobj.hxx
index 31fdd38..ead0776 100644
--- a/binfilter/inc/bf_svx/svdobj.hxx
+++ b/binfilter/inc/bf_svx/svdobj.hxx
@@ -844,7 +844,7 @@ public:
// pre- and postprocessing for objects for saving
virtual void PreSave();
- virtual void PostSave();
+ virtual void PostSave() {}
// NotPersistAttr fuer Layer, ObjName, geometrische Transformationen, ...
void TakeNotPersistAttr(SfxItemSet& rAttr, bool bMerge) const;
diff --git a/binfilter/inc/bf_svx/svdocapt.hxx b/binfilter/inc/bf_svx/svdocapt.hxx
index 6f38ab2..0aec424 100644
--- a/binfilter/inc/bf_svx/svdocapt.hxx
+++ b/binfilter/inc/bf_svx/svdocapt.hxx
@@ -94,13 +94,10 @@ public:
// pre- and postprocessing for objects for saving
virtual void PreSave();
- virtual void PostSave();
+ virtual void PostSave() {}
virtual void NbcSetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr);
-
-
-
virtual void NbcMove(const Size& rSiz);
virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact);
diff --git a/binfilter/inc/bf_svx/svdocirc.hxx b/binfilter/inc/bf_svx/svdocirc.hxx
index 144484c..850c787 100644
--- a/binfilter/inc/bf_svx/svdocirc.hxx
+++ b/binfilter/inc/bf_svx/svdocirc.hxx
@@ -129,7 +129,7 @@ public:
// pre- and postprocessing for objects for saving
virtual void PreSave();
- virtual void PostSave();
+ virtual void PostSave() {}
};
}//end of namespace binfilter
diff --git a/binfilter/inc/bf_svx/svdoedge.hxx b/binfilter/inc/bf_svx/svdoedge.hxx
index 6fb98f0..eaa101b 100644
--- a/binfilter/inc/bf_svx/svdoedge.hxx
+++ b/binfilter/inc/bf_svx/svdoedge.hxx
@@ -209,7 +209,7 @@ public:
// pre- and postprocessing for objects for saving
virtual void PreSave();
- virtual void PostSave();
+ virtual void PostSave() {}
virtual void NbcSetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr);
diff --git a/binfilter/inc/bf_svx/svdograf.hxx b/binfilter/inc/bf_svx/svdograf.hxx
index 695ef2a..4525388 100644
--- a/binfilter/inc/bf_svx/svdograf.hxx
+++ b/binfilter/inc/bf_svx/svdograf.hxx
@@ -183,7 +183,7 @@ public:
// pre- and postprocessing for objects for saving
virtual void PreSave();
- virtual void PostSave();
+ virtual void PostSave() {}
virtual void AfterRead();
diff --git a/binfilter/inc/bf_svx/svdogrp.hxx b/binfilter/inc/bf_svx/svdogrp.hxx
index e7c2ec9..278ff79 100644
--- a/binfilter/inc/bf_svx/svdogrp.hxx
+++ b/binfilter/inc/bf_svx/svdogrp.hxx
@@ -193,7 +193,7 @@ public:
// pre- and postprocessing for objects for saving
virtual void PreSave();
- virtual void PostSave();
+ virtual void PostSave() {};
virtual void NbcSetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr);
virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr);
diff --git a/binfilter/inc/bf_svx/svdomeas.hxx b/binfilter/inc/bf_svx/svdomeas.hxx
index 89d920a..7bc3486 100644
--- a/binfilter/inc/bf_svx/svdomeas.hxx
+++ b/binfilter/inc/bf_svx/svdomeas.hxx
@@ -129,7 +129,7 @@ public:
// pre- and postprocessing for objects for saving
virtual void PreSave();
- virtual void PostSave();
+ virtual void PostSave() {}
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 12fbdcf..dd052bb 100644
--- a/binfilter/inc/bf_svx/svdovirt.hxx
+++ b/binfilter/inc/bf_svx/svdovirt.hxx
@@ -100,7 +100,7 @@ public:
// pre- and postprocessing for objects for saving
virtual void PreSave();
- virtual void PostSave();
+ virtual void PostSave() {}
virtual void NbcSetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr);
virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr);
commit ac56695c87ebf442d71c61325b56aec03f8ee216
Author: Pierre-André Jacquod <pjacquod at alumni.ethz.ch>
Date: Sun Apr 24 20:13:21 2011 +0200
deactivate WriteData31 in binfilter/bf_svx
performs nothing, just return
diff --git a/binfilter/bf_svx/source/engine3d/svx_camera3d.cxx b/binfilter/bf_svx/source/engine3d/svx_camera3d.cxx
index c8ff124..b6904a9 100644
--- a/binfilter/bf_svx/source/engine3d/svx_camera3d.cxx
+++ b/binfilter/bf_svx/source/engine3d/svx_camera3d.cxx
@@ -239,29 +239,6 @@ namespace binfilter {
/*************************************************************************
|*
-|* Stream-Out-Operator fuer Camera3D fuer die Filerevision 3.1
-|*
-\************************************************************************/
-
-/*N*/ void Camera3D::WriteData31(SvStream& rOut) const
-/*N*/ {
-/*N*/ #ifndef SVX_LIGHT
-/*N*/ Viewport3D::WriteData(rOut);
-/*N*/
-/*N*/ rOut << aResetPos;
-/*N*/ rOut << aResetLookAt;
-/*N*/ rOut << fResetFocalLength;
-/*N*/ rOut << fResetBankAngle;
-/*N*/ rOut << aPosition;
-/*N*/ rOut << aLookAt;
-/*N*/ rOut << fFocalLength;
-/*N*/ rOut << fBankAngle;
-/*N*/ rOut << BOOL(bAutoAdjustProjection);
-/*N*/ #endif
-/*N*/ }
-
-/*************************************************************************
-|*
|* Stream-In-Operator fuer Camera3D
|*
\************************************************************************/
diff --git a/binfilter/bf_svx/source/engine3d/svx_polyob3d.cxx b/binfilter/bf_svx/source/engine3d/svx_polyob3d.cxx
index d4386c2..c4c609e 100644
--- a/binfilter/bf_svx/source/engine3d/svx_polyob3d.cxx
+++ b/binfilter/bf_svx/source/engine3d/svx_polyob3d.cxx
@@ -246,33 +246,6 @@ namespace binfilter {
/*************************************************************************
|*
-|* sichern
-|*
-\************************************************************************/
-
-/*N*/ void E3dPolyObj::WriteData31(SvStream& rOut) const
-/*N*/ {
-/*N*/ #ifndef SVX_LIGHT
-/*N*/ E3dObject::WriteData(rOut);
-/*N*/
-/*N*/ SdrDownCompat aCompat(rOut, STREAM_WRITE);
-/*N*/ #ifdef DBG_UTIL
-/*N*/ aCompat.SetID("E3dPolyObj");
-/*N*/ #endif
-/*N*/
-/*N*/ rOut << aPolyPoly3D;
-/*N*/ rOut << aNormal;
-/*N*/ rOut << BOOL(bDoubleSided);
-/*N*/ rOut << BOOL(bBackSideVisible);
-/*N*/ rOut << BOOL(bLighted);
-/*N*/
-/*N*/ rOut << (UINT32) bOwnAttrs;
-/*N*/ rOut << (UINT32) bOwnStyle;
-/*N*/ #endif
-/*N*/ }
-
-/*************************************************************************
-|*
|* laden
|*
\************************************************************************/
diff --git a/binfilter/bf_svx/source/engine3d/svx_viewpt3d.cxx b/binfilter/bf_svx/source/engine3d/svx_viewpt3d.cxx
index be7e5b7..e1f9f3a 100644
--- a/binfilter/bf_svx/source/engine3d/svx_viewpt3d.cxx
+++ b/binfilter/bf_svx/source/engine3d/svx_viewpt3d.cxx
@@ -375,32 +375,6 @@ namespace binfilter {
/*************************************************************************
|*
-|* Stream-Out-Operator fuer Viewport3D (Version 3.1)
-|*
-\************************************************************************/
-
-/*N*/ void Viewport3D::WriteData31(SvStream& rOut) const
-/*N*/ {
-/*N*/ #ifndef SVX_LIGHT
-/*N*/ rOut << aVRP;
-/*N*/ rOut << aVPN;
-/*N*/ rOut << aVUV;
-/*N*/ rOut << aPRP;
-/*N*/ rOut << fVPD;
-/*N*/ rOut << fNearClipDist;
-/*N*/ rOut << fFarClipDist;
-/*N*/ rOut << UINT16(eProjection);
-/*N*/ rOut << UINT16(eAspectMapping);
-/*N*/ rOut << aDeviceRect;
-/*N*/ rOut << aViewWin.X;
-/*N*/ rOut << aViewWin.Y;
-/*N*/ rOut << aViewWin.W;
-/*N*/ rOut << aViewWin.H;
-/*N*/ #endif
-/*N*/ }
-
-/*************************************************************************
-|*
|* Stream-In-Operator fuer Viewport3D fuer die Version 3.1
|*
\************************************************************************/
diff --git a/binfilter/inc/bf_svx/camera3d.hxx b/binfilter/inc/bf_svx/camera3d.hxx
index 4fc3e13..3ec74cc 100644
--- a/binfilter/inc/bf_svx/camera3d.hxx
+++ b/binfilter/inc/bf_svx/camera3d.hxx
@@ -92,7 +92,7 @@ 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& rOut) const;
+ virtual void WriteData31(SvStream& ) const {}
virtual void ReadData31(SvStream& rIn);
virtual void WriteData(SvStream& ) const {}
diff --git a/binfilter/inc/bf_svx/polyob3d.hxx b/binfilter/inc/bf_svx/polyob3d.hxx
index 8850bfa..44e0dae 100644
--- a/binfilter/inc/bf_svx/polyob3d.hxx
+++ b/binfilter/inc/bf_svx/polyob3d.hxx
@@ -57,7 +57,7 @@ class E3dPolyObj : public E3dObject
// [FG]: Zwecks schreiben des Formates der 3.1 Version
// Diese Funktionen werden nur von ReadData31 und WriteData31
// aufgerufen.
- void WriteData31(SvStream& rOut) const;
+ void WriteData31(SvStream& ) const {}
void ReadData31(const SdrObjIOHeader& rHead, SvStream& rIn);
public:
diff --git a/binfilter/inc/bf_svx/viewpt3d.hxx b/binfilter/inc/bf_svx/viewpt3d.hxx
index 6a71107..6acde52 100644
--- a/binfilter/inc/bf_svx/viewpt3d.hxx
+++ b/binfilter/inc/bf_svx/viewpt3d.hxx
@@ -133,7 +133,7 @@ class Viewport3D
// Wird nur vom Stream-Operator gerufen
virtual void ReadData31(SvStream& rIn);
- virtual void WriteData31(SvStream& rOut) const;
+ virtual void WriteData31(SvStream& ) const {}
};
// FG: eigentlich sollten die Stream-Funktionen in der 3D-Engine nicht verwendet werden
commit 3b83a07cd2f06cc80fd8ebdeabbe71c41ef824b4
Author: Pierre-André Jacquod <pjacquod at alumni.ethz.ch>
Date: Sun Apr 24 20:04:47 2011 +0200
deactive WriteData in binfilter/bf_goodies
and performs nothing anymore when the function is called
diff --git a/binfilter/bf_goodies/source/base3d/goodies_b3dlight.cxx b/binfilter/bf_goodies/source/base3d/goodies_b3dlight.cxx
index a25f24c..5b9512e 100644
--- a/binfilter/bf_goodies/source/base3d/goodies_b3dlight.cxx
+++ b/binfilter/bf_goodies/source/base3d/goodies_b3dlight.cxx
@@ -152,34 +152,6 @@ void B3dLight::Init()
bIsAmbient = FALSE;
}
-void B3dLight::WriteData(SvStream& rOut) const
-{
- rOut << aAmbient;
- rOut << aDiffuse;
- rOut << aSpecular;
-
- rOut << aPosition;
- rOut << aPositionEye;
- rOut << aSpotDirection;
- rOut << aSpotDirectionEye;
- rOut << nSpotExponent;
-
- rOut << fSpotCutoff;
- rOut << fCosSpotCutoff;
- rOut << fConstantAttenuation;
- rOut << fLinearAttenuation;
- rOut << fQuadraticAttenuation;
-
- rOut << (BOOL)bIsFirstLight;
- rOut << (BOOL)bIsEnabled;
- rOut << (BOOL)bIsDirectionalSource;
- rOut << (BOOL)bIsSpot;
- rOut << (BOOL)bIsAmbient;
- rOut << (BOOL)bIsDiffuse;
- rOut << (BOOL)bIsSpecular;
- rOut << (BOOL)bLinearOrQuadratic;
-}
-
void B3dLight::ReadData(SvStream& rIn)
{
BOOL bTmp;
@@ -467,21 +439,6 @@ B3dLight& B3dLightGroup::GetLightObject(Base3DLightNumber eNum)
return aLight[eNum];
}
-void B3dLightGroup::WriteData(SvStream& rOut) const
-{
- for(UINT16 a=0;a<BASE3D_MAX_NUMBER_LIGHTS;a++)
- {
- B3dLight& rLight = ((B3dLightGroup*)(this))->GetLightObject((Base3DLightNumber)(Base3DLight0 + a));
- rLight.WriteData(rOut);
- }
-
- rOut << aGlobalAmbientLight;
-
- rOut << (BOOL)bLightingEnabled;
- rOut << (BOOL)bLocalViewer;
- rOut << (BOOL)bModelTwoSide;
-}
-
void B3dLightGroup::ReadData(SvStream& rIn)
{
BOOL bTmp;
diff --git a/binfilter/bf_goodies/source/base3d/goodies_matril3d.cxx b/binfilter/bf_goodies/source/base3d/goodies_matril3d.cxx
index ade6a42..7cef218 100644
--- a/binfilter/bf_goodies/source/base3d/goodies_matril3d.cxx
+++ b/binfilter/bf_goodies/source/base3d/goodies_matril3d.cxx
@@ -47,15 +47,6 @@ B3dMaterial::B3dMaterial()
{
}
-void B3dMaterial::WriteData(SvStream& rOut) const
-{
- rOut << aAmbient;
- rOut << aDiffuse;
- rOut << aSpecular;
- rOut << aEmission;
- rOut << nExponent;
-}
-
void B3dMaterial::ReadData(SvStream& rIn)
{
rIn >> aAmbient;
diff --git a/binfilter/inc/bf_goodies/b3dlight.hxx b/binfilter/inc/bf_goodies/b3dlight.hxx
index 27cecc9..a3a144c 100644
--- a/binfilter/inc/bf_goodies/b3dlight.hxx
+++ b/binfilter/inc/bf_goodies/b3dlight.hxx
@@ -155,7 +155,7 @@ public:
void Init();
// Laden/Speichern in StarView
- virtual void WriteData(SvStream& rOut) const;
+ virtual void WriteData(SvStream& ) const {}
virtual void ReadData(SvStream& rIn);
protected:
@@ -215,7 +215,7 @@ public:
B3dLight& GetLightObject(Base3DLightNumber=Base3DLight0);
// Laden/Speichern in StarView
- virtual void WriteData(SvStream& rOut) const;
+ virtual void WriteData(SvStream& ) const {}
virtual void ReadData(SvStream& rIn);
protected:
diff --git a/binfilter/inc/bf_goodies/matril3d.hxx b/binfilter/inc/bf_goodies/matril3d.hxx
index 918d94d..98ef399 100644
--- a/binfilter/inc/bf_goodies/matril3d.hxx
+++ b/binfilter/inc/bf_goodies/matril3d.hxx
@@ -86,7 +86,7 @@ public:
B3dMaterial();
// Laden/Speichern in StarView
- virtual void WriteData(SvStream& rOut) const;
+ virtual void WriteData(SvStream& ) const {}
virtual void ReadData(SvStream& rIn);
// Vergleichsoperator
commit 735bf182ecb8de683a6d4d7ce882e3712de168fc
Author: Pierre-André Jacquod <pjacquod at alumni.ethz.ch>
Date: Sun Apr 24 19:26:30 2011 +0200
deactivate WriteData in binfilter/bf_svx
these functions do not perform anything, just return
diff --git a/binfilter/bf_svx/source/engine3d/svx_camera3d.cxx b/binfilter/bf_svx/source/engine3d/svx_camera3d.cxx
index 1934340..c8ff124 100644
--- a/binfilter/bf_svx/source/engine3d/svx_camera3d.cxx
+++ b/binfilter/bf_svx/source/engine3d/svx_camera3d.cxx
@@ -262,42 +262,6 @@ namespace binfilter {
/*************************************************************************
|*
-|* Stream-Out-Operator fuer Camera3D
-|* Zur Version 356 wurde das Fileformat inkompatibel, wenn man das alte
-|* Format schreiben will, muss man die Version am Stream abfragen.
-|*
-\************************************************************************/
-
-/*N*/ void Camera3D::WriteData(SvStream& rOut) const
-/*N*/ {
-/*N*/ #ifndef SVX_LIGHT
-/*N*/
-/*N*/ if (rOut.GetVersion() < 3560) // FG: Ab der Release 356 wurde das Fileformat geaendert
-/*N*/ { // Falls das Format der Version 31 geschrieben werden soll
-/*N*/ WriteData31(rOut); // muss am Stream die Version der 3.1 gesetzt sein.
-/*N*/ return; // Im Prinzip kann man auf diese Art auch Zwischenversionen
-/*N*/ } // erzeugen.
-/*N*/
-/*N*/ SdrDownCompat aCompat(rOut, STREAM_WRITE);
-/*N*/ #ifdef DBG_UTIL
-/*N*/ aCompat.SetID("Camera3D");
-/*N*/ #endif
-/*N*/ Viewport3D::WriteData(rOut);
-/*N*/
-/*N*/ rOut << aResetPos; // Alles Vektoren 3*double
-/*N*/ rOut << aResetLookAt;
-/*N*/ rOut << fResetFocalLength;
-/*N*/ rOut << fResetBankAngle;
-/*N*/ rOut << aPosition;
-/*N*/ rOut << aLookAt;
-/*N*/ rOut << fFocalLength;
-/*N*/ rOut << fBankAngle;
-/*N*/ rOut << BOOL(bAutoAdjustProjection);
-/*N*/ #endif
-/*N*/ }
-
-/*************************************************************************
-|*
|* Stream-In-Operator fuer Camera3D
|*
\************************************************************************/
diff --git a/binfilter/bf_svx/source/engine3d/svx_cube3d.cxx b/binfilter/bf_svx/source/engine3d/svx_cube3d.cxx
index 308470d..c014f36 100644
--- a/binfilter/bf_svx/source/engine3d/svx_cube3d.cxx
+++ b/binfilter/bf_svx/source/engine3d/svx_cube3d.cxx
@@ -201,39 +201,6 @@ namespace binfilter {
/*************************************************************************
|*
-|* Objektdaten in Stream speichern
-|*
-\************************************************************************/
-
-/*N*/ void E3dCubeObj::WriteData(SvStream& rOut) const
-/*N*/ {
-/*N*/ #ifndef SVX_LIGHT
-/*N*/ long nVersion = rOut.GetVersion(); // Build_Nr * 10 z.B. 3810
-/*N*/ if(nVersion < 3800)
-/*N*/ {
-/*N*/ // Alte Geometrie erzeugen, um die E3dPolyObj's zu haben
-/*?*/ ((E3dCompoundObject*)this)->ReCreateGeometry(TRUE);
-/*N*/ }
-/*N*/
-/*N*/ // call parent, schreibt die SubList (alte Geometrie) raus
-/*N*/ E3dCompoundObject::WriteData(rOut);
-/*N*/
-/*N*/ E3dIOCompat aCompat(rOut, STREAM_WRITE, 1);
-/*N*/ rOut << aCubePos;
-/*N*/ rOut << aCubeSize;
-/*N*/ rOut << BOOL(bPosIsCenter);
-/*N*/ rOut << nSideFlags;
-/*N*/
-/*N*/ if(nVersion < 3800)
-/*N*/ {
-/*N*/ // Geometrie neu erzeugen, um E3dPolyObj's wieder loszuwerden
-/*?*/ ((E3dCompoundObject*)this)->ReCreateGeometry();
-/*N*/ }
-/*N*/ #endif
-/*N*/ }
-
-/*************************************************************************
-|*
|* Objektdaten aus Stream laden
|*
\************************************************************************/
diff --git a/binfilter/bf_svx/source/engine3d/svx_dlight3d.cxx b/binfilter/bf_svx/source/engine3d/svx_dlight3d.cxx
index 49ee76c..8214b77 100644
--- a/binfilter/bf_svx/source/engine3d/svx_dlight3d.cxx
+++ b/binfilter/bf_svx/source/engine3d/svx_dlight3d.cxx
@@ -136,28 +136,6 @@ namespace binfilter {
/*************************************************************************
|*
-|* sichern
-|*
-\************************************************************************/
-
-/*N*/ void E3dDistantLight::WriteData(SvStream& rOut) const
-/*N*/ {
-/*N*/ #ifndef SVX_LIGHT
-/*N*/ E3dLight::WriteData(rOut);
-/*N*/
-/*N*/ #ifdef E3D_STREAMING
-/*N*/ SdrDownCompat aCompat(rOut, STREAM_WRITE);
-/*N*/ #ifdef DBG_UTIL
-/*N*/ aCompat.SetID("E3dDistantLight");
-/*N*/ #endif
-/*N*/
-/*N*/ rOut << aDirection;
-/*N*/ #endif
-/*N*/ #endif // #ifndef SVX_LIGHT
-/*N*/ }
-
-/*************************************************************************
-|*
|* laden
|*
\************************************************************************/
diff --git a/binfilter/bf_svx/source/engine3d/svx_extrud3d.cxx b/binfilter/bf_svx/source/engine3d/svx_extrud3d.cxx
index 20c734a..2872f8c 100644
--- a/binfilter/bf_svx/source/engine3d/svx_extrud3d.cxx
+++ b/binfilter/bf_svx/source/engine3d/svx_extrud3d.cxx
@@ -286,52 +286,6 @@ namespace binfilter {
/*************************************************************************
|*
-|* Objektdaten in Stream speichern
-|*
-\************************************************************************/
-
-/*N*/ void E3dExtrudeObj::WriteData(SvStream& rOut) const
-/*N*/ {
-/*N*/ #ifndef SVX_LIGHT
-/*N*/ long nVersion = rOut.GetVersion(); // Build_Nr * 10 z.B. 3810
-/*N*/ if(nVersion < 3800)
-/*N*/ {
-/*N*/ // Alte Geometrie erzeugen, um die E3dPolyObj's zu haben
-/*N*/ ((E3dCompoundObject*)this)->ReCreateGeometry(TRUE);
-/*N*/ }
-/*N*/
-/*N*/ // call parent
-/*N*/ E3dCompoundObject::WriteData(rOut);
-/*N*/
-/*N*/ E3dIOCompat aCompat(rOut, STREAM_WRITE, 1);
-/*N*/ rOut << aExtrudePolygon;
-/*N*/ rOut << fExtrudeScale;
-/*N*/
-/*N*/ rOut << (double)GetExtrudeDepth();
-/*N*/
-/*N*/ rOut << (double)GetPercentBackScale() / 100.0;
-/*N*/
-/*N*/ rOut << (double)GetPercentDiagonal() / 200.0;
-/*N*/
-/*N*/ rOut << GetSmoothNormals(); // #107245# (BOOL)bExtrudeSmoothed;
-/*N*/ rOut << GetSmoothLids(); // #107245# (BOOL)bExtrudeSmoothFrontBack;
-/*N*/ rOut << GetCharacterMode(); // #107245# (BOOL)bExtrudeCharacterMode;
-/*N*/
-/*N*/ // Ab Version 513a (5.2.99): Parameter fuer das
-/*N*/ // Erzeugen der Vorder/Rueckwand
-/*N*/ rOut << GetCloseFront(); // #107245# (BOOL)bExtrudeCloseFront;
-/*N*/ rOut << GetCloseBack(); // #107245# (BOOL)bExtrudeCloseBack;
-/*N*/
-/*N*/ if(nVersion < 3800)
-/*N*/ {
-/*N*/ // Geometrie neu erzeugen, um E3dPolyObj's wieder loszuwerden
-/*N*/ ((E3dCompoundObject*)this)->ReCreateGeometry();
-/*N*/ }
-/*N*/ #endif
-/*N*/ }
-
-/*************************************************************************
-|*
|* Objektdaten aus Stream laden
|*
\************************************************************************/
diff --git a/binfilter/bf_svx/source/engine3d/svx_label3d.cxx b/binfilter/bf_svx/source/engine3d/svx_label3d.cxx
index fed0696..8e4256f 100644
--- a/binfilter/bf_svx/source/engine3d/svx_label3d.cxx
+++ b/binfilter/bf_svx/source/engine3d/svx_label3d.cxx
@@ -86,30 +86,6 @@ namespace binfilter {
/*************************************************************************
|*
-|* In Stream schreiben
-|*
-\************************************************************************/
-
-/*N*/ void E3dLabelObj::WriteData(SvStream& rOut) const
-/*N*/ {
-/*N*/ #ifndef SVX_LIGHT
-/*N*/ E3dPointObj::WriteData(rOut);
-/*N*/
-/*N*/ #ifdef E3D_STREAMING
-/*N*/
-/*N*/ SdrDownCompat aCompat(rOut, STREAM_WRITE);
-/*N*/ #ifdef DBG_UTIL
-/*N*/ aCompat.SetID("E3dLabelObj");
-/*N*/ #endif
-/*N*/ DBG_ASSERT(p2DLabelObj, "p2DLabelObj muss vor dem Speichern definiert sein!");
-/*N*/
-/*N*/ rOut << *p2DLabelObj;
-/*N*/ #endif
-/*N*/ #endif // #ifndef SVX_LIGHT
-/*N*/ }
-
-/*************************************************************************
-|*
|* Aus Stream laden
|*
\************************************************************************/
diff --git a/binfilter/bf_svx/source/engine3d/svx_lathe3d.cxx b/binfilter/bf_svx/source/engine3d/svx_lathe3d.cxx
index ca606d1..206feac 100644
--- a/binfilter/bf_svx/source/engine3d/svx_lathe3d.cxx
+++ b/binfilter/bf_svx/source/engine3d/svx_lathe3d.cxx
@@ -359,132 +359,6 @@ namespace binfilter {
/*************************************************************************
|*
-|* Objektdaten in Stream speichern
-|*
-\************************************************************************/
-
-/*N*/ void E3dLatheObj::WriteData(SvStream& rOut) const
-/*N*/ {
-/*N*/ #ifndef SVX_LIGHT
-/*N*/ long nVersion = rOut.GetVersion(); // Build_Nr * 10 z.B. 3810
-/*N*/ if(nVersion < 3800)
-/*N*/ {
-/*N*/ // Alte Geometrie erzeugen, um die E3dPolyObj's zu haben
-/*N*/ ((E3dCompoundObject*)this)->ReCreateGeometry(TRUE);
-/*N*/ }
-/*N*/
-/*N*/ // leider kann das E3dLatheObj nicht auf E3dObject abgestuetzt werden,
-/*N*/ // da neue Member hinzugekommen sind und die Kompatibilitaet erhalten
-/*N*/ // bleiben muss.
-/*N*/ SdrAttrObj::WriteData(rOut);
-/*N*/
-/*N*/ // Fuer Abwaertskompatibilitaet (Lesen neuer Daten mit altem Code)
-/*N*/ SdrDownCompat aCompat(rOut, STREAM_WRITE);
-/*N*/ #ifdef DBG_UTIL
-/*N*/ aCompat.SetID("E3dLatheObj");
-/*N*/ #endif
-/*N*/
-/*N*/ pSub->Save(rOut);
-/*N*/
-/*N*/ // Parameter aus E3dObject speichern
-/*N*/ rOut << aLocalBoundVol;
-/*N*/ Old_Matrix3D aMat3D;
-/*N*/ aMat3D = aTfMatrix;
-/*N*/ rOut << aMat3D;
-/*N*/ rOut << nLogicalGroup;
-/*N*/ rOut << nObjTreeLevel;
-/*N*/ rOut << nPartOfParent;
-/*N*/ rOut << UINT16(eDragDetail);
-/*N*/
-/*N*/ // neue Member
-/*N*/ // Alte version schreibt Polygon3D raus, neue Version
-/*N*/ // benutzt dafuer das erste Teilpolygon von PolyPolygon3D
-/*N*/ // rOut << aPolyPoly3D;
-/*N*/ rOut << aPolyPoly3D[0];
-/*N*/
-/*N*/ rOut << GetHorizontalSegments();
-/*N*/
-/*N*/ rOut << GetEndAngle();
-/*N*/
-/*N*/ rOut << ((E3dLatheObj*)this)->GetDoubleSided();
-/*N*/ rOut << fLatheScale;
-/*N*/
-/*N*/
-/*N*/ // internally the real number of segments (edges) is
-/*N*/ // used, no longer the number of points
-/*N*/ sal_Int32 nVSegs = GetVerticalSegments();
-/*N*/ if(!aPolyPoly3D[0].IsClosed())
-/*N*/ nVSegs += 1;
-/*N*/
-/*N*/ rOut << nVSegs;
-/*N*/
-/*N*/ rOut << aPolyPoly3D;
-/*N*/
-/*N*/ rOut << ((double)GetBackScale() / 100.0);
-/*N*/
-/*N*/ rOut << ((double)GetPercentDiagonal() / 200.0);
-/*N*/
-/*N*/ rOut << GetSmoothNormals();
-/*N*/ rOut << GetSmoothLids();
-/*N*/ rOut << GetCharacterMode();
-/*N*/
-/*N*/ // Parameter aus dem Objekt
-/*N*/ // E3dCompoundObject. Da irgendwann mal jemand die Ableitungs-
-/*N*/ // hierarchie beim FileFormat unterbrochen hat, wurden diese Attribute
-/*N*/ // bisher NOCH NIE gespeichert (Grrr). Diese Stelle muss nun natuerlich
-/*N*/ // auch IMMER MITGEPFLEGT werden, wenn sich Parameter in
-/*N*/ // E3dCompoundObject oder E3dObject aendern.
-/*N*/ rOut << GetDoubleSided();
-/*N*/
-/*N*/ rOut << BOOL(bCreateNormals);
-/*N*/ rOut << BOOL(bCreateTexture);
-/*N*/
-/*N*/ sal_uInt16 nVal = GetNormalsKind();
-/*N*/ rOut << BOOL(nVal > 0);
-/*N*/ rOut << BOOL(nVal > 1);
-/*N*/
-/*N*/ nVal = GetTextureProjectionX();
-/*N*/ rOut << BOOL(nVal > 0);
-/*N*/ rOut << BOOL(nVal > 1);
-/*N*/
-/*N*/ nVal = GetTextureProjectionY();
-/*N*/ rOut << BOOL(nVal > 0);
-/*N*/ rOut << BOOL(nVal > 1);
-/*N*/
-/*N*/ rOut << BOOL(GetShadow3D());
-/*N*/
-/*N*/ rOut << GetMaterialAmbientColor();
-/*N*/ rOut << GetMaterialColor();
-/*N*/ rOut << GetMaterialSpecular();
-/*N*/ rOut << GetMaterialEmission();
-/*N*/ rOut << GetMaterialSpecularIntensity();
-/*N*/
-/*N*/ aBackMaterial.WriteData(rOut);
-/*N*/
-/*N*/ rOut << (UINT16)GetTextureKind();
-/*N*/
-/*N*/ rOut << (UINT16)GetTextureMode();
-/*N*/
-/*N*/ rOut << BOOL(GetNormalsInvert());
-/*N*/
-/*N*/ // Ab Version 513a (5.2.99): Parameter fuer das
-/*N*/ // Erzeugen der Vorder/Rueckwand
-/*N*/ rOut << GetCloseFront(); // #107245# BOOL(bLatheCloseFront);
-/*N*/ rOut << GetCloseBack(); // #107245# BOOL(bLatheCloseBack);
-/*N*/
-/*N*/ // neu ab 534: (hat noch gefehlt)
-/*N*/ rOut << BOOL(GetTextureFilter());
-/*N*/
-/*N*/ if(nVersion < 3800)
-/*N*/ {
-/*N*/ // Geometrie neu erzeugen, um E3dPolyObj's wieder loszuwerden
-/*N*/ ((E3dCompoundObject*)this)->ReCreateGeometry();
-/*N*/ }
-/*N*/ #endif
-/*N*/ }
-
-/*************************************************************************
-|*
|* Objektdaten aus Stream laden
|*
\************************************************************************/
diff --git a/binfilter/bf_svx/source/engine3d/svx_light3d.cxx b/binfilter/bf_svx/source/engine3d/svx_light3d.cxx
index e6f79fc..9f76cc7 100644
--- a/binfilter/bf_svx/source/engine3d/svx_light3d.cxx
+++ b/binfilter/bf_svx/source/engine3d/svx_light3d.cxx
@@ -218,35 +218,6 @@ namespace binfilter {
/*************************************************************************
|*
-|* sichern
-|*
-\************************************************************************/
-
-/*N*/ void E3dLight::WriteData(SvStream& rOut) const
-/*N*/ {
-/*N*/ #ifndef SVX_LIGHT
-/*N*/ E3dPointObj::WriteData(rOut);
-/*N*/
-/*N*/ #ifdef E3D_STREAMING
-/*N*/
-/*N*/ SdrDownCompat aCompat(rOut, STREAM_WRITE);
-/*N*/ #ifdef DBG_UTIL
-/*N*/ aCompat.SetID("E3dLight");
-/*N*/ #endif
-/*N*/
-/*N*/ rOut << aColor;
-/*N*/ rOut << fIntensity;
-/*N*/ rOut << fRed;
-/*N*/ rOut << fGreen;
-/*N*/ rOut << fBlue;
-/*N*/ rOut << BOOL(bOn);
-/*N*/ rOut << BOOL(bVisible);
-/*N*/ #endif
-/*N*/ #endif // #ifndef SVX_LIGHT
-/*N*/ }
-
-/*************************************************************************
-|*
|* laden
|*
\************************************************************************/
diff --git a/binfilter/bf_svx/source/engine3d/svx_obj3d.cxx b/binfilter/bf_svx/source/engine3d/svx_obj3d.cxx
index 9282ed9..54dd962 100644
--- a/binfilter/bf_svx/source/engine3d/svx_obj3d.cxx
+++ b/binfilter/bf_svx/source/engine3d/svx_obj3d.cxx
@@ -821,45 +821,6 @@ namespace binfilter {
/*************************************************************************
|*
-|* Objektdaten in Stream speichern
-|*
-\************************************************************************/
-
-/*N*/ void E3dObject::WriteData(SvStream& rOut) const
-/*N*/ {
-/*N*/ #ifndef SVX_LIGHT
-/*N*/ SdrAttrObj::WriteData(rOut);
-/*N*/
-/*N*/ // Fuer Abwaertskompatibilitaet (Lesen neuer Daten mit altem Code)
-/*N*/ SdrDownCompat aCompat(rOut, STREAM_WRITE);
-/*N*/ #ifdef DBG_UTIL
-/*N*/ aCompat.SetID("E3dObject");
-/*N*/ #endif
-/*N*/
-/*N*/ pSub->Save(rOut);
-/*N*/
-/*N*/ if (rOut.GetVersion() < 3560)
-/*N*/ {
-/*N*/ rOut << aLocalBoundVol;
-/*N*/
-/*N*/ Old_Matrix3D aMat3D;
-/*N*/ aMat3D = aTfMatrix;
-/*N*/ rOut << aMat3D;
-/*N*/
-/*N*/ rOut << nLogicalGroup;
-/*N*/ rOut << nObjTreeLevel;
-/*N*/ rOut << nPartOfParent;
-/*N*/ rOut << UINT16(eDragDetail);
-/*N*/ }
-/*N*/ else
-/*N*/ {
-/*N*/ WriteOnlyOwnMembers(rOut);
-/*N*/ }
-/*N*/ #endif
-/*N*/ }
-
-/*************************************************************************
-|*
|* Objektdaten aus Stream laden
|*
\************************************************************************/
@@ -1220,79 +1181,6 @@ namespace binfilter {
/*************************************************************************
|*
-|* Rausschreiben der Datenmember eines E3dCompounds
-|*
-\************************************************************************/
-
-/*N*/ void E3dCompoundObject::WriteData(SvStream& rOut) const
-/*N*/ {
-/*N*/ #ifndef SVX_LIGHT
-/*N*/ #ifdef E3D_STREAMING
-/*N*/
-/*N*/ if (!aLocalBoundVol.IsValid() && aBoundVol.IsValid())
-/*N*/ {
-/*N*/ // Das aLocalBoundVol wird gespeichert.
-/*N*/ // Ist dieses ungueltig, so wird das aBoundVol genommen
-/*N*/ // (sollten beim E3dCompoundObject sowieso gleich sein)
-/*N*/ ((E3dCompoundObject*) this)->aLocalBoundVol = aBoundVol;
-/*N*/ }
-/*N*/
-/*N*/ E3dObject::WriteData(rOut);
-/*N*/ if (rOut.GetVersion() < 3560)
-/*N*/ {
-/*N*/ // In diesem Fall passiert nichts, da vor der Version 4.0
-/*N*/ // also im Falle der Revision 3.1
-/*N*/ }
-/*N*/ else
-/*N*/ {
-/*N*/ SdrDownCompat aCompat(rOut, STREAM_WRITE);
-/*N*/ #ifdef DBG_UTIL
-/*N*/ aCompat.SetID("E3dCompoundObject");
-/*N*/ #endif
-/*N*/ rOut << BOOL(GetDoubleSided());
-/*N*/ #endif
-/*N*/
-/*N*/ // neue Parameter zur Geometrieerzeugung
-/*N*/ rOut << BOOL(bCreateNormals);
-/*N*/ rOut << BOOL(bCreateTexture);
-/*N*/
-/*N*/ sal_uInt16 nVal = GetNormalsKind();
-/*N*/ rOut << BOOL(nVal > 0);
-/*N*/ rOut << BOOL(nVal > 1);
-/*N*/
-/*N*/ nVal = GetTextureProjectionX();
-/*N*/ rOut << BOOL(nVal > 0);
-/*N*/ rOut << BOOL(nVal > 1);
-/*N*/
-/*N*/ nVal = GetTextureProjectionY();
-/*N*/ rOut << BOOL(nVal > 0);
-/*N*/ rOut << BOOL(nVal > 1);
-/*N*/
-/*N*/ rOut << BOOL(GetShadow3D());
-/*N*/
-/*N*/ // neu al 384:
-/*N*/ rOut << GetMaterialAmbientColor();
-/*N*/ rOut << GetMaterialColor();
-/*N*/ rOut << GetMaterialSpecular();
-/*N*/ rOut << GetMaterialEmission();
-/*N*/ rOut << GetMaterialSpecularIntensity();
-/*N*/
-/*N*/ aBackMaterial.WriteData(rOut);
-/*N*/
-/*N*/ rOut << (UINT16)GetTextureKind();
-/*N*/
-/*N*/ rOut << (UINT16)GetTextureMode();
-/*N*/
-/*N*/ rOut << BOOL(GetNormalsInvert());
-/*N*/
-/*N*/ // neu ab 534: (hat noch gefehlt)
-/*N*/ rOut << BOOL(GetTextureFilter());
-/*N*/ }
-/*N*/ #endif
-/*N*/ }
-
-/*************************************************************************
-|*
|* Einlesen der Datenmember eines E3dCompounds
|*
\************************************************************************/
diff --git a/binfilter/bf_svx/source/engine3d/svx_pntobj3d.cxx b/binfilter/bf_svx/source/engine3d/svx_pntobj3d.cxx
index 0f56519..7813c8a 100644
--- a/binfilter/bf_svx/source/engine3d/svx_pntobj3d.cxx
+++ b/binfilter/bf_svx/source/engine3d/svx_pntobj3d.cxx
@@ -116,29 +116,6 @@ namespace binfilter {
/*************************************************************************
|*
-|* sichern
-|*
-\************************************************************************/
-
-/*N*/ void E3dPointObj::WriteData(SvStream& rOut) const
-/*N*/ {
-/*N*/ #ifndef SVX_LIGHT
-/*N*/ E3dObject::WriteData(rOut);
-/*N*/
-/*N*/ #ifdef E3D_STREAMING
-/*N*/
-/*N*/ SdrDownCompat aCompat(rOut, STREAM_WRITE);
-/*N*/ #ifdef DBG_UTIL
-/*N*/ aCompat.SetID("E3dPointObj");
-/*N*/ #endif
-/*N*/
-/*N*/ rOut << aPosition;
-/*N*/ #endif
-/*N*/ #endif // #ifndef SVX_LIGHT
-/*N*/ }
-
-/*************************************************************************
-|*
|* laden
|*
\************************************************************************/
diff --git a/binfilter/bf_svx/source/engine3d/svx_polygn3d.cxx b/binfilter/bf_svx/source/engine3d/svx_polygn3d.cxx
index c6577fc..925f240 100644
--- a/binfilter/bf_svx/source/engine3d/svx_polygn3d.cxx
+++ b/binfilter/bf_svx/source/engine3d/svx_polygn3d.cxx
@@ -330,57 +330,6 @@ namespace binfilter {
/*************************************************************************
|*
-|* Wandle das Objekt in ein Gruppenobjekt bestehend aus 6 Polygonen
-|*
-\************************************************************************/
-
-
-/*************************************************************************
-|*
-|* Give out simple line geometry
-|*
-\************************************************************************/
-
-
-/*************************************************************************
-|*
-|* Geometrieerzeugung
-|*
-\************************************************************************/
-
-
-/*************************************************************************
-|*
-|* Objektdaten in Stream speichern
-|*
-\************************************************************************/
-
-/*N*/ void E3dPolygonObj::WriteData(SvStream& rOut) const
-/*N*/ {
-/*N*/ #ifndef SVX_LIGHT
-/*N*/ long nVersion = rOut.GetVersion(); // Build_Nr * 10 z.B. 3810
-/*N*/ if(nVersion < 3800)
-/*N*/ {
-/*N*/ // Alte Geometrie erzeugen, um die E3dPolyObj's zu haben
-/*N*/ ((E3dCompoundObject*)this)->ReCreateGeometry(TRUE);
-/*N*/ }
-/*N*/
-/*N*/ // call parent
-/*N*/ E3dCompoundObject::WriteData(rOut);
-/*N*/
-/*N*/ E3dIOCompat aCompat(rOut, STREAM_WRITE, 1);
-/*N*/ rOut << BOOL(bLineOnly);
-/*N*/
-/*N*/ if(nVersion < 3800)
-/*N*/ {
-/*N*/ // Geometrie neu erzeugen, um E3dPolyObj's wieder loszuwerden
-/*N*/ ((E3dCompoundObject*)this)->ReCreateGeometry();
-/*N*/ }
-/*N*/ #endif
-/*N*/ }
-
-/*************************************************************************
-|*
|* Objektdaten aus Stream laden
|*
\************************************************************************/
diff --git a/binfilter/bf_svx/source/engine3d/svx_polyob3d.cxx b/binfilter/bf_svx/source/engine3d/svx_polyob3d.cxx
index c2283a0..d4386c2 100644
--- a/binfilter/bf_svx/source/engine3d/svx_polyob3d.cxx
+++ b/binfilter/bf_svx/source/engine3d/svx_polyob3d.cxx
@@ -35,11 +35,6 @@
#endif
#include "svdopath.hxx"
-
-
-
-
-
#include "svdio.hxx"
@@ -278,72 +273,6 @@ namespace binfilter {
/*************************************************************************
|*
-|* sichern: zur 356 wurde das Fileformat freigegeben 11.2.1997 FG
-|*
-**************************************************************************/
-
-/*N*/ void E3dPolyObj::WriteData(SvStream& rOut) const
-/*N*/ {
-/*N*/ #ifndef SVX_LIGHT
-/*N*/ if (rOut.GetVersion() < 3560) // FG: Zu dieser Version erfolgte die Umstellung
-/*N*/ {
-/*N*/ WriteData31(rOut);
-/*N*/ }
-/*N*/ else
-/*N*/ {
-/*N*/ SdrDownCompat aCompat(rOut, STREAM_WRITE);
-/*N*/ #ifdef DBG_UTIL
-/*N*/ aCompat.SetID("E3dPolyObj");
-/*N*/ #endif
-/*N*/ {
-/*N*/ SdrDownCompat aInnerCompat (rOut, STREAM_WRITE);
-/*N*/ #ifdef DBG_UTIL
-/*N*/ aInnerCompat.SetID("PolyPolygon3D");
-/*N*/ #endif
-/*N*/ rOut << aPolyPoly3D;
-/*N*/ }
-/*N*/ {
-/*N*/ SdrDownCompat aInnerCompat (rOut, STREAM_WRITE);
-/*N*/ #ifdef DBG_UTIL
-/*N*/ aInnerCompat.SetID("PolyPolygon3D");
-/*N*/ #endif
-/*N*/ rOut << aNormal;
-/*N*/ }
-/*N*/ rOut << BOOL(bDoubleSided);
-/*N*/ rOut << BOOL(bBackSideVisible);
-/*N*/ rOut << BOOL(bLighted);
-/*N*/
-/*N*/ rOut << (UINT32) bOwnAttrs;
-/*N*/ rOut << (UINT32) bOwnStyle;
-/*N*/ rOut << (UINT32) nObjectnumber;
-/*N*/ // Falls das Objekt eigene Attribute hat, wird es rausgeschrieben
-/*N*/
-/*N*/ if (OwnAttrs() || OwnStyle())
-/*N*/ {
-/*N*/ E3dObject::WriteData(rOut);
-/*N*/ }
-/*N*/
-/*N*/ // Neue PolyPolygone schreiben fuer Normalen und Textur
-/*N*/ if(aPolyNormals3D.Count())
-/*N*/ {
-/*N*/ #ifdef DBG_UTIL
-/*N*/ aCompat.SetID("PolyPolygon3D Normals");
-/*N*/ #endif
-/*N*/ rOut << aPolyNormals3D;
-/*N*/ }
-/*N*/ if(aPolyTexture3D.Count())
-/*N*/ {
-/*N*/ #ifdef DBG_UTIL
-/*N*/ aCompat.SetID("PolyPolygon3D Texturkoordinaten");
-/*N*/ #endif
-/*N*/ rOut << aPolyTexture3D;
-/*N*/ }
-/*N*/ }
-/*N*/ #endif // #ifndef SVX_LIGHT
-/*N*/ }
-
-/*************************************************************************
-|*
|* laden
|*
\************************************************************************/
@@ -516,7 +445,7 @@ namespace binfilter {
/*N*/ SdrObjGeoData *E3dPolyObj::NewGeoData() const
/*N*/ {
/*N*/ DBG_ASSERT(GetParentObj(), "3D-Polygone ohne Parent ?");
-/*N*/ DBG_ASSERT(GetParentObj()->ISA(E3dScene) || GetParentObj()->ISA(E3dObject), "Parent eines 3D-Polygons ungültig");
+/*N*/ DBG_ASSERT(GetParentObj()->ISA(E3dScene) || GetParentObj()->ISA(E3dObject), "Parent eines 3D-Polygons ung?tig");
/*N*/
/*N*/ if (GetParentObj()->ISA (E3dObject))
/*N*/ return GetParentObj()->E3dObject::NewGeoData ();
@@ -533,7 +462,7 @@ namespace binfilter {
/*?*/ void E3dPolyObj::SaveGeoData(SdrObjGeoData& rGeo) const
/*?*/ {
/*?*/ DBG_ASSERT(GetParentObj(), "3D-Polygone ohne Parent ?");
-/*?*/ DBG_ASSERT(GetParentObj()->ISA(E3dScene) || GetParentObj()->ISA(E3dObject), "Parent eines 3D-Polygons ungültig");
+/*?*/ DBG_ASSERT(GetParentObj()->ISA(E3dScene) || GetParentObj()->ISA(E3dObject), "Parent eines 3D-Polygons ung?tig");
/*?*/
/*?*/ if (GetParentObj()->ISA (E3dObject))
/*?*/ GetParentObj()->E3dObject::SaveGeoData (rGeo);
@@ -550,7 +479,7 @@ namespace binfilter {
/*?*/ void E3dPolyObj::RestGeoData(const SdrObjGeoData& rGeo)
/*?*/ {
/*?*/ DBG_ASSERT(GetParentObj(), "3D-Polygone ohne Parent ?");
-/*?*/ DBG_ASSERT(GetParentObj()->ISA(E3dScene) || GetParentObj()->ISA(E3dObject), "Parent eines 3D-Polygons ungültig");
+/*?*/ DBG_ASSERT(GetParentObj()->ISA(E3dScene) || GetParentObj()->ISA(E3dObject), "Parent eines 3D-Polygons ung?tig");
/*?*/
/*?*/ if (GetParentObj()->ISA (E3dObject))
/*?*/ GetParentObj()->E3dObject::RestGeoData (rGeo);
@@ -570,7 +499,7 @@ namespace binfilter {
/*N*/ {
/*N*/ if (GetParentObj())
/*N*/ {
-/*N*/ DBG_ASSERT(GetParentObj()->ISA(E3dScene) || GetParentObj()->ISA(E3dObject), "Parent eines 3D-Polygons ungültig");
+/*N*/ DBG_ASSERT(GetParentObj()->ISA(E3dScene) || GetParentObj()->ISA(E3dObject), "Parent eines 3D-Polygons ung?tig");
/*N*/
/*N*/ if (GetParentObj()->ISA (E3dObject))
/*N*/ GetParentObj()->E3dObject::SetPage (pNewPage);
@@ -605,7 +534,7 @@ namespace binfilter {
/*?*/ SdrLayerID E3dPolyObj::GetLayer() const
/*?*/ {
/*?*/ DBG_ASSERT(GetParentObj(), "3D-Polygone ohne Parent ?");
-/*?*/ DBG_ASSERT(GetParentObj()->ISA(E3dScene) || GetParentObj()->ISA(E3dObject), "Parent eines 3D-Polygons ungültig");
+/*?*/ DBG_ASSERT(GetParentObj()->ISA(E3dScene) || GetParentObj()->ISA(E3dObject), "Parent eines 3D-Polygons ung?tig");
/*?*/
/*?*/ if (GetParentObj()->ISA (E3dObject))
/*?*/ return GetParentObj()->E3dObject::GetLayer ();
@@ -622,7 +551,7 @@ namespace binfilter {
/*N*/ void E3dPolyObj::NbcSetLayer(SdrLayerID nLayer)
/*N*/ {
/*N*/ DBG_ASSERT(GetParentObj(), "3D-Polygone ohne Parent ?");
-/*N*/ DBG_ASSERT(GetParentObj()->ISA(E3dScene) || GetParentObj()->ISA(E3dObject), "Parent eines 3D-Polygons ungültig");
+/*N*/ DBG_ASSERT(GetParentObj()->ISA(E3dScene) || GetParentObj()->ISA(E3dObject), "Parent eines 3D-Polygons ung?tig");
/*N*/
/*N*/ if (GetParentObj()->ISA (E3dObject))
/*N*/ GetParentObj()->SdrAttrObj::NbcSetLayer (nLayer);
@@ -638,7 +567,7 @@ namespace binfilter {
/*N*/ SfxStyleSheet* E3dPolyObj::GetStyleSheet() const
/*N*/ {
/*N*/ DBG_ASSERT(GetParentObj(), "3D-Polygone ohne Parent ?");
-/*N*/ DBG_ASSERT(GetParentObj()->ISA(E3dScene) || GetParentObj()->ISA(E3dObject), "Parent eines 3D-Polygons ungültig");
+/*N*/ DBG_ASSERT(GetParentObj()->ISA(E3dScene) || GetParentObj()->ISA(E3dObject), "Parent eines 3D-Polygons ung?tig");
/*N*/
/*N*/ if (bOwnStyle)
/*N*/ return SdrAttrObj::GetStyleSheet();
diff --git a/binfilter/bf_svx/source/engine3d/svx_scene3d.cxx b/binfilter/bf_svx/source/engine3d/svx_scene3d.cxx
index 5234eaa..f446c19 100644
--- a/binfilter/bf_svx/source/engine3d/svx_scene3d.cxx
+++ b/binfilter/bf_svx/source/engine3d/svx_scene3d.cxx
@@ -437,91 +437,6 @@ namespace binfilter {
/*************************************************************************
|*
-|* sichern mit neuer Methode und zukunftskompatibilitaet
-|* Die Zahl 3560 ist die Major-Update-Nummer * 10 zu der die Umstellung
-|* erfolgte. Dies ist leider das korrekte Verhalten, die 3d-Engine hat keine
-|* eigene Versionsnummer sondern ist an die der Drawing-Engine gekoppelt.
-|* Probleme gibt es immer dann wenn einen neue Version ein altes Format
-|* schreiben soll: Hier wird von der Drawing-Engine trotzdem die neue Nummer
-|* verwendet.
-|*
-\************************************************************************/
-
-/*N*/ void E3dScene::WriteData(SvStream& rOut) const
-/*N*/ {
-/*N*/ #ifndef SVX_LIGHT
-/*N*/ long nVersion = rOut.GetVersion(); // Build_Nr * 10 z.B. 3810
-/*N*/ if(nVersion < 3830)
-/*N*/ {
-/*N*/ // Hier die Lichtobjekte erzeugen, um im alten Format schreiben zu koennen
-/*N*/ ((E3dScene*)(this))->CreateLightObjectsFromLightGroup();
-/*N*/ }
-/*N*/
-/*N*/ // Schreiben
-/*N*/ E3dObject::WriteData(rOut);
-/*N*/
-/*N*/ if(nVersion < 3830)
-/*N*/ {
-/*N*/ // Lichtobjekte wieder wegnehmen
-/*N*/ ((E3dScene*)(this))->RemoveLightObjects();
-/*N*/ }
-/*N*/ else
-/*N*/ {
-/*N*/ #ifdef E3D_STREAMING
-/*N*/ SdrDownCompat aCompat(rOut, STREAM_WRITE);
-/*N*/ #ifdef DBG_UTIL
-/*N*/ aCompat.SetID("B3dLightGroup");
-/*N*/ #endif
-/*N*/ // LightGroup schreiben
-/*N*/ aLightGroup.WriteData(rOut);
-/*N*/
-/*N*/ #endif
-/*N*/ }
-/*N*/
-/*N*/ #ifdef E3D_STREAMING
-/*N*/ SdrDownCompat aCompat(rOut, STREAM_WRITE);
-/*N*/ #ifdef DBG_UTIL
-/*N*/ aCompat.SetID("E3dScene");
-/*N*/ #endif
-/*N*/
-/*N*/ DBG_ASSERT (rOut.GetVersion(),"3d-Engine: Keine Version am Stream gesetzt!");
-/*N*/ if (rOut.GetVersion() < 3560) // FG: Das ist der Zeitpunkt der Umstellung
-/*N*/ {
-/*N*/ rOut << aCamera;
-/*N*/ }
-/*N*/ if (rOut.GetVersion() >= 3560)
-/*N*/ {
-/*N*/ aCamera.WriteData(rOut);
-/*N*/ }
-/*N*/
-/*N*/ rOut << BOOL(bDoubleBuffered);
-/*N*/ rOut << BOOL(bClipping);
-/*N*/ rOut << BOOL(bFitInSnapRect);
-/*N*/ rOut << nSortingMode;
-/*N*/
-/*N*/ // neu ab 377:
-/*N*/ Vector3D aPlaneDirection = GetShadowPlaneDirection();
-/*N*/ rOut << aPlaneDirection;
-/*N*/
-/*N*/ // neu ab 383:
-/*N*/ rOut << (BOOL)bDither;
-/*N*/
-/*N*/ // neu ab 384:
-/*N*/ sal_uInt16 nShadeMode = GetShadeMode();
-/*N*/ if(nShadeMode == 0)
-/*N*/ rOut << (sal_uInt16)Base3DFlat;
-/*N*/ else if(nShadeMode == 1)
-/*N*/ rOut << (sal_uInt16)Base3DPhong;
-/*N*/ else
-/*N*/ rOut << (sal_uInt16)Base3DSmooth;
-/*N*/ rOut << (BOOL)(nShadeMode > 2);
-/*N*/
-/*N*/ #endif
-/*N*/ #endif // #ifndef SVX_LIGHT
-/*N*/ }
-
-/*************************************************************************
-|*
|* laden
|*
\************************************************************************/
diff --git a/binfilter/bf_svx/source/engine3d/svx_sphere3d.cxx b/binfilter/bf_svx/source/engine3d/svx_sphere3d.cxx
index 36a529c..7059948 100644
--- a/binfilter/bf_svx/source/engine3d/svx_sphere3d.cxx
+++ b/binfilter/bf_svx/source/engine3d/svx_sphere3d.cxx
@@ -281,133 +281,6 @@ namespace binfilter {
/*************************************************************************
|*
-|* Objektdaten in Stream speichern
-|*
-\************************************************************************/
-
-/*N*/ void E3dSphereObj::WriteData(SvStream& rOut) const
-/*N*/ {
-/*N*/ #ifndef SVX_LIGHT
-/*N*/ long nVersion = rOut.GetVersion(); // Build_Nr * 10 z.B. 3810
-/*N*/ if(nVersion < 3800)
-/*N*/ {
-/*N*/ // Alte Geometrie erzeugen, um die E3dPolyObj's zu haben
-/*N*/ ((E3dCompoundObject*)this)->ReCreateGeometry(TRUE);
-/*N*/ }
-/*N*/
-/*N*/ // call parent
-/*N*/ SdrAttrObj::WriteData(rOut);
-/*N*/
-/*N*/ // Fuer Abwaertskompatibilitaet (Lesen neuer Daten mit altem Code)
-/*N*/ SdrDownCompat aCompat(rOut, STREAM_WRITE);
-/*N*/ #ifdef DBG_UTIL
-/*N*/ aCompat.SetID("E3dSphereObj");
-/*N*/ #endif
-/*N*/
-/*N*/ if (rOut.GetVersion() < 3560) // FG: kleiner als die Final Beta der Version 4.0
-/*N*/ {
-/*N*/ pSub->Save(rOut);
-/*N*/ }
-/*N*/ else
-/*N*/ {
-/*N*/ // [FG] Jetzt wird die Kindliste abgeklapptert, allerdings weiss ich im Gegensatz zu
-/*N*/ // Joe dass es nur E3dPolyObj - Kindobjekte sein koennen.
-/*N*/ // Jedes dieser Objekte frage ich ob es eigene Attribute enthaelt. Falls OwnStyle ()
-/*N*/ // true liefert, werde ich das Polygon nicht wegspeichern.
-/*N*/
-/*N*/ SdrObjListIter aIter(*pSub,IM_FLAT);
-/*N*/ while (aIter.IsMore()) {
-/*N*/ E3dPolyObj* pObj=(E3dPolyObj *) aIter.Next();
-/*N*/ if ((!pObj->IsNotPersistent()) && (pObj->OwnAttrs() || pObj->OwnStyle()))
-/*N*/ {
-/*N*/ rOut<<*pObj;
-/*N*/ }
-/*N*/ if (pSub->GetModel()!=NULL) pSub->GetModel()->IncProgress();
-/*N*/ }
-/*N*/ SdrIOHeader(rOut,STREAM_WRITE,SdrIOEndeID); // Endemarke
-/*N*/ }
-/*N*/
-/*N*/ // Daß hier gehört zum E3dObject (ohne Basisklassen);
-/*N*/ if (rOut.GetVersion() < 3560)
-/*N*/ {
-/*N*/ rOut << aLocalBoundVol;
-/*N*/
-/*N*/ Old_Matrix3D aMat3D;
-/*N*/ aMat3D = aTfMatrix;
-/*N*/ rOut << aMat3D;
-/*N*/
-/*N*/ rOut << nLogicalGroup;
-/*N*/ rOut << nObjTreeLevel;
-/*N*/ rOut << nPartOfParent;
-/*N*/ rOut << UINT16(eDragDetail);
-/*N*/ }
-/*N*/ else
-/*N*/ {
-/*N*/ E3dObject::WriteOnlyOwnMembers(rOut);
-/*N*/ }
-/*N*/ // Das gehört zu E3dSphere
-/*N*/ rOut << GetHorizontalSegments();
-/*N*/
-/*N*/ rOut << GetVerticalSegments();
-/*N*/
-/*N*/ rOut << aCenter;
-/*N*/ rOut << aSize;
-/*N*/
-/*N*/ // Das hier ist ein Merkmal eines Compound-Objektes
-/*N*/ rOut << GetDoubleSided();
-/*N*/
-/*N*/ // Ab Version 395 (8.6.98): Parameter aus dem Objekt
-/*N*/ // E3dCompoundObject. Da irgendwann mal jemand die Ableitungs-
-/*N*/ // hierarchie beim FileFormat unterbrochen hat, wurden diese Attribute
-/*N*/ // bisher NOCH NIE gespeichert (Grrr). Diese Stelle muss nun natuerlich
-/*N*/ // auch IMMER MITGEPFLEGT werden, wenn sich Parameter in
-/*N*/ // E3dCompoundObject oder E3dObject aendern.
-/*N*/ rOut << GetDoubleSided();
-/*N*/
-/*N*/ rOut << BOOL(bCreateNormals);
-/*N*/ rOut << BOOL(bCreateTexture);
-/*N*/
-/*N*/ sal_uInt16 nVal = GetNormalsKind();
-/*N*/ rOut << BOOL(nVal > 0);
-/*N*/ rOut << BOOL(nVal > 1);
-/*N*/
-/*N*/ nVal = GetTextureProjectionX();
-/*N*/ rOut << BOOL(nVal > 0);
-/*N*/ rOut << BOOL(nVal > 1);
-/*N*/
-/*N*/ nVal = GetTextureProjectionY();
-/*N*/ rOut << BOOL(nVal > 0);
-/*N*/ rOut << BOOL(nVal > 1);
-/*N*/
-/*N*/ rOut << BOOL(GetShadow3D());
-/*N*/
-/*N*/ rOut << GetMaterialAmbientColor();
-/*N*/ rOut << GetMaterialColor();
-/*N*/ rOut << GetMaterialSpecular();
-/*N*/ rOut << GetMaterialEmission();
-/*N*/ rOut << GetMaterialSpecularIntensity();
-/*N*/
-/*N*/ aBackMaterial.WriteData(rOut);
-/*N*/
-/*N*/ rOut << (UINT16)GetTextureKind();
-/*N*/
-/*N*/ rOut << (UINT16)GetTextureMode();
-/*N*/
-/*N*/ rOut << BOOL(GetNormalsInvert());
-/*N*/
-/*N*/ // neu ab 534: (hat noch gefehlt)
-/*N*/ rOut << BOOL(GetTextureFilter());
-/*N*/
-/*N*/ if(nVersion < 3800)
-/*N*/ {
-/*N*/ // Geometrie neu erzeugen, um E3dPolyObj's wieder loszuwerden
-/*N*/ ((E3dCompoundObject*)this)->ReCreateGeometry();
-/*N*/ }
-/*N*/ #endif
-/*N*/ }
-
-/*************************************************************************
-|*
|* Objektdaten aus Stream laden
|*
\************************************************************************/
diff --git a/binfilter/bf_svx/source/engine3d/svx_viewpt3d.cxx b/binfilter/bf_svx/source/engine3d/svx_viewpt3d.cxx
index d90de62..be7e5b7 100644
--- a/binfilter/bf_svx/source/engine3d/svx_viewpt3d.cxx
+++ b/binfilter/bf_svx/source/engine3d/svx_viewpt3d.cxx
@@ -375,20 +375,6 @@ namespace binfilter {
/*************************************************************************
|*
-|* Abstand der vorderen Clippingebene setzen
-|*
-\************************************************************************/
-
-
-/*************************************************************************
-|*
-|* Abstand der hinteren Clippingebene setzen
-|*
-\************************************************************************/
-
-
-/*************************************************************************
-|*
|* Stream-Out-Operator fuer Viewport3D (Version 3.1)
|*
\************************************************************************/
@@ -415,43 +401,6 @@ namespace binfilter {
/*************************************************************************
|*
-|* Stream-Out-Operator fuer Viewport3D ab File-Revision 13
-|* implementiert zum Hauptupdate 355 am 4.2.97 FG (freigegeben ab 356)
-|*
-\************************************************************************/
-
-/*N*/ void Viewport3D::WriteData(SvStream& rOut) const
-/*N*/ {
-/*N*/ #ifndef SVX_LIGHT
-/*N*/ if (rOut.GetVersion() < 3560)
-/*N*/ {
-/*N*/ Viewport3D::WriteData31(rOut);
-/*N*/ return;
-/*N*/ }
-/*N*/ SdrDownCompat aCompat(rOut, STREAM_WRITE);
-/*N*/ #ifdef DBG_UTIL
-/*N*/ aCompat.SetID("Viewport3D");
-/*N*/ #endif
-/*N*/
-/*N*/ rOut << aVRP;
-/*N*/ rOut << aVPN;
-/*N*/ rOut << aVUV;
-/*N*/ rOut << aPRP;
-/*N*/ rOut << fVPD;
-/*N*/ rOut << fNearClipDist;
-/*N*/ rOut << fFarClipDist;
-/*N*/ rOut << UINT16(eProjection);
-/*N*/ rOut << UINT16(eAspectMapping);
-/*N*/ rOut << aDeviceRect;
-/*N*/ rOut << aViewWin.X;
-/*N*/ rOut << aViewWin.Y;
-/*N*/ rOut << aViewWin.W;
-/*N*/ rOut << aViewWin.H;
-/*N*/ #endif
-/*N*/ }
-
-/*************************************************************************
-|*
|* Stream-In-Operator fuer Viewport3D fuer die Version 3.1
|*
\************************************************************************/
diff --git a/binfilter/bf_svx/source/form/svx_fmmodel.cxx b/binfilter/bf_svx/source/form/svx_fmmodel.cxx
index 3d4af48..52707bf 100644
--- a/binfilter/bf_svx/source/form/svx_fmmodel.cxx
+++ b/binfilter/bf_svx/source/form/svx_fmmodel.cxx
@@ -125,65 +125,6 @@ struct FmFormModelImplData
/*************************************************************************
|*
-|* Copy-Ctor
-|*
-\************************************************************************/
-
-/*************************************************************************
-|*
-|* Operator=
-|*
-\************************************************************************/
-
-/*************************************************************************
-|*
-|* Operator==
-|*
-\************************************************************************/
-
-
-/*************************************************************************
-|*
-|* Erzeugt eine neue Seite
-|*
-\************************************************************************/
-
-/*************************************************************************
-|*
-|* WriteData
-|*
-\************************************************************************/
-
-/*N*/ void FmFormModel::WriteData(SvStream& rOut) const
-/*N*/ {
-/*N*/ #ifndef SVX_LIGHT
-/*N*/
-/*N*/ if( rOut.GetVersion() < SOFFICE_FILEFORMAT_50 )
-/*N*/ ((FmFormModel*)this)->bStreamingOldVersion = sal_True;
-/*N*/
-/*N*/ SdrModel::WriteData( rOut );
-/*N*/
-/*N*/ //////////////////////////////////////////////////////////////////////
-/*N*/ // Speichern der Option OpenInDesignMode
-/*N*/ if (!bStreamingOldVersion)
-/*N*/ {
-/*N*/ SdrDownCompat aModelFormatCompat(rOut,STREAM_WRITE);
-/*N*/
-/*N*/ sal_uInt8 nTemp = m_bOpenInDesignMode;
-/*N*/ rOut << nTemp;
-/*N*/
-/*N*/ nTemp = m_bAutoControlFocus;
-/*N*/ rOut << nTemp;
-/*N*/ }
-/*N*/
-/*N*/ ((FmFormModel*)this)->bStreamingOldVersion = sal_False;
-/*N*/
-/*N*/ #endif
-/*N*/ }
-
-
-/*************************************************************************
-|*
|* ReadData
|*
\************************************************************************/
diff --git a/binfilter/bf_svx/source/form/svx_fmobj.cxx b/binfilter/bf_svx/source/form/svx_fmobj.cxx
index 451a890..0627711 100644
--- a/binfilter/bf_svx/source/form/svx_fmobj.cxx
+++ b/binfilter/bf_svx/source/form/svx_fmobj.cxx
@@ -194,43 +194,11 @@ using namespace ::binfilter::svxform;
/*N*/ return OBJ_FM_CONTROL;
/*N*/ }
-//------------------------------------------------------------------
-
-//------------------------------------------------------------------
-
-//------------------------------------------------------------------
-
-//------------------------------------------------------------------
-
-//------------------------------------------------------------------
-/*N*/ void FmFormObj::WriteData(SvStream& rOut) const
-/*N*/ {
-/*N*/ FmFormModel* pLclModel = (FmFormModel*)GetModel();
-/*N*/ if( pLclModel && pLclModel->IsStreamingOldVersion() )
-/*N*/ {
-/*?*/ SdrLayerID nOld = GetLayer();
-/*?*/ ((FmFormObj*)this)->NbcSetLayer( pLclModel->GetControlExportLayerId( *this ) );
-/*?*/ SdrUnoObj::WriteData( rOut );
-/*?*/ ((FmFormObj*)this)->NbcSetLayer( nOld );
-/*?*/ return;
-/*N*/ }
-/*N*/ SdrUnoObj::WriteData(rOut);
-/*N*/ }
-
-//------------------------------------------------------------------
/*N*/ void FmFormObj::ReadData(const SdrObjIOHeader& rHead, SvStream& rIn)
/*N*/ {
/*N*/ SdrUnoObj::ReadData(rHead,rIn);
/*N*/ }
-//------------------------------------------------------------------
-
-//------------------------------------------------------------------
-
-//------------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-
}
diff --git a/binfilter/bf_svx/source/form/svx_fmpage.cxx b/binfilter/bf_svx/source/form/svx_fmpage.cxx
index 788ad2f..c7e109d 100644
--- a/binfilter/bf_svx/source/form/svx_fmpage.cxx
+++ b/binfilter/bf_svx/source/form/svx_fmpage.cxx
@@ -83,9 +83,6 @@ namespace binfilter {
/*N*/ {
/*N*/ }
-//------------------------------------------------------------------
-
-//------------------------------------------------------------------
/*N*/ FmFormPage::~FmFormPage()
/*N*/ {
/*N*/ #ifndef SVX_LIGHT
@@ -93,43 +90,6 @@ namespace binfilter {
/*N*/ #endif
/*N*/ }
-//------------------------------------------------------------------
-/*N*/ void FmFormPage::WriteData(SvStream& rOut) const
-/*N*/ {
-/*N*/ #ifndef SVX_LIGHT
-/*N*/ {
-/*N*/ {
-/*N*/ SdrDownCompat aVCCompat1( rOut, STREAM_WRITE );
-/*N*/ sal_uInt16 n = 0;
-/*N*/ rOut << n;
-/*N*/ }
-/*N*/ SdrPage::WriteData( rOut );
-/*N*/ SdrDownCompat aVCCompat2( rOut, STREAM_WRITE );
-/*N*/
-/*N*/ rOut << ByteString(aPageName, gsl_getSystemTextEncoding());
-/*N*/ rOut << (sal_uInt32)0x11051967;
-/*N*/ rOut << (sal_uInt32)0x19670511;
-/*N*/ sal_uInt16 nVer = 1;
-/*N*/ rOut << nVer;
-/*N*/ {
-/*N*/ SdrDownCompat aVCCompat3( rOut, STREAM_WRITE);
-/*N*/ sal_uInt32 nFormCount = 0;
-/*N*/ rOut << nFormCount;
-/*N*/ }
-/*N*/ }
-/*N*/
-/*N*/ // dont use the flag in that way: if (rOut.GetVersion() >= SOFFICE_FILEFORMAT_40)
-/*N*/ if (rOut.GetVersion() >= 3830)
-/*N*/ {
-/*N*/ SdrDownCompat aCompat(rOut, STREAM_WRITE); // Fuer Abwaertskompatibilitaet (Lesen neuer Daten mit altem Code)
-/*N*/ pImpl->WriteData(rOut);
-/*N*/ }
-/*N*/ #else
-/*N*/ OSL_FAIL( "FmFormPage::WriteData: not to be called in SVX_LIGHT version!" );
-/*N*/ #endif
-/*N*/ }
-
-//------------------------------------------------------------------
/*N*/ void FmFormPage::ReadData(const SdrIOHeader& rHead, SvStream& rIn)
/*N*/ {
/*N*/ {
diff --git a/binfilter/bf_svx/source/form/svx_fmpgeimp.cxx b/binfilter/bf_svx/source/form/svx_fmpgeimp.cxx
index 66fa694..5d86309 100644
--- a/binfilter/bf_svx/source/form/svx_fmpgeimp.cxx
+++ b/binfilter/bf_svx/source/form/svx_fmpgeimp.cxx
@@ -123,63 +123,6 @@ using namespace ::binfilter::svxform;
/*N*/ DBG_DTOR(FmFormPageImpl,NULL);
/*N*/ }
-//------------------------------------------------------------------------------
-
-//------------------------------------------------------------------------------
-
-//------------------------------------------------------------------------------
-
-//------------------------------------------------------------------------------
-
-//------------------------------------------------------------------------------
-
-
-
-//------------------------------------------------------------------------------
-
-//------------------------------------------------------------------
-
-//------------------------------------------------------------------------------
-/*N*/ void FmFormPageImpl::WriteData(SvStream& rOut) const
-/*N*/ {
-/*N*/ // anlegen eines output streams fuer UNO
-/*N*/ Reference< ::com::sun::star::io::XActiveDataSource > xSource(::legacy_binfilters::getLegacyProcessServiceFactory()->createInstance(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.io.ObjectOutputStream" ))), UNO_QUERY);
-/*N*/ Reference< ::com::sun::star::io::XOutputStream > xMarkOut(::legacy_binfilters::getLegacyProcessServiceFactory()->createInstance(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.io.MarkableOutputStream" ))), UNO_QUERY);
-/*N*/ Reference< ::com::sun::star::io::XActiveDataSource > xMarkSource(xMarkOut, UNO_QUERY);
-/*N*/
-/*N*/ if (xSource.is())
-/*N*/ {
-/*N*/ xMarkSource->setOutputStream(new ::utl::OOutputStreamWrapper(rOut));
-/*N*/ xSource->setOutputStream(xMarkOut);
-/*N*/
-/*N*/ Reference< ::com::sun::star::io::XObjectOutputStream > xOutStrm(xSource, UNO_QUERY);
-/*N*/ try
-/*N*/ {
-/*N*/ write(xOutStrm);
-/*N*/ }
-/*N*/ catch(Exception&)
-/*N*/ {
-/*?*/ rOut.SetError( ERRCODE_CLASS_WRITE | ERRCODE_SVX_FORMS_READWRITEFAILED | ERRCODE_WARNING_MASK );
-/*N*/ }
-/*N*/
-/*N*/ xOutStrm->closeOutput();
-/*N*/ }
-/*N*/ else
-/*N*/ {
-/*N*/ // let's do a hack : in former versions we didn't use UNO-stream but SvStreams, so there was
-/*N*/ // no possibility that we couldn't write because of the lack of stream objects. Now, with UNO, this may happen
-/*N*/ // (as it happended here). But the read-methods of the older versions don't expect that (there is no flag in
-/*N*/ // the fileformat as it never was neccessary). To allow the old versions the read of the documents, we fake the
-/*N*/ // write : the first token usually written by our impl is an sal_Int32 giving the number of forms within the forms
-/*N*/ // collection. If this number is 0, no further reading will occur.
-/*?*/ sal_Int32 nDummLength = 0; rOut << nDummLength; // this means 'no forms'
-/*?*/ nDummLength = 0; rOut << nDummLength; // this means 'no form controls"
-/*?*/ // To tell the user that something went wrong we set a warning on the stream.
-/*?*/ rOut.SetError( ERRCODE_CLASS_WRITE | ERRCODE_SVX_FORMS_NOIOSERVICES | ERRCODE_WARNING_MASK );
-/*N*/ }
-/*N*/ }
-
-//------------------------------------------------------------------------------
/*N*/ void FmFormPageImpl::ReadData(const SdrIOHeader& /*rHead*/, SvStream& rIn)
/*N*/ {
/*N*/ // Abholen des InputStreams ueber uno
diff --git a/binfilter/bf_svx/source/inc/fmobj.hxx b/binfilter/bf_svx/source/inc/fmobj.hxx
index 38918a4..2eb4f18 100644
--- a/binfilter/bf_svx/source/inc/fmobj.hxx
+++ b/binfilter/bf_svx/source/inc/fmobj.hxx
@@ -91,7 +91,7 @@ public:
sal_Int32 getType() const;
protected:
- virtual void WriteData(SvStream& rOut) const;
+ 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 ae889bf..e1ed16d 100644
--- a/binfilter/bf_svx/source/inc/fmpgeimp.hxx
+++ b/binfilter/bf_svx/source/inc/fmpgeimp.hxx
@@ -96,7 +96,7 @@ public:
protected:
// lesen und schreiben der Objecte
- void WriteData(SvStream& rOut) const; //
+ void WriteData(SvStream& ) const {}
void ReadData(const SdrIOHeader& rHead, SvStream& rIn); //
void write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& OutStream) const;
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdmodel.cxx b/binfilter/bf_svx/source/svdraw/svx_svdmodel.cxx
index e5105e7..1c797a4 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdmodel.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdmodel.cxx
@@ -1228,231 +1228,6 @@ using namespace ::com::sun::star;
/*N*/ Broadcast(aHint);
/*N*/ }
-/*N*/ void SdrModel::WriteData(SvStream& rOut) const
-/*N*/ {
-/*N*/ sal_uInt32 nNewCompressMode = nStreamCompressMode;
-/*N*/
-/*N*/ if( SOFFICE_FILEFORMAT_40 <= rOut.GetVersion() )
-/*N*/ {
-/*N*/ if( IsSaveCompressed() )
-/*N*/ nNewCompressMode |= COMPRESSMODE_ZBITMAP;
-/*N*/
-/*N*/ if( IsSaveNative() )
-/*N*/ nNewCompressMode |= COMPRESSMODE_NATIVE;
-/*N*/ }
-/*N*/
-/*N*/ // Fuer Abwaertskompatibilitaet (Lesen neuer Daten mit altem Code)
-/*N*/ SdrDownCompat aCompat(rOut, STREAM_WRITE);
-/*N*/
-/*N*/ #ifdef DBG_UTIL
-/*N*/ aCompat.SetID("SdrModel");
-/*N*/ #endif
-/*N*/
-/*N*/ // damit ich meine eigenen SubRecords erkenne (ab V11)
-/*N*/ rOut.Write(SdrIOJoeMagic, 4);
-/*N*/
-/*N*/ {
-/*N*/ // Focus fuer aModelMiscCompat
-/*N*/ // ab V11 eingepackt
-/*N*/ SdrDownCompat aModelMiscCompat(rOut, STREAM_WRITE);
-/*N*/
-/*N*/ #ifdef DBG_UTIL
-/*N*/ aModelMiscCompat.SetID("SdrModel(Miscellaneous)");
-/*N*/ #endif
-/*N*/
-/*N*/ // ModelInfo muss hier ganz am Anfang stehen!
-/*N*/ ((SdrModel*)this)->aInfo.aLastWriteDate = DateTime();
-/*N*/ rtl_TextEncoding eOutCharSet = rOut.GetStreamCharSet();
-/*N*/ if(eOutCharSet == ((rtl_TextEncoding)9) /* == RTL_TEXTENCODING_SYSTEM */ )
-/*?*/ eOutCharSet = gsl_getSystemTextEncoding();
-/*N*/
-/*N*/ // #90477# ((SdrModel*)this)->aInfo.eLastWriteCharSet = GetStoreCharSet(eOutCharSet);
-/*N*/ ((SdrModel*)this)->aInfo.eLastWriteCharSet = GetSOStoreTextEncoding(eOutCharSet, (sal_uInt16)rOut.GetVersion());
-/*N*/
-/*N*/ // UNICODE: set the target charset on the stream to access it as parameter
-/*N*/ // in all streaming operations for UniString->ByteString conversions
-/*N*/ rOut.SetStreamCharSet(aInfo.eLastWriteCharSet);
-/*N*/
- /* old SV-stuff, there is no possibility to determine this informations in another way
- ((SdrModel*)this)->aInfo.eLastWriteGUI=System::GetGUIType();
- ((SdrModel*)this)->aInfo.eLastWriteCPU=System::GetCPUType();
- ((SdrModel*)this)->aInfo.eLastWriteSys=System::GetSystemType();
- */
-/*N*/
-/*N*/ if(aReadDate.IsValid())
-/*N*/ {
-/*N*/ ((SdrModel*)this)->aInfo.aLastReadDate = aReadDate;
-/*N*/
-/*N*/ // ((SdrModel*)this)->aInfo.eLastReadCharSet = GetStoreCharSet(gsl_getSystemTextEncoding());
-/*N*/ ((SdrModel*)this)->aInfo.eLastReadCharSet = GetSOStoreTextEncoding(gsl_getSystemTextEncoding(), (sal_uInt16)rOut.GetVersion());
-/*N*/
- /* old SV-stuff, there is no possibility to determine this informations in another way
- ((SdrModel*)this)->aInfo.eLastReadGUI=System::GetGUIType();
- ((SdrModel*)this)->aInfo.eLastReadCPU=System::GetCPUType();
- ((SdrModel*)this)->aInfo.eLastReadSys=System::GetSystemType();
- */
-/*N*/ }
-/*N*/ rOut << aInfo; // DateiInfo rausschreiben (ab V11)
-/*N*/
-/*N*/ { // ein Bereich fuer Statistik reservieren (V11) (kommt spaeter vielleicht mal dazu)
-/*N*/ SdrDownCompat aModelStatisticCompat(rOut, STREAM_WRITE);
-/*N*/
-/*N*/ #ifdef DBG_UTIL
-/*N*/ aModelStatisticCompat.SetID("SdrModel(Statistic)");
-/*N*/ #endif
-/*N*/ }
-/*N*/
-/*N*/ {
-/*N*/ // ab V11
-/*N*/ SdrDownCompat aModelFormatCompat(rOut, STREAM_WRITE);
-/*N*/
-/*N*/ #ifdef DBG_UTIL
-/*N*/ aModelFormatCompat.SetID("SdrModel(Format)");
-/*N*/ #endif
-/*N*/
-/*N*/ // ab V11
-/*N*/ rOut << nNewCompressMode;
-/*N*/
-/*N*/ // ab V11
-/*N*/ rOut << UINT16(rOut.GetNumberFormatInt());
-/*N*/
-/*N*/ rOut.SetCompressMode( (sal_uInt16)nNewCompressMode);
-/*N*/ // CompressMode erst an dieser Stelle setzen, damit konform zu ReadData()
-/*N*/ }
-/*N*/
-/*N*/ rOut << INT32(aObjUnit.GetNumerator());
-/*N*/ rOut << INT32(aObjUnit.GetDenominator());
-/*N*/ rOut << UINT16(eObjUnit);
-/*N*/ // Komprimiert ?
-/*N*/ rOut << UINT16(0);
-/*N*/ // Nur eine DummyPage, jedoch mit relevanten Objekten?
-/*N*/ rOut << UINT8(bPageNotValid);
-/*N*/ // Reserve DummyByte
-/*N*/ rOut << UINT8(0);
-/*N*/
-/*N*/ // Tabellen-, Listen- und Palettennamen schreiben
-/*N*/ // rOut<<INT16(::GetSystemCharSet()); seit V11 hier kein CharSet mehr
-/*N*/ XubString aEmptyStr;
-/*N*/
-/*N*/ if(bExtColorTable)
-/*N*/ {
-/*N*/ // der Writer hat seinen eigenen ColorTable
-/*N*/ // UNICODE: rOut << aEmptyStr;
-/*N*/ rOut.WriteByteString(aEmptyStr);
-/*N*/ }
-/*N*/ else
-/*N*/ {
-/*N*/ if(pColorTable && !pColorTable->GetName().Equals(pszStandard))
-/*N*/ {
-/*N*/ // UNICODE: rOut << pColorTable->GetName();
-/*N*/ rOut.WriteByteString(pColorTable->GetName());
-/*N*/ }
-/*N*/ else
-/*N*/ {
-/*N*/ // UNICODE: rOut << aEmptyStr;
-/*N*/ rOut.WriteByteString(aEmptyStr);
-/*N*/ }
-/*N*/ }
-/*N*/
-/*N*/ if(pDashList && !pDashList->GetName().Equals(pszStandard))
-/*N*/ {
-/*N*/ // UNICODE: rOut<<pDashList->GetName();
-/*N*/ rOut.WriteByteString(pDashList->GetName());
-/*N*/ }
-/*N*/ else
-/*N*/ {
-/*N*/ // UNICODE: rOut << aEmptyStr;
-/*N*/ rOut.WriteByteString(aEmptyStr);
-/*N*/ }
-/*N*/
-/*N*/ if(pLineEndList && !pLineEndList->GetName().Equals(pszStandard))
-/*N*/ {
-/*N*/ // UNICODE: rOut<<pLineEndList->GetName();
-/*N*/ rOut.WriteByteString(pLineEndList->GetName());
-/*N*/ }
-/*N*/ else
-/*N*/ {
-/*N*/ // UNICODE: rOut << aEmptyStr;
-/*N*/ rOut.WriteByteString(aEmptyStr);
-/*N*/ }
-/*N*/
-/*N*/ if(pHatchList && !pHatchList->GetName().Equals(pszStandard))
-/*N*/ {
-/*N*/ // UNICODE: rOut<<pHatchList->GetName();
-/*N*/ rOut.WriteByteString(pHatchList->GetName());
-/*N*/ }
-/*N*/ else
-/*N*/ {
-/*N*/ // UNICODE: rOut << aEmptyStr;
-/*N*/ rOut.WriteByteString(aEmptyStr);
-/*N*/ }
-/*N*/
-/*N*/ if(pGradientList && !pGradientList->GetName().Equals(pszStandard))
-/*N*/ {
-/*N*/ // UNICODE: rOut<<pGradientList->GetName();
-/*N*/ rOut.WriteByteString(pGradientList->GetName());
-/*N*/ }
-/*N*/ else
-/*N*/ {
-/*N*/ // UNICODE: rOut << aEmptyStr;
-/*N*/ rOut.WriteByteString(aEmptyStr);
-/*N*/ }
-/*N*/
-/*N*/ if(pBitmapList && !pBitmapList->GetName().Equals(pszStandard))
-/*N*/ {
-/*N*/ // UNICODE: rOut<<pBitmapList->GetName();
-/*N*/ rOut.WriteByteString(pBitmapList->GetName());
-/*N*/ }
-/*N*/ else
-/*N*/ {
-/*N*/ // UNICODE: rOut << aEmptyStr;
-/*N*/ rOut.WriteByteString(aEmptyStr);
-/*N*/ }
-/*N*/
-/*N*/ rOut << INT32(aUIScale.GetNumerator());
-/*N*/ rOut << INT32(aUIScale.GetDenominator());
-/*N*/ rOut << UINT16(eUIUnit);
-/*N*/
-/*N*/ rOut << INT32(nDefTextHgt);
-/*N*/ rOut << INT32(nDefaultTabulator);
-/*N*/
-/*N*/ // StarDraw-Preview: Nummer der MasterPage der ersten Standard-Seite
-/*N*/ if(GetPageCount() >= 3 && GetPage(1)->GetMasterPageCount())
-/*N*/ {
-/*N*/ ((SdrModel*)this)->nStarDrawPreviewMasterPageNum =
-/*N*/ GetPage(1)->GetMasterPageNum(0);
-/*N*/ }
-/*N*/ rOut << nStarDrawPreviewMasterPageNum;
-/*N*/ }
-/*N*/
-/*N*/ UINT16 i;
-/*N*/
-/*N*/ for(i=0; i < GetLayerAdmin().GetLayerCount(); i++)
-/*N*/ {
-/*N*/ rOut << *GetLayerAdmin().GetLayer(i);
-/*N*/ }
-/*N*/
-/*N*/ for(i=0; i < GetLayerAdmin().GetLayerSetCount(); i++)
-/*N*/ {
-/*?*/ rOut << *GetLayerAdmin().GetLayerSet(i);
-/*N*/ }
-/*N*/
-/*N*/ for(i=0; i < GetMasterPageCount(); i++)
-/*N*/ {
-/*N*/ const SdrPage* pPg = GetMasterPage(i);
-/*N*/ rOut << *pPg;
-/*N*/ }
-/*N*/
-/*N*/ for(i=0; i < GetPageCount(); i++)
-/*N*/ {
-/*N*/ const SdrPage* pPg = GetPage(i);
-/*N*/ rOut << *pPg;
-/*N*/ }
-/*N*/
-/*N*/ // Endemarke
-/*N*/ SdrIOHeader(rOut, STREAM_WRITE, SdrIOEndeID);
-/*N*/ }
-
/*N*/ void SdrModel::ReadData(const SdrIOHeader& rHead, SvStream& rIn)
/*N*/ {
/*N*/ if(rIn.GetError())
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdoattr.cxx b/binfilter/bf_svx/source/svdraw/svx_svdoattr.cxx
index 15e5c80..c7dd6f9 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdoattr.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdoattr.cxx
@@ -328,57 +328,6 @@ namespace binfilter {
/*N*/ mpObjectItemSet->ClearItem(SDRATTRSET_MISC);
/*N*/ }
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-/*N*/ void SdrAttrObj::WriteData(SvStream& rOut) const
-/*N*/ {
-/*N*/ // call parent
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list