diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2013-03-03 11:52:14 +0100 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2013-03-03 11:52:14 +0100 |
commit | 763e94b584411fd856253a06c869a82702f8c89d (patch) | |
tree | c91d7d9431e6d1ec32a40985174491f6361dc74f | |
parent | 919e27746650f223699a97f8f3d4922101d6d739 (diff) |
protocol shttp is not defined yet
Change-Id: I67678f8a16d051427a7c36f3a46d46f296109e3b
-rw-r--r-- | filter/source/xsltdialog/typedetectionexport.cxx | 2 | ||||
-rw-r--r-- | filter/source/xsltdialog/xmlfilterjar.cxx | 2 | ||||
-rw-r--r-- | filter/source/xsltdialog/xmlfiltertabpagexslt.cxx | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/filter/source/xsltdialog/typedetectionexport.cxx b/filter/source/xsltdialog/typedetectionexport.cxx index bcc547575a61..ac7118459c8b 100644 --- a/filter/source/xsltdialog/typedetectionexport.cxx +++ b/filter/source/xsltdialog/typedetectionexport.cxx @@ -46,7 +46,7 @@ static OUString createRelativeURL( const OUString& rFilterName, const OUString& { if( !rURL.isEmpty() && (rURL.compareToAscii( RTL_CONSTASCII_STRINGPARAM("http:") ) != 0) && - (rURL.compareToAscii( RTL_CONSTASCII_STRINGPARAM("shttp:") ) != 0) && + (rURL.compareToAscii( RTL_CONSTASCII_STRINGPARAM("https:") ) != 0) && (rURL.compareToAscii( RTL_CONSTASCII_STRINGPARAM("jar:") ) != 0) && (rURL.compareToAscii( RTL_CONSTASCII_STRINGPARAM("ftp:") ) != 0)) { diff --git a/filter/source/xsltdialog/xmlfilterjar.cxx b/filter/source/xsltdialog/xmlfilterjar.cxx index 1defb2ed1354..8bf0f710a829 100644 --- a/filter/source/xsltdialog/xmlfilterjar.cxx +++ b/filter/source/xsltdialog/xmlfilterjar.cxx @@ -129,7 +129,7 @@ void XMLFilterJarHelper::addFile( Reference< XInterface > xRootFolder, Reference { if( !rSourceFile.isEmpty() && (rSourceFile.compareToAscii( RTL_CONSTASCII_STRINGPARAM("http:") ) != 0) && - (rSourceFile.compareToAscii( RTL_CONSTASCII_STRINGPARAM("shttp:") ) != 0) && + (rSourceFile.compareToAscii( RTL_CONSTASCII_STRINGPARAM("https:") ) != 0) && (rSourceFile.compareToAscii( RTL_CONSTASCII_STRINGPARAM("jar:") ) != 0) && (rSourceFile.compareToAscii( RTL_CONSTASCII_STRINGPARAM("ftp:") ) != 0)) { diff --git a/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx b/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx index 25d19be080e3..f07c497ad86e 100644 --- a/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx +++ b/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx @@ -57,7 +57,7 @@ XMLFilterTabPageXSLT::XMLFilterTabPageXSLT( Window* pParent, ResMgr& rResMgr, co maCBNeedsXSLT2( this, ResId (CB_XML_NEEDS_XSLT2, rResMgr ) ), sHTTPSchema( "http://" ), - sSHTTPSchema( "shttp://" ), + sSHTTPSchema( "https://" ), sFILESchema( "file://" ), sFTPSchema( "ftp://" ), sInstPath( "$(prog)/" ) @@ -128,7 +128,7 @@ void XMLFilterTabPageXSLT::SetURL( SvtURLBox& rURLBox, const OUString& rURL ) rURLBox.SetText( aPath ); } else if( rURL.matchIgnoreAsciiCase( "http://" ) || - rURL.matchIgnoreAsciiCase( "shttp://" ) || + rURL.matchIgnoreAsciiCase( "https://" ) || rURL.matchIgnoreAsciiCase( "ftp://" ) ) { rURLBox.SetBaseURL( rURL ); @@ -156,7 +156,7 @@ OUString XMLFilterTabPageXSLT::GetURL( SvtURLBox& rURLBox ) OUString aURL; OUString aStrPath ( rURLBox.GetText() ); if( aStrPath.matchIgnoreAsciiCase( "http://" ) || - aStrPath.matchIgnoreAsciiCase( "shttp://" ) || + aStrPath.matchIgnoreAsciiCase( "https://" ) || aStrPath.matchIgnoreAsciiCase( "ftp://" ) ) { return aStrPath; |