diff options
Diffstat (limited to 'xmlhelp')
-rw-r--r-- | xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx | 2 | ||||
-rw-r--r-- | xmlhelp/source/cxxhelp/provider/content.cxx | 10 | ||||
-rw-r--r-- | xmlhelp/source/cxxhelp/provider/content.hxx | 9 | ||||
-rw-r--r-- | xmlhelp/source/cxxhelp/provider/databases.hxx | 1 | ||||
-rw-r--r-- | xmlhelp/source/cxxhelp/provider/resultsetbase.cxx | 2 | ||||
-rw-r--r-- | xmlhelp/source/cxxhelp/provider/resultsetbase.hxx | 2 | ||||
-rw-r--r-- | xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx | 3 | ||||
-rw-r--r-- | xmlhelp/source/cxxhelp/provider/resultsetforquery.hxx | 1 | ||||
-rw-r--r-- | xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx | 3 | ||||
-rw-r--r-- | xmlhelp/source/cxxhelp/provider/resultsetforroot.hxx | 1 | ||||
-rw-r--r-- | xmlhelp/source/cxxhelp/provider/urlparameter.cxx | 9 | ||||
-rw-r--r-- | xmlhelp/source/cxxhelp/qe/DocGenerator.cxx | 1 |
12 files changed, 5 insertions, 39 deletions
diff --git a/xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx b/xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx index 286369326f62..c0aa93c87eb2 100644 --- a/xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx +++ b/xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx @@ -35,8 +35,6 @@ namespace xmlsearch { private: static RoleFiller roleFiller_; - - std::vector< RoleFiller* > fillers_; }; } } diff --git a/xmlhelp/source/cxxhelp/provider/content.cxx b/xmlhelp/source/cxxhelp/provider/content.cxx index 24019cd2ad9b..a1411b11752a 100644 --- a/xmlhelp/source/cxxhelp/provider/content.cxx +++ b/xmlhelp/source/cxxhelp/provider/content.cxx @@ -168,7 +168,6 @@ private: uno::Reference< uno::XComponentContext > m_xContext; uno::Reference< ucb::XContentProvider > m_xProvider; - sal_Int32 m_nOpenMode; uno::Sequence< beans::Property > m_seq; uno::Sequence< ucb::NumberedSortingInfo > m_seqSort; URLParameter m_aURLParameter; @@ -179,14 +178,12 @@ public: ResultSetForRootFactory( const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< ucb::XContentProvider >& xProvider, - sal_Int32 nOpenMode, const uno::Sequence< beans::Property >& seq, const uno::Sequence< ucb::NumberedSortingInfo >& seqSort, const URLParameter& rURLParameter, Databases* pDatabases ) : m_xContext( xContext ), m_xProvider( xProvider ), - m_nOpenMode( nOpenMode ), m_seq( seq ), m_seqSort( seqSort ), m_aURLParameter( rURLParameter ), @@ -198,7 +195,6 @@ public: { return new ResultSetForRoot( m_xContext, m_xProvider, - m_nOpenMode, m_seq, m_seqSort, m_aURLParameter, @@ -213,7 +209,6 @@ private: uno::Reference< uno::XComponentContext > m_xContext; uno::Reference< ucb::XContentProvider > m_xProvider; - sal_Int32 m_nOpenMode; uno::Sequence< beans::Property > m_seq; uno::Sequence< ucb::NumberedSortingInfo > m_seqSort; URLParameter m_aURLParameter; @@ -224,14 +219,12 @@ public: ResultSetForQueryFactory( 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, const URLParameter& rURLParameter, Databases* pDatabases ) : m_xContext( rxContext ), m_xProvider( xProvider ), - m_nOpenMode( nOpenMode ), m_seq( seq ), m_seqSort( seqSort ), m_aURLParameter( rURLParameter ), @@ -243,7 +236,6 @@ public: { return new ResultSetForQuery( m_xContext, m_xProvider, - m_nOpenMode, m_seq, m_seqSort, m_aURLParameter, @@ -352,7 +344,6 @@ uno::Any SAL_CALL Content::execute( new ResultSetForRootFactory( m_xContext, m_xProvider.get(), - aOpenCommand.Mode, aOpenCommand.Properties, aOpenCommand.SortingInfo, m_aURLParameter, @@ -370,7 +361,6 @@ uno::Any SAL_CALL Content::execute( new ResultSetForQueryFactory( m_xContext, m_xProvider.get(), - aOpenCommand.Mode, aOpenCommand.Properties, aOpenCommand.SortingInfo, m_aURLParameter, diff --git a/xmlhelp/source/cxxhelp/provider/content.hxx b/xmlhelp/source/cxxhelp/provider/content.hxx index 1124e495e2d4..9a43c30d3052 100644 --- a/xmlhelp/source/cxxhelp/provider/content.hxx +++ b/xmlhelp/source/cxxhelp/provider/content.hxx @@ -39,14 +39,6 @@ namespace chelp class Databases; - struct ContentProperties - { - OUString aTitle; // Title - OUString aContentType; // ContentType - - ContentProperties() {} - }; - class Content : public ::ucbhelper::ContentImplHelper { public: @@ -106,7 +98,6 @@ namespace chelp // private members; - ContentProperties m_aProps; URLParameter m_aURLParameter; Databases* m_pDatabases; diff --git a/xmlhelp/source/cxxhelp/provider/databases.hxx b/xmlhelp/source/cxxhelp/provider/databases.hxx index 527f08666560..2c65dedbc1ce 100644 --- a/xmlhelp/source/cxxhelp/provider/databases.hxx +++ b/xmlhelp/source/cxxhelp/provider/databases.hxx @@ -358,7 +358,6 @@ namespace chelp { Databases& m_rDatabases; IteratorState m_eState; - OUString m_aExtensionPath; OUString m_aInitialModule; OUString m_aLanguage; diff --git a/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx b/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx index 773236bd0166..d014aa3ffa0c 100644 --- a/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx +++ b/xmlhelp/source/cxxhelp/provider/resultsetbase.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/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx b/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx index ce2c167e5440..b577fc50d4a3 100644 --- a/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx +++ b/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx @@ -52,7 +52,6 @@ namespace chelp { ResultSetBase( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext, const com::sun::star::uno::Reference< com::sun::star::ucb::XContentProvider >& xProvider, - sal_Int32 nOpenMode, const com::sun::star::uno::Sequence< com::sun::star::beans::Property >& seq, const com::sun::star::uno::Sequence< com::sun::star::ucb::NumberedSortingInfo >& seqSort ); @@ -537,7 +536,6 @@ namespace chelp { com::sun::star::uno::Reference< com::sun::star::ucb::XContentProvider > m_xProvider; sal_Int32 m_nRow; bool m_nWasNull; - sal_Int32 m_nOpenMode; bool m_bRowCountFinal; typedef std::vector< com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > > IdentSet; diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx index 92c94e09b8cd..0999298c41c4 100644 --- a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx +++ b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx @@ -81,12 +81,11 @@ struct HitItem ResultSetForQuery::ResultSetForQuery( const uno::Reference< uno::XComponentContext >& rxContext, const uno::Reference< XContentProvider >& xProvider, - sal_Int32 nOpenMode, const uno::Sequence< beans::Property >& seq, const uno::Sequence< NumberedSortingInfo >& seqSort, URLParameter& aURLParameter, Databases* pDatabases ) - : ResultSetBase( rxContext,xProvider,nOpenMode,seq,seqSort ), + : ResultSetBase( rxContext,xProvider,seq,seqSort ), m_aURLParameter( aURLParameter ) { Reference< XExtendedTransliteration > xTrans = Transliteration::create( rxContext ); diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforquery.hxx b/xmlhelp/source/cxxhelp/provider/resultsetforquery.hxx index de09a91ebcc7..d161e9826cb1 100644 --- a/xmlhelp/source/cxxhelp/provider/resultsetforquery.hxx +++ b/xmlhelp/source/cxxhelp/provider/resultsetforquery.hxx @@ -38,7 +38,6 @@ namespace chelp { ResultSetForQuery( const com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext>& rxContext, const com::sun::star::uno::Reference<com::sun::star::ucb::XContentProvider>& xProvider, - sal_Int32 nOpenMode, const com::sun::star::uno::Sequence< com::sun::star::beans::Property >& seq, const com::sun::star::uno::Sequence< com::sun::star::ucb::NumberedSortingInfo >& seqSort, URLParameter& aURLParameter, diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx b/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx index 614e4b5f1c7d..15d568ab8923 100644 --- a/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx +++ b/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx @@ -32,12 +32,11 @@ using namespace com::sun::star::ucb; ResultSetForRoot::ResultSetForRoot( const uno::Reference< uno::XComponentContext >& rxContext, const uno::Reference< XContentProvider >& xProvider, - sal_Int32 nOpenMode, const uno::Sequence< beans::Property >& seq, const uno::Sequence< NumberedSortingInfo >& seqSort, URLParameter& aURLParameter, Databases* pDatabases ) - : ResultSetBase( rxContext, xProvider,nOpenMode,seq,seqSort ), + : ResultSetBase( rxContext, xProvider,seq,seqSort ), m_aURLParameter( aURLParameter ), m_pDatabases( pDatabases ) { diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforroot.hxx b/xmlhelp/source/cxxhelp/provider/resultsetforroot.hxx index 829815a8f72d..5058b9e8aefa 100644 --- a/xmlhelp/source/cxxhelp/provider/resultsetforroot.hxx +++ b/xmlhelp/source/cxxhelp/provider/resultsetforroot.hxx @@ -38,7 +38,6 @@ namespace chelp { ResultSetForRoot( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext, const com::sun::star::uno::Reference< com::sun::star::ucb::XContentProvider >& xProvider, - sal_Int32 nOpenMode, const com::sun::star::uno::Sequence< com::sun::star::beans::Property >& seq, const com::sun::star::uno::Sequence< com::sun::star::ucb::NumberedSortingInfo >& seqSort, URLParameter& aURLParameter, diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx index ff4c9e21c006..bc5792149cec 100644 --- a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx +++ b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx @@ -593,16 +593,13 @@ bool URLParameter::query() struct UserData { - UserData( InputStreamTransformer* pTransformer, - URLParameter* pInitial, + UserData( URLParameter* pInitial, Databases* pDatabases ) - : m_pTransformer( pTransformer ), - m_pDatabases( pDatabases ), + : m_pDatabases( pDatabases ), m_pInitial( pInitial ) { } - InputStreamTransformer* m_pTransformer; Databases* m_pDatabases; URLParameter* m_pInitial; }; @@ -787,7 +784,7 @@ InputStreamTransformer::InputStreamTransformer( URLParameter* urlParam, } else { - UserData userData( this,urlParam,pDatabases ); + UserData userData( urlParam,pDatabases ); // Uses the implementation detail, that OString::getStr returns a zero terminated character-array diff --git a/xmlhelp/source/cxxhelp/qe/DocGenerator.cxx b/xmlhelp/source/cxxhelp/qe/DocGenerator.cxx index c82ac7158555..f6e9dfbfe1e3 100644 --- a/xmlhelp/source/cxxhelp/qe/DocGenerator.cxx +++ b/xmlhelp/source/cxxhelp/qe/DocGenerator.cxx @@ -29,7 +29,6 @@ RoleFiller RoleFiller::roleFiller_; RoleFiller::RoleFiller() - : fillers_( 0 ) { } |