summaryrefslogtreecommitdiff
path: root/writerfilter
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-12-21 10:59:06 +0200
committerNoel Grandin <noel@peralex.com>2015-12-21 12:45:49 +0200
commit8ee52d72f57f70f791c79372a43ad6e5efd88c19 (patch)
treee4c846b0f041ac26882a62684f923ae831e5489c /writerfilter
parent4c7ce41582b85375df385a05770a0a79fa742bbc (diff)
loplugin:unusedfields writerfilter,writerperfect
Change-Id: I8863fcdb0751d2f1becea5b2487d4070e4fd4195
Diffstat (limited to 'writerfilter')
-rw-r--r--writerfilter/source/dmapper/DomainMapper_Impl.hxx2
-rw-r--r--writerfilter/source/dmapper/SettingsTable.cxx11
-rw-r--r--writerfilter/source/dmapper/SettingsTable.hxx2
-rw-r--r--writerfilter/source/dmapper/StyleSheetTable.cxx1
-rw-r--r--writerfilter/source/dmapper/TableData.hxx5
-rw-r--r--writerfilter/source/dmapper/TableManager.hxx5
-rw-r--r--writerfilter/source/filter/WriterFilterDetection.cxx11
7 files changed, 10 insertions, 27 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;
diff --git a/writerfilter/source/filter/WriterFilterDetection.cxx b/writerfilter/source/filter/WriterFilterDetection.cxx
index 2624c06bd997..bf77004faa8e 100644
--- a/writerfilter/source/filter/WriterFilterDetection.cxx
+++ b/writerfilter/source/filter/WriterFilterDetection.cxx
@@ -33,10 +33,8 @@ class WriterFilterDetection : public cppu::WeakImplHelper
lang::XServiceInfo
>
{
- uno::Reference<uno::XComponentContext> m_xContext;
-
public:
- explicit WriterFilterDetection(const uno::Reference<uno::XComponentContext>& rxContext);
+ explicit WriterFilterDetection();
virtual ~WriterFilterDetection();
//XExtendedFilterDetection
@@ -50,8 +48,7 @@ public:
uno::Sequence<OUString> SAL_CALL WriterFilterDetection_getSupportedServiceNames() throw (uno::RuntimeException);
-WriterFilterDetection::WriterFilterDetection(const uno::Reference<uno::XComponentContext>& rxContext)
- : m_xContext(rxContext)
+WriterFilterDetection::WriterFilterDetection()
{
}
@@ -135,9 +132,9 @@ uno::Sequence<OUString> WriterFilterDetection::getSupportedServiceNames() throw
return WriterFilterDetection_getSupportedServiceNames();
}
-extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface* SAL_CALL com_sun_star_comp_Writer_WriterFilterDetector_get_implementation(uno::XComponentContext* pComp, uno::Sequence<css::uno::Any> const&)
+extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface* SAL_CALL com_sun_star_comp_Writer_WriterFilterDetector_get_implementation(uno::XComponentContext* /*pComp*/, uno::Sequence<css::uno::Any> const&)
{
- return cppu::acquire(new WriterFilterDetection(pComp));
+ return cppu::acquire(new WriterFilterDetection);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */