diff options
author | Noel Grandin <noel@peralex.com> | 2015-12-21 10:59:06 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-12-21 12:45:49 +0200 |
commit | 8ee52d72f57f70f791c79372a43ad6e5efd88c19 (patch) | |
tree | e4c846b0f041ac26882a62684f923ae831e5489c /writerfilter/source/dmapper | |
parent | 4c7ce41582b85375df385a05770a0a79fa742bbc (diff) |
loplugin:unusedfields writerfilter,writerperfect
Change-Id: I8863fcdb0751d2f1becea5b2487d4070e4fd4195
Diffstat (limited to 'writerfilter/source/dmapper')
-rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.hxx | 2 | ||||
-rw-r--r-- | writerfilter/source/dmapper/SettingsTable.cxx | 11 | ||||
-rw-r--r-- | writerfilter/source/dmapper/SettingsTable.hxx | 2 | ||||
-rw-r--r-- | writerfilter/source/dmapper/StyleSheetTable.cxx | 1 | ||||
-rw-r--r-- | writerfilter/source/dmapper/TableData.hxx | 5 | ||||
-rw-r--r-- | writerfilter/source/dmapper/TableManager.hxx | 5 |
6 files changed, 6 insertions, 20 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx b/writerfilter/source/dmapper/DomainMapper_Impl.hxx index 14199bb4a78d..7aace410c990 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx @@ -593,7 +593,7 @@ public: SettingsTablePtr GetSettingsTable() { if( !m_pSettingsTable ) - m_pSettingsTable.reset( new SettingsTable( m_xTextFactory ) ); + m_pSettingsTable.reset( new SettingsTable ); return m_pSettingsTable; } diff --git a/writerfilter/source/dmapper/SettingsTable.cxx b/writerfilter/source/dmapper/SettingsTable.cxx index 6aae48da4da1..7dbda3682011 100644 --- a/writerfilter/source/dmapper/SettingsTable.cxx +++ b/writerfilter/source/dmapper/SettingsTable.cxx @@ -41,8 +41,6 @@ namespace dmapper struct SettingsTable_Impl { - const uno::Reference< lang::XMultiServiceFactory > m_xTextFactory; - OUString m_sCharacterSpacing; OUString m_sDecimalSymbol; OUString m_sListSeparatorForFields; //2.15.1.56 listSeparator (List Separator for Field Code Evaluation) @@ -71,9 +69,8 @@ struct SettingsTable_Impl std::vector<beans::PropertyValue> m_aCompatSettings; uno::Sequence<beans::PropertyValue> m_pCurrentCompatSetting; - SettingsTable_Impl( const uno::Reference< lang::XMultiServiceFactory > & xTextFactory ) : - m_xTextFactory( xTextFactory ) - , m_nDefaultTabStop( 720 ) //default is 1/2 in + SettingsTable_Impl() : + m_nDefaultTabStop( 720 ) //default is 1/2 in , m_nHyphenationZone(0) , m_bNoPunctuationKerning(false) , m_doNotIncludeSubdocsInStats(false) @@ -97,10 +94,10 @@ struct SettingsTable_Impl }; -SettingsTable::SettingsTable(const uno::Reference< lang::XMultiServiceFactory > & xTextFactory) +SettingsTable::SettingsTable() : LoggedProperties("SettingsTable") , LoggedTable("SettingsTable") -, m_pImpl( new SettingsTable_Impl(xTextFactory) ) +, m_pImpl( new SettingsTable_Impl ) { } diff --git a/writerfilter/source/dmapper/SettingsTable.hxx b/writerfilter/source/dmapper/SettingsTable.hxx index 5a0d6886b4c0..813f8dddeae0 100644 --- a/writerfilter/source/dmapper/SettingsTable.hxx +++ b/writerfilter/source/dmapper/SettingsTable.hxx @@ -45,7 +45,7 @@ class SettingsTable : public LoggedProperties, public LoggedTable std::unique_ptr<SettingsTable_Impl> m_pImpl; public: - SettingsTable(const css::uno::Reference<css::lang::XMultiServiceFactory>& xTextFactory); + SettingsTable(); virtual ~SettingsTable(); //returns default TabStop in 1/100th mm diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx index a0e5922b7f15..e9b22182d04c 100644 --- a/writerfilter/source/dmapper/StyleSheetTable.cxx +++ b/writerfilter/source/dmapper/StyleSheetTable.cxx @@ -285,7 +285,6 @@ struct StyleSheetTable_Impl std::vector< StyleSheetEntryPtr > m_aStyleSheetEntries; StyleSheetEntryPtr m_pCurrentEntry; PropertyMapPtr m_pDefaultParaProps, m_pDefaultCharProps; - PropertyMapPtr m_pCurrentProps; StringPairMap_t m_aStyleNameMap; /// Style names which should not be used without a " (user)" suffix. std::set<OUString> m_aReservedStyleNames; diff --git a/writerfilter/source/dmapper/TableData.hxx b/writerfilter/source/dmapper/TableData.hxx index b1b5c1827997..ff5f6aa7da11 100644 --- a/writerfilter/source/dmapper/TableData.hxx +++ b/writerfilter/source/dmapper/TableData.hxx @@ -245,11 +245,6 @@ class TableData typedef ::std::vector<RowPointer_t> Rows; /** - the table properties - */ - TablePropertyMapPtr mpTableProps; - - /** the data of the rows of the table */ Rows mRows; diff --git a/writerfilter/source/dmapper/TableManager.hxx b/writerfilter/source/dmapper/TableManager.hxx index 2429f4d32bae..8f907cc35091 100644 --- a/writerfilter/source/dmapper/TableManager.hxx +++ b/writerfilter/source/dmapper/TableManager.hxx @@ -52,11 +52,6 @@ class TableManager class TableManagerState { /** - properties at the current point in document - */ - TablePropertyMapPtr mpProps; - - /** properties of the current cell */ TablePropertyMapPtr mpCellProps; |