[Libreoffice-commits] core.git: basic/source extensions/source filter/source include/tools svl/source vcl/source vcl/unx
Stephan Bergmann
sbergman at redhat.com
Sun Jul 28 23:27:24 PDT 2013
basic/source/uno/namecont.cxx | 11 -
extensions/source/plugin/base/context.cxx | 2
filter/source/msfilter/msdffimp.cxx | 2
include/tools/urlobj.hxx | 285 ------------------------------
svl/source/misc/inethist.cxx | 4
vcl/source/gdi/pdfwriter_impl.cxx | 2
vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx | 2
7 files changed, 12 insertions(+), 296 deletions(-)
New commits:
commit a95d1eff071cfafb7e072f6ba82fd04989a76ea9
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Jul 29 08:26:29 2013 +0200
Remove effectively unused INetURLObject OString overloads
Change-Id: Icbbe27b229d5454d27be646e00e8b362a77359b3
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index b6abe41..edf724e 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -1019,13 +1019,11 @@ void SfxLibraryContainer::init_Impl( const OUString& rInitialDocumentURL,
INetURLObject aUserBasicInetObj( maLibraryPath.getToken(1, (sal_Unicode)';') );
OUString aStandardStr("Standard");
- static char const strPrevFolderName_1[] = "__basic_80";
- static char const strPrevFolderName_2[] = "__basic_80_2";
INetURLObject aPrevUserBasicInetObj_1( aUserBasicInetObj );
aPrevUserBasicInetObj_1.removeSegment();
INetURLObject aPrevUserBasicInetObj_2 = aPrevUserBasicInetObj_1;
- aPrevUserBasicInetObj_1.Append( OString( strPrevFolderName_1 ));
- aPrevUserBasicInetObj_2.Append( OString( strPrevFolderName_2 ));
+ aPrevUserBasicInetObj_1.Append( "__basic_80" );
+ aPrevUserBasicInetObj_2.Append( "__basic_80_2" );
// #i93163
bool bCleanUp = false;
@@ -1090,7 +1088,7 @@ void SfxLibraryContainer::init_Impl( const OUString& rInitialDocumentURL,
OUString aFolderUserBasic = aUserBasicInetObj.GetMainURL( INetURLObject::NO_DECODE );
INetURLObject aUserBasicTmpInetObj( aUserBasicInetObj );
aUserBasicTmpInetObj.removeSegment();
- aUserBasicTmpInetObj.Append( OString( "__basic_tmp" ));
+ aUserBasicTmpInetObj.Append( "__basic_tmp" );
OUString aFolderTmp = aUserBasicTmpInetObj.GetMainURL( INetURLObject::NO_DECODE );
mxSFI->move( aFolderUserBasic, aFolderTmp );
@@ -1217,10 +1215,9 @@ void SfxLibraryContainer::init_Impl( const OUString& rInitialDocumentURL,
// #i93163
if( bCleanUp )
{
- static const char strErrorSavFolderName[] = "__basic_80_err";
INetURLObject aPrevUserBasicInetObj_Err( aUserBasicInetObj );
aPrevUserBasicInetObj_Err.removeSegment();
- aPrevUserBasicInetObj_Err.Append( OString( strErrorSavFolderName ));
+ aPrevUserBasicInetObj_Err.Append( "__basic_80_err" );
OUString aPrevFolder_Err = aPrevUserBasicInetObj_Err.GetMainURL( INetURLObject::NO_DECODE );
bool bSaved = false;
diff --git a/extensions/source/plugin/base/context.cxx b/extensions/source/plugin/base/context.cxx
index eae1956..3a24595 100644
--- a/extensions/source/plugin/base/context.cxx
+++ b/extensions/source/plugin/base/context.cxx
@@ -134,7 +134,7 @@ void XPluginContext_Impl::getURL(const Reference< ::com::sun::star::plugin::XPlu
{
INetURLObject aURL;
aURL.SetSmartProtocol( INET_PROT_FILE );
- aURL.SetSmartURL( OUStringToOString( url, m_aEncoding ) );
+ aURL.SetSmartURL( url );
OUString aUrl = aURL.GetMainURL(INetURLObject::DECODE_TO_IURI);
// the mimetype cannot be specified
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 58f455c..c7b24da 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -3884,7 +3884,7 @@ SdrObject* SvxMSDffManager::ImportGraphic( SvStream& rSt, SfxItemSet& rSet, cons
if( bLinkGrf && !bGrfRead ) // sj: #i55484# if the graphic was embedded ( bGrfRead == true ) then
{ // we do not need to set a link. TODO: not to lose the information where the graphic is linked from
INetURLObject aAbsURL;
- if ( !INetURLObject( maBaseURL ).GetNewAbsURL( OUStringToOString(aFileName, RTL_TEXTENCODING_UTF8), &aAbsURL ) )
+ if ( !INetURLObject( maBaseURL ).GetNewAbsURL( aFileName, &aAbsURL ) )
{
OUString aValidURL;
if( ::utl::LocalFileHelper::ConvertPhysicalNameToURL( aFileName, aValidURL ) )
diff --git a/include/tools/urlobj.hxx b/include/tools/urlobj.hxx
index 8905334..6c5f132 100644
--- a/include/tools/urlobj.hxx
+++ b/include/tools/urlobj.hxx
@@ -113,11 +113,8 @@ public:
/** The way input strings that represent (parts of) URIs are interpreted
in set-methods.
- @descr Most set-methods accept either a OString or a OUString
- as input. Using a OString, octets in the range 0x80--0xFF are
- replaced by single escape sequences. Using a OUString , UTF-32
- characters in the range 0x80--0x10FFFF are replaced by sequences of
- escape sequences, representing the UTF-8 coded characters.
+ @descr UTF-32 characters in the range 0x80--0x10FFFF are replaced by
+ sequences of escape sequences, representing the UTF-8 coded characters.
@descr Along with an EncodeMechanism parameter, the set-methods all
take an rtl_TextEncoding parameter, which is ignored unless the
@@ -225,18 +222,10 @@ public:
// Strict Parsing:
- inline INetURLObject(const OString& rTheAbsURIRef,
- EncodeMechanism eMechanism = WAS_ENCODED,
- rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8);
-
inline INetURLObject(OUString const & rTheAbsURIRef,
EncodeMechanism eMechanism = WAS_ENCODED,
rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8);
- inline bool SetURL(const OString& rTheAbsURIRef,
- EncodeMechanism eMechanism = WAS_ENCODED,
- rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8);
-
inline bool SetURL(OUString const & rTheAbsURIRef,
EncodeMechanism eMechanism = WAS_ENCODED,
rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8);
@@ -357,27 +346,12 @@ public:
{ m_eSmartScheme = eTheSmartScheme; }
inline bool
- SetSmartURL(const OString& rTheAbsURIRef,
- EncodeMechanism eMechanism = WAS_ENCODED,
- rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8,
- FSysStyle eStyle = FSYS_DETECT);
-
- inline bool
SetSmartURL(OUString const & rTheAbsURIRef,
EncodeMechanism eMechanism = WAS_ENCODED,
rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8,
FSysStyle eStyle = FSYS_DETECT);
inline INetURLObject
- smartRel2Abs(const OString& rTheRelURIRef,
- bool & rWasAbsolute,
- bool bIgnoreFragment = false,
- EncodeMechanism eMechanism = WAS_ENCODED,
- rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8,
- bool bRelativeNonURIs = false,
- FSysStyle eStyle = FSYS_DETECT) const;
-
- inline INetURLObject
smartRel2Abs(OUString const & rTheRelURIRef,
bool & rWasAbsolute,
bool bIgnoreFragment = false,
@@ -389,14 +363,6 @@ public:
// Relative URLs:
inline bool
- GetNewAbsURL(const OString& rTheRelURIRef,
- INetURLObject * pTheAbsURIRef,
- EncodeMechanism eMechanism = WAS_ENCODED,
- rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8,
- FSysStyle eStyle = FSYS_DETECT, bool bIgnoreFragment = false)
- const;
-
- inline bool
GetNewAbsURL(OUString const & rTheRelURIRef,
INetURLObject * pTheAbsURIRef,
EncodeMechanism eMechanism = WAS_ENCODED,
@@ -421,14 +387,6 @@ public:
FSysStyle eStyle = FSYS_DETECT);
static inline OUString
- GetRelURL(const OString& rTheBaseURIRef,
- const OString& rTheAbsURIRef,
- EncodeMechanism eEncodeMechanism = WAS_ENCODED,
- DecodeMechanism eDecodeMechanism = DECODE_TO_IURI,
- rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8,
- FSysStyle eStyle = FSYS_DETECT);
-
- static inline OUString
GetRelURL(OUString const & rTheBaseURIRef,
OUString const & rTheAbsURIRef,
EncodeMechanism eEncodeMechanism = WAS_ENCODED,
@@ -442,13 +400,6 @@ public:
rtl_TextEncoding eCharset
= RTL_TEXTENCODING_UTF8) const;
- static inline bool translateToExternal(const OString& rTheIntURIRef,
- OUString & rTheExtURIRef,
- DecodeMechanism eDecodeMechanism
- = DECODE_TO_IURI,
- rtl_TextEncoding eCharset
- = RTL_TEXTENCODING_UTF8);
-
static inline bool translateToExternal(OUString const & rTheIntURIRef,
OUString & rTheExtURIRef,
DecodeMechanism eDecodeMechanism
@@ -456,13 +407,6 @@ public:
rtl_TextEncoding eCharset
= RTL_TEXTENCODING_UTF8);
- static inline bool translateToInternal(const OString& rTheExtURIRef,
- OUString & rTheIntURIRef,
- DecodeMechanism eDecodeMechanism
- = DECODE_TO_IURI,
- rtl_TextEncoding eCharset
- = RTL_TEXTENCODING_UTF8);
-
static inline bool translateToInternal(OUString const & rTheExtURIRef,
OUString & rTheIntURIRef,
DecodeMechanism eDecodeMechanism
@@ -492,10 +436,6 @@ public:
*/
static OUString GetSchemeName(INetProtocol eTheScheme);
- static inline INetProtocol CompareProtocolScheme(const OString&
- rTheAbsURIRef)
- { return CompareProtocolScheme(extend(rTheAbsURIRef)); }
-
static INetProtocol CompareProtocolScheme(OUString const &
rTheAbsURIRef);
@@ -516,30 +456,15 @@ public:
= RTL_TEXTENCODING_UTF8) const
{ return decode(m_aAuth, getEscapePrefix(), eMechanism, eCharset); }
- inline bool SetUser(const OString& rTheUser,
- EncodeMechanism eMechanism = WAS_ENCODED,
- rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8)
- { return setUser(extend(rTheUser), true, eMechanism, eCharset); }
-
inline bool SetUser(OUString const & rTheUser,
EncodeMechanism eMechanism = WAS_ENCODED,
rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8)
{ return setUser(rTheUser, false, eMechanism, eCharset); }
- inline bool SetPass(const OString& rThePassword,
- EncodeMechanism eMechanism = WAS_ENCODED,
- rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8);
-
inline bool SetPass(OUString const & rThePassword,
EncodeMechanism eMechanism = WAS_ENCODED,
rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8);
- inline bool SetUserAndPass(const OString& rTheUser,
- const OString& rThePassword,
- EncodeMechanism eMechanism = WAS_ENCODED,
- rtl_TextEncoding eCharset
- = RTL_TEXTENCODING_UTF8);
-
inline bool SetUserAndPass(OUString const & rTheUser,
OUString const & rThePassword,
EncodeMechanism eMechanism = WAS_ENCODED,
@@ -560,11 +485,6 @@ public:
sal_uInt32 GetPort() const;
- inline bool SetHost(const OString& rTheHost,
- EncodeMechanism eMechanism = WAS_ENCODED,
- rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8)
- { return setHost(extend(rTheHost), true, eMechanism, eCharset); }
-
inline bool SetHost(OUString const & rTheHost,
EncodeMechanism eMechanism = WAS_ENCODED,
rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8)
@@ -581,11 +501,6 @@ public:
= RTL_TEXTENCODING_UTF8) const
{ return decode(m_aPath, getEscapePrefix(), eMechanism, eCharset); }
- inline bool SetURLPath(const OString& rThePath,
- EncodeMechanism eMechanism = WAS_ENCODED,
- rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8)
- { return setPath(extend(rThePath), true, eMechanism, eCharset); }
-
inline bool SetURLPath(OUString const & rThePath,
EncodeMechanism eMechanism = WAS_ENCODED,
rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8)
@@ -886,10 +801,6 @@ public:
= RTL_TEXTENCODING_UTF8) const
{ return decode(m_aQuery, getEscapePrefix(), eMechanism, eCharset); }
- inline bool SetParam(const OString& rTheQuery,
- EncodeMechanism eMechanism = WAS_ENCODED,
- rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8);
-
inline bool SetParam(OUString const & rTheQuery,
EncodeMechanism eMechanism = WAS_ENCODED,
rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8);
@@ -903,10 +814,6 @@ public:
= RTL_TEXTENCODING_UTF8) const
{ return decode(m_aFragment, getEscapePrefix(), eMechanism, eCharset); }
- inline bool SetMark(const OString& rTheFragment,
- EncodeMechanism eMechanism = WAS_ENCODED,
- rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8);
-
inline bool SetMark(OUString const & rTheFragment,
EncodeMechanism eMechanism = WAS_ENCODED,
rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8);
@@ -1019,31 +926,6 @@ public:
@param eCharset See the general discussion for set-methods.
- @return The encoded representation of the text ('forbidden'
- characters replaced by escape sequences).
- */
- static inline OUString encode(const OString& rText, Part ePart,
- sal_Char cEscapePrefix,
- EncodeMechanism eMechanism,
- rtl_TextEncoding eCharset
- = RTL_TEXTENCODING_UTF8);
-
- /** Encode some text as part of a URI.
-
- @param rText Some text (for its interpretation, see the general
- discussion for set-methods).
-
- @param ePart The part says which characters are 'forbidden' and must
- be encoded (replaced by escape sequences). Characters outside the US-
- ASCII range are always 'forbidden.'
-
- @param cEscapePrefix The first character in an escape sequence
- (normally '%').
-
- @param eMechanism See the general discussion for set-methods.
-
- @param eCharset See the general discussion for set-methods.
-
@return The text, encoded according to the given mechanism and
charset ('forbidden' characters replaced by escape sequences).
*/
@@ -1137,11 +1019,6 @@ public:
rtl_TextEncoding eCharset
= RTL_TEXTENCODING_UTF8) const;
- inline bool Append(const OString& rTheSegment,
- EncodeMechanism eMechanism = WAS_ENCODED,
- rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8)
- { return appendSegment(extend(rTheSegment), true, eMechanism, eCharset); }
-
inline bool Append(OUString const & rTheSegment,
EncodeMechanism eMechanism = WAS_ENCODED,
rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8)
@@ -1371,11 +1248,6 @@ private:
// Coding:
- static inline OUString extend(const OString& rOctets)
- {
- return OStringToOUString(rOctets, RTL_TEXTENCODING_ISO_8859_1);
- }
-
static inline sal_Char getEscapePrefix(INetProtocol eTheScheme)
{ return eTheScheme == INET_PROT_VIM ? '=' : '%'; }
@@ -1439,15 +1311,6 @@ inline OUString INetURLObject::decode(SubString const & rSubString,
OUString();
}
-inline INetURLObject::INetURLObject(const OString& rTheAbsURIRef,
- EncodeMechanism eMechanism,
- rtl_TextEncoding eCharset):
- m_eScheme(INET_PROT_NOT_VALID), m_eSmartScheme(INET_PROT_HTTP)
-{
- setAbsURIRef(extend(rTheAbsURIRef), true, eMechanism, eCharset, false,
- FSysStyle(0));
-}
-
inline INetURLObject::INetURLObject(OUString const & rTheAbsURIRef,
EncodeMechanism eMechanism,
rtl_TextEncoding eCharset):
@@ -1457,14 +1320,6 @@ inline INetURLObject::INetURLObject(OUString const & rTheAbsURIRef,
FSysStyle(0));
}
-inline bool INetURLObject::SetURL(const OString& rTheAbsURIRef,
- EncodeMechanism eMechanism,
- rtl_TextEncoding eCharset)
-{
- return setAbsURIRef(extend(rTheAbsURIRef), true, eMechanism, eCharset,
- false, FSysStyle(0));
-}
-
inline bool INetURLObject::SetURL(OUString const & rTheAbsURIRef,
EncodeMechanism eMechanism,
rtl_TextEncoding eCharset)
@@ -1483,15 +1338,6 @@ inline INetURLObject::INetURLObject(OUString const & rTheAbsURIRef,
setAbsURIRef(rTheAbsURIRef, false, eMechanism, eCharset, true, eStyle);
}
-inline bool INetURLObject::SetSmartURL(const OString& rTheAbsURIRef,
- EncodeMechanism eMechanism,
- rtl_TextEncoding eCharset,
- FSysStyle eStyle)
-{
- return setAbsURIRef(extend(rTheAbsURIRef), true, eMechanism, eCharset,
- true, eStyle);
-}
-
inline bool INetURLObject::SetSmartURL(OUString const & rTheAbsURIRef,
EncodeMechanism eMechanism,
rtl_TextEncoding eCharset,
@@ -1502,22 +1348,6 @@ inline bool INetURLObject::SetSmartURL(OUString const & rTheAbsURIRef,
}
inline INetURLObject
-INetURLObject::smartRel2Abs(const OString& rTheRelURIRef,
- bool & rWasAbsolute,
- bool bIgnoreFragment,
- EncodeMechanism eMechanism,
- rtl_TextEncoding eCharset,
- bool bRelativeNonURIs,
- FSysStyle eStyle) const
-{
- INetURLObject aTheAbsURIRef;
- convertRelToAbs(extend(rTheRelURIRef), true, aTheAbsURIRef, rWasAbsolute,
- eMechanism, eCharset, bIgnoreFragment, true,
- bRelativeNonURIs, eStyle);
- return aTheAbsURIRef;
-}
-
-inline INetURLObject
INetURLObject::smartRel2Abs(OUString const & rTheRelURIRef,
bool & rWasAbsolute,
bool bIgnoreFragment,
@@ -1533,24 +1363,6 @@ INetURLObject::smartRel2Abs(OUString const & rTheRelURIRef,
return aTheAbsURIRef;
}
-inline bool INetURLObject::GetNewAbsURL(const OString& rTheRelURIRef,
- INetURLObject * pTheAbsURIRef,
- EncodeMechanism eMechanism,
- rtl_TextEncoding eCharset,
- FSysStyle eStyle, bool bIgnoreFragment)
- const
-{
- INetURLObject aTheAbsURIRef;
- bool bWasAbsolute;
- if (!convertRelToAbs(extend(rTheRelURIRef), true, aTheAbsURIRef,
- bWasAbsolute, eMechanism, eCharset, bIgnoreFragment,
- false, false, eStyle))
- return false;
- if (pTheAbsURIRef)
- *pTheAbsURIRef = aTheAbsURIRef;
- return true;
-}
-
inline bool INetURLObject::GetNewAbsURL(OUString const & rTheRelURIRef,
INetURLObject * pTheAbsURIRef,
EncodeMechanism eMechanism,
@@ -1570,21 +1382,6 @@ inline bool INetURLObject::GetNewAbsURL(OUString const & rTheRelURIRef,
}
// static
-inline OUString INetURLObject::GetRelURL(const OString& rTheBaseURIRef,
- const OString& rTheAbsURIRef,
- EncodeMechanism eEncodeMechanism,
- DecodeMechanism eDecodeMechanism,
- rtl_TextEncoding eCharset,
- FSysStyle eStyle)
-{
- OUString aTheRelURIRef;
- INetURLObject(rTheBaseURIRef, eEncodeMechanism, eCharset).
- convertAbsToRel(extend(rTheAbsURIRef), true, aTheRelURIRef,
- eEncodeMechanism, eDecodeMechanism, eCharset, eStyle);
- return aTheRelURIRef;
-}
-
-// static
inline OUString INetURLObject::GetRelURL(OUString const & rTheBaseURIRef,
OUString const & rTheAbsURIRef,
EncodeMechanism eEncodeMechanism,
@@ -1600,20 +1397,6 @@ inline OUString INetURLObject::GetRelURL(OUString const & rTheBaseURIRef,
}
// static
-inline bool INetURLObject::translateToExternal(const OString& rTheIntURIRef,
- OUString & rTheExtURIRef,
- DecodeMechanism
- eDecodeMechanism,
- rtl_TextEncoding eCharset)
-{
- OUString aTheExtURIRef;
- bool bRet = convertIntToExt(extend(rTheIntURIRef), true, aTheExtURIRef,
- eDecodeMechanism, eCharset);
- rTheExtURIRef = aTheExtURIRef;
- return bRet;
-}
-
-// static
inline bool INetURLObject::translateToExternal(OUString const &
rTheIntURIRef,
OUString & rTheExtURIRef,
@@ -1626,21 +1409,6 @@ inline bool INetURLObject::translateToExternal(OUString const &
}
// static
-inline bool INetURLObject::translateToInternal(const OString&
- rTheExtURIRef,
- OUString & rTheIntURIRef,
- DecodeMechanism
- eDecodeMechanism,
- rtl_TextEncoding eCharset)
-{
- OUString aTheIntURIRef;
- bool bRet = convertExtToInt(extend(rTheExtURIRef), true, aTheIntURIRef,
- eDecodeMechanism, eCharset);
- rTheIntURIRef = aTheIntURIRef;
- return bRet;
-}
-
-// static
inline bool INetURLObject::translateToInternal(OUString const &
rTheExtURIRef,
OUString & rTheIntURIRef,
@@ -1652,15 +1420,6 @@ inline bool INetURLObject::translateToInternal(OUString const &
eDecodeMechanism, eCharset);
}
-inline bool INetURLObject::SetPass(const OString& rThePassword,
- EncodeMechanism eMechanism,
- rtl_TextEncoding eCharset)
-{
- return rThePassword.isEmpty() ?
- clearPassword() :
- setPassword(extend(rThePassword), true, eMechanism, eCharset);
-}
-
inline bool INetURLObject::SetPass(OUString const & rThePassword,
EncodeMechanism eMechanism,
rtl_TextEncoding eCharset)
@@ -1670,18 +1429,6 @@ inline bool INetURLObject::SetPass(OUString const & rThePassword,
setPassword(rThePassword, false, eMechanism, eCharset);
}
-inline bool INetURLObject::SetUserAndPass(const OString& rTheUser,
- const OString& rThePassword,
- EncodeMechanism eMechanism,
- rtl_TextEncoding eCharset)
-{
- return setUser(extend(rTheUser), true, eMechanism, eCharset)
- && (rThePassword.isEmpty() ?
- clearPassword() :
- setPassword(extend(rThePassword), true, eMechanism,
- eCharset));
-}
-
inline bool INetURLObject::SetUserAndPass(OUString const & rTheUser,
OUString const & rThePassword,
EncodeMechanism eMechanism,
@@ -1704,15 +1451,6 @@ inline bool INetURLObject::insertName(OUString const & rTheName,
bIgnoreFinalSlash, eMechanism, eCharset);
}
-inline bool INetURLObject::SetParam(const OString& rTheQuery,
- EncodeMechanism eMechanism,
- rtl_TextEncoding eCharset)
-{
- return rTheQuery.isEmpty() ?
- clearQuery() :
- setQuery(extend(rTheQuery), true, eMechanism, eCharset);
-}
-
inline bool INetURLObject::SetParam(OUString const & rTheQuery,
EncodeMechanism eMechanism,
rtl_TextEncoding eCharset)
@@ -1722,15 +1460,6 @@ inline bool INetURLObject::SetParam(OUString const & rTheQuery,
setQuery(rTheQuery, false, eMechanism, eCharset);
}
-inline bool INetURLObject::SetMark(const OString& rTheFragment,
- EncodeMechanism eMechanism,
- rtl_TextEncoding eCharset)
-{
- return rTheFragment.isEmpty() ?
- clearFragment() :
- setFragment(extend(rTheFragment), true, eMechanism, eCharset);
-}
-
inline bool INetURLObject::SetMark(OUString const & rTheFragment,
EncodeMechanism eMechanism,
rtl_TextEncoding eCharset)
@@ -1748,16 +1477,6 @@ inline INetURLObject::INetURLObject(OUString const & rFSysPath,
}
// static
-inline OUString INetURLObject::encode(const OString& rText, Part ePart,
- sal_Char cEscapePrefix,
- EncodeMechanism eMechanism,
- rtl_TextEncoding eCharset)
-{
- return encodeText(extend(rText), true, ePart, cEscapePrefix, eMechanism,
- eCharset, false);
-}
-
-// static
inline OUString INetURLObject::encode(OUString const & rText, Part ePart,
sal_Char cEscapePrefix,
EncodeMechanism eMechanism,
diff --git a/svl/source/misc/inethist.cxx b/svl/source/misc/inethist.cxx
index 167ccdc..cb14845 100644
--- a/svl/source/misc/inethist.cxx
+++ b/svl/source/misc/inethist.cxx
@@ -430,14 +430,14 @@ void INetURLHistory::NormalizeUrl_Impl (INetURLObject &rUrl)
if (!rUrl.HasPort())
rUrl.SetPort (INETHIST_DEF_HTTP_PORT);
if (!rUrl.HasURLPath())
- rUrl.SetURLPath (OString("/"));
+ rUrl.SetURLPath("/");
break;
case INET_PROT_HTTPS:
if (!rUrl.HasPort())
rUrl.SetPort (INETHIST_DEF_HTTPS_PORT);
if (!rUrl.HasURLPath())
- rUrl.SetURLPath (OString("/"));
+ rUrl.SetURLPath("/");
break;
default:
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index 1718965..7410bee 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -4547,7 +4547,7 @@ we check in the following sequence:
OStringBuffer aLineLoc( 1024 );
appendDestinationName( aFragment , aLineLoc );
//substitute the fragment
- aTargetURL.SetMark( aLineLoc.getStr() );
+ aTargetURL.SetMark( OStringToOUString(aLineLoc.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US) );
}
OUString aURL = aTargetURL.GetMainURL( bFileSpec ? INetURLObject::DECODE_WITH_CHARSET : INetURLObject::NO_DECODE );
appendLiteralStringEncrypt(bSetRelative ? INetURLObject::GetRelURL( m_aContext.BaseURL, aURL,
diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
index 2f35174..90a25bb 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
@@ -1011,7 +1011,7 @@ sal_Int16 SAL_CALL SalGtkFilePicker::execute() throw( uno::RuntimeException )
gchar *gFileName = g_filename_from_uri ( sFileName.getStr(), NULL, NULL );
if( g_file_test( gFileName, G_FILE_TEST_IS_REGULAR ) )
{
- INetURLObject aFileObj( sFileName );
+ INetURLObject aFileObj( OStringToOUString(sFileName, RTL_TEXTENCODING_UTF8) );
OString baseName(
OUStringToOString(
More information about the Libreoffice-commits
mailing list