diff options
Diffstat (limited to 'writerfilter/source')
3 files changed, 19 insertions, 24 deletions
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx index cab6d926e7f5..ac566f762d5d 100644 --- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx +++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx @@ -51,7 +51,8 @@ using namespace ::std; #define DEF_BORDER_DIST 190 //0,19cm -DomainMapperTableHandler::DomainMapperTableHandler(TextReference_t const& xText, +DomainMapperTableHandler::DomainMapperTableHandler( + css::uno::Reference<css::text::XTextAppendAndConvert> const& xText, DomainMapper_Impl& rDMapper_Impl) : m_xText(xText), m_rDMapper_Impl( rDMapper_Impl ), @@ -247,7 +248,7 @@ struct TableInfo PropertyMapPtr pTableDefaults; PropertyMapPtr pTableBorders; TableStyleSheetEntry* pTableStyle; - TablePropertyValues_t aTableProperties; + css::beans::PropertyValues aTableProperties; TableInfo() : nLeftBorderDistance(DEF_BORDER_DIST) @@ -629,7 +630,7 @@ CellPropertyValuesSeq_t DomainMapperTableHandler::endTableGetCellProperties(Tabl sal_Int32 nRow = 0; //it's a uno::Sequence< beans::PropertyValues >* - RowPropertyValuesSeq_t* pCellProperties = aCellProperties.getArray(); + css::uno::Sequence<css::beans::PropertyValues>* pCellProperties = aCellProperties.getArray(); PropertyMapVector1::const_iterator aRowIter = m_aRowProperties.begin(); while( aRowOfCellsIterator != aRowOfCellsIteratorEnd ) { @@ -907,14 +908,14 @@ bool lcl_emptyRow(TableSequence_t& rTableSeq, sal_Int32 nRow) return true; } -RowPropertyValuesSeq_t DomainMapperTableHandler::endTableGetRowProperties() +css::uno::Sequence<css::beans::PropertyValues> DomainMapperTableHandler::endTableGetRowProperties() { #ifdef DEBUG_WRITERFILTER TagLogger::getInstance().startElement("getRowProperties"); #endif static const int MINLAY = 23; // sw/inc/swtypes.hxx, minimal possible size of frames. - RowPropertyValuesSeq_t aRowProperties( m_aRowProperties.size() ); + css::uno::Sequence<css::beans::PropertyValues> aRowProperties( m_aRowProperties.size() ); PropertyMapVector1::const_iterator aRowIter = m_aRowProperties.begin(); PropertyMapVector1::const_iterator aRowIterEnd = m_aRowProperties.end(); sal_Int32 nRow = 0; @@ -992,7 +993,7 @@ void DomainMapperTableHandler::endTable(unsigned int nestedTableLevel) std::vector<HorizontallyMergedCell> aMerges; CellPropertyValuesSeq_t aCellProperties = endTableGetCellProperties(aTableInfo, aMerges); - RowPropertyValuesSeq_t aRowProperties = endTableGetRowProperties(); + css::uno::Sequence<css::beans::PropertyValues> aRowProperties = endTableGetRowProperties(); #ifdef DEBUG_WRITERFILTER lcl_DumpPropertyValueSeq(aRowProperties); @@ -1167,7 +1168,7 @@ void DomainMapperTableHandler::endRow() #endif } -void DomainMapperTableHandler::startCell(const Handle_t & start, +void DomainMapperTableHandler::startCell(const css::uno::Reference< css::text::XTextRange > & start, TablePropertyMapPtr pProps ) { sal_uInt32 nRow = m_aRowProperties.size(); @@ -1197,7 +1198,7 @@ void DomainMapperTableHandler::startCell(const Handle_t & start, (*m_pCellSeq)[0] = start->getStart(); } -void DomainMapperTableHandler::endCell(const Handle_t & end) +void DomainMapperTableHandler::endCell(const css::uno::Reference< css::text::XTextRange > & end) { #ifdef DEBUG_WRITERFILTER TagLogger::getInstance().startElement("table.cell.end"); diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.hxx b/writerfilter/source/dmapper/DomainMapperTableHandler.hxx index d91b140b770d..bec48a323705 100644 --- a/writerfilter/source/dmapper/DomainMapperTableHandler.hxx +++ b/writerfilter/source/dmapper/DomainMapperTableHandler.hxx @@ -28,19 +28,14 @@ namespace writerfilter { namespace dmapper { -typedef css::uno::Reference< css::text::XTextRange > Handle_t; -typedef css::uno::Sequence<Handle_t> CellSequence_t; +typedef css::uno::Sequence< css::uno::Reference< css::text::XTextRange > > CellSequence_t; typedef std::shared_ptr<CellSequence_t> CellSequencePointer_t; typedef css::uno::Sequence<CellSequence_t> RowSequence_t; typedef std::shared_ptr<RowSequence_t> RowSequencePointer_t; typedef css::uno::Sequence<RowSequence_t> TableSequence_t; typedef std::shared_ptr<TableSequence_t> TableSequencePointer_t; -typedef css::text::XTextAppendAndConvert Text_t; -typedef css::uno::Reference<Text_t> TextReference_t; -typedef css::beans::PropertyValues TablePropertyValues_t; -typedef css::uno::Sequence<TablePropertyValues_t> RowPropertyValuesSeq_t; -typedef css::uno::Sequence<RowPropertyValuesSeq_t> CellPropertyValuesSeq_t; +typedef css::uno::Sequence< css::uno::Sequence<css::beans::PropertyValues> > CellPropertyValuesSeq_t; typedef std::vector<PropertyMapPtr> PropertyMapVector1; typedef std::vector<PropertyMapVector1> PropertyMapVector2; @@ -67,13 +62,13 @@ struct HorizontallyMergedCell class DomainMapperTableHandler : public TableDataHandler { - TextReference_t m_xText; + css::uno::Reference<css::text::XTextAppendAndConvert> m_xText; DomainMapper_Impl& m_rDMapper_Impl; CellSequencePointer_t m_pCellSeq; RowSequencePointer_t m_pRowSeq; TableSequencePointer_t m_pTableSeq; - Handle_t m_xTableRange; + css::uno::Reference< css::text::XTextRange > m_xTableRange; // properties PropertyMapVector2 m_aCellProperties; @@ -88,12 +83,12 @@ class DomainMapperTableHandler : public TableDataHandler TableStyleSheetEntry * endTableGetTableStyle(TableInfo & rInfo, std::vector<css::beans::PropertyValue>& rFrameProperties); CellPropertyValuesSeq_t endTableGetCellProperties(TableInfo & rInfo, std::vector<HorizontallyMergedCell>& rMerges); - RowPropertyValuesSeq_t endTableGetRowProperties(); + css::uno::Sequence<css::beans::PropertyValues> endTableGetRowProperties(); public: typedef std::shared_ptr<DomainMapperTableHandler> Pointer_t; - DomainMapperTableHandler(TextReference_t const& xText, + DomainMapperTableHandler(css::uno::Reference<css::text::XTextAppendAndConvert> const& xText, DomainMapper_Impl& rDMapper_Impl); virtual ~DomainMapperTableHandler(); @@ -102,10 +97,10 @@ public: virtual void endTable(unsigned int nestedTableLevel) SAL_OVERRIDE; virtual void startRow(unsigned int nCells, TablePropertyMapPtr pProps) SAL_OVERRIDE; virtual void endRow() SAL_OVERRIDE; - virtual void startCell(const Handle_t & start, TablePropertyMapPtr pProps) SAL_OVERRIDE; - virtual void endCell(const Handle_t & end) SAL_OVERRIDE; + virtual void startCell(const css::uno::Reference< css::text::XTextRange > & start, TablePropertyMapPtr pProps) SAL_OVERRIDE; + virtual void endCell(const css::uno::Reference< css::text::XTextRange > & end) SAL_OVERRIDE; - Handle_t& getTable() { return m_xTableRange; }; + css::uno::Reference< css::text::XTextRange >& getTable() { return m_xTableRange; }; void setHadFootOrEndnote(bool bHadFootOrEndnote); }; diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx index 0eb22e8e5399..54b9bd33be43 100644 --- a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx +++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx @@ -471,8 +471,7 @@ public: bool isShapeSent( ) { return m_bShapeSent; } protected: - typedef css::uno::Reference<css::xml::sax::XFastShapeContextHandler> ShapeContextRef; - ShapeContextRef mrShapeContext; + css::uno::Reference<css::xml::sax::XFastShapeContextHandler> mrShapeContext; virtual void lcl_startFastElement(Token_t Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; |