diff options
author | Noel Grandin <noel@peralex.com> | 2014-08-12 11:33:51 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-08-12 12:16:37 +0200 |
commit | cc4d76145f7b92992b885cdc58b4534e8c024ac5 (patch) | |
tree | 6c914110e164b7db86ec557d2a3006a6f4f9d19c /writerfilter | |
parent | 73bb0fe7953f501747fb6b7c315beda4f253a216 (diff) |
-Werror,-Wunused-private-field
Change-Id: I4632e78feb9ad7cae91427bd99bb48e980c06f03
Diffstat (limited to 'writerfilter')
8 files changed, 10 insertions, 16 deletions
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx index 75eeb619adc2..2afeba82e824 100644 --- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx +++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx @@ -41,7 +41,7 @@ using namespace ::com::sun::star; using namespace ::std; -DomainMapperTableManager::DomainMapperTableManager(bool bOOXML, DomainMapper& rDMapper) : +DomainMapperTableManager::DomainMapperTableManager(bool bOOXML) : m_nRow(0), m_nCell(), m_nGridSpan(1), @@ -51,7 +51,6 @@ DomainMapperTableManager::DomainMapperTableManager(bool bOOXML, DomainMapper& rD m_nHeaderRepeat(0), m_nTableWidth(0), m_bOOXML( bOOXML ), - m_rDMapper( rDMapper ), m_aTmpPosition(), m_aTmpTableProperties(), m_bPushCurrentWidth(false), @@ -60,7 +59,7 @@ DomainMapperTableManager::DomainMapperTableManager(bool bOOXML, DomainMapper& rD m_bTableSizeTypeInserted(false), m_nLayoutType(0), m_nMaxFixedWidth(0), - m_pTablePropsHandler( new TablePropertiesHandler( bOOXML, rDMapper ) ) + m_pTablePropsHandler( new TablePropertiesHandler( bOOXML ) ) { m_pTablePropsHandler->SetTableManager( this ); diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.hxx b/writerfilter/source/dmapper/DomainMapperTableManager.hxx index dfb89445b4a9..e810a89dffb4 100644 --- a/writerfilter/source/dmapper/DomainMapperTableManager.hxx +++ b/writerfilter/source/dmapper/DomainMapperTableManager.hxx @@ -47,7 +47,6 @@ class DomainMapperTableManager : public DomainMapperTableManager_Base_t sal_Int32 m_nHeaderRepeat; //counter of repeated headers - if == -1 then the repeating stops sal_Int32 m_nTableWidth; //might be set directly or has to be calculated from the column positions bool m_bOOXML; - DomainMapper& m_rDMapper; OUString m_sTableStyleName; /// Grab-bag of table look attributes for preserving. comphelper::SequenceAsHashMap m_aTableLook; @@ -79,7 +78,7 @@ class DomainMapperTableManager : public DomainMapperTableManager_Base_t public: - DomainMapperTableManager(bool bOOXML, DomainMapper& rDMapper); + DomainMapperTableManager(bool bOOXML); virtual ~DomainMapperTableManager(); // use this method to avoid adding the properties for the table diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx b/writerfilter/source/dmapper/DomainMapper_Impl.hxx index 8ec93fec6e39..2bb0478f2c2a 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx @@ -676,7 +676,7 @@ public: void appendTableManager( ) { boost::shared_ptr< DomainMapperTableManager > pMngr( - new DomainMapperTableManager( m_eDocumentType == DOCUMENT_OOXML || m_eDocumentType == DOCUMENT_RTF, m_rDMapper )); + new DomainMapperTableManager( m_eDocumentType == DOCUMENT_OOXML || m_eDocumentType == DOCUMENT_RTF )); m_aTableManagers.push( pMngr ); } diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx index 3d717398d01e..50e9b7eeb5e9 100644 --- a/writerfilter/source/dmapper/StyleSheetTable.cxx +++ b/writerfilter/source/dmapper/StyleSheetTable.cxx @@ -382,8 +382,7 @@ StyleSheetTable::StyleSheetTable(DomainMapper& rDMapper, bool const bIsNewDoc) : LoggedProperties(dmapper_logger, "StyleSheetTable") , LoggedTable(dmapper_logger, "StyleSheetTable") -, m_pImpl( new StyleSheetTable_Impl(rDMapper, xTextDocument, bIsNewDoc) ), -m_rDMapper( rDMapper ) +, m_pImpl( new StyleSheetTable_Impl(rDMapper, xTextDocument, bIsNewDoc) ) { } @@ -748,7 +747,7 @@ void StyleSheetTable::lcl_sprm(Sprm & rSprm) if (!m_pImpl->m_pCurrentEntry) break; - TablePropertiesHandlerPtr pTblHandler( new TablePropertiesHandler( true, m_rDMapper ) ); + TablePropertiesHandlerPtr pTblHandler( new TablePropertiesHandler( true ) ); pTblHandler->SetProperties( m_pImpl->m_pCurrentEntry->pProperties ); if ( !pTblHandler->sprm( rSprm ) ) { diff --git a/writerfilter/source/dmapper/StyleSheetTable.hxx b/writerfilter/source/dmapper/StyleSheetTable.hxx index 7bc40a3b6234..43b3b432eb52 100644 --- a/writerfilter/source/dmapper/StyleSheetTable.hxx +++ b/writerfilter/source/dmapper/StyleSheetTable.hxx @@ -86,7 +86,6 @@ class StyleSheetTable : public LoggedTable { StyleSheetTable_Impl *m_pImpl; - DomainMapper & m_rDMapper; public: StyleSheetTable( DomainMapper& rDMapper, diff --git a/writerfilter/source/dmapper/TablePropertiesHandler.cxx b/writerfilter/source/dmapper/TablePropertiesHandler.cxx index e2d30316cce1..8581ac044ac7 100644 --- a/writerfilter/source/dmapper/TablePropertiesHandler.cxx +++ b/writerfilter/source/dmapper/TablePropertiesHandler.cxx @@ -41,11 +41,10 @@ using namespace oox; namespace writerfilter { namespace dmapper { - TablePropertiesHandler::TablePropertiesHandler( bool bOOXML, DomainMapper& rDMapper ) : + TablePropertiesHandler::TablePropertiesHandler( bool bOOXML ) : m_pCurrentInteropGrabBag(0), m_pTableManager( NULL ), - m_bOOXML( bOOXML ), - m_rDMapper( rDMapper ) + m_bOOXML( bOOXML ) { } diff --git a/writerfilter/source/dmapper/TablePropertiesHandler.hxx b/writerfilter/source/dmapper/TablePropertiesHandler.hxx index a4588e06434e..ed41c643bd46 100644 --- a/writerfilter/source/dmapper/TablePropertiesHandler.hxx +++ b/writerfilter/source/dmapper/TablePropertiesHandler.hxx @@ -45,10 +45,9 @@ private: std::vector<css::beans::PropertyValue>* m_pCurrentInteropGrabBag; DomainMapperTableManager_Base_t *m_pTableManager; bool m_bOOXML; - DomainMapper& m_rDMapper; public: - TablePropertiesHandler( bool bOOXML, DomainMapper& rDMapper ); + TablePropertiesHandler( bool bOOXML ); virtual ~TablePropertiesHandler( ); bool sprm(Sprm & sprm); diff --git a/writerfilter/source/dmapper/TblStylePrHandler.cxx b/writerfilter/source/dmapper/TblStylePrHandler.cxx index 0acccd644a36..24fee7d5f5dc 100644 --- a/writerfilter/source/dmapper/TblStylePrHandler.cxx +++ b/writerfilter/source/dmapper/TblStylePrHandler.cxx @@ -33,7 +33,7 @@ namespace dmapper { TblStylePrHandler::TblStylePrHandler( DomainMapper & rDMapper ) : LoggedProperties(dmapper_logger, "TblStylePrHandler"), m_rDMapper( rDMapper ), -m_pTablePropsHandler( new TablePropertiesHandler( true, rDMapper ) ), +m_pTablePropsHandler( new TablePropertiesHandler( true ) ), m_nType( TBL_STYLE_UNKNOWN ), m_pProperties( new PropertyMap ) { |