72e54b6960
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
57 lines
2.2 KiB
C++
57 lines
2.2 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
/*
|
|
* This file is part of the LibreOffice project.
|
|
*
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
*
|
|
* This file incorporates work covered by the following license notice:
|
|
*
|
|
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
* contributor license agreements. See the NOTICE file distributed
|
|
* with this work for additional information regarding copyright
|
|
* ownership. The ASF licenses this file to you under the Apache
|
|
* License, Version 2.0 (the "License"); you may not use this file
|
|
* except in compliance with the License. You may obtain a copy of
|
|
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
|
*/
|
|
#ifndef _FLYPOS_HXX
|
|
#define _FLYPOS_HXX
|
|
|
|
#include <swdllapi.h>
|
|
#include <boost/shared_ptr.hpp>
|
|
#include <set>
|
|
|
|
class SwFrmFmt;
|
|
class SwNodeIndex;
|
|
|
|
|
|
/// For querying current flys in document.
|
|
class SW_DLLPUBLIC SwPosFlyFrm
|
|
{
|
|
const SwFrmFmt* pFrmFmt; ///< FlyFrmFmt
|
|
SwNodeIndex* pNdIdx; ///< Index for node is sufficient.
|
|
sal_uInt32 nOrdNum;
|
|
public:
|
|
SwPosFlyFrm( const SwNodeIndex& , const SwFrmFmt*, sal_uInt16 nArrPos );
|
|
virtual ~SwPosFlyFrm(); ///< Virtual for Writer (DLL !!)
|
|
|
|
const SwFrmFmt& GetFmt() const { return *pFrmFmt; }
|
|
const SwNodeIndex& GetNdIndex() const { return *pNdIdx; }
|
|
sal_uInt32 GetOrdNum() const { return nOrdNum; }
|
|
};
|
|
|
|
// define needed classes to safely handle an array of allocated SwPosFlyFrm(s).
|
|
// SwPosFlyFrms can be handled by value (as return value), only refcounts to
|
|
// contained SwPosFlyFrm* will be copied. When releasing the last SwPosFlyFrmPtr
|
|
// instance the allocated instance will be freed. The array is sorted by
|
|
// GetNdIndex by using a ::std::set container.
|
|
typedef ::boost::shared_ptr< SwPosFlyFrm > SwPosFlyFrmPtr;
|
|
struct SwPosFlyFrmCmp { bool operator()(const SwPosFlyFrmPtr& rA, const SwPosFlyFrmPtr& rB) const; };
|
|
typedef ::std::set< SwPosFlyFrmPtr, SwPosFlyFrmCmp > SwPosFlyFrms;
|
|
|
|
#endif // _FLYPOS_HXX
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|