diff options
| -rw-r--r-- | include/toolkit/awt/vclxdevice.hxx | 1 | ||||
| -rw-r--r-- | include/tools/inetmime.hxx | 22 | ||||
| -rw-r--r-- | include/unotools/atom.hxx | 6 | ||||
| -rw-r--r-- | toolkit/source/awt/vclxdevice.cxx | 3 | ||||
| -rw-r--r-- | tools/source/inet/inetmime.cxx | 3 |
5 files changed, 2 insertions, 33 deletions
diff --git a/include/toolkit/awt/vclxdevice.hxx b/include/toolkit/awt/vclxdevice.hxx index b5f984423bd6..4d54ec521c59 100644 --- a/include/toolkit/awt/vclxdevice.hxx +++ b/include/toolkit/awt/vclxdevice.hxx @@ -52,7 +52,6 @@ private: VclPtr<OutputDevice> mpOutputDevice; public: - void* pDummy; sal_uInt32 nFlags; public: diff --git a/include/tools/inetmime.hxx b/include/tools/inetmime.hxx index 73d9975054a8..819e3b0f34ee 100644 --- a/include/tools/inetmime.hxx +++ b/include/tools/inetmime.hxx @@ -33,23 +33,6 @@ class INetMIMEOutputSink; struct INetContentTypeParameter { - /** The name of the attribute, in US-ASCII encoding and converted to lower - case. If a parameter value is split as described in RFC 2231, there - will only be one item for the complete parameter, with the attribute - name lacking any section suffix. - */ - OString m_sAttribute; - - /** The optional character set specification (see RFC 2231), in US-ASCII - encoding and converted to lower case. - */ - OString m_sCharset; - - /** The optional language specification (see RFC 2231), in US-ASCII - encoding and converted to lower case. - */ - OString m_sLanguage; - /** The attribute value. If the value is a quoted-string, it is 'unpacked.' If a character set is specified, and the value can be converted to Unicode, this is done. Also, if no character set is @@ -69,11 +52,6 @@ struct INetContentTypeParameter */ OUString m_sValue; - /** This is true if the value is successfully converted to Unicode, and - false if the value is a special mixture of ISO-LATIN-1 characters and - characters from Unicode's Private Use Area. - */ - bool m_bConverted; }; // the key is the m_sAttribute again; all keys are lower case: diff --git a/include/unotools/atom.hxx b/include/unotools/atom.hxx index fdc656e5b69a..f8f684cc3cca 100644 --- a/include/unotools/atom.hxx +++ b/include/unotools/atom.hxx @@ -31,12 +31,6 @@ namespace utl { - struct AtomDescription - { - int atom; - OUString description; - }; - class AtomProvider { int m_nAtoms; diff --git a/toolkit/source/awt/vclxdevice.cxx b/toolkit/source/awt/vclxdevice.cxx index 0c3132573347..63ccd601e244 100644 --- a/toolkit/source/awt/vclxdevice.cxx +++ b/toolkit/source/awt/vclxdevice.cxx @@ -43,8 +43,7 @@ // class VCLXDevice VCLXDevice::VCLXDevice() - : pDummy(nullptr) - , nFlags(0) + : nFlags(0) { } diff --git a/tools/source/inet/inetmime.cxx b/tools/source/inet/inetmime.cxx index d4004c79c544..6ed448d1500d 100644 --- a/tools/source/inet/inetmime.cxx +++ b/tools/source/inet/inetmime.cxx @@ -690,8 +690,7 @@ bool parseParameters(ParameterList const & rInput, } auto const ret = pOutput->insert( {p->m_aAttribute, - {p->m_aAttribute, p->m_aCharset, p->m_aLanguage, aValue, - !bBadEncoding}}); + {aValue}}); SAL_INFO_IF(!ret.second, "tools", "INetMIME: dropping duplicate parameter: " << p->m_aAttribute); p = pNext; |