loplugin:unuseddefaultparam in tools

Change-Id: I2a974ba76566700c2037fcb38de3ecfea9d2651d

1 files changed, 19 insertions, 27 deletions

diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx
index 57e73e4805cc..597ecfdec43a 100644
--- a/tools/source/fsys/urlobj.cxx
+++ b/tools/source/fsys/urlobj.cxx
@@ -3701,8 +3701,7 @@ bool INetURLObject::ConcatData(INetProtocol eTheScheme,
                                OUString const & rTheHost,
                                sal_uInt32 nThePort,
                                OUString const & rThePath,
-                               EncodeMechanism eMechanism,
-                               rtl_TextEncoding eCharset)
+                               EncodeMechanism eMechanism)
 {
     setInvalid();
     m_eScheme = eTheScheme;
@@ -3721,7 +3720,7 @@ bool INetURLObject::ConcatData(INetProtocol eTheScheme,
             {
                 m_aUser.set(m_aAbsURIRef,
                             encodeText(rTheUser, false, PART_USER_PASSWORD,
-                                       eMechanism, eCharset, false),
+                                       eMechanism, RTL_TEXTENCODING_UTF8, false),
                             m_aAbsURIRef.getLength());
                 bUserInfo = true;
             }
@@ -3738,7 +3737,7 @@ bool INetURLObject::ConcatData(INetProtocol eTheScheme,
                 m_aAbsURIRef.append(':');
                 m_aAuth.set(m_aAbsURIRef,
                             encodeText(rThePassword, false, PART_USER_PASSWORD,
-                                       eMechanism, eCharset, false),
+                                       eMechanism, RTL_TEXTENCODING_UTF8, false),
                             m_aAbsURIRef.getLength());
                 bUserInfo = true;
             }
@@ -3785,7 +3784,7 @@ bool INetURLObject::ConcatData(INetProtocol eTheScheme,
             }
             if (!parseHostOrNetBiosName(
                     aSynHost.getStr(), aSynHost.getStr() + aSynHost.getLength(),
-                    false, eMechanism, eCharset, bNetBiosName, &aSynHost))
+                    false, eMechanism, RTL_TEXTENCODING_UTF8, bNetBiosName, &aSynHost))
             {
                 setInvalid();
                 return false;
@@ -3817,7 +3816,7 @@ bool INetURLObject::ConcatData(INetProtocol eTheScheme,
     OUStringBuffer aSynPath;
     sal_Unicode const * p = rThePath.getStr();
     sal_Unicode const * pEnd = p + rThePath.getLength();
-    if (!parsePath(m_eScheme, &p, pEnd, false, eMechanism, eCharset, false, '/',
+    if (!parsePath(m_eScheme, &p, pEnd, false, eMechanism, RTL_TEXTENCODING_UTF8, false, '/',
                    0x80000000, 0x80000000, 0x80000000, aSynPath)
         || p != pEnd)
     {
@@ -3835,8 +3834,7 @@ OUString INetURLObject::GetAbsURL(OUString const & rTheBaseURIRef,
                                        bool bIgnoreFragment,
                                        EncodeMechanism eEncodeMechanism,
                                        DecodeMechanism eDecodeMechanism,
-                                       rtl_TextEncoding eCharset,
-                                       FSysStyle eStyle)
+                                       rtl_TextEncoding eCharset)
 {
     // Backwards compatibility:
     if (rTheRelURIRef.isEmpty() || rTheRelURIRef[0] == '#')
@@ -3848,7 +3846,7 @@ OUString INetURLObject::GetAbsURL(OUString const & rTheBaseURIRef,
             convertRelToAbs(rTheRelURIRef, false, aTheAbsURIRef,
                             bWasAbsolute, eEncodeMechanism,
                             eCharset, bIgnoreFragment, false,
-                            false, eStyle)
+                            false, FSYS_DETECT)
            || eEncodeMechanism != WAS_ENCODED
            || eDecodeMechanism != DECODE_TO_IURI
            || eCharset != RTL_TEXTENCODING_UTF8 ?
@@ -3856,12 +3854,11 @@ OUString INetURLObject::GetAbsURL(OUString const & rTheBaseURIRef,
                rTheRelURIRef;
 }
 
-OUString INetURLObject::getExternalURL(DecodeMechanism eMechanism,
-                                        rtl_TextEncoding eCharset) const
+OUString INetURLObject::getExternalURL(DecodeMechanism eMechanism) const
 {
     OUString aTheExtURIRef;
     translateToExternal(
-        m_aAbsURIRef.toString(), aTheExtURIRef, eMechanism, eCharset);
+        m_aAbsURIRef.toString(), aTheExtURIRef, eMechanism);
     return aTheExtURIRef;
 }
 
@@ -4016,8 +4013,7 @@ OUString INetURLObject::getName(sal_Int32 nIndex, bool bIgnoreFinalSlash,
 
 bool INetURLObject::setName(OUString const & rTheName, sal_Int32 nIndex,
                             bool bIgnoreFinalSlash,
-                            EncodeMechanism eMechanism,
-                            rtl_TextEncoding eCharset)
+                            EncodeMechanism eMechanism)
 {
     SubString aSegment(getSegment(nIndex, bIgnoreFinalSlash));
     if (!aSegment.isPresent())
@@ -4039,17 +4035,17 @@ bool INetURLObject::setName(OUString const & rTheName, sal_Int32 nIndex,
     OUStringBuffer aNewPath;
     aNewPath.append(pPathBegin, pSegBegin - pPathBegin);
     aNewPath.append(encodeText(rTheName, false, PART_PCHAR,
-        eMechanism, eCharset, true));
+        eMechanism, RTL_TEXTENCODING_UTF8, true));
     aNewPath.append(p, pPathEnd - p);
 
     return setPath(aNewPath.makeStringAndClear(), false, NOT_CANONIC,
         RTL_TEXTENCODING_UTF8);
 }
 
-bool INetURLObject::hasExtension(sal_Int32 nIndex, bool bIgnoreFinalSlash)
+bool INetURLObject::hasExtension(sal_Int32 nIndex)
     const
 {
-    SubString aSegment(getSegment(nIndex, bIgnoreFinalSlash));
+    SubString aSegment(getSegment(nIndex, true/*bIgnoreFinalSlash*/));
     if (!aSegment.isPresent())
         return false;
 
@@ -4866,8 +4862,7 @@ bool INetURLObject::scanIPv6reference(sal_Unicode const *& rBegin,
     return false;
 }
 
-OUString INetURLObject::GetPartBeforeLastName(DecodeMechanism eMechanism,
-                                               rtl_TextEncoding eCharset)
+OUString INetURLObject::GetPartBeforeLastName(DecodeMechanism eMechanism)
     const
 {
     if (!checkHierarchical())
@@ -4877,7 +4872,7 @@ OUString INetURLObject::GetPartBeforeLastName(DecodeMechanism eMechanism,
     aTemp.clearQuery();
     aTemp.removeSegment(LAST_SEGMENT, false);
     aTemp.setFinalSlash();
-    return aTemp.GetMainURL(eMechanism, eCharset);
+    return aTemp.GetMainURL(eMechanism);
 }
 
 OUString INetURLObject::GetLastName(DecodeMechanism eMechanism,
@@ -4954,17 +4949,14 @@ void INetURLObject::SetName(OUString const & rTheName,
 }
 
 void INetURLObject::SetExtension(OUString const & rTheExtension,
-                                 EncodeMechanism eMechanism,
-                                 rtl_TextEncoding eCharset)
+                                 EncodeMechanism eMechanism)
 {
-    setExtension(rTheExtension, LAST_SEGMENT, false, eMechanism, eCharset);
+    setExtension(rTheExtension, LAST_SEGMENT, false, eMechanism);
 }
 
-OUString INetURLObject::CutExtension(DecodeMechanism eMechanism,
-                                      rtl_TextEncoding eCharset)
+OUString INetURLObject::CutExtension(DecodeMechanism eMechanism)
 {
-    OUString aTheExtension(getExtension(LAST_SEGMENT, false, eMechanism,
-                                         eCharset));
+    OUString aTheExtension(getExtension(LAST_SEGMENT, false, eMechanism));
     return removeExtension(LAST_SEGMENT, false)
         ? aTheExtension : OUString();
 }