diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-05-31 10:45:59 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-05-31 10:45:59 +0200 |
| commit | 31d2ec14ca3790748cf0c724f14f494cce7dff4f (patch) | |
| tree | 074e3fcfbb3609f15c6f3dbb82f98d2bf35839df /sw/inc/fesh.hxx | |
| parent | 6803462fb620eb350923148a2c10c3223266e97f (diff) | |
| parent | c8deddfb2e3aa3d00c2b3321e41de79b526b7c2f (diff) | |
Merge commit 'libreoffice-3.4.0.2'
Conflicts:
sw/inc/viewsh.hxx
sw/source/core/layout/paintfrm.cxx
sw/source/ui/index/cnttab.cxx
sw/source/ui/ribbar/inputwin.cxx
Diffstat (limited to 'sw/inc/fesh.hxx')
| -rw-r--r-- | sw/inc/fesh.hxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx index a59a6cd6866e..5feb33085334 100644 --- a/sw/inc/fesh.hxx +++ b/sw/inc/fesh.hxx @@ -410,7 +410,8 @@ public: // Else the size is provided via GetCurFlyRect(). virtual void CalcAndSetScale( svt::EmbeddedObjectRef& xObj, const SwRect *pFlyPrtRect = 0, - const SwRect *pFlyFrmRect = 0 ) = 0; + const SwRect *pFlyFrmRect = 0, + const bool bNoTxtFrmPrtAreaChanged = false ) = 0; // Connect objects with ActivateWhenVisible at Paint. // Called by notxtfrm::Paint, implemented in wrtsh. |