[Libreoffice-commits] core.git: include/xmloff xmloff/source
Kohei Yoshida
kohei.yoshida at collabora.com
Tue Nov 25 15:54:23 PST 2014
include/xmloff/xmlnumfe.hxx | 3 +--
xmloff/source/style/xmlnumfe.cxx | 24 ++++++++++++++++++++++++
2 files changed, 25 insertions(+), 2 deletions(-)
New commits:
commit 5c3f47e44c2a734bddd0c3fb7f1151d5096ac494
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date: Tue Nov 25 18:45:58 2014 -0500
Remove ptr_vector header include in favor of forward declaration.
Change-Id: I0aed7ec1bd8ac30ef18147b385c8649a413e4e3a
diff --git a/include/xmloff/xmlnumfe.hxx b/include/xmloff/xmlnumfe.hxx
index 3c898d7..c07da9c 100644
--- a/include/xmloff/xmlnumfe.hxx
+++ b/include/xmloff/xmlnumfe.hxx
@@ -26,7 +26,6 @@
#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
#include <com/sun/star/uno/Sequence.h>
#include <rtl/ustrbuf.hxx>
-#include <boost/ptr_container/ptr_vector.hpp>
#define XML_WRITTENNUMBERSTYLES "WrittenNumberStyles"
@@ -41,7 +40,7 @@ class SvNumberformat;
class SvXMLNumUsedList_Impl;
struct SvXMLEmbeddedTextEntry;
-typedef boost::ptr_vector<SvXMLEmbeddedTextEntry> SvXMLEmbeddedTextEntryArr;
+class SvXMLEmbeddedTextEntryArr;
class XMLOFF_DLLPUBLIC SvXMLNumFmtExport
{
diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx
index d0f46fc..f848293 100644
--- a/xmloff/source/style/xmlnumfe.cxx
+++ b/xmloff/source/style/xmlnumfe.cxx
@@ -46,6 +46,7 @@
#include <xmloff/xmlexp.hxx>
#include <set>
+#include <boost/ptr_container/ptr_vector.hpp>
using namespace ::com::sun::star;
using namespace ::xmloff::token;
@@ -63,6 +64,29 @@ struct LessuInt32
typedef std::set< sal_uInt32, LessuInt32 > SvXMLuInt32Set;
+class SvXMLEmbeddedTextEntryArr
+{
+ typedef boost::ptr_vector<SvXMLEmbeddedTextEntry> DataType;
+ DataType maData;
+
+public:
+
+ void push_back( SvXMLEmbeddedTextEntry* p )
+ {
+ maData.push_back(p);
+ }
+
+ const SvXMLEmbeddedTextEntry& operator[] ( size_t i ) const
+ {
+ return maData[i];
+ }
+
+ size_t size() const
+ {
+ return maData.size();
+ }
+};
+
class SvXMLNumUsedList_Impl
{
SvXMLuInt32Set aUsed;
More information about the Libreoffice-commits
mailing list