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 | |
| 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')
| -rw-r--r-- | sw/inc/fesh.hxx | 3 | ||||
| -rw-r--r-- | sw/inc/rcid.hrc | 2 | ||||
| -rw-r--r-- | sw/inc/section.hxx | 23 |
3 files changed, 26 insertions, 2 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. diff --git a/sw/inc/rcid.hrc b/sw/inc/rcid.hrc index 82be306b0cb7..7bf40c39cb17 100644 --- a/sw/inc/rcid.hrc +++ b/sw/inc/rcid.hrc @@ -103,7 +103,7 @@ // Page frame #define RC_PAGEFRM_BEGIN RC_PAGEFRM -#define RC_PAGEFRM_EN (RC_PAGEFRM + 99) +#define RC_PAGEFRM_END (RC_PAGEFRM + 99) // SW/Web #define RC_WEB_BEGIN RC_WEB diff --git a/sw/inc/section.hxx b/sw/inc/section.hxx index 80cabb722e01..9a6452a424fd 100644 --- a/sw/inc/section.hxx +++ b/sw/inc/section.hxx @@ -36,6 +36,7 @@ #include <tools/rtti.hxx> #include <tools/ref.hxx> #include <svl/svarray.hxx> +#include <svl/smplhint.hxx> #include <sfx2/lnkbase.hxx> #include <sfx2/Metadatable.hxx> @@ -267,6 +268,28 @@ public: }; +/** Hint used to notify the deletion of SwSectionFrm objects with or without + keeping the content of the frame #i117863#. + */ +class SwSectionFrmMoveAndDeleteHint : public SfxSimpleHint +{ + public: + SwSectionFrmMoveAndDeleteHint( const sal_Bool bSaveCntnt ) + : SfxSimpleHint( SFX_HINT_DYING ) + , mbSaveCntnt( bSaveCntnt ) + {} + + ~SwSectionFrmMoveAndDeleteHint() + {} + + sal_Bool IsSaveCntnt() const + { + return mbSaveCntnt; + } + + private: + const sal_Bool mbSaveCntnt; +}; enum SectionSort { SORTSECT_NOT, SORTSECT_NAME, SORTSECT_POS }; |