diff options
author | Matthew Pottage <matthewpottage@invincitech.com> | 2014-10-28 16:50:02 +0000 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2015-02-06 23:06:58 +0100 |
commit | 4f7a1f5b9499d5fbeff413a4914283c2bfe7c2d9 (patch) | |
tree | d626505be68b47a1219d9838f9d5dc35c7271248 /writerfilter/source/dmapper/DomainMapperTableHandler.hxx | |
parent | 90613f4e47e5e113e5fafb573d832bfcace314e5 (diff) |
fdo#75757: Remove inheritance from std::vector
Deprecated comphelper/sequenceasvector.hxx.
Rewritten code using it. Using instead the functions containerToSequence and
sequenceToContainer, found in include/comphelper/sequence.hxx.
One class that inherits from it (in framework/inc/stdtypes.h), and
the code using that has been left.
Signed-off-by: Michael Stahl <mstahl@redhat.com>
Conflicts:
writerfilter/source/dmapper/DomainMapper.cxx
writerfilter/source/dmapper/TblStylePrHandler.hxx
writerfilter/source/dmapper/WrapPolygonHandler.hxx
Change-Id: Ice61c94ffb052e389281aebb7cdf185134221061
Diffstat (limited to 'writerfilter/source/dmapper/DomainMapperTableHandler.hxx')
-rw-r--r-- | writerfilter/source/dmapper/DomainMapperTableHandler.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.hxx b/writerfilter/source/dmapper/DomainMapperTableHandler.hxx index 8ed1b1412d1f..470c7975baa5 100644 --- a/writerfilter/source/dmapper/DomainMapperTableHandler.hxx +++ b/writerfilter/source/dmapper/DomainMapperTableHandler.hxx @@ -21,7 +21,7 @@ #include <TableManager.hxx> #include <PropertyMap.hxx> -#include <comphelper/sequenceasvector.hxx> +#include <vector> #include <com/sun/star/text/XTextAppendAndConvert.hpp> @@ -83,7 +83,7 @@ class DomainMapperTableHandler : public TableDataHandler sal_Int32 m_nCellIndex; sal_Int32 m_nRowIndex; - TableStyleSheetEntry * endTableGetTableStyle(TableInfo & rInfo, comphelper::SequenceAsVector<css::beans::PropertyValue>& rFrameProperties); + TableStyleSheetEntry * endTableGetTableStyle(TableInfo & rInfo, std::vector<css::beans::PropertyValue>& rFrameProperties); CellPropertyValuesSeq_t endTableGetCellProperties(TableInfo & rInfo, std::vector<HorizontallyMergedCell>& rMerges); RowPropertyValuesSeq_t endTableGetRowProperties(); |