diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-10-06 11:06:56 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-10-06 11:07:59 +0200 |
| commit | 9d7f03f2ab05863665316bb2bd964c73aecc8723 (patch) | |
| tree | c111b0fcea3293be1fc252393c3995cbf0e861d8 | |
| parent | a2aed0e866c8e4eb308b90967fcd81e70bcdf7fb (diff) | |
-Werror,-Wunused-private-field
Change-Id: Ifb599354720369458a43d8e1e7bca9ceb24d7c7d
| -rw-r--r-- | sw/source/filter/html/svxcss1.cxx | 5 | ||||
| -rw-r--r-- | sw/source/filter/html/svxcss1.hxx | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/sw/source/filter/html/svxcss1.cxx b/sw/source/filter/html/svxcss1.cxx index 74f2f2cebf40..ff369b19c6fd 100644 --- a/sw/source/filter/html/svxcss1.cxx +++ b/sw/source/filter/html/svxcss1.cxx @@ -649,9 +649,8 @@ void SvxCSS1PropertyInfo::SetBoxItem( SfxItemSet& rItemSet, DestroyBorderInfos(); } -SvxCSS1MapEntry::SvxCSS1MapEntry( const OUString& rKey, const SfxItemSet& rItemSet, +SvxCSS1MapEntry::SvxCSS1MapEntry( const SfxItemSet& rItemSet, const SvxCSS1PropertyInfo& rProp ) : - aKey( rKey.toAsciiUpperCase() ), aItemSet( rItemSet ), aPropInfo( rProp ) {} @@ -928,7 +927,7 @@ void SvxCSS1Parser::InsertMapEntry( const OUString& rKey, CSS1Map::iterator itr = rMap.find(rKey); if (itr == rMap.end()) { - rMap.insert(std::make_pair(rKey, o3tl::make_unique<SvxCSS1MapEntry>(rKey, rItemSet, rProp))); + rMap.insert(std::make_pair(rKey, o3tl::make_unique<SvxCSS1MapEntry>(rItemSet, rProp))); } else { diff --git a/sw/source/filter/html/svxcss1.hxx b/sw/source/filter/html/svxcss1.hxx index a9dc429ad078..445363dde790 100644 --- a/sw/source/filter/html/svxcss1.hxx +++ b/sw/source/filter/html/svxcss1.hxx @@ -154,7 +154,6 @@ public: class SvxCSS1MapEntry { - OUString aKey; SfxItemSet aItemSet; SvxCSS1PropertyInfo aPropInfo; @@ -163,7 +162,7 @@ public: aItemSet( rPool, pWhichMap ) {} - SvxCSS1MapEntry( const OUString& rKey, const SfxItemSet& rItemSet, + SvxCSS1MapEntry( const SfxItemSet& rItemSet, const SvxCSS1PropertyInfo& rProp ); const SfxItemSet& GetItemSet() const { return aItemSet; } |