diff options
| author | Ocke Janssen [oj] <Ocke.Janssen@oracle.com> | 2011-03-15 11:46:34 +0100 |
|---|---|---|
| committer | Ocke Janssen [oj] <Ocke.Janssen@oracle.com> | 2011-03-15 11:46:34 +0100 |
| commit | 37cbbd1d0cd7a5a44e8d887fecd2e7ba56c3977d (patch) | |
| tree | 747ab36834e5bc5ebcfa6102ca4c857c818ce507 /sw/inc | |
| parent | b381f759166cc326f413ae6af0a8e5351d895198 (diff) | |
| parent | f3aebfd6de4b1abff23406de1d64fbf5c3dbadf8 (diff) | |
Automated merge with http://hg-lan.germany.sun.com/ooo/DEV300
Diffstat (limited to 'sw/inc')
| -rw-r--r-- | sw/inc/dcontact.hxx | 2 | ||||
| -rw-r--r-- | sw/inc/doc.hxx | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/sw/inc/dcontact.hxx b/sw/inc/dcontact.hxx index 7d5fec3e37c0..a6f336d2776e 100644 --- a/sw/inc/dcontact.hxx +++ b/sw/inc/dcontact.hxx @@ -342,7 +342,7 @@ class SwDrawVirtObj : public SdrVirtObj // #108784# // All overloaded methods which need to use the offset - virtual void RecalcBoundRect(); + virtual void RecalcBoundRect(bool bForce = false); virtual ::basegfx::B2DPolyPolygon TakeXorPoly() const; virtual ::basegfx::B2DPolyPolygon TakeContour() const; virtual SdrHdl* GetHdl(sal_uInt32 nHdlNum) const; diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index 8ac03ff109bd..a5331ebef810 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -599,6 +599,8 @@ private: sal_Bool mbStartIdleTimer ; // idle timer mode start/stop + bool mbSetDrawDefaults; ; // set draw pool defaults for freshly created documents + static SwAutoCompleteWord *pACmpltWords; // Liste aller Worte fuers AutoComplete //---------------- private Methoden ------------------------------ @@ -2092,6 +2094,13 @@ public: ::sw::UndoManager & GetUndoManager(); ::sw::UndoManager const& GetUndoManager() const; SfxObjectShell* CreateCopy(bool bCallInitNew) const; + + /// must be called only in SwDocShell::InitNew, causes UpdateDrawDefaults to be called when drawing layer is created + void SetDrawDefaults(); + +private: + /// method to set new graphics pool defaults, must only be called by SetDrawDefaults! + void UpdateDrawDefaults(); }; |