summaryrefslogtreecommitdiffstats
path: root/sw/inc/tblafmt.hxx
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2012-05-15 00:25:35 +0200
committerMichael Stahl <mstahl@redhat.com>2012-05-15 00:28:31 +0200
commit007f16ef7ad40ae932df884ba04f0de71928b852 (patch)
tree5fbac3ca50aa1f47cecd8af40c684ec498eedb41 /sw/inc/tblafmt.hxx
parentsw: avoid over-using over-complicated SfxUndoManager::IsUndoEnabled (diff)
downloadcore-007f16ef7ad40ae932df884ba04f0de71928b852.tar.gz
core-007f16ef7ad40ae932df884ba04f0de71928b852.zip
SwTableAutoFmtTbl: try to fix MSVC tinderbox:
C:/lo/core/sw/inc\tblafmt.hxx(311) : error C2487: 'boost::ptr_container_detail::reversible_ptr_container<Config,CloneAllocator>::insert' : member of dll interface class may not be declared with dll interface Not really understanding what the problem is here, attempting to fix it by not deriving SwTableAutoFmtTbl from the container, and trying to get that to build somehow resulted in this commit.
Diffstat (limited to 'sw/inc/tblafmt.hxx')
-rw-r--r--sw/inc/tblafmt.hxx23
1 files changed, 17 insertions, 6 deletions
diff --git a/sw/inc/tblafmt.hxx b/sw/inc/tblafmt.hxx
index a185c0fc8914..ae8399e90762 100644
--- a/sw/inc/tblafmt.hxx
+++ b/sw/inc/tblafmt.hxx
@@ -25,8 +25,8 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#ifndef _TBLAFMT_HXX
-#define _TBLAFMT_HXX
+#ifndef SW_TBLAFMT_HXX
+#define SW_TBLAFMT_HXX
/*************************************************************************
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -37,6 +37,8 @@
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
**************************************************************************/
+#include <boost/scoped_ptr.hpp>
+
#include <svl/svarray.hxx>
#include "hintids.hxx" // _Always_ before the solar-items!
#include <svx/algitem.hxx>
@@ -305,15 +307,24 @@ public:
sal_Bool Save( SvStream& rStream, sal_uInt16 fileVersion ) const;
};
-typedef boost::ptr_vector<SwTableAutoFmt> _SwTableAutoFmtTbl;
-
-class SW_DLLPUBLIC SwTableAutoFmtTbl : public _SwTableAutoFmtTbl
+class SW_DLLPUBLIC SwTableAutoFmtTbl
{
+ class Impl;
+ ::boost::scoped_ptr<Impl> m_pImpl;
+
SW_DLLPRIVATE sal_Bool Load( SvStream& rStream );
SW_DLLPRIVATE sal_Bool Save( SvStream& rStream ) const;
public:
- SwTableAutoFmtTbl();
+ explicit SwTableAutoFmtTbl();
+ ~SwTableAutoFmtTbl();
+
+ size_t size() const;
+ SwTableAutoFmt const& operator[](size_t i) const;
+ SwTableAutoFmt & operator[](size_t i);
+ void InsertAutoFmt(size_t i, SwTableAutoFmt * pFmt);
+ void EraseAutoFmt(size_t i);
+ void MoveAutoFmt(size_t target, size_t source);
sal_Bool Load();
sal_Bool Save() const;