diff options
| author | Armin Le Grand <alg@apache.org> | 2012-06-29 11:39:59 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-05-13 20:38:19 +0100 |
| commit | 72e54b69601dc44932d4a3c9882d24d2380ae3b7 (patch) | |
| tree | db36225f46e419198994713a2a9d25bcf1d50833 /sw/inc/doc.hxx | |
| parent | a85f5b1ee0ccf5e1999f5452ce162e251191dd98 (diff) | |
Resolves: #i120106# implement a SwPosFlyFrms which avoids memory leaks
Use boost::shared_ptr and stl tools to implement a SwPosFlyFrms which can be
used and handed over by value and cleans up it's content to avoid memory leaks.
Found by: Chao Huang
Patch by: Chao Huang, alg
Review by: Chao Huang, alg
(cherry picked from commit c26f80aa1ba65b63e313dce9c6d7e40ab8efede6)
Conflicts:
sw/inc/doc.hxx
sw/inc/flypos.hxx
sw/source/core/doc/doclay.cxx
sw/source/core/layout/flypos.cxx
sw/source/core/unocore/unoobj2.cxx
sw/source/filter/html/htmlfly.cxx
sw/source/filter/ww8/writerhelper.cxx
Change-Id: If610457654b1056d799d4336cd249815f7878a96
Fix build breaker from i120106
Patch by: Chao Huang
Suggested by: alg
(cherry picked from commit 880aadbeba4e31049d5b7f0a34323553fb6249fb)
Conflicts:
sw/source/filter/ww8/writerhelper.cxx
Change-Id: I516fcb6ee69944c54cc9eb76c069eb8b28749050
Diffstat (limited to 'sw/inc/doc.hxx')
| -rw-r--r-- | sw/inc/doc.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index d1956b84b921..f0b97f068010 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -53,6 +53,7 @@ class SwList; #include <swatrset.hxx> #include <toxe.hxx> // enums #include <flyenum.hxx> +#include <flypos.hxx> #include <itabenum.hxx> #include <swdbdata.hxx> #include <chcmprse.hxx> @@ -143,7 +144,6 @@ class SwNodes; class SwNumRule; class SwNumRuleTbl; class SwPageDesc; -class SwPosFlyFrms; class SwPagePreViewPrtData; class SwRedline; class SwRedlineTbl; @@ -1048,7 +1048,7 @@ public: have to be surrounded completely by ::com::sun::star::awt::Selection. ( Start < Pos < End ) !!! (Required for Writers.) */ - void GetAllFlyFmts( SwPosFlyFrms& rPosFlyFmts, const SwPaM* = 0, + SwPosFlyFrms GetAllFlyFmts( const SwPaM* = 0, bool bDrawAlso = false, bool bAsCharAlso = false ) const; |