diff options
Diffstat (limited to 'tools/source')
-rw-r--r-- | tools/source/fsys/urlobj.cxx | 4 | ||||
-rw-r--r-- | tools/source/inet/inetmime.cxx | 8 |
2 files changed, 5 insertions, 7 deletions
diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx index eb0b025ec848..8f869d869329 100644 --- a/tools/source/fsys/urlobj.cxx +++ b/tools/source/fsys/urlobj.cxx @@ -674,12 +674,12 @@ OUString parseScheme( } bool INetURLObject::setAbsURIRef(OUString const & rTheAbsURIRef, - bool bOctets, EncodeMechanism eMechanism, rtl_TextEncoding eCharset, bool bSmart, FSysStyle eStyle) { + const bool bOctets = false; sal_Unicode const * pPos = rTheAbsURIRef.getStr(); sal_Unicode const * pEnd = pPos + rTheAbsURIRef.getLength(); @@ -1541,7 +1541,7 @@ bool INetURLObject::convertRelToAbs(OUString const & rTheRelURIRef, if (bFSys) { INetURLObject aNewURI; - aNewURI.setAbsURIRef(rTheRelURIRef, false/*bOctets*/, eMechanism, + aNewURI.setAbsURIRef(rTheRelURIRef, eMechanism, eCharset, true, eStyle); if (!aNewURI.HasError()) { diff --git a/tools/source/inet/inetmime.cxx b/tools/source/inet/inetmime.cxx index 3491964f8628..d530500a41c2 100644 --- a/tools/source/inet/inetmime.cxx +++ b/tools/source/inet/inetmime.cxx @@ -431,8 +431,7 @@ class INetMIMECharsetList_Impl bool m_bDisabled; Node * m_pNext; - inline Node(const Charset & rTheCharset, bool bTheDisabled, - Node * pTheNext); + inline Node(const Charset & rTheCharset, Node * pTheNext); }; Node * m_pFirst; @@ -443,7 +442,7 @@ public: ~INetMIMECharsetList_Impl(); void prepend(const Charset & rCharset) - { m_pFirst = new Node(rCharset, false, m_pFirst); } + { m_pFirst = new Node(rCharset, m_pFirst); } void includes(sal_uInt32 nChar); @@ -455,10 +454,9 @@ public: }; inline INetMIMECharsetList_Impl::Node::Node(const Charset & rTheCharset, - bool bTheDisabled, Node * pTheNext): m_aCharset(rTheCharset), - m_bDisabled(bTheDisabled), + m_bDisabled(false), m_pNext(pTheNext) {} |