Skip to content

C
core
Kaydet (Commit) bc7fba24 authored tarafından Noel Grandin's avatar Noel Grandin
Dosyalara gözat
Seçenekler

clean up svdpage.hxx a little 

Change-Id: I5da9f408a80fd5990336aac847574f74164b6f7b
üst 5ca19369
Hide whitespace changes
Inline Side-by-side
Showing with 27 additions and 30 deletions
include/svx/svdpage.hxx
Dosyayı görüntüle @ bc7fba24
...@@ -83,8 +83,7 @@ class SVX_DLLPUBLIC SdrObjList ...@@ -83,8 +83,7 @@ class SVX_DLLPUBLIC SdrObjList
SdrObjList &operator=(const SdrObjList& rSrcList) SAL_DELETED_FUNCTION; SdrObjList &operator=(const SdrObjList& rSrcList) SAL_DELETED_FUNCTION;
private: private:
typedef ::std::vector<SdrObject*> SdrObjectContainerType; ::std::vector<SdrObject*> maList;
SdrObjectContainerType maList;
protected: protected:
friend class SdrObjListIter; friend class SdrObjListIter;
...@@ -96,8 +95,8 @@ friend class SdrEditView; ...@@ -96,8 +95,8 @@ friend class SdrEditView;
Rectangle aOutRect; Rectangle aOutRect;
Rectangle aSnapRect; Rectangle aSnapRect;
SdrObjListKind eListKind; SdrObjListKind eListKind;
bool bObjOrdNumsDirty; bool bObjOrdNumsDirty;
bool bRectsDirty; bool bRectsDirty;
protected: protected:
void RecalcRects(); void RecalcRects();
...@@ -127,19 +126,17 @@ public: ...@@ -127,19 +126,17 @@ public:
void SetUpList(SdrObjList* pNewUpList) { pUpList=pNewUpList; } void SetUpList(SdrObjList* pNewUpList) { pUpList=pNewUpList; }
SdrObject* GetOwnerObj() const { return pOwnerObj; } SdrObject* GetOwnerObj() const { return pOwnerObj; }
void SetOwnerObj(SdrObject* pNewOwner) { pOwnerObj=pNewOwner; } void SetOwnerObj(SdrObject* pNewOwner) { pOwnerObj=pNewOwner; }
SdrPage* GetPage() const; SdrPage* GetPage() const;
void SetPage(SdrPage* pNewPage); void SetPage(SdrPage* pNewPage);
SdrModel* GetModel() const; SdrModel* GetModel() const;
virtual void SetModel(SdrModel* pNewModel); virtual void SetModel(SdrModel* pNewModel);
/// recalculate order numbers / ZIndex /// recalculate order numbers / ZIndex
void RecalcObjOrdNums(); void RecalcObjOrdNums();
bool IsObjOrdNumsDirty() const { return bObjOrdNumsDirty; } bool IsObjOrdNumsDirty() const { return bObjOrdNumsDirty; }
virtual void NbcInsertObject(SdrObject* pObj, size_t nPos=SAL_MAX_SIZE virtual void NbcInsertObject(SdrObject* pObj, size_t nPos=SAL_MAX_SIZE,
, const SdrInsertReason* pReason=NULL const SdrInsertReason* pReason=NULL);
); virtual void InsertObject(SdrObject* pObj, size_t nPos=SAL_MAX_SIZE,
virtual void InsertObject(SdrObject* pObj, size_t nPos=SAL_MAX_SIZE const SdrInsertReason* pReason=NULL);
, const SdrInsertReason* pReason=NULL
);
/// remove from list without delete /// remove from list without delete
virtual SdrObject* NbcRemoveObject(size_t nObjNum); virtual SdrObject* NbcRemoveObject(size_t nObjNum);
virtual SdrObject* RemoveObject(size_t nObjNum); virtual SdrObject* RemoveObject(size_t nObjNum);
...@@ -248,8 +245,8 @@ public: ...@@ -248,8 +245,8 @@ public:
Otherwise this list is expected to contain all the shapes in the Otherwise this list is expected to contain all the shapes in the
called SdrObjList. called SdrObjList.
*/ */
void SetNavigationOrder (const ::com::sun::star::uno::Reference< void SetNavigationOrder (const css::uno::Reference<
::com::sun::star::container::XIndexAccess>& rxOrder); css::container::XIndexAccess>& rxOrder);
void dumpAsXml(struct _xmlTextWriter* pWriter) const; void dumpAsXml(struct _xmlTextWriter* pWriter) const;
...@@ -333,7 +330,7 @@ public: ...@@ -333,7 +330,7 @@ public:
SdrPageGridFrameList(): aList() {} SdrPageGridFrameList(): aList() {}
~SdrPageGridFrameList() { Clear(); } ~SdrPageGridFrameList() { Clear(); }
void Clear(); void Clear();
sal_uInt16 GetCount() const { return sal_uInt16(aList.size()); } sal_uInt16 GetCount() const { return sal_uInt16(aList.size()); }
void Insert(const SdrPageGridFrame& rGF) { aList.push_back(new SdrPageGridFrame(rGF)); } void Insert(const SdrPageGridFrame& rGF) { aList.push_back(new SdrPageGridFrame(rGF)); }
void Insert(const SdrPageGridFrame& rGF, sal_uInt16 nPos) void Insert(const SdrPageGridFrame& rGF, sal_uInt16 nPos)
{ {
...@@ -453,7 +450,7 @@ protected: ...@@ -453,7 +450,7 @@ protected:
SdrLayerAdmin* pLayerAdmin; SdrLayerAdmin* pLayerAdmin;
private: private:
SdrPageProperties* mpSdrPageProperties; SdrPageProperties* mpSdrPageProperties;
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > mxUnoPage; css::uno::Reference< css::uno::XInterface > mxUnoPage;
public: public:
SdrPageProperties& getSdrPageProperties() { return *mpSdrPageProperties; } SdrPageProperties& getSdrPageProperties() { return *mpSdrPageProperties; }
...@@ -464,8 +461,8 @@ protected: ...@@ -464,8 +461,8 @@ protected:
// new MasterPageDescriptorVector // new MasterPageDescriptorVector
sdr::MasterPageDescriptor* mpMasterPageDescriptor; sdr::MasterPageDescriptor* mpMasterPageDescriptor;
SetOfByte aPrefVisiLayers; SetOfByte aPrefVisiLayers;
sal_uInt16 nPageNum; sal_uInt16 nPageNum;
// bitfield // bitfield
bool mbMaster : 1; // flag if this is a MasterPage bool mbMaster : 1; // flag if this is a MasterPage
...@@ -475,9 +472,9 @@ protected: ...@@ -475,9 +472,9 @@ protected:
// #i93597# // #i93597#
bool mbPageBorderOnlyLeftRight : 1; bool mbPageBorderOnlyLeftRight : 1;
void SetUnoPage(::com::sun::star::uno::Reference< void SetUnoPage(css::uno::Reference<
::com::sun::star::drawing::XDrawPage> const&); css::drawing::XDrawPage> const&);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoPage(); virtual css::uno::Reference< css::uno::XInterface > createUnoPage();
// Copying of pages is split into two parts: construction and copying of page objects, // Copying of pages is split into two parts: construction and copying of page objects,
// because the copying might need access to fully initialized page. Clone() is responsible // because the copying might need access to fully initialized page. Clone() is responsible
...@@ -493,10 +490,10 @@ public: ...@@ -493,10 +490,10 @@ public:
virtual ~SdrPage(); virtual ~SdrPage();
virtual SdrPage* Clone() const SAL_OVERRIDE; virtual SdrPage* Clone() const SAL_OVERRIDE;
virtual SdrPage* Clone(SdrModel* pNewModel) const; virtual SdrPage* Clone(SdrModel* pNewModel) const;
bool IsMasterPage() const { return mbMaster; } bool IsMasterPage() const { return mbMaster; }
void SetInserted(bool bNew = true); void SetInserted(bool bNew = true);
bool IsInserted() const { return mbInserted; } bool IsInserted() const { return mbInserted; }
void SetChanged(); void SetChanged();
// #i68775# React on PageNum changes (from Model in most cases) // #i68775# React on PageNum changes (from Model in most cases)
void SetPageNum(sal_uInt16 nNew); void SetPageNum(sal_uInt16 nNew);
...@@ -551,7 +548,7 @@ public: ...@@ -551,7 +548,7 @@ public:
bool IsObjectsNotPersistent() const { return mbObjectsNotPersistent; } bool IsObjectsNotPersistent() const { return mbObjectsNotPersistent; }
void SetObjectsNotPersistent(bool b) { mbObjectsNotPersistent = b; } void SetObjectsNotPersistent(bool b) { mbObjectsNotPersistent = b; }
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getUnoPage(); css::uno::Reference< css::uno::XInterface > getUnoPage();
virtual SfxStyleSheet* GetTextStyleSheetForObject( SdrObject* pObj ) const; virtual SfxStyleSheet* GetTextStyleSheetForObject( SdrObject* pObj ) const;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment