[Libreoffice-commits] .: svx/inc svx/source unusedcode.easy
Jan Holesovsky
kendy at kemper.freedesktop.org
Fri Nov 18 14:40:13 PST 2011
svx/inc/svx/sdasitm.hxx | 4 -
svx/inc/svx/sdrpaintwindow.hxx | 1
svx/inc/svx/svdedtv.hxx | 1
svx/inc/svx/svdetc.hxx | 2
svx/inc/svx/svdglue.hxx | 2
svx/inc/svx/svdhdl.hxx | 3
svx/inc/svx/svdlayer.hxx | 1
svx/inc/svx/svdmark.hxx | 2
svx/inc/svx/svdmodel.hxx | 21 ------
svx/inc/svx/svdobj.hxx | 2
svx/inc/svx/svdograf.hxx | 5 -
svx/inc/svx/svdomedia.hxx | 2
svx/inc/svx/svdoole2.hxx | 2
svx/inc/svx/svdotext.hxx | 12 ---
svx/inc/svx/svdpage.hxx | 15 ----
svx/inc/svx/svdpagv.hxx | 10 ---
svx/inc/svx/svdpntv.hxx | 7 --
svx/inc/svx/svdpoev.hxx | 1
svx/inc/svx/svdsnpv.hxx | 1
svx/inc/svx/svdundo.hxx | 3
svx/inc/svx/svdview.hxx | 2
svx/source/items/customshapeitem.cxx | 40 ------------
svx/source/svdraw/sdrpaintwindow.cxx | 11 ---
svx/source/svdraw/svdedtv.cxx | 14 ----
svx/source/svdraw/svdetc.cxx | 15 ----
svx/source/svdraw/svdglue.cxx | 45 --------------
svx/source/svdraw/svdhdl.cxx | 5 -
svx/source/svdraw/svdlayer.cxx | 10 ---
svx/source/svdraw/svdmark.cxx | 10 ---
svx/source/svdraw/svdmodel.cxx | 110 -----------------------------------
svx/source/svdraw/svdobj.cxx | 28 --------
svx/source/svdraw/svdograf.cxx | 36 -----------
svx/source/svdraw/svdomedia.cxx | 17 -----
svx/source/svdraw/svdoole2.cxx | 42 -------------
svx/source/svdraw/svdotext.cxx | 69 ---------------------
svx/source/svdraw/svdotxat.cxx | 55 -----------------
svx/source/svdraw/svdpage.cxx | 41 -------------
svx/source/svdraw/svdpagv.cxx | 70 ----------------------
svx/source/svdraw/svdpntv.cxx | 47 --------------
svx/source/svdraw/svdpoev.cxx | 5 -
svx/source/svdraw/svdsnpv.cxx | 20 ------
svx/source/svdraw/svdundo.cxx | 20 ------
svx/source/svdraw/svdview.cxx | 28 --------
unusedcode.easy | 67 ---------------------
44 files changed, 904 deletions(-)
New commits:
commit ddb1d5ebf0a81888001ffa1dbab883df70cdc279
Author: Felix Zhang <fezhang at suse.com>
Date: Fri Nov 18 18:23:52 2011 +0800
remove unused Sdr methods
diff --git a/svx/inc/svx/sdasitm.hxx b/svx/inc/svx/sdasitm.hxx
index caa88b2..1c71ab4 100644
--- a/svx/inc/svx/sdasitm.hxx
+++ b/svx/inc/svx/sdasitm.hxx
@@ -44,14 +44,12 @@ class SdrCustomShapeEngineItem : public SfxStringItem
{
public :
SdrCustomShapeEngineItem();
- SdrCustomShapeEngineItem( const String& rCustomShapeEngine );
};
class SdrCustomShapeDataItem : public SfxStringItem
{
public :
SdrCustomShapeDataItem();
- SdrCustomShapeDataItem( const String& rCustomShapeData );
};
class SVX_DLLPUBLIC SdrCustomShapeGeometryItem : public SfxPoolItem
@@ -112,14 +110,12 @@ private:
void SetPropertyValue( const rtl::OUString& rSequenceName, const com::sun::star::beans::PropertyValue& rPropVal );
void ClearPropertyValue( const rtl::OUString& rPropertyName );
- void ClearPropertyValue( const rtl::OUString& rSequenceName, const rtl::OUString& rPropertyName );
};
class SdrCustomShapeReplacementURLItem : public SfxStringItem
{
public :
SdrCustomShapeReplacementURLItem();
- SdrCustomShapeReplacementURLItem( const String& rCustomShapeReplacementURL );
};
//---------------------------
diff --git a/svx/inc/svx/sdrpaintwindow.hxx b/svx/inc/svx/sdrpaintwindow.hxx
index f16fd5a..24388ef 100644
--- a/svx/inc/svx/sdrpaintwindow.hxx
+++ b/svx/inc/svx/sdrpaintwindow.hxx
@@ -122,7 +122,6 @@ public:
::sdr::overlay::OverlayManager* GetOverlayManager() const;
// #i73602# add flag if buffer shall be used
void DrawOverlay(const Region& rRegion, bool bUseBuffer);
- void HideOverlay(const Region& rRegion);
// calculate visible area and return
Rectangle GetVisibleArea() const;
diff --git a/svx/inc/svx/svdedtv.hxx b/svx/inc/svx/svdedtv.hxx
index 6dd2d78..81ef666 100644
--- a/svx/inc/svx/svdedtv.hxx
+++ b/svx/inc/svx/svdedtv.hxx
@@ -209,7 +209,6 @@ public:
void BegUndo() { pMod->BegUndo(); } // Undo-Klammerung auf
void BegUndo(const String& rComment) { pMod->BegUndo(rComment); } // Undo-Klammerung auf
void BegUndo(const String& rComment, const String& rObjDescr, SdrRepeatFunc eFunc=SDRREPFUNC_OBJ_NONE) { pMod->BegUndo(rComment,rObjDescr,eFunc); } // Undo-Klammerung auf
- void BegUndo(SdrUndoGroup* pUndoGrp) { pMod->BegUndo(pUndoGrp); } // Undo-Klammerung auf
void EndUndo(); // Undo-Klammerung zu (inkl BroadcastEdges)
void AddUndo(SdrUndoAction* pUndo) { pMod->AddUndo(pUndo); } // Action hinzufuegen
// nur nach dem 1. BegUndo oder vor dem letzten EndUndo:
diff --git a/svx/inc/svx/svdetc.hxx b/svx/inc/svx/svdetc.hxx
index 9100b5b..42c1c3d 100644
--- a/svx/inc/svx/svdetc.hxx
+++ b/svx/inc/svx/svdetc.hxx
@@ -279,11 +279,9 @@ public:
const SvtSysLocale* GetSysLocale(); // follows always locale settings
- const CharClass* GetCharClass(); // follows always SysLocale
const LocaleDataWrapper* GetLocaleData(); // follows always SysLocale
public:
SdrGlobalData();
- ~SdrGlobalData();
OLEObjCache& GetOLEObjCache() { return aOLEObjCache; }
};
diff --git a/svx/inc/svx/svdglue.hxx b/svx/inc/svx/svdglue.hxx
index df208d5..c6a58eb 100644
--- a/svx/inc/svx/svdglue.hxx
+++ b/svx/inc/svx/svdglue.hxx
@@ -100,7 +100,6 @@ public:
void SetHorzAlign(sal_uInt16 nAlg) { nAlign=(nAlign&0xFF00)|(nAlg&0x00FF); }
sal_uInt16 GetVertAlign() const { return nAlign&0xFF00; }
void SetVertAlign(sal_uInt16 nAlg) { nAlign=(nAlign&0x00FF)|(nAlg&0xFF00); }
- void Draw(OutputDevice& rOut, const SdrObject* pObj) const;
bool IsHit(const Point& rPnt, const OutputDevice& rOut, const SdrObject* pObj) const;
void Invalidate(Window& rWin, const SdrObject* pObj) const;
Point GetAbsolutePos(const SdrObject& rObj) const;
@@ -110,7 +109,6 @@ public:
long EscDirToAngle(sal_uInt16 nEsc) const;
sal_uInt16 EscAngleToDir(long nWink) const;
void Rotate(const Point& rRef, long nWink, double sn, double cs, const SdrObject* pObj);
- void Mirror(const Point& rRef1, const Point& rRef2, const SdrObject* pObj);
void Mirror(const Point& rRef1, const Point& rRef2, long nWink, const SdrObject* pObj);
void Shear (const Point& rRef, long nWink, double tn, bool bVShear, const SdrObject* pObj);
};
diff --git a/svx/inc/svx/svdhdl.hxx b/svx/inc/svx/svdhdl.hxx
index 4dbde6d..895644d 100644
--- a/svx/inc/svx/svdhdl.hxx
+++ b/svx/inc/svx/svdhdl.hxx
@@ -252,10 +252,7 @@ public:
visualisation during mouse over it must override this method and call Touch(). */
virtual void onMouseLeave();
- bool isMouseOver() const;
-
static BitmapEx createGluePointBitmap() { return ImpGetBitmapEx(Glue_Deselected, 0); }
-
};
////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/svx/inc/svx/svdlayer.hxx b/svx/inc/svx/svdlayer.hxx
index ad591d4..0fb10c6 100644
--- a/svx/inc/svx/svdlayer.hxx
+++ b/svx/inc/svx/svdlayer.hxx
@@ -113,7 +113,6 @@ public:
// Neuer Layer wird angelegt und eingefuegt
SdrLayer* NewLayer(const String& rName, sal_uInt16 nPos=0xFFFF);
void DeleteLayer(SdrLayer* pLayer) { aLayer.Remove(pLayer); delete pLayer; Broadcast(); }
- void MoveLayer(SdrLayer* pLayer, sal_uInt16 nNewPos=0xFFFF);
SdrLayer* MoveLayer(sal_uInt16 nPos, sal_uInt16 nNewPos);
// Neuer Layer, Name wird aus der Resource geholt
SdrLayer* NewStandardLayer(sal_uInt16 nPos=0xFFFF);
diff --git a/svx/inc/svx/svdmark.hxx b/svx/inc/svx/svdmark.hxx
index 9654355..5dd6ce3 100644
--- a/svx/inc/svx/svdmark.hxx
+++ b/svx/inc/svx/svdmark.hxx
@@ -177,8 +177,6 @@ public:
void SetMarkedSdrObj(SdrObject* pNewObj);
SdrObject* GetMarkedSdrObj() const;
- SdrPage* GetPage() const;
- SdrObjList* GetObjList() const;
SdrPageView* GetPageView() const
{
return mpPageView;
diff --git a/svx/inc/svx/svdmodel.hxx b/svx/inc/svx/svdmodel.hxx
index af2a336..3eec2cf 100644
--- a/svx/inc/svx/svdmodel.hxx
+++ b/svx/inc/svx/svdmodel.hxx
@@ -138,22 +138,16 @@ public:
public:
TYPEINFO();
- SdrHint();
SdrHint(SdrHintKind eNewHint);
SdrHint(const SdrObject& rNewObj);
- SdrHint(const SdrObject& rNewObj, const Rectangle& rRect);
void SetPage(const SdrPage* pNewPage);
- void SetObjList(const SdrObjList* pNewOL);
void SetObject(const SdrObject* pNewObj);
void SetKind(SdrHintKind eNewKind);
- void SetRect(const Rectangle& rNewRect);
const SdrPage* GetPage() const;
- const SdrObjList* GetObjList() const;
const SdrObject* GetObject() const;
SdrHintKind GetKind() const;
- const Rectangle& GetRect() const;
};
////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -256,7 +250,6 @@ public:
void SetUniqueCommentID(sal_uInt32 nNewID) { if(nNewID != mnUniqueCommentID) { mnUniqueCommentID = nNewID; } }
/** cl: added this for OJ to complete his reporting engine, does not work
correctly so only enable it for his model */
- bool IsAllowShapePropertyChangeListener() const;
void SetAllowShapePropertyChangeListener( bool bAllow );
sal_uInt16 nStarDrawPreviewMasterPageNum;
@@ -284,8 +277,6 @@ public:
// and destroyed when destroying the SdrModel.
SvNumberFormatter* mpNumberFormatter;
public:
- const SvNumberFormatter& GetNumberFormatter() const;
-
sal_uInt16 getHandoutPageCount() const { return mnHandoutPageCount; }
void setHandoutPageCount( sal_uInt16 nHandoutPageCount ) { mnHandoutPageCount = nHandoutPageCount; }
@@ -573,7 +564,6 @@ public:
void BegUndo(); // Undo-Klammerung auf
void BegUndo(const String& rComment); // Undo-Klammerung auf
void BegUndo(const String& rComment, const String& rObjDescr, SdrRepeatFunc eFunc=SDRREPFUNC_OBJ_NONE); // Undo-Klammerung auf
- void BegUndo(SdrUndoGroup* pUndoGrp); // Undo-Klammerung auf
void EndUndo(); // Undo-Klammerung zu
void AddUndo(SdrUndoAction* pUndo);
sal_uInt16 GetUndoBracketLevel() const { return nUndoLevel; }
@@ -652,15 +642,6 @@ public:
SfxStyleSheetBasePool* GetStyleSheetPool() const { return mxStyleSheetPool.get(); }
void SetStyleSheetPool(SfxStyleSheetBasePool* pPool) { mxStyleSheetPool=pPool; }
- // Diese Methode fuert einen Konsistenzcheck auf die Struktur des Models
- // durch. Geprueft wird insbesondere die Verkettung von Verschachtelten
- // Gruppenobjekten, aber auch Stati wie bInserted sowie Model* und Page*
- // der Objects, SubLists und Pages. Bei korrekter Struktur liefert die
- // Methode sal_True, andernfalls FALSE.
- // Dieser Check steht nur zur Verfuegung, wenn die Engine mit DBG_UTIL
- // uebersetzt wurde. Andernfalls liefert die Methode immer TRUE. (ni)
- bool CheckConsistence() const;
-
void SetStarDrawPreviewMode(sal_Bool bPreview);
sal_Bool IsStarDrawPreviewMode() { return bStarDrawPreviewMode; }
@@ -689,8 +670,6 @@ public:
void ReformatAllTextObjects();
- bool HasTransparentObjects( bool bCheckForAlphaChannel = false ) const;
-
SdrOutliner* createOutliner( sal_uInt16 nOutlinerMode );
void disposeOutliner( SdrOutliner* pOutliner );
diff --git a/svx/inc/svx/svdobj.hxx b/svx/inc/svx/svdobj.hxx
index fba48bf..57c8569 100644
--- a/svx/inc/svx/svdobj.hxx
+++ b/svx/inc/svx/svdobj.hxx
@@ -849,7 +849,6 @@ public:
protected:
const SfxItemSet& GetObjectItemSet() const;
void SetObjectItem(const SfxPoolItem& rItem);
- void ClearObjectItem(const sal_uInt16 nWhich = 0);
void SetObjectItemSet(const SfxItemSet& rSet);
const SfxPoolItem& GetObjectItem(const sal_uInt16 nWhich) const;
@@ -1174,7 +1173,6 @@ public:
static SdrObject* MakeNewObject(sal_uInt32 nInvent, sal_uInt16 nIdent, SdrPage* pPage, SdrModel* pModel=NULL);
static void InsertMakeObjectHdl(const Link& rLink);
static void RemoveMakeObjectHdl(const Link& rLink);
- static SdrObjUserData* MakeNewObjUserData(sal_uInt32 nInvent, sal_uInt16 nIdent, SdrObject* pObj);
static void InsertMakeUserDataHdl(const Link& rLink);
static void RemoveMakeUserDataHdl(const Link& rLink);
};
diff --git a/svx/inc/svx/svdograf.hxx b/svx/inc/svx/svdograf.hxx
index 34e4583..b5fc778 100644
--- a/svx/inc/svx/svdograf.hxx
+++ b/svx/inc/svx/svdograf.hxx
@@ -165,13 +165,10 @@ public:
void ReleaseGraphicLink();
sal_Bool IsLinkedGraphic() const { return (sal_Bool)aFileName.Len(); }
- void SetFileName(const String& rFileName);
const String& GetFileName() const { return aFileName; }
- void SetFilterName(const String& rFilterName);
const String& GetFilterName() const { return aFilterName; }
void StartAnimation(OutputDevice* pOutDev, const Point& rPoint, const Size& rSize, long nExtraData=0L);
- void StopAnimation(OutputDevice* pOutDev=NULL, long nExtraData=0L);
virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const;
virtual sal_uInt16 GetObjIdentifier() const;
@@ -199,7 +196,6 @@ public:
virtual void RestGeoData(const SdrObjGeoData& rGeo);
bool HasGDIMetaFile() const;
- const GDIMetaFile* GetGDIMetaFile() const;
virtual void SetPage(SdrPage* pNewPage);
virtual void SetModel(SdrModel* pNewModel);
@@ -215,7 +211,6 @@ public:
// #111096#
// Access to GrafAnimationAllowed flag
- sal_Bool IsGrafAnimationAllowed() const;
void SetGrafAnimationAllowed(sal_Bool bNew);
// #i25616#
diff --git a/svx/inc/svx/svdomedia.hxx b/svx/inc/svx/svdomedia.hxx
index fa2de35..c2a3e53 100644
--- a/svx/inc/svx/svdomedia.hxx
+++ b/svx/inc/svx/svdomedia.hxx
@@ -75,10 +75,8 @@ public:
void setMediaProperties( const ::avmedia::MediaItem& rState );
const ::avmedia::MediaItem& getMediaProperties() const;
- bool hasPreferredSize() const;
Size getPreferredSize() const;
- const Graphic& getGraphic() const;
void setGraphic( const Graphic* pGraphic = NULL );
protected:
diff --git a/svx/inc/svx/svdoole2.hxx b/svx/inc/svx/svdoole2.hxx
index 7907831..6681e36 100644
--- a/svx/inc/svx/svdoole2.hxx
+++ b/svx/inc/svx/svdoole2.hxx
@@ -87,8 +87,6 @@ public:
TYPEINFO();
SdrOle2Obj(bool bFrame_ = false);
- SdrOle2Obj(const svt::EmbeddedObjectRef& rNewObjRef, bool bFrame_ = false);
- SdrOle2Obj(const svt::EmbeddedObjectRef& rNewObjRef, const String& rNewObjName, bool bFrame_ = false);
SdrOle2Obj(const svt::EmbeddedObjectRef& rNewObjRef, const String& rNewObjName, const Rectangle& rNewRect, bool bFrame_ = false);
virtual ~SdrOle2Obj();
diff --git a/svx/inc/svx/svdotext.hxx b/svx/inc/svx/svdotext.hxx
index b86fa01..f506ba6 100644
--- a/svx/inc/svx/svdotext.hxx
+++ b/svx/inc/svx/svdotext.hxx
@@ -299,13 +299,8 @@ protected:
virtual void SaveGeoData(SdrObjGeoData& rGeo) const;
virtual void RestGeoData(const SdrObjGeoData& rGeo);
bool NbcSetEckenradius(long nRad);
- bool NbcSetAutoGrowHeight(bool bAuto);
bool NbcSetMinTextFrameHeight(long nHgt);
- bool NbcSetMaxTextFrameHeight(long nHgt);
- bool NbcSetAutoGrowWidth(bool bAuto);
bool NbcSetMinTextFrameWidth(long nWdt);
- bool NbcSetMaxTextFrameWidth(long nWdt);
- bool NbcSetFitToSize(SdrFitToSizeType eFit);
// Konstruktoren fuer beschriftete Zeichenobjekte
SdrTextObj();
@@ -342,7 +337,6 @@ public:
virtual bool AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHgt = true, bool bWdt = true) const;
virtual bool NbcAdjustTextFrameWidthAndHeight(bool bHgt = true, bool bWdt = true);
virtual bool AdjustTextFrameWidthAndHeight(bool bHgt = true, bool bWdt = true);
- void NbcResizeTextAttributes(const Fraction& xFact, const Fraction& yFact);
bool IsTextFrame() const { return bTextFrame; }
bool IsOutlText() const { return bTextFrame && (eTextKind==OBJ_OUTLINETEXT || eTextKind==OBJ_TITLETEXT); }
/// returns true if the PPT autofit of text into shape bounds is enabled. implies IsFitToSize()==false!
@@ -555,18 +549,12 @@ public:
virtual void RemoveOutlinerCharacterAttribs( const std::vector<sal_uInt16>& rCharWhichIds );
// #111096#
- // Access to thext hidden flag
- sal_Bool GetTextHidden() const;
- void NbcSetTextHidden(sal_Bool bNew);
-
- // #111096#
// Get necessary data for text scroll animation. ATM base it on a Text-Metafile and a
// painting rectangle. Rotation is taken from the object.
GDIMetaFile* GetTextScrollMetaFileAndRectangle(Rectangle& rScrollRectangle, Rectangle& rPaintRectangle);
// #111096#
// Access to TextAnimationAllowed flag
- bool IsTextAnimationAllowed() const;
void SetTextAnimationAllowed(sal_Bool bNew);
// #i8824#
diff --git a/svx/inc/svx/svdpage.hxx b/svx/inc/svx/svdpage.hxx
index 55ff262..d7af3bc 100644
--- a/svx/inc/svx/svdpage.hxx
+++ b/svx/inc/svx/svdpage.hxx
@@ -528,15 +528,6 @@ public:
const SdrLayerAdmin& GetLayerAdmin() const { return *pLayerAdmin; }
SdrLayerAdmin& GetLayerAdmin() { return *pLayerAdmin; }
- // GetBitmap und GetMetafile sind noch nicht implementiert.
- // Bitmap in Bildschirmaufloesung und -farbtiefe aus den Objekten der
- // Page erzeugen.
- Bitmap GetBitmap(bool bTrimBorders = true) const { return GetBitmap(aPrefVisiLayers,bTrimBorders); }
- Bitmap GetBitmap(const SetOfByte& rVisibleLayers, bool bTrimBorders = true) const;
- // Metafile aus den Objekten der Page erzeugen
- GDIMetaFile GetMetaFile(bool bTrimBorders = true) { return GetMetaFile(aPrefVisiLayers,bTrimBorders); }
- GDIMetaFile GetMetaFile(const SetOfByte& rVisibleLayers, bool bTrimBorders = true);
-
virtual String GetLayoutName() const;
// fuer's Raster im Writer, auch fuer AlignObjects wenn 1 Objekt markiert ist
@@ -578,9 +569,6 @@ public:
const sdr::contact::DisplayInfo& rDisplayInfo,
bool bEdit );
- /** Check if page is the HandoutMasterPage (in SVX, no PK_HANDOUT available) */
- bool isHandoutMasterPage() const;
-
//////////////////////////////////////////////////////////////////////////////
// sdr::Comment interface
private:
@@ -588,9 +576,6 @@ private:
public:
sal_uInt32 GetCommentCount() const { return maComments.size(); }
- const sdr::Comment& GetCommentByIndex(sal_uInt32 nIndex);
- void AddComment(const sdr::Comment& rNew);
- void ReplaceCommentByIndex(sal_uInt32 nIndex, const sdr::Comment& rNew);
};
typedef tools::WeakReference< SdrPage > SdrPageWeakRef;
diff --git a/svx/inc/svx/svdpagv.hxx b/svx/inc/svx/svdpagv.hxx
index e6d1fe7..2e81452 100644
--- a/svx/inc/svx/svdpagv.hxx
+++ b/svx/inc/svx/svdpagv.hxx
@@ -108,7 +108,6 @@ protected:
protected:
void ClearPageWindows();
void AppendPageWindow(SdrPageWindow& rNew);
- SdrPageWindow* RemovePageWindow(sal_uInt32 nPos);
SdrPageWindow* RemovePageWindow(SdrPageWindow& rOld);
public:
sal_uInt32 PageWindowCount() const { return maPageWindows.size(); }
@@ -179,9 +178,6 @@ public:
// Invalidiert den gesamten Bereich der Page
void InvalidateAllWin();
- // rRect bezieht sich auf die Page
- void InvalidateAllWin(const Rectangle& rRect, sal_Bool bPlus1Pix=sal_False);
-
// PrePaint call forwarded from app windows
void PrePaint();
@@ -276,12 +272,6 @@ public:
// Feststellen, wie weit hinabgestiegen wurde (0=Root(Page))
sal_uInt16 GetEnteredLevel() const;
- // Name der aktuellen Objektgruppe
- String GetActualGroupName() const;
-
- // Die Namen aller z.Zt. betretenen Gruppen
- String GetActualPathName(sal_Unicode cSep = sal_Unicode('|')) const;
-
// #103834# Set background color for svx at SdrPageViews
void SetApplicationBackgroundColor(Color aBackgroundColor);
diff --git a/svx/inc/svx/svdpntv.hxx b/svx/inc/svx/svdpntv.hxx
index 3240a4f..c099d83 100644
--- a/svx/inc/svx/svdpntv.hxx
+++ b/svx/inc/svx/svdpntv.hxx
@@ -363,22 +363,16 @@ public:
void SetLayerVisible(const String& rName, sal_Bool bShow=sal_True);
bool IsLayerVisible(const String& rName) const;
- void SetAllLayersVisible(sal_Bool bShow=sal_True);
void SetLayerLocked(const String& rName, sal_Bool bLock=sal_True);
bool IsLayerLocked(const String& rName) const;
- void SetAllLayersLocked(sal_Bool bLock=sal_True);
void SetLayerPrintable(const String& rName, sal_Bool bPrn=sal_True);
bool IsLayerPrintable(const String& rName) const;
- void SetAllLayersPrintable(sal_Bool bPrn=sal_True);
// PrePaint call forwarded from app windows
void PrePaint();
- // PostPaint call forwarded from app windows
- void PostPaint();
-
////////////////////////////////////////////////////////////////////////////////////////////////////
// used internally for Draw/Impress/sch/chart2
virtual void CompleteRedraw(OutputDevice* pOut, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0);
@@ -492,7 +486,6 @@ public:
// pOut bezeichnet das OutputDevice, in das animierte Rechteck dargestellt
// werden soll. Wird NULL uebergeben, wird es in allen an der View
// angemeldeten OutputDevices gleichzeitig dargestellt.
- void BegEncirclement(const Point& rPnt);
void MovEncirclement(const Point& rPnt);
Rectangle EndEncirclement(sal_Bool bNoJustify = sal_False);
void BrkEncirclement();
diff --git a/svx/inc/svx/svdpoev.hxx b/svx/inc/svx/svdpoev.hxx
index b65d0b2..6d6305a 100644
--- a/svx/inc/svx/svdpoev.hxx
+++ b/svx/inc/svx/svdpoev.hxx
@@ -99,7 +99,6 @@ public:
// Alle markierten Polylines werden zu Polygonen, alle offenen
// Bezierkurven zu geschlossenen.
- void ShutMarkedObjects();
void CloseMarkedObjects(sal_Bool bToggle=sal_False, sal_Bool bOpen=sal_False); // , long nOpenDistance=0);
bool IsOpenCloseMarkedObjectsPossible() const;
SdrObjClosedKind GetMarkedObjectsClosedState() const;
diff --git a/svx/inc/svx/svdsnpv.hxx b/svx/inc/svx/svdsnpv.hxx
index 8d9ec90..504e74a 100644
--- a/svx/inc/svx/svdsnpv.hxx
+++ b/svx/inc/svx/svdsnpv.hxx
@@ -142,7 +142,6 @@ public:
// SDRSNAP_YSNAPPED oder SDRSNAP_XYSNAPPED
sal_uInt16 SnapPos(Point& rPnt, const SdrPageView* pPV) const;
Point GetSnapPos(const Point& rPnt, const SdrPageView* pPV) const;
- sal_uInt16 SnapRect(const Rectangle& rRect, const SdrPageView* pPV, long& rDX, long& rDY) const;
void CheckSnap(const Point& rPt, const SdrPageView* pPV, long& nBestXSnap, long& nBestYSnap, bool& bXSnapped, bool& bYSnapped) const;
// Alle Fangeinstellungen sind Persistent.
diff --git a/svx/inc/svx/svdundo.hxx b/svx/inc/svx/svdundo.hxx
index a88540f..5b924a4 100644
--- a/svx/inc/svx/svdundo.hxx
+++ b/svx/inc/svx/svdundo.hxx
@@ -106,14 +106,12 @@ protected:
public:
SdrUndoGroup(SdrModel& rNewMod);
- SdrUndoGroup(SdrModel& rNewMod,const String& rStr);
virtual ~SdrUndoGroup();
void Clear();
sal_uIntPtr GetActionCount() const { return aBuf.Count(); }
SdrUndoAction* GetAction(sal_uIntPtr nNum) const { return (SdrUndoAction*)(aBuf.GetObject(nNum)); }
void AddAction(SdrUndoAction* pAct);
- void push_front( SdrUndoAction* pAct );
void SetComment(const String& rStr) { aComment=rStr; }
void SetObjDescription(const String& rStr) { aObjDescription=rStr; }
@@ -187,7 +185,6 @@ protected:
public:
SdrUndoAttrObj(SdrObject& rNewObj, bool bStyleSheet1 = false, bool bSaveText = false);
virtual ~SdrUndoAttrObj();
- void SetRepeatAttr(const SfxItemSet& rSet);
virtual void Undo();
virtual void Redo();
diff --git a/svx/inc/svx/svdview.hxx b/svx/inc/svx/svdview.hxx
index 36471d9..71c7403 100644
--- a/svx/inc/svx/svdview.hxx
+++ b/svx/inc/svx/svdview.hxx
@@ -259,8 +259,6 @@ public:
// - ... to be continued
void MarkAll();
void UnmarkAll();
- sal_Bool MarkNext(sal_Bool bPrev=sal_False);
- sal_Bool MarkNext(const Point& rPnt, sal_Bool bPrev=sal_False);
const Rectangle& GetMarkedRect() const;
diff --git a/svx/source/items/customshapeitem.cxx b/svx/source/items/customshapeitem.cxx
index 3119696..3878778 100644
--- a/svx/source/items/customshapeitem.cxx
+++ b/svx/source/items/customshapeitem.cxx
@@ -37,16 +37,10 @@ using namespace com::sun::star;
SdrCustomShapeEngineItem::SdrCustomShapeEngineItem()
: SfxStringItem( SDRATTR_CUSTOMSHAPE_ENGINE, String() )
{}
-SdrCustomShapeEngineItem::SdrCustomShapeEngineItem( const String& rVal )
-: SfxStringItem( SDRATTR_CUSTOMSHAPE_ENGINE, rVal )
-{}
SdrCustomShapeDataItem::SdrCustomShapeDataItem()
: SfxStringItem( SDRATTR_CUSTOMSHAPE_DATA, String() )
{}
-SdrCustomShapeDataItem::SdrCustomShapeDataItem( const String& rVal )
-: SfxStringItem( SDRATTR_CUSTOMSHAPE_DATA, rVal )
-{}
bool SdrCustomShapeGeometryItem::PropertyEq::operator()( const rtl::OUString& r1, const rtl::OUString& r2 ) const
{
@@ -248,37 +242,6 @@ void SdrCustomShapeGeometryItem::ClearPropertyValue( const rtl::OUString& rPropN
}
}
-void SdrCustomShapeGeometryItem::ClearPropertyValue( const rtl::OUString& rSequenceName, const rtl::OUString& rPropName )
-{
- com::sun::star::uno::Any* pSeqAny = GetPropertyValueByName( rSequenceName );
- if ( pSeqAny )
- {
- if ( pSeqAny->getValueType() == ::getCppuType((const ::com::sun::star::uno::Sequence < beans::PropertyValue >*)0) )
- {
- PropertyPairHashMap::iterator aHashIter( aPropPairHashMap.find( PropertyPair( rSequenceName, rPropName ) ) );
- if ( aHashIter != aPropPairHashMap.end() )
- {
- ::com::sun::star::uno::Sequence < beans::PropertyValue >& rSecSequence =
- *((::com::sun::star::uno::Sequence < beans::PropertyValue >*)pSeqAny->getValue());
-
- sal_Int32 nLength = rSecSequence.getLength();
- if ( nLength )
- {
- sal_Int32 nIndex = (*aHashIter).second;
- if ( nIndex != ( nLength - 1 ) ) // resizing sequence
- {
- PropertyPairHashMap::iterator aHashIter2( aPropPairHashMap.find( PropertyPair( rSequenceName, rSecSequence[ nLength - 1 ].Name ) ) );
- (*aHashIter2).second = nIndex;
- rSecSequence[ nIndex ] = rSecSequence[ nLength - 1 ];
- }
- rSecSequence.realloc( aPropSeq.getLength() - 1 );
- }
- aPropPairHashMap.erase( aHashIter );
- }
- }
- }
-}
-
SdrCustomShapeGeometryItem::~SdrCustomShapeGeometryItem()
{
}
@@ -355,8 +318,5 @@ const uno::Sequence< beans::PropertyValue >& SdrCustomShapeGeometryItem::GetGeom
SdrCustomShapeReplacementURLItem::SdrCustomShapeReplacementURLItem()
: SfxStringItem( SDRATTR_CUSTOMSHAPE_REPLACEMENT_URL, String() )
{}
-SdrCustomShapeReplacementURLItem::SdrCustomShapeReplacementURLItem( const String& rVal )
-: SfxStringItem( SDRATTR_CUSTOMSHAPE_REPLACEMENT_URL, rVal )
-{}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/svdraw/sdrpaintwindow.cxx b/svx/source/svdraw/sdrpaintwindow.cxx
index 98e28a0..280cb2a 100644
--- a/svx/source/svdraw/sdrpaintwindow.cxx
+++ b/svx/source/svdraw/sdrpaintwindow.cxx
@@ -288,17 +288,6 @@ void SdrPaintWindow::DrawOverlay(const Region& rRegion, bool bUseBuffer)
}
}
-void SdrPaintWindow::HideOverlay(const Region& rRegion)
-{
- if(mpOverlayManager && !OutputToPrinter())
- {
- if(!mpPreRenderDevice)
- {
- mpOverlayManager->restoreBackground(rRegion);
- }
- }
-}
-
const Region& SdrPaintWindow::GetRedrawRegion() const
{
return maRedrawRegion;
diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx
index 8874f11..7ed2039 100644
--- a/svx/source/svdraw/svdedtv.cxx
+++ b/svx/source/svdraw/svdedtv.cxx
@@ -308,20 +308,6 @@ void SdrEditView::DeleteLayer(const XubString& rName)
}
}
-void SdrEditView::MoveLayer(const XubString& rName, sal_uInt16 nNewPos)
-{
- SdrLayerAdmin& rLA=pMod->GetLayerAdmin();
- SdrLayer* pLayer=rLA.GetLayer(rName,sal_True);
- sal_uInt16 nLayerNum=rLA.GetLayerPos(pLayer);
- if (nLayerNum!=SDRLAYER_NOTFOUND)
- {
- if( IsUndoEnabled() )
- AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoMoveLayer(nLayerNum,rLA,*pMod,nNewPos));
- rLA.MoveLayer(nLayerNum,nNewPos);
- pMod->SetChanged();
- }
-}
-
////////////////////////////////////////////////////////////////////////////////////////////////////
void SdrEditView::EndUndo()
diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx
index d1fc85a..88a2471 100644
--- a/svx/source/svdraw/svdetc.cxx
+++ b/svx/source/svdraw/svdetc.cxx
@@ -89,33 +89,18 @@ SdrGlobalData::SdrGlobalData() :
nExchangeFormat(0)
{
//pSysLocale = new SvtSysLocale;
- //pCharClass = pSysLocale->GetCharClassPtr();
//pLocaleData = pSysLocale->GetLocaleDataPtr();
svx::ExtrusionBar::RegisterInterface();
svx::FontworkBar::RegisterInterface();
}
-SdrGlobalData::~SdrGlobalData()
-{
- delete pOutliner;
- delete pDefaults;
- delete pResMgr;
- //! do NOT delete pCharClass and pLocaleData
- delete pSysLocale;
-}
const SvtSysLocale* SdrGlobalData::GetSysLocale()
{
if ( !pSysLocale )
pSysLocale = new SvtSysLocale;
return pSysLocale;
}
-const CharClass* SdrGlobalData::GetCharClass()
-{
- if ( !pCharClass )
- pCharClass = GetSysLocale()->GetCharClassPtr();
- return pCharClass;
-}
const LocaleDataWrapper* SdrGlobalData::GetLocaleData()
{
if ( !pLocaleData )
diff --git a/svx/source/svdraw/svdglue.cxx b/svx/source/svdraw/svdglue.cxx
index 737542d..a42947e 100644
--- a/svx/source/svdraw/svdglue.cxx
+++ b/svx/source/svdraw/svdglue.cxx
@@ -201,13 +201,6 @@ void SdrGluePoint::Rotate(const Point& rRef, long nWink, double sn, double cs, c
if (pObj!=NULL) SetAbsolutePos(aPt,*pObj); else SetPos(aPt);
}
-void SdrGluePoint::Mirror(const Point& rRef1, const Point& rRef2, const SdrObject* pObj)
-{
- Point aPt(rRef2); aPt-=rRef1;
- long nWink=GetAngle(aPt);
- Mirror(rRef1,rRef2,nWink,pObj);
-}
-
void SdrGluePoint::Mirror(const Point& rRef1, const Point& rRef2, long nWink, const SdrObject* pObj)
{
Point aPt(pObj!=NULL ? GetAbsolutePos(*pObj) : GetPos());
@@ -253,44 +246,6 @@ void SdrGluePoint::Shear(const Point& rRef, long /*nWink*/, double tn, bool bVSh
if (pObj!=NULL) SetAbsolutePos(aPt,*pObj); else SetPos(aPt);
}
-void SdrGluePoint::Draw(OutputDevice& rOut, const SdrObject* pObj) const
-{
- Color aBackPenColor(COL_WHITE);
- Color aForePenColor(COL_LIGHTBLUE);
-
- bool bMapMerk=rOut.IsMapModeEnabled();
- Point aPt(pObj!=NULL ? GetAbsolutePos(*pObj) : GetPos());
- aPt=rOut.LogicToPixel(aPt);
- rOut.EnableMapMode(sal_False);
- long x=aPt.X(),y=aPt.Y(); // Groesse erstmal fest auf 7 Pixel
-
- rOut.SetLineColor( aBackPenColor );
- rOut.DrawLine(Point(x-2,y-3),Point(x+3,y+2));
- rOut.DrawLine(Point(x-3,y-2),Point(x+2,y+3));
- rOut.DrawLine(Point(x-3,y+2),Point(x+2,y-3));
- rOut.DrawLine(Point(x-2,y+3),Point(x+3,y-2));
-
- if (bNoPercent)
- {
- switch (GetHorzAlign())
- {
- case SDRHORZALIGN_LEFT : rOut.DrawLine(Point(x-3,y-1),Point(x-3,y+1)); break;
- case SDRHORZALIGN_RIGHT : rOut.DrawLine(Point(x+3,y-1),Point(x+3,y+1)); break;
- }
-
- switch (GetVertAlign())
- {
- case SDRVERTALIGN_TOP : rOut.DrawLine(Point(x-1,y-3),Point(x+1,y-3)); break;
- case SDRVERTALIGN_BOTTOM: rOut.DrawLine(Point(x-1,y+3),Point(x+1,y+3)); break;
- }
- }
-
- rOut.SetLineColor( aForePenColor );
- rOut.DrawLine(Point(x-2,y-2),Point(x+2,y+2));
- rOut.DrawLine(Point(x-2,y+2),Point(x+2,y-2));
- rOut.EnableMapMode(bMapMerk);
-}
-
void SdrGluePoint::Invalidate(Window& rWin, const SdrObject* pObj) const
{
bool bMapMerk=rWin.IsMapModeEnabled();
diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx
index 2cfb2cc..dff3afa 100644
--- a/svx/source/svdraw/svdhdl.cxx
+++ b/svx/source/svdraw/svdhdl.cxx
@@ -903,11 +903,6 @@ void SdrHdl::onMouseLeave()
{
}
-bool SdrHdl::isMouseOver() const
-{
- return mbMouseOver;
-}
-
////////////////////////////////////////////////////////////////////////////////////////////////////
// class SdrHdlColor
diff --git a/svx/source/svdraw/svdlayer.cxx b/svx/source/svdraw/svdlayer.cxx
index 232c63a..e8cc9bf 100644
--- a/svx/source/svdraw/svdlayer.cxx
+++ b/svx/source/svdraw/svdlayer.cxx
@@ -360,16 +360,6 @@ SdrLayer* SdrLayerAdmin::MoveLayer(sal_uInt16 nPos, sal_uInt16 nNewPos)
return pLayer;
}
-void SdrLayerAdmin::MoveLayer(SdrLayer* pLayer, sal_uInt16 nNewPos)
-{
- sal_uIntPtr nPos=aLayer.GetPos(pLayer);
- if (nPos!=CONTAINER_ENTRY_NOTFOUND) {
- aLayer.Remove(nPos);
- aLayer.Insert(pLayer,nNewPos);
- Broadcast();
- }
-}
-
sal_uInt16 SdrLayerAdmin::GetLayerPos(SdrLayer* pLayer) const
{
sal_uIntPtr nRet=SDRLAYER_NOTFOUND;
diff --git a/svx/source/svdraw/svdmark.cxx b/svx/source/svdraw/svdmark.cxx
index 1aa2a74..daf0302 100644
--- a/svx/source/svdraw/svdmark.cxx
+++ b/svx/source/svdraw/svdmark.cxx
@@ -313,16 +313,6 @@ sal_Bool SdrMark::operator==(const SdrMark& rMark) const
return bRet;
}
-SdrPage* SdrMark::GetPage() const
-{
- return (mpSelectedSdrObject ? mpSelectedSdrObject->GetPage() : 0);
-}
-
-SdrObjList* SdrMark::GetObjList() const
-{
- return (mpSelectedSdrObject ? mpSelectedSdrObject->GetObjList() : 0);
-}
-
////////////////////////////////////////////////////////////////////////////////////////////////////
class ImpSdrMarkListSorter: public ContainerSorter
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index 07331e5..fdc87e5 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -366,18 +366,6 @@ bool SdrModel::IsInDestruction() const
return mbInDestruction;
}
-const SvNumberFormatter& SdrModel::GetNumberFormatter() const
-{
- if(!mpNumberFormatter)
- {
- // use cast here since from outside view this IS a const method
- ((SdrModel*)this)->mpNumberFormatter = new SvNumberFormatter(
- ::comphelper::getProcessServiceFactory(), LANGUAGE_SYSTEM);
- }
-
- return *mpNumberFormatter;
-}
-
// noch nicht implementiert:
void SdrModel::operator=(const SdrModel& /*rSrcModel*/)
{
@@ -600,32 +588,6 @@ void SdrModel::BegUndo(const XubString& rComment, const XubString& rObjDescr, Sd
}
}
-void SdrModel::BegUndo(SdrUndoGroup* pUndoGrp)
-{
- if( mpImpl->mpUndoManager )
- {
- OSL_FAIL("svx::SdrModel::BegUndo(), method not supported with application undo manager!" );
- nUndoLevel++;
- }
- else if( IsUndoEnabled() )
- {
- if (pAktUndoGroup==NULL)
- {
- pAktUndoGroup=pUndoGrp;
- nUndoLevel=1;
- }
- else
- {
- delete pUndoGrp;
- nUndoLevel++;
- }
- }
- else
- {
- delete pUndoGrp;
- }
-}
-
void SdrModel::EndUndo()
{
DBG_ASSERT(nUndoLevel!=0,"SdrModel::EndUndo(): UndoLevel is already 0!");
@@ -1547,17 +1509,6 @@ void SdrModel::MoveMasterPage(sal_uInt16 nPgNum, sal_uInt16 nNewPos)
////////////////////////////////////////////////////////////////////////////////////////////////////
-bool SdrModel::CheckConsistence() const
-{
- bool bRet = true;
-#ifdef DBG_UTIL
- DBG_CHKTHIS(SdrModel,NULL);
-#endif
- return bRet;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
// #48289#
void SdrModel::CopyPages(sal_uInt16 nFirstPageNum, sal_uInt16 nLastPageNum,
sal_uInt16 nDestPos,
@@ -1967,25 +1918,6 @@ void SdrModel::ReformatAllTextObjects()
ImpReformatAllTextObjects();
}
-bool SdrModel::HasTransparentObjects( bool bCheckForAlphaChannel ) const
-{
- bool bRet = false;
- sal_uInt16 n, nCount;
-
- for( n = 0, nCount = GetMasterPageCount(); ( n < nCount ) && !bRet; n++ )
- if( GetMasterPage( n )->HasTransparentObjects( bCheckForAlphaChannel ) )
- bRet = true;
-
- if( !bRet )
- {
- for( n = 0, nCount = GetPageCount(); ( n < nCount ) && !bRet; n++ )
- if( GetPage( n )->HasTransparentObjects( bCheckForAlphaChannel ) )
- bRet = true;
- }
-
- return bRet;
-}
-
SdrOutliner* SdrModel::createOutliner( sal_uInt16 nOutlinerMode )
{
if( NULL == mpOutlinerCache )
@@ -2081,11 +2013,6 @@ void SdrModel::SetSdrUndoFactory( SdrUndoFactory* pUndoFactory )
/** cl: added this for OJ to complete his reporting engine, does not work
correctly so only enable it for his model */
-bool SdrModel::IsAllowShapePropertyChangeListener() const
-{
- return mpImpl && mpImpl->mbAllowShapePropertyChangeListener;
-}
-
void SdrModel::SetAllowShapePropertyChangeListener( bool bAllow )
{
if( mpImpl )
@@ -2108,14 +2035,6 @@ const ::com::sun::star::uno::Sequence< sal_Int8 >& SdrModel::getUnoTunnelImpleme
TYPEINIT1(SdrHint,SfxHint);
-SdrHint::SdrHint()
-: mpPage(0L),
- mpObj(0L),
- mpObjList(0L),
- meHint(HINT_UNKNOWN)
-{
-}
-
SdrHint::SdrHint(SdrHintKind eNewHint)
: mpPage(0L),
mpObj(0L),
@@ -2133,25 +2052,11 @@ SdrHint::SdrHint(const SdrObject& rNewObj)
maRectangle = rNewObj.GetLastBoundRect();
}
-SdrHint::SdrHint(const SdrObject& rNewObj, const Rectangle& rRect)
-: mpPage(rNewObj.GetPage()),
- mpObj(&rNewObj),
- mpObjList(rNewObj.GetObjList()),
- meHint(HINT_OBJCHG)
-{
- maRectangle = rRect;
-}
-
void SdrHint::SetPage(const SdrPage* pNewPage)
{
mpPage = pNewPage;
}
-void SdrHint::SetObjList(const SdrObjList* pNewOL)
-{
- mpObjList = pNewOL;
-}
-
void SdrHint::SetObject(const SdrObject* pNewObj)
{
mpObj = pNewObj;
@@ -2162,21 +2067,11 @@ void SdrHint::SetKind(SdrHintKind eNewKind)
meHint = eNewKind;
}
-void SdrHint::SetRect(const Rectangle& rNewRect)
-{
- maRectangle = rNewRect;
-}
-
const SdrPage* SdrHint::GetPage() const
{
return mpPage;
}
-const SdrObjList* SdrHint::GetObjList() const
-{
- return mpObjList;
-}
-
const SdrObject* SdrHint::GetObject() const
{
return mpObj;
@@ -2187,11 +2082,6 @@ SdrHintKind SdrHint::GetKind() const
return meHint;
}
-const Rectangle& SdrHint::GetRect() const
-{
- return maRectangle;
-}
-
// eof
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index e91ec3e..132690d 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -1900,11 +1900,6 @@ void SdrObject::SetMergedItem(const SfxPoolItem& rItem)
GetProperties().SetMergedItem(rItem);
}
-void SdrObject::ClearObjectItem(const sal_uInt16 nWhich)
-{
- GetProperties().ClearObjectItem(nWhich);
-}
-
void SdrObject::ClearMergedItem(const sal_uInt16 nWhich)
{
GetProperties().ClearMergedItem(nWhich);
@@ -3124,29 +3119,6 @@ SdrObject* SdrObjFactory::MakeNewObject(sal_uInt32 nInvent, sal_uInt16 nIdent, S
return pObj;
}
-SdrObjUserData* SdrObjFactory::MakeNewObjUserData(sal_uInt32 nInvent, sal_uInt16 nIdent, SdrObject* pObj1)
-{
- SdrObjUserData* pData=NULL;
- if (nInvent==SdrInventor) {
- switch (nIdent)
- {
- case sal_uInt16(SDRUSERDATA_OBJTEXTLINK) : pData=new ImpSdrObjTextLinkUserData((SdrTextObj*)pObj1); break;
- }
- }
- if (pData==NULL) {
- SdrObjFactory aFact(nInvent,nIdent,pObj1);
- SdrLinkList& rLL=ImpGetUserMakeObjUserDataHdl();
- unsigned nAnz=rLL.GetLinkCount();
- unsigned i=0;
- while (i<nAnz && pData==NULL) {
- rLL.GetLink(i).Call((void*)&aFact);
- pData=aFact.pNewData;
- i++;
- }
- }
- return pData;
-}
-
void SdrObjFactory::InsertMakeObjectHdl(const Link& rLink)
{
SdrLinkList& rLL=ImpGetUserMakeObjHdl();
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index d1eadd0..ae74a96 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -556,22 +556,6 @@ String SdrGrafObj::GetGrafStreamURL() const
// -----------------------------------------------------------------------------
-void SdrGrafObj::SetFileName(const String& rFileName)
-{
- aFileName = rFileName;
- SetChanged();
-}
-
-// -----------------------------------------------------------------------------
-
-void SdrGrafObj::SetFilterName(const String& rFilterName)
-{
- aFilterName = rFilterName;
- SetChanged();
-}
-
-// -----------------------------------------------------------------------------
-
void SdrGrafObj::ForceSwapIn() const
{
if( mbIsPreview )
@@ -1027,13 +1011,6 @@ void SdrGrafObj::StartAnimation( OutputDevice* /*pOutDev*/, const Point& /*rPoin
// -----------------------------------------------------------------------------
-void SdrGrafObj::StopAnimation(OutputDevice* /*pOutDev*/, long /*nExtraData*/)
-{
- SetGrafAnimationAllowed(sal_False);
-}
-
-// -----------------------------------------------------------------------------
-
bool SdrGrafObj::HasGDIMetaFile() const
{
return( pGraphic->GetType() == GRAPHIC_GDIMETAFILE );
@@ -1041,14 +1018,6 @@ bool SdrGrafObj::HasGDIMetaFile() const
// -----------------------------------------------------------------------------
-const GDIMetaFile* SdrGrafObj::GetGDIMetaFile() const
-{
- OSL_FAIL( "Invalid return value! Don't use it! (KA)" );
- return &GetGraphic().GetGDIMetaFile();
-}
-
-// -----------------------------------------------------------------------------
-
SdrObject* SdrGrafObj::DoConvertToPolyObj(sal_Bool bBezier) const
{
SdrObject* pRetval = NULL;
@@ -1334,11 +1303,6 @@ IMPL_LINK( SdrGrafObj, ImpSwapHdl, GraphicObject*, pO )
// -----------------------------------------------------------------------------
-sal_Bool SdrGrafObj::IsGrafAnimationAllowed() const
-{
- return mbGrafAnimationAllowed;
-}
-
void SdrGrafObj::SetGrafAnimationAllowed(sal_Bool bNew)
{
if(mbGrafAnimationAllowed != bNew)
diff --git a/svx/source/svdraw/svdomedia.cxx b/svx/source/svdraw/svdomedia.cxx
index 0001cd5..d1d4bba 100644
--- a/svx/source/svdraw/svdomedia.cxx
+++ b/svx/source/svdraw/svdomedia.cxx
@@ -232,13 +232,6 @@ const ::avmedia::MediaItem& SdrMediaObj::getMediaProperties() const
// ------------------------------------------------------------------------------
-bool SdrMediaObj::hasPreferredSize() const
-{
- return static_cast< ::sdr::contact::ViewContactOfSdrMediaObj& >( GetViewContact() ).hasPreferredSize();
-}
-
-// ------------------------------------------------------------------------------
-
Size SdrMediaObj::getPreferredSize() const
{
return static_cast< ::sdr::contact::ViewContactOfSdrMediaObj& >( GetViewContact() ).getPreferredSize();
@@ -246,16 +239,6 @@ Size SdrMediaObj::getPreferredSize() const
// ------------------------------------------------------------------------------
-const Graphic& SdrMediaObj::getGraphic() const
-{
- if( !mapGraphic.get() )
- const_cast< SdrMediaObj* >( this )->mapGraphic.reset( new Graphic( ::avmedia::MediaWindow::grabFrame( getURL(), true ) ) );
-
- return *mapGraphic;
-}
-
-// ------------------------------------------------------------------------------
-
void SdrMediaObj::setGraphic( const Graphic* pGraphic )
{
mapGraphic.reset( pGraphic ? new Graphic( *pGraphic ) : NULL );
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index b6c5f47..a3c26a4 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -755,48 +755,6 @@ SdrOle2Obj::SdrOle2Obj(bool bFrame_) : m_bTypeAsked(false)
}
// -----------------------------------------------------------------------------
-SdrOle2Obj::SdrOle2Obj( const svt::EmbeddedObjectRef& rNewObjRef, bool bFrame_)
- : xObjRef( rNewObjRef )
- , m_bTypeAsked(false)
- , m_bChart(false)
-{
- DBG_CTOR( SdrOle2Obj,NULL);
- bInDestruction = false;
- Init();
-
- bFrame=bFrame_;
-
- if ( xObjRef.is() && (xObjRef->getStatus( GetAspect() ) & embed::EmbedMisc::EMBED_NEVERRESIZE ) )
- SetResizeProtect(sal_True);
-
- // For math objects, set closed state to transparent
- if( ImplIsMathObj( xObjRef.GetObject() ) )
- SetClosedObj( false );
-}
-
-// -----------------------------------------------------------------------------
-
-SdrOle2Obj::SdrOle2Obj( const svt::EmbeddedObjectRef& rNewObjRef, const XubString& rNewObjName, bool bFrame_)
- : xObjRef( rNewObjRef )
- , m_bTypeAsked(false)
- , m_bChart(false)
-{
- DBG_CTOR( SdrOle2Obj,NULL);
- bInDestruction = false;
- Init();
-
- mpImpl->aPersistName = rNewObjName;
- bFrame=bFrame_;
-
- if ( xObjRef.is() && (xObjRef->getStatus( GetAspect() ) & embed::EmbedMisc::EMBED_NEVERRESIZE ) )
- SetResizeProtect(sal_True);
-
- // For math objects, set closed state to transparent
- if( ImplIsMathObj( xObjRef.GetObject() ) )
- SetClosedObj( false );
-}
-
-// -----------------------------------------------------------------------------
SdrOle2Obj::SdrOle2Obj( const svt::EmbeddedObjectRef& rNewObjRef, const XubString& rNewObjName, const Rectangle& rNewRect, bool bFrame_)
: SdrRectObj(rNewRect)
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 1f77182..fb0acd4 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -561,16 +561,6 @@ bool SdrTextObj::NbcSetEckenradius(long nRad)
return true;
}
-bool SdrTextObj::NbcSetAutoGrowHeight(bool bAuto)
-{
- if(bTextFrame)
- {
- SetObjectItem(SdrTextAutoGrowHeightItem(bAuto));
- return true;
- }
- return false;
-}
-
bool SdrTextObj::NbcSetMinTextFrameHeight(long nHgt)
{
if( bTextFrame && ( !pModel || !pModel->isLocked() ) ) // #i44922#
@@ -590,26 +580,6 @@ bool SdrTextObj::NbcSetMinTextFrameHeight(long nHgt)
return false;
}
-bool SdrTextObj::NbcSetMaxTextFrameHeight(long nHgt)
-{
- if(bTextFrame)
- {
- SetObjectItem(SdrTextMaxFrameHeightItem(nHgt));
- return true;
- }
- return false;
-}
-
-bool SdrTextObj::NbcSetAutoGrowWidth(bool bAuto)
-{
- if(bTextFrame)
- {
- SetObjectItem(SdrTextAutoGrowWidthItem(bAuto));
- return true;
- }
- return false;
-}
-
bool SdrTextObj::NbcSetMinTextFrameWidth(long nWdt)
{
if( bTextFrame && ( !pModel || !pModel->isLocked() ) ) // #i44922#
@@ -629,26 +599,6 @@ bool SdrTextObj::NbcSetMinTextFrameWidth(long nWdt)
return false;
}
-bool SdrTextObj::NbcSetMaxTextFrameWidth(long nWdt)
-{
- if(bTextFrame)
- {
- SetObjectItem(SdrTextMaxFrameWidthItem(nWdt));
- return true;
- }
- return false;
-}
-
-bool SdrTextObj::NbcSetFitToSize(SdrFitToSizeType eFit)
-{
- if(bTextFrame)
- {
- SetObjectItem(SdrTextFitToSizeTypeItem(eFit));
- return true;
- }
- return false;
-}
-
void SdrTextObj::ImpSetContourPolygon( SdrOutliner& rOutliner, Rectangle& rAnchorRect, sal_Bool bLineWidth ) const
{
basegfx::B2DPolyPolygon aXorPolyPolygon(TakeXorPoly());
@@ -1869,20 +1819,6 @@ SdrTextAniDirection SdrTextObj::GetTextAniDirection() const
return ((SdrTextAniDirectionItem&)(GetObjectItemSet().Get(SDRATTR_TEXT_ANIDIRECTION))).GetValue();
}
-// Access to thext hidden flag
-sal_Bool SdrTextObj::GetTextHidden() const
-{
- return mbTextHidden;
-}
-
-void SdrTextObj::NbcSetTextHidden(sal_Bool bNew)
-{
- if(bNew != mbTextHidden)
- {
- mbTextHidden = bNew;
- }
-}
-
// Get necessary data for text scroll animation. ATM base it on a Text-Metafile and a
// painting rectangle. Rotation is excluded from the returned values.
GDIMetaFile* SdrTextObj::GetTextScrollMetaFileAndRectangle(
@@ -1939,11 +1875,6 @@ GDIMetaFile* SdrTextObj::GetTextScrollMetaFileAndRectangle(
}
// Access to TextAnimationAllowed flag
-bool SdrTextObj::IsTextAnimationAllowed() const
-{
- return mbTextAnimationAllowed;
-}
-
bool SdrTextObj::IsAutoFit() const
{
return GetFitToSize()==SDRTEXTFIT_AUTOFIT;
diff --git a/svx/source/svdraw/svdotxat.cxx b/svx/source/svdraw/svdotxat.cxx
index 94b6727..92c07b0 100644
--- a/svx/source/svdraw/svdotxat.cxx
+++ b/svx/source/svdraw/svdotxat.cxx
@@ -327,61 +327,6 @@ void SdrTextObj::ImpSetTextStyleSheetListeners()
}
}
-void SdrTextObj::NbcResizeTextAttributes(const Fraction& xFact, const Fraction& yFact)
-{
- OutlinerParaObject* pOutlinerParaObject = GetOutlinerParaObject();
- if (pOutlinerParaObject!=NULL && xFact.IsValid() && yFact.IsValid())
- {
- Fraction n100(100,1);
- long nX=long(xFact*n100);
- long nY=long(yFact*n100);
- if (nX<0) nX=-nX;
- if (nX<1) nX=1;
- if (nX>0xFFFF) nX=0xFFFF;
- if (nY<0) nY=-nY;
- if (nY<1) nY=1;
- if (nY>0xFFFF) nY=0xFFFF;
- if (nX!=100 || nY!=100)
- {
- // Rahmenattribute
- const SfxItemSet& rSet = GetObjectItemSet();
- const SvxCharScaleWidthItem& rOldWdt=(SvxCharScaleWidthItem&)rSet.Get(EE_CHAR_FONTWIDTH);
- const SvxFontHeightItem& rOldHgt=(SvxFontHeightItem&)rSet.Get(EE_CHAR_FONTHEIGHT);
-
- // erstmal die alten Werte holen
- long nRelWdt=rOldWdt.GetValue();
- long nAbsHgt=rOldHgt.GetHeight();
- long nRelHgt=rOldHgt.GetProp();
-
- // Relative Breite aendern
- nRelWdt*=nX;
- nRelWdt/=nY;
- if (nRelWdt<0) nRelWdt=-nRelWdt; // nicht negativ
- if (nRelWdt<=0) nRelWdt=1; // und mind. 1%
- if (nRelWdt>0xFFFF) nRelWdt=0xFFFF;
-
- // Absolute Hoehe aendern
- nAbsHgt*=nY;
- nAbsHgt/=100;
- if (nAbsHgt<0) nAbsHgt=-nAbsHgt; // nicht negativ
- if (nAbsHgt<=0) nAbsHgt=1; // und mind. 1
- if (nAbsHgt>0xFFFF) nAbsHgt=0xFFFF;
-
- // und nun attributieren
- SetObjectItem(SvxCharScaleWidthItem( (sal_uInt16) nRelWdt, EE_CHAR_FONTWIDTH));
- SetObjectItem(SvxFontHeightItem(nAbsHgt,(sal_uInt16)nRelHgt, EE_CHAR_FONTHEIGHT));
- // Zeichen- und Absatzattribute innerhalb des OutlinerParaObjects
- Outliner& rOutliner=ImpGetDrawOutliner();
- rOutliner.SetPaperSize(Size(LONG_MAX,LONG_MAX));
- rOutliner.SetText(*pOutlinerParaObject);
- rOutliner.DoStretchChars((sal_uInt16)nX,(sal_uInt16)nY);
- OutlinerParaObject* pNewPara=rOutliner.CreateParaObject();
- NbcSetOutlinerParaObject(pNewPara);
- rOutliner.Clear();
- }
- }
-}
-
/** iterates over the paragraphs of a given SdrObject and removes all
hard set character attributes with the which ids contained in the
given vector
diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx
index 63fe525..de10860 100644
--- a/svx/source/svdraw/svdpage.cxx
+++ b/svx/source/svdraw/svdpage.cxx
@@ -1891,50 +1891,9 @@ void SdrPage::ActionChanged() const
}
}
-// Dummy implementations for declarations in svdpage.hxx
-Bitmap SdrPage::GetBitmap(const SetOfByte& /*rVisibleLayers*/, bool /*bTrimBorders*/) const
-{
- DBG_ASSERT(0, "SdrPage::GetBitmap(): not yet implemented.");
- return Bitmap();
-}
-GDIMetaFile SdrPage::GetMetaFile(const SetOfByte& /*rVisibleLayers*/, bool /*bTrimBorders*/)
-{
- DBG_ASSERT(0, "SdrPage::GetMetaFile(): not yet implemented.");
- return GDIMetaFile();
-}
-
-bool SdrPage::isHandoutMasterPage() const
-{
- return mbMaster && GetModel() && GetModel()->GetMasterPageCount()
- && GetModel()->GetMasterPage(0) == this;
-}
-
//////////////////////////////////////////////////////////////////////////////
// sdr::Comment interface
-const sdr::Comment& SdrPage::GetCommentByIndex(sal_uInt32 nIndex)
-{
- DBG_ASSERT(nIndex < maComments.size(), "SdrPage::GetCommentByIndex: Access out of range (!)");
- return maComments[nIndex];
-}
-
-void SdrPage::AddComment(const sdr::Comment& rNew)
-{
- maComments.push_back(rNew);
- ::std::sort(maComments.begin(), maComments.end());
-}
-
-void SdrPage::ReplaceCommentByIndex(sal_uInt32 nIndex, const sdr::Comment& rNew)
-{
- DBG_ASSERT(nIndex < maComments.size(), "SdrPage::GetCommentByIndex: Access out of range (!)");
-
- if(maComments[nIndex] != rNew)
- {
- maComments[nIndex] = rNew;
- ::std::sort(maComments.begin(), maComments.end());
- }
-}
-
const SdrPageProperties* SdrPage::getCorrectSdrPageProperties() const
{
if(mpMasterPageDescriptor)
diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx
index 1392ab9..f689bc0 100644
--- a/svx/source/svdraw/svdpagv.cxx
+++ b/svx/source/svdraw/svdpagv.cxx
@@ -143,20 +143,6 @@ void SdrPageView::AppendPageWindow(SdrPageWindow& rNew)
maPageWindows.push_back(&rNew);
}
-SdrPageWindow* SdrPageView::RemovePageWindow(sal_uInt32 nPos)
-{
- if(nPos < maPageWindows.size())
- {
- SdrPageWindowVector::iterator aAccess = maPageWindows.begin() + nPos;
- // remember return value
- SdrPageWindow* pErasedSdrPageWindow = *aAccess;
- maPageWindows.erase(aAccess);
- return pErasedSdrPageWindow;
- }
-
- return 0L;
-}
-
SdrPageWindow* SdrPageView::RemovePageWindow(SdrPageWindow& rOld)
{
const SdrPageWindowVector::iterator aFindResult = ::std::find(maPageWindows.begin(), maPageWindows.end(), &rOld);
@@ -311,14 +297,6 @@ void SdrPageView::InvalidateAllWin()
}
}
-void SdrPageView::InvalidateAllWin(const Rectangle& rRect, sal_Bool bPlus1Pix)
-{
- if(IsVisible())
- {
- GetView().InvalidateAllWin(rRect, bPlus1Pix);
- }
-}
-
void SdrPageView::PaintOutlinerView(OutputDevice* pOut, const Rectangle& rRect) const
{
if (GetView().pTextEditOutliner==NULL) return;
@@ -1015,54 +993,6 @@ sal_uInt16 SdrPageView::GetEnteredLevel() const
return nAnz;
}
-XubString SdrPageView::GetActualGroupName() const
-{
- if(GetAktGroup())
- {
- XubString aStr(GetAktGroup()->GetName());
-
- if(!aStr.Len())
- aStr += sal_Unicode('?');
-
- return aStr;
- }
- else
- return String();
-}
-
-XubString SdrPageView::GetActualPathName(sal_Unicode cSep) const
-{
- XubString aStr;
- sal_Bool bNamFnd(sal_False);
- SdrObject* pGrp = GetAktGroup();
-
- while(pGrp)
- {
- XubString aStr1(pGrp->GetName());
-
- if(!aStr1.Len())
- aStr1 += sal_Unicode('?');
- else
- bNamFnd = sal_True;
-
- aStr += aStr1;
- pGrp = pGrp->GetUpGroup();
-
- if(pGrp)
- aStr += cSep;
- }
-
- if(!bNamFnd && GetAktGroup())
- {
- aStr = String();
- aStr += sal_Unicode('(');
- aStr += String::CreateFromInt32( GetEnteredLevel() );
- aStr += sal_Unicode(')');
- }
-
- return aStr;
-}
-
void SdrPageView::CheckAktGroup()
{
SdrObject* pGrp=GetAktGroup();
diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx
index 92ffdcc..dd6f700 100644
--- a/svx/source/svdraw/svdpntv.cxx
+++ b/svx/source/svdraw/svdpntv.cxx
@@ -504,19 +504,6 @@ void SdrPaintView::SetActualWin(const OutputDevice* pWin)
////////////////////////////////////////////////////////////////////////////////////////////////////
-void SdrPaintView::BegEncirclement(const Point& rPnt)
-{
- BrkAction();
-
- DBG_ASSERT(0L == mpEncirclementOverlay, "SdrSnapView::BegSetPageOrg: There exists a ImplPageOriginOverlay (!)");
- basegfx::B2DPoint aStartPos(rPnt.X(), rPnt.Y());
- mpEncirclementOverlay = new ImplEncirclementOverlay(*this, aStartPos);
-
- aDragStat.Reset(rPnt);
- aDragStat.SetMinMove(ImpGetMinMovLogic(-2,0L));
- aDragStat.NextPoint();
-}
-
void SdrPaintView::MovEncirclement(const Point& rPnt)
{
if(IsEncirclement() && aDragStat.CheckMinMoved(rPnt))
@@ -662,16 +649,6 @@ bool SdrPaintView::IsLayerVisible(const XubString& rName) const
return false;
}
-void SdrPaintView::SetAllLayersVisible(sal_Bool bShow)
-{
- if(mpPageView)
- {
- mpPageView->SetAllLayersVisible(bShow);
- }
-
- InvalidateAllWin();
-}
-
void SdrPaintView::SetLayerLocked(const XubString& rName, sal_Bool bLock)
{
if(mpPageView)
@@ -690,14 +667,6 @@ bool SdrPaintView::IsLayerLocked(const XubString& rName) const
return false;
}
-void SdrPaintView::SetAllLayersLocked(sal_Bool bLock)
-{
- if(mpPageView)
- {
- mpPageView->SetAllLayersLocked(bLock);
- }
-}
-
void SdrPaintView::SetLayerPrintable(const XubString& rName, sal_Bool bPrn)
{
if(mpPageView)
@@ -716,14 +685,6 @@ bool SdrPaintView::IsLayerPrintable(const XubString& rName) const
return false;
}
-void SdrPaintView::SetAllLayersPrintable(sal_Bool bPrn)
-{
- if(mpPageView)
- {
- mpPageView->SetAllLayersPrintable(bPrn);
- }
-}
-
void SdrPaintView::PrePaint()
{
if(mpPageView)
@@ -732,14 +693,6 @@ void SdrPaintView::PrePaint()
}
}
-void SdrPaintView::PostPaint()
-{
- if(mpPageView)
- {
- mpPageView->PostPaint();
- }
-}
-
////////////////////////////////////////////////////////////////////////////////////////////////////
// #define SVX_REPAINT_TIMER_TEST
diff --git a/svx/source/svdraw/svdpoev.cxx b/svx/source/svdraw/svdpoev.cxx
index a5cdd40..a988291 100644
--- a/svx/source/svdraw/svdpoev.cxx
+++ b/svx/source/svdraw/svdpoev.cxx
@@ -549,11 +549,6 @@ SdrObjClosedKind SdrPolyEditView::GetMarkedObjectsClosedState() const
}
}
-void SdrPolyEditView::ShutMarkedObjects()
-{
- CloseMarkedObjects();
-}
-
void SdrPolyEditView::CloseMarkedObjects(sal_Bool bToggle, sal_Bool bOpen) // , long nOpenDistance)
{
if (AreObjectsMarked())
diff --git a/svx/source/svdraw/svdsnpv.cxx b/svx/source/svdraw/svdsnpv.cxx
index 40f7c6a..24efd7c 100644
--- a/svx/source/svdraw/svdsnpv.cxx
+++ b/svx/source/svdraw/svdsnpv.cxx
@@ -471,26 +471,6 @@ void SdrSnapView::CheckSnap(const Point& rPt, const SdrPageView* pPV, long& nBes
}
}
-sal_uInt16 SdrSnapView::SnapRect(const Rectangle& rRect, const SdrPageView* pPV, long& rDX, long& rDY) const
-{
- long nBestXSnap=0;
- long nBestYSnap=0;
- bool bXSnapped=sal_False;
- bool bYSnapped=sal_False;
- CheckSnap(rRect.TopLeft() ,pPV,nBestXSnap,nBestYSnap,bXSnapped,bYSnapped);
- if (!bMoveSnapOnlyTopLeft) {
- CheckSnap(rRect.TopRight() ,pPV,nBestXSnap,nBestYSnap,bXSnapped,bYSnapped);
- CheckSnap(rRect.BottomLeft() ,pPV,nBestXSnap,nBestYSnap,bXSnapped,bYSnapped);
- CheckSnap(rRect.BottomRight(),pPV,nBestXSnap,nBestYSnap,bXSnapped,bYSnapped);
- }
- rDX=nBestXSnap;
- rDY=nBestYSnap;
- sal_uInt16 nRet=0;
- if (bXSnapped) nRet+=SDRSNAP_XSNAPPED;
- if (bYSnapped) nRet+=SDRSNAP_YSNAPPED;
- return nRet;
-}
-
////////////////////////////////////////////////////////////////////////////////////////////////////
sal_Bool SdrSnapView::BegSetPageOrg(const Point& rPnt)
diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx
index b746813..154713d 100644
--- a/svx/source/svdraw/svdundo.cxx
+++ b/svx/source/svdraw/svdundo.cxx
@@ -109,13 +109,6 @@ SdrUndoGroup::SdrUndoGroup(SdrModel& rNewMod)
eFunction(SDRREPFUNC_OBJ_NONE)
{}
-SdrUndoGroup::SdrUndoGroup(SdrModel& rNewMod,const String& rStr)
-: SdrUndoAction(rNewMod),
- aBuf(1024,32,32),
- aComment(rStr),
- eFunction(SDRREPFUNC_OBJ_NONE)
-{}
-
SdrUndoGroup::~SdrUndoGroup()
{
Clear();
@@ -135,11 +128,6 @@ void SdrUndoGroup::AddAction(SdrUndoAction* pAct)
aBuf.Insert(pAct,CONTAINER_APPEND);
}
-void SdrUndoGroup::push_front( SdrUndoAction* pAct )
-{
- aBuf.Insert(pAct, (sal_uIntPtr)0 );
-}
-
void SdrUndoGroup::Undo()
{
for (sal_uIntPtr nu=GetActionCount(); nu>0;) {
@@ -354,14 +342,6 @@ SdrUndoAttrObj::~SdrUndoAttrObj()
delete pTextRedo;
}
-void SdrUndoAttrObj::SetRepeatAttr(const SfxItemSet& rSet)
-{
- if(pRepeatSet)
- delete pRepeatSet;
-
- pRepeatSet = new SfxItemSet(rSet);
-}
-
void SdrUndoAttrObj::Undo()
{
E3DModifySceneSnapRectUpdater aUpdater(pObj);
diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index 84cfe9d..a915777 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -1382,34 +1382,6 @@ void SdrView::UnmarkAll()
else UnmarkAllObj();
}
-sal_Bool SdrView::MarkNext(sal_Bool bPrev)
-{
- if (IsTextEdit()) {
- return sal_False;
- }
- if (IsGluePointEditMode() && HasMarkedGluePoints()) {
- return MarkNextGluePoint(bPrev);
- }
- if (HasMarkedPoints()) {
- return MarkNextPoint(bPrev);
- }
- return MarkNextObj(bPrev);
-}
-
-sal_Bool SdrView::MarkNext(const Point& rPnt, sal_Bool bPrev)
-{
- if (IsTextEdit()) {
- return sal_False;
- }
- if (IsGluePointEditMode() && HasMarkedGluePoints()) {
- //return MarkNextGluePoint(rPnt,bPrev); fehlende Implementation !!!
- }
- if (HasMarkedPoints()) {
- //return MarkNextPoint(rPnt,bPrev); fehlende Implementation !!!
- }
- return MarkNextObj(rPnt,-2,bPrev);
-}
-
const Rectangle& SdrView::GetMarkedRect() const
{
if (IsGluePointEditMode() && HasMarkedGluePoints()) {
diff --git a/unusedcode.easy b/unusedcode.easy
index 176e334..6e3a2fb 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -479,73 +479,6 @@ ScrollableWindow::ScrollableWindow(Window*, ResId const&, unsigned short)
ScrollableWindow::SetLineSize(unsigned long, unsigned long)
ScrollableWindow::SetVisibleSize(Size const&)
SdFilterDetect::impl_createFactory(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&)
-SdrCustomShapeDataItem::SdrCustomShapeDataItem(String const&)
-SdrCustomShapeEngineItem::SdrCustomShapeEngineItem(String const&)
-SdrCustomShapeGeometryItem::ClearPropertyValue(rtl::OUString const&, rtl::OUString const&)
-SdrCustomShapeReplacementURLItem::SdrCustomShapeReplacementURLItem(String const&)
-SdrEditView::MoveLayer(String const&, unsigned short)
-SdrGlobalData::GetCharClass()
-SdrGlobalData::~SdrGlobalData()
-SdrGluePoint::Draw(OutputDevice&, SdrObject const*) const
-SdrGluePoint::Mirror(Point const&, Point const&, SdrObject const*)
-SdrGrafObj::GetGDIMetaFile() const
-SdrGrafObj::IsGrafAnimationAllowed() const
-SdrGrafObj::SetFileName(String const&)
-SdrGrafObj::SetFilterName(String const&)
-SdrGrafObj::StopAnimation(OutputDevice*, long)
-SdrHdl::isMouseOver() const
-SdrHint::GetObjList() const
-SdrHint::GetRect() const
-SdrHint::SdrHint()
-SdrHint::SdrHint(SdrObject const&, Rectangle const&)
-SdrHint::SetObjList(SdrObjList const*)
-SdrHint::SetRect(Rectangle const&)
-SdrLayerAdmin::MoveLayer(SdrLayer*, unsigned short)
-SdrMark::GetObjList() const
-SdrMark::GetPage() const
-SdrMediaObj::getGraphic() const
-SdrMediaObj::hasPreferredSize() const
-SdrModel::BegUndo(SdrUndoGroup*)
-SdrModel::CheckConsistence() const
-SdrModel::GetNumberFormatter() const
-SdrModel::HasTransparentObjects(bool) const
-SdrModel::IsAllowShapePropertyChangeListener() const
-SdrObjFactory::MakeNewObjUserData(unsigned int, unsigned short, SdrObject*)
-SdrObject::ClearObjectItem(unsigned short)
-SdrOle2Obj::SdrOle2Obj(svt::EmbeddedObjectRef const&, String const&, bool)
-SdrOle2Obj::SdrOle2Obj(svt::EmbeddedObjectRef const&, bool)
-SdrPage::AddComment(sdr::Comment const&)
-SdrPage::GetBitmap(SetOfByte const&, bool) const
-SdrPage::GetCommentByIndex(unsigned int)
-SdrPage::GetMetaFile(SetOfByte const&, bool)
-SdrPage::ReplaceCommentByIndex(unsigned int, sdr::Comment const&)
-SdrPage::isHandoutMasterPage() const
-SdrPageView::GetActualGroupName() const
-SdrPageView::GetActualPathName(unsigned short) const
-SdrPageView::InvalidateAllWin(Rectangle const&, unsigned char)
-SdrPageView::RemovePageWindow(unsigned int)
-SdrPaintView::BegEncirclement(Point const&)
-SdrPaintView::PostPaint()
-SdrPaintView::SetAllLayersLocked(unsigned char)
-SdrPaintView::SetAllLayersPrintable(unsigned char)
-SdrPaintView::SetAllLayersVisible(unsigned char)
-SdrPaintWindow::HideOverlay(Region const&)
-SdrPolyEditView::ShutMarkedObjects()
-SdrSnapView::SnapRect(Rectangle const&, SdrPageView const*, long&, long&) const
-SdrTextObj::GetTextHidden() const
-SdrTextObj::IsTextAnimationAllowed() const
-SdrTextObj::NbcResizeTextAttributes(Fraction const&, Fraction const&)
-SdrTextObj::NbcSetAutoGrowHeight(bool)
-SdrTextObj::NbcSetAutoGrowWidth(bool)
-SdrTextObj::NbcSetFitToSize(SdrFitToSizeType)
-SdrTextObj::NbcSetMaxTextFrameHeight(long)
-SdrTextObj::NbcSetMaxTextFrameWidth(long)
-SdrTextObj::NbcSetTextHidden(unsigned char)
-SdrUndoAttrObj::SetRepeatAttr(SfxItemSet const&)
-SdrUndoGroup::SdrUndoGroup(SdrModel&, String const&)
-SdrUndoGroup::push_front(SdrUndoAction*)
-SdrView::MarkNext(Point const&, unsigned char)
-SdrView::MarkNext(unsigned char)
SectReprArr::Insert(SectRepr* const&, unsigned short&)
SectReprArr::Insert(SectRepr* const*, unsigned short)
SectReprArr::Insert(SectReprArr const*, unsigned short, unsigned short)
More information about the Libreoffice-commits
mailing list