compilerplugins/clang/unusedfields.cxx | 3 - tools/source/fsys/urlobj.cxx | 59 ++++++++++----------- ucb/source/core/ucb.cxx | 1 ucb/source/core/ucb.hxx | 1 ucb/source/ucp/ext/ucpext_datasupplier.cxx | 10 +-- ucb/source/ucp/ext/ucpext_datasupplier.hxx | 3 - ucb/source/ucp/ext/ucpext_resultset.cxx | 3 - ucb/source/ucp/ftp/ftpcontent.cxx | 5 - ucb/source/ucp/ftp/ftpresultsetI.cxx | 3 - ucb/source/ucp/ftp/ftpresultsetI.hxx | 1 ucb/source/ucp/ftp/ftpresultsetbase.cxx | 2 ucb/source/ucp/ftp/ftpresultsetbase.hxx | 2 ucb/source/ucp/ftp/ftpstrcont.hxx | 3 - ucb/source/ucp/package/pkgdatasupplier.cxx | 11 +-- ucb/source/ucp/package/pkgdatasupplier.hxx | 3 - ucb/source/ucp/package/pkgresultset.cxx | 6 -- ucb/source/ucp/tdoc/tdoc_datasupplier.cxx | 13 +--- ucb/source/ucp/tdoc/tdoc_datasupplier.hxx | 3 - ucb/source/ucp/tdoc/tdoc_resultset.cxx | 6 -- ucb/source/ucp/webdav-neon/DAVResource.hxx | 3 - ucb/source/ucp/webdav-neon/DAVTypes.hxx | 30 ---------- ucb/source/ucp/webdav-neon/NeonPropFindRequest.cxx | 5 - 22 files changed, 54 insertions(+), 122 deletions(-)
New commits: commit 00bb8141beee7088625992a046e94c6f8da8da83 Author: Noel Grandin <n...@peralex.com> Date: Tue Nov 24 08:09:58 2015 +0200 loplugin:unusedfields in ucb/ Change-Id: Ic9ca044aa2465a197397bec6632e1a5aa5fe7110 diff --git a/ucb/source/core/ucb.cxx b/ucb/source/core/ucb.cxx index 8b5bac6..5f5cff3 100644 --- a/ucb/source/core/ucb.cxx +++ b/ucb/source/core/ucb.cxx @@ -230,7 +230,6 @@ UniversalContentBroker::UniversalContentBroker( const Reference< css::uno::XComponentContext >& xContext ) : m_xContext( xContext ), m_pDisposeEventListeners( nullptr ), - m_nInitCount( 0 ), //@@@ see initialize() method m_nCommandId( 0 ) { OSL_ENSURE( m_xContext.is(), diff --git a/ucb/source/core/ucb.hxx b/ucb/source/core/ucb.hxx index dfd46f9..4e094de 100644 --- a/ucb/source/core/ucb.hxx +++ b/ucb/source/core/ucb.hxx @@ -210,7 +210,6 @@ private: ProviderMap_Impl m_aProviders; osl::Mutex m_aMutex; cppu::OInterfaceContainerHelper* m_pDisposeEventListeners; - oslInterlockedCount m_nInitCount; //@@@ see initialize() method sal_Int32 m_nCommandId; }; diff --git a/ucb/source/ucp/ext/ucpext_datasupplier.cxx b/ucb/source/ucp/ext/ucpext_datasupplier.cxx index 9192f1b..1c23942 100644 --- a/ucb/source/ucp/ext/ucpext_datasupplier.cxx +++ b/ucb/source/ucp/ext/ucpext_datasupplier.cxx @@ -86,13 +86,10 @@ namespace ucb { namespace ucp { namespace ext ResultList m_aResults; ::rtl::Reference< Content > m_xContent; Reference< XComponentContext > m_xContext; - sal_Int32 m_nOpenMode; - DataSupplier_Impl( const Reference< XComponentContext >& rxContext, const ::rtl::Reference< Content >& i_rContent, - const sal_Int32 i_nOpenMode ) + DataSupplier_Impl( const Reference< XComponentContext >& rxContext, const ::rtl::Reference< Content >& i_rContent ) :m_xContent( i_rContent ) ,m_xContext( rxContext ) - ,m_nOpenMode( i_nOpenMode ) { } ~DataSupplier_Impl(); @@ -126,9 +123,8 @@ namespace ucb { namespace ucp { namespace ext DataSupplier::DataSupplier( const Reference< XComponentContext >& rxContext, - const ::rtl::Reference< Content >& i_rContent, - const sal_Int32 i_nOpenMode ) - :m_pImpl( new DataSupplier_Impl( rxContext, i_rContent, i_nOpenMode ) ) + const ::rtl::Reference< Content >& i_rContent ) + :m_pImpl( new DataSupplier_Impl( rxContext, i_rContent ) ) { } diff --git a/ucb/source/ucp/ext/ucpext_datasupplier.hxx b/ucb/source/ucp/ext/ucpext_datasupplier.hxx index 207d9186..57395a3 100644 --- a/ucb/source/ucp/ext/ucpext_datasupplier.hxx +++ b/ucb/source/ucp/ext/ucpext_datasupplier.hxx @@ -42,8 +42,7 @@ namespace ucb { namespace ucp { namespace ext public: DataSupplier( const css::uno::Reference< css::uno::XComponentContext >& rxContext, - const rtl::Reference< Content >& rContent, - const sal_Int32 nOpenMode + const rtl::Reference< Content >& rContent ); void fetchData(); diff --git a/ucb/source/ucp/ext/ucpext_resultset.cxx b/ucb/source/ucp/ext/ucpext_resultset.cxx index 2c9b6a9..4526f60 100644 --- a/ucb/source/ucp/ext/ucpext_resultset.cxx +++ b/ucb/source/ucp/ext/ucpext_resultset.cxx @@ -63,8 +63,7 @@ namespace ucb { namespace ucp { namespace ext { ::rtl::Reference< DataSupplier > pDataSupplier( new DataSupplier( m_xContext, - m_xContent, - m_aCommand.Mode + m_xContent ) ); m_xResultSet1 = new ::ucbhelper::ResultSet( m_xContext, diff --git a/ucb/source/ucp/ftp/ftpcontent.cxx b/ucb/source/ucp/ftp/ftpcontent.cxx index cac9bdb..03685c7 100644 --- a/ucb/source/ucp/ftp/ftpcontent.cxx +++ b/ucb/source/ucp/ftp/ftpcontent.cxx @@ -238,13 +238,11 @@ public: ResultSetFactoryI(const Reference<XComponentContext >& rxContext, const Reference<XContentProvider >& xProvider, - sal_Int32 nOpenMode, const Sequence<Property>& seq, const Sequence<NumberedSortingInfo>& seqSort, const std::vector<FTPDirentry>& dirvec) : m_xContext(rxContext), m_xProvider(xProvider), - m_nOpenMode(nOpenMode), m_seq(seq), m_seqSort(seqSort), m_dirvec(dirvec) @@ -255,7 +253,6 @@ public: { return new ResultSetI(m_xContext, m_xProvider, - m_nOpenMode, m_seq, m_seqSort, m_dirvec); @@ -265,7 +262,6 @@ public: Reference< XComponentContext > m_xContext; Reference< XContentProvider > m_xProvider; - sal_Int32 m_nOpenMode; Sequence< Property > m_seq; Sequence< NumberedSortingInfo > m_seqSort; std::vector<FTPDirentry> m_dirvec; @@ -564,7 +560,6 @@ Any SAL_CALL FTPContent::execute( const Command& aCommand, Environment, new ResultSetFactoryI(m_xContext, m_xProvider.get(), - aOpenCommand.Mode, aOpenCommand.Properties, aOpenCommand.SortingInfo, resvec)); diff --git a/ucb/source/ucp/ftp/ftpresultsetI.cxx b/ucb/source/ucp/ftp/ftpresultsetI.cxx index 7488449..424c05d 100644 --- a/ucb/source/ucp/ftp/ftpresultsetI.cxx +++ b/ucb/source/ucp/ftp/ftpresultsetI.cxx @@ -40,11 +40,10 @@ using namespace com::sun::star::sdbc; ResultSetI::ResultSetI(const Reference<XComponentContext>& rxContext, const Reference<XContentProvider>& xProvider, - sal_Int32 nOpenMode, const Sequence<Property>& seqProp, const Sequence< NumberedSortingInfo >& seqSort, const std::vector<FTPDirentry>& dirvec) - : ResultSetBase(rxContext,xProvider,nOpenMode,seqProp,seqSort) + : ResultSetBase(rxContext,xProvider,seqProp,seqSort) { for( size_t i = 0; i < dirvec.size(); ++i) m_aPath.push_back(dirvec[i].m_aURL); diff --git a/ucb/source/ucp/ftp/ftpresultsetI.hxx b/ucb/source/ucp/ftp/ftpresultsetI.hxx index eb44423..adf2906 100644 --- a/ucb/source/ucp/ftp/ftpresultsetI.hxx +++ b/ucb/source/ucp/ftp/ftpresultsetI.hxx @@ -37,7 +37,6 @@ namespace ftp { ResultSetI( const css::uno::Reference< css::uno::XComponentContext>& rxContext, const css::uno::Reference< css::ucb::XContentProvider>& xProvider, - sal_Int32 nOpenMode, const css::uno::Sequence< css::beans::Property >& seq, const css::uno::Sequence< css::ucb::NumberedSortingInfo >& seqSort, const std::vector<FTPDirentry>& dirvec); diff --git a/ucb/source/ucp/ftp/ftpresultsetbase.cxx b/ucb/source/ucp/ftp/ftpresultsetbase.cxx index 0b774fb..bd09094 100644 --- a/ucb/source/ucp/ftp/ftpresultsetbase.cxx +++ b/ucb/source/ucp/ftp/ftpresultsetbase.cxx @@ -33,14 +33,12 @@ using namespace com::sun::star; ResultSetBase::ResultSetBase( const uno::Reference< uno::XComponentContext >& rxContext, const uno::Reference< ucb::XContentProvider >& xProvider, - sal_Int32 nOpenMode, const uno::Sequence< beans::Property >& seq, const uno::Sequence< ucb::NumberedSortingInfo >& seqSort ) : m_xContext( rxContext ), m_xProvider( xProvider ), m_nRow( -1 ), m_nWasNull( true ), - m_nOpenMode( nOpenMode ), m_bRowCountFinal( true ), m_sProperty( seq ), m_sSortingInfo( seqSort ), diff --git a/ucb/source/ucp/ftp/ftpresultsetbase.hxx b/ucb/source/ucp/ftp/ftpresultsetbase.hxx index 7a45ba0..1f15110 100644 --- a/ucb/source/ucp/ftp/ftpresultsetbase.hxx +++ b/ucb/source/ucp/ftp/ftpresultsetbase.hxx @@ -52,7 +52,6 @@ namespace ftp { ResultSetBase(const css::uno::Reference< css::uno::XComponentContext >& rxContext, const css::uno::Reference< css::ucb::XContentProvider >& xProvider, - sal_Int32 nOpenMode, const css::uno::Sequence< css::beans::Property >& seq, const css::uno::Sequence< css::ucb::NumberedSortingInfo >& seqSort); @@ -523,7 +522,6 @@ namespace ftp { css::ucb::XContentProvider > m_xProvider; sal_Int32 m_nRow; bool m_nWasNull; - sal_Int32 m_nOpenMode; bool m_bRowCountFinal; typedef std::vector< css::uno::Reference< diff --git a/ucb/source/ucp/ftp/ftpstrcont.hxx b/ucb/source/ucp/ftp/ftpstrcont.hxx index 9c88272..45f84fe 100644 --- a/ucb/source/ucp/ftp/ftpstrcont.hxx +++ b/ucb/source/ucp/ftp/ftpstrcont.hxx @@ -57,9 +57,6 @@ namespace ftp { virtual ~FTPInputStreamContainer() {} css::uno::Reference< css::io::XInputStream> operator()(); - - private: - FTPInputStream* m_out; }; } diff --git a/ucb/source/ucp/package/pkgdatasupplier.cxx b/ucb/source/ucp/package/pkgdatasupplier.cxx index 3b2687e..38e9803 100644 --- a/ucb/source/ucp/package/pkgdatasupplier.cxx +++ b/ucb/source/ucp/package/pkgdatasupplier.cxx @@ -79,16 +79,14 @@ struct DataSupplier_Impl rtl::Reference< Content > m_xContent; uno::Reference< uno::XComponentContext > m_xContext; uno::Reference< container::XEnumeration > m_xFolderEnum; - sal_Int32 m_nOpenMode; bool m_bCountFinal; bool m_bThrowException; DataSupplier_Impl( const uno::Reference< uno::XComponentContext >& rxContext, - const rtl::Reference< Content >& rContent, - sal_Int32 nOpenMode ) + const rtl::Reference< Content >& rContent ) : m_xContent( rContent ), m_xContext( rxContext ), - m_xFolderEnum( rContent->getIterator() ), m_nOpenMode( nOpenMode ), + m_xFolderEnum( rContent->getIterator() ), m_bCountFinal( !m_xFolderEnum.is() ), m_bThrowException( m_bCountFinal ) {} ~DataSupplier_Impl(); @@ -119,9 +117,8 @@ DataSupplier_Impl::~DataSupplier_Impl() DataSupplier::DataSupplier( const uno::Reference< uno::XComponentContext >& rxContext, - const rtl::Reference< Content >& rContent, - sal_Int32 nOpenMode ) -: m_pImpl( new DataSupplier_Impl( rxContext, rContent, nOpenMode ) ) + const rtl::Reference< Content >& rContent ) +: m_pImpl( new DataSupplier_Impl( rxContext, rContent ) ) { } diff --git a/ucb/source/ucp/package/pkgdatasupplier.hxx b/ucb/source/ucp/package/pkgdatasupplier.hxx index 719bb26..2abe391 100644 --- a/ucb/source/ucp/package/pkgdatasupplier.hxx +++ b/ucb/source/ucp/package/pkgdatasupplier.hxx @@ -35,8 +35,7 @@ class DataSupplier : public ::ucbhelper::ResultSetDataSupplier public: DataSupplier( const css::uno::Reference< css::uno::XComponentContext >& rxContext, - const rtl::Reference< Content >& rContent, - sal_Int32 nOpenMode ); + const rtl::Reference< Content >& rContent ); virtual ~DataSupplier(); virtual OUString queryContentIdentifierString( sal_uInt32 nIndex ) override; diff --git a/ucb/source/ucp/package/pkgresultset.cxx b/ucb/source/ucp/package/pkgresultset.cxx index 4537c6c..33a300e 100644 --- a/ucb/source/ucp/package/pkgresultset.cxx +++ b/ucb/source/ucp/package/pkgresultset.cxx @@ -65,8 +65,7 @@ void DynamicResultSet::initStatic() = new ::ucbhelper::ResultSet( m_xContext, m_aCommand.Properties, new DataSupplier( m_xContext, - m_xContent, - m_aCommand.Mode ), + m_xContent ), m_xEnv ); } @@ -77,8 +76,7 @@ void DynamicResultSet::initDynamic() = new ::ucbhelper::ResultSet( m_xContext, m_aCommand.Properties, new DataSupplier( m_xContext, - m_xContent, - m_aCommand.Mode ), + m_xContent ), m_xEnv ); m_xResultSet2 = m_xResultSet1; } diff --git a/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx b/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx index 52d6c07..3db6492 100644 --- a/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx +++ b/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx @@ -74,17 +74,15 @@ struct DataSupplier_Impl ResultList m_aResults; rtl::Reference< Content > m_xContent; uno::Reference< uno::XComponentContext > m_xContext; - uno::Sequence< OUString > * m_pNamesOfChildren; - sal_Int32 m_nOpenMode; + uno::Sequence< OUString > * m_pNamesOfChildren; bool m_bCountFinal; bool m_bThrowException; DataSupplier_Impl( const uno::Reference< uno::XComponentContext >& rxContext, - const rtl::Reference< Content >& rContent, - sal_Int32 nOpenMode ) + const rtl::Reference< Content >& rContent ) : m_xContent( rContent ), m_xContext( rxContext ), - m_pNamesOfChildren( nullptr ), m_nOpenMode( nOpenMode ), + m_pNamesOfChildren( nullptr ), m_bCountFinal( false ), m_bThrowException( false ) {} ~DataSupplier_Impl(); @@ -110,9 +108,8 @@ DataSupplier_Impl::~DataSupplier_Impl() // DataSupplier Implementation. ResultSetDataSupplier::ResultSetDataSupplier( const uno::Reference< uno::XComponentContext >& rxContext, - const rtl::Reference< Content >& rContent, - sal_Int32 nOpenMode ) -: m_pImpl( new DataSupplier_Impl( rxContext, rContent, nOpenMode ) ) + const rtl::Reference< Content >& rContent ) +: m_pImpl( new DataSupplier_Impl( rxContext, rContent ) ) { } diff --git a/ucb/source/ucp/tdoc/tdoc_datasupplier.hxx b/ucb/source/ucp/tdoc/tdoc_datasupplier.hxx index 8bf1632..7c81bdc 100644 --- a/ucb/source/ucp/tdoc/tdoc_datasupplier.hxx +++ b/ucb/source/ucp/tdoc/tdoc_datasupplier.hxx @@ -41,8 +41,7 @@ private: public: ResultSetDataSupplier( const css::uno::Reference< css::uno::XComponentContext >& rxContext, - const rtl::Reference< Content >& rContent, - sal_Int32 nOpenMode = css::ucb::OpenMode::ALL ); + const rtl::Reference< Content >& rContent ); virtual ~ResultSetDataSupplier(); virtual OUString queryContentIdentifierString( sal_uInt32 nIndex ) override; diff --git a/ucb/source/ucp/tdoc/tdoc_resultset.cxx b/ucb/source/ucp/tdoc/tdoc_resultset.cxx index 58dc848..e7c4bdb 100644 --- a/ucb/source/ucp/tdoc/tdoc_resultset.cxx +++ b/ucb/source/ucp/tdoc/tdoc_resultset.cxx @@ -67,8 +67,7 @@ void DynamicResultSet::initStatic() m_xContext, m_aCommand.Properties, new ResultSetDataSupplier( m_xContext, - m_xContent, - m_aCommand.Mode ) ); + m_xContent ) ); } @@ -79,8 +78,7 @@ void DynamicResultSet::initDynamic() m_xContext, m_aCommand.Properties, new ResultSetDataSupplier( m_xContext, - m_xContent, - m_aCommand.Mode ) ); + m_xContent ) ); m_xResultSet2 = m_xResultSet1; } diff --git a/ucb/source/ucp/webdav-neon/DAVResource.hxx b/ucb/source/ucp/webdav-neon/DAVResource.hxx index 1368619..56a2009 100644 --- a/ucb/source/ucp/webdav-neon/DAVResource.hxx +++ b/ucb/source/ucp/webdav-neon/DAVResource.hxx @@ -58,10 +58,7 @@ struct DAVResource struct DAVResourceInfo { - OUString uri; std::vector < OUString > properties; - - explicit DAVResourceInfo( const OUString & inUri ) : uri( inUri ) {} }; } // namespace webdav_ucp diff --git a/ucb/source/ucp/webdav-neon/DAVTypes.hxx b/ucb/source/ucp/webdav-neon/DAVTypes.hxx index 4ad4dab..6ee993a 100644 --- a/ucb/source/ucp/webdav-neon/DAVTypes.hxx +++ b/ucb/source/ucp/webdav-neon/DAVTypes.hxx @@ -35,36 +35,6 @@ namespace webdav_ucp { -/* RFC 2518 - -15.1 Class 1 - - A class 1 compliant resource MUST meet all "MUST" requirements in all - sections of this document. - - Class 1 compliant resources MUST return, at minimum, the value "1" in - the DAV header on all responses to the OPTIONS method. - -15.2 Class 2 - - A class 2 compliant resource MUST meet all class 1 requirements and - support the LOCK method, the supportedlock property, the - lockdiscovery property, the Time-Out response header and the Lock- - Token request header. A class "2" compliant resource SHOULD also - support the Time-Out request header and the owner XML element. - - Class 2 compliant resources MUST return, at minimum, the values "1" - and "2" in the DAV header on all responses to the OPTIONS method. -*/ - -struct DAVCapabilities -{ - bool class1; - bool class2; - bool executable; // supports "executable" property (introduced by mod_dav) - - DAVCapabilities() : class1( false ), class2( false ), executable( false ) {} -}; enum Depth { DAVZERO = 0, DAVONE = 1, DAVINFINITY = -1 }; diff --git a/ucb/source/ucp/webdav-neon/NeonPropFindRequest.cxx b/ucb/source/ucp/webdav-neon/NeonPropFindRequest.cxx index 705d79c..4083345 100644 --- a/ucb/source/ucp/webdav-neon/NeonPropFindRequest.cxx +++ b/ucb/source/ucp/webdav-neon/NeonPropFindRequest.cxx @@ -220,13 +220,12 @@ extern "C" int NPFR_propnames_iter( void* userdata, } extern "C" void NPFR_propnames_results( void* userdata, - const ne_uri* uri, + const ne_uri* /*uri*/, const NeonPropFindResultSet* results ) { // @@@ href is not the uri! DAVResourceInfo ctor wants uri! // Create entry for the resource. - DAVResourceInfo theResource( - OStringToOUString( uri->path, RTL_TEXTENCODING_UTF8 ) ); + DAVResourceInfo theResource; // Fill entry. ne_propset_iterate( results, NPFR_propnames_iter, &theResource ); commit acc4acb9ca3536c3f6d16cfc9bfac8587d57a112 Author: Noel Grandin <n...@peralex.com> Date: Tue Nov 24 08:09:24 2015 +0200 loplugin:unusedfields in tools/ Change-Id: Ic460bf42cbcf356cdcebbd5060a0dad3d3caa4ef diff --git a/compilerplugins/clang/unusedfields.cxx b/compilerplugins/clang/unusedfields.cxx index d002356..3d4abe7 100644 --- a/compilerplugins/clang/unusedfields.cxx +++ b/compilerplugins/clang/unusedfields.cxx @@ -169,6 +169,7 @@ gotfunc: bool UnusedFields::VisitFieldDecl( const FieldDecl* fieldDecl ) { fieldDecl = fieldDecl->getCanonicalDecl(); + const FieldDecl* canonicalDecl = fieldDecl; if( ignoreLocation( fieldDecl )) return true; @@ -212,7 +213,7 @@ bool UnusedFields::VisitFieldDecl( const FieldDecl* fieldDecl ) return true; } - definitionSet.insert(niceName(fieldDecl)); + definitionSet.insert(niceName(canonicalDecl)); return true; } diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx index 874f321..771c3bb 100644 --- a/tools/source/fsys/urlobj.cxx +++ b/tools/source/fsys/urlobj.cxx @@ -289,7 +289,6 @@ struct INetURLObject::SchemeInfo { sal_Char const * m_pScheme; sal_Char const * m_pPrefix; - sal_uInt16 m_nDefaultPort; bool m_bAuthority; bool m_bUser; bool m_bAuth; @@ -316,89 +315,89 @@ INetURLObject::getSchemeInfo(INetProtocol eTheScheme) { static o3tl::enumarray<INetProtocol, SchemeInfo> const map = { SchemeInfo{ - "", "", 0, false, false, false, false, false, false, false, false}, + "", "", false, false, false, false, false, false, false, false}, SchemeInfo{ - "ftp", "ftp://", 21, true, true, false, true, true, true, true, + "ftp", "ftp://", true, true, false, true, true, true, true, false}, SchemeInfo{ - "http", "http://", 80, true, false, false, false, true, true, true, + "http", "http://", true, false, false, false, true, true, true, true}, SchemeInfo{ - "file", "file://", 0, true, false, false, false, true, false, true, + "file", "file://", true, false, false, false, true, false, true, false}, SchemeInfo{ - "mailto", "mailto:", 0, false, false, false, false, false, false, + "mailto", "mailto:", false, false, false, false, false, false, false, true}, SchemeInfo{ - "vnd.sun.star.webdav", "vnd.sun.star.webdav://", 80, true, false, + "vnd.sun.star.webdav", "vnd.sun.star.webdav://", true, false, false, false, true, true, true, true}, SchemeInfo{ - "private", "private:", 0, false, false, false, false, false, false, + "private", "private:", false, false, false, false, false, false, false, true}, SchemeInfo{ - "vnd.sun.star.help", "vnd.sun.star.help://", 0, true, false, false, + "vnd.sun.star.help", "vnd.sun.star.help://", true, false, false, false, false, false, true, true}, SchemeInfo{ - "https", "https://", 443, true, false, false, false, true, true, + "https", "https://", true, false, false, false, true, true, true, true}, SchemeInfo{ - "slot", "slot:", 0, false, false, false, false, false, false, false, + "slot", "slot:", false, false, false, false, false, false, false, true}, SchemeInfo{ - "macro", "macro:", 0, false, false, false, false, false, false, + "macro", "macro:", false, false, false, false, false, false, false, true}, SchemeInfo{ - "javascript", "javascript:", 0, false, false, false, false, false, + "javascript", "javascript:", false, false, false, false, false, false, false, false}, SchemeInfo{ - "data", "data:", 0, false, false, false, false, false, false, false, + "data", "data:", false, false, false, false, false, false, false, false}, SchemeInfo{ - "cid", "cid:", 0, false, false, false, false, false, false, false, + "cid", "cid:", false, false, false, false, false, false, false, false}, SchemeInfo{ - "vnd.sun.star.hier", "vnd.sun.star.hier:", 0, true, false, false, + "vnd.sun.star.hier", "vnd.sun.star.hier:", true, false, false, false, false, false, true, false}, SchemeInfo{ - ".uno", ".uno:", 0, false, false, false, false, false, false, false, + ".uno", ".uno:", false, false, false, false, false, false, false, true}, SchemeInfo{ - ".component", ".component:", 0, false, false, false, false, false, + ".component", ".component:", false, false, false, false, false, false, false, true}, SchemeInfo{ - "vnd.sun.star.pkg", "vnd.sun.star.pkg://", 0, true, false, false, + "vnd.sun.star.pkg", "vnd.sun.star.pkg://", true, false, false, false, false, false, true, true}, SchemeInfo{ - "ldap", "ldap://", 389, true, false, false, false, true, true, + "ldap", "ldap://", true, false, false, false, true, true, false, true}, SchemeInfo{ - "db", "db:", 0, false, false, false, false, false, false, false, + "db", "db:", false, false, false, false, false, false, false, false}, SchemeInfo{ - "vnd.sun.star.cmd", "vnd.sun.star.cmd:", 0, false, false, false, + "vnd.sun.star.cmd", "vnd.sun.star.cmd:", false, false, false, false, false, false, false, false}, SchemeInfo{ - "telnet", "telnet://", 23, true, true, false, true, true, true, + "telnet", "telnet://", true, true, false, true, true, true, true, false}, SchemeInfo{ - "vnd.sun.star.expand", "vnd.sun.star.expand:", 0, false, false, + "vnd.sun.star.expand", "vnd.sun.star.expand:", false, false, false, false, false, false, false, false}, SchemeInfo{ - "vnd.sun.star.tdoc", "vnd.sun.star.tdoc:", 0, false, false, false, + "vnd.sun.star.tdoc", "vnd.sun.star.tdoc:", false, false, false, false, false, false, true, false}, SchemeInfo{ - "", "", 0, false, false, false, false, true, true, true, false }, + "", "", false, false, false, false, true, true, true, false }, SchemeInfo{ - "smb", "smb://", 139, true, true, false, true, true, true, true, + "smb", "smb://", true, true, false, true, true, true, true, true}, SchemeInfo{ - "hid", "hid:", 0, false, false, false, false, false, false, false, + "hid", "hid:", false, false, false, false, false, false, false, true}, SchemeInfo{ - "sftp", "sftp://", 22, true, true, false, true, true, true, true, + "sftp", "sftp://", true, true, false, true, true, true, true, true}, SchemeInfo{ - "vnd.libreoffice.cmis", "vnd.libreoffice.cmis://", 0, true, true, + "vnd.libreoffice.cmis", "vnd.libreoffice.cmis://", true, true, false, false, true, false, true, true} }; return map[eTheScheme]; }; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits