diff options
Diffstat (limited to 'xmlhelp/source')
-rw-r--r-- | xmlhelp/source/cxxhelp/inc/tvread.hxx | 18 | ||||
-rw-r--r-- | xmlhelp/source/cxxhelp/provider/content.cxx | 12 | ||||
-rw-r--r-- | xmlhelp/source/cxxhelp/provider/databases.cxx | 3 | ||||
-rw-r--r-- | xmlhelp/source/cxxhelp/provider/provider.hxx | 20 | ||||
-rw-r--r-- | xmlhelp/source/cxxhelp/provider/resultsetbase.cxx | 22 | ||||
-rw-r--r-- | xmlhelp/source/cxxhelp/provider/urlparameter.cxx | 18 | ||||
-rw-r--r-- | xmlhelp/source/cxxhelp/provider/urlparameter.hxx | 12 | ||||
-rw-r--r-- | xmlhelp/source/treeview/tvread.cxx | 4 |
8 files changed, 26 insertions, 83 deletions
diff --git a/xmlhelp/source/cxxhelp/inc/tvread.hxx b/xmlhelp/source/cxxhelp/inc/tvread.hxx index 208ed0a824c2..cd0b22b49e09 100644 --- a/xmlhelp/source/cxxhelp/inc/tvread.hxx +++ b/xmlhelp/source/cxxhelp/inc/tvread.hxx @@ -88,18 +88,16 @@ namespace treeview { virtual void SAL_CALL addChangesListener( - const css::uno::Reference< css::util::XChangesListener >& aListener ) override + const css::uno::Reference< css::util::XChangesListener >& ) override { // read only - (void)aListener; } virtual void SAL_CALL removeChangesListener( - const css::uno::Reference< css::util::XChangesListener >& aListener ) override + const css::uno::Reference< css::util::XChangesListener >& ) override { // read only - (void)aListener; } // XComponent @@ -109,17 +107,13 @@ namespace treeview { } virtual void SAL_CALL addEventListener( - const css::uno::Reference< css::lang::XEventListener >& xListener ) override - { - (void)xListener; - } + const css::uno::Reference< css::lang::XEventListener >& ) override + {} virtual void SAL_CALL removeEventListener( - const css::uno::Reference< css::lang::XEventListener >& aListener ) override - { - (void)aListener; - } + const css::uno::Reference< css::lang::XEventListener >& ) override + {} // Abstract functions // XNameAccess diff --git a/xmlhelp/source/cxxhelp/provider/content.cxx b/xmlhelp/source/cxxhelp/provider/content.cxx index 1b7deb82f305..f4f299d724cc 100644 --- a/xmlhelp/source/cxxhelp/provider/content.cxx +++ b/xmlhelp/source/cxxhelp/provider/content.cxx @@ -206,7 +206,7 @@ public: // virtual uno::Any SAL_CALL Content::execute( const ucb::Command& aCommand, - sal_Int32 CommandId, + sal_Int32, const uno::Reference< ucb::XCommandEnvironment >& Environment ) { uno::Any aRet; @@ -268,10 +268,7 @@ uno::Any SAL_CALL Content::execute( aOpenCommand.Sink, uno::UNO_QUERY); if(xActiveDataSink.is()) - m_aURLParameter.open(aCommand, - CommandId, - Environment, - xActiveDataSink); + m_aURLParameter.open(xActiveDataSink); uno::Reference< io::XActiveDataStreamer > xActiveDataStreamer( aOpenCommand.Sink, uno::UNO_QUERY); @@ -285,10 +282,7 @@ uno::Any SAL_CALL Content::execute( aOpenCommand.Sink, uno::UNO_QUERY); if(xOutputStream.is() ) - m_aURLParameter.open(aCommand, - CommandId, - Environment, - xOutputStream); + m_aURLParameter.open(xOutputStream); if( m_aURLParameter.isRoot() ) { diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx index 8e8aa07fa8a8..524669a7211f 100644 --- a/xmlhelp/source/cxxhelp/provider/databases.cxx +++ b/xmlhelp/source/cxxhelp/provider/databases.cxx @@ -787,8 +787,7 @@ KeywordInfo* Databases::getKeyword( const OUString& Database, KeywordElementComparator aComparator( xCollator ); std::sort(aVector.begin(),aVector.end(),aComparator); - KeywordInfo* pInfo = it->second = new KeywordInfo( aVector ); - (void)pInfo; + it->second = new KeywordInfo( aVector ); } return it->second; diff --git a/xmlhelp/source/cxxhelp/provider/provider.hxx b/xmlhelp/source/cxxhelp/provider/provider.hxx index 6e43ecf5c293..1063de490069 100644 --- a/xmlhelp/source/cxxhelp/provider/provider.hxx +++ b/xmlhelp/source/cxxhelp/provider/provider.hxx @@ -91,16 +91,10 @@ namespace chelp { dispose( ) override; virtual void SAL_CALL - addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override - { - (void)xListener; - } + addEventListener( const css::uno::Reference< css::lang::XEventListener >& ) override {} virtual void SAL_CALL - removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override - { - (void)aListener; - } + removeEventListener( const css::uno::Reference< css::lang::XEventListener >& ) override {} // XContainerListener ( derive from XEventListener ) @@ -111,16 +105,10 @@ namespace chelp { } virtual void SAL_CALL - elementInserted( const css::container::ContainerEvent& Event ) override - { - (void)Event; - } + elementInserted( const css::container::ContainerEvent& ) override {} virtual void SAL_CALL - elementRemoved( const css::container::ContainerEvent& Event ) override - { - (void)Event; - } + elementRemoved( const css::container::ContainerEvent& ) override {} virtual void SAL_CALL elementReplaced( const css::container::ContainerEvent& Event ) override; diff --git a/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx b/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx index 53cb1b5233da..5b0df00312f6 100644 --- a/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx +++ b/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx @@ -418,10 +418,8 @@ ResultSetBase::getPropertySetInfo() void SAL_CALL ResultSetBase::setPropertyValue( - const OUString& aPropertyName, const uno::Any& aValue ) + const OUString& aPropertyName, const uno::Any& ) { - (void)aValue; - if( aPropertyName == "IsRowCountFinal" || aPropertyName == "RowCount" ) return; @@ -495,21 +493,15 @@ void SAL_CALL ResultSetBase::removePropertyChangeListener( void SAL_CALL ResultSetBase::addVetoableChangeListener( - const OUString& PropertyName, - const uno::Reference< beans::XVetoableChangeListener >& aListener ) -{ - (void)PropertyName; - (void)aListener; -} + const OUString&, + const uno::Reference< beans::XVetoableChangeListener >& ) +{} void SAL_CALL ResultSetBase::removeVetoableChangeListener( - const OUString& PropertyName, - const uno::Reference< beans::XVetoableChangeListener >& aListener ) -{ - (void)PropertyName; - (void)aListener; -} + const OUString&, + const uno::Reference< beans::XVetoableChangeListener >& ) +{} // XResultSetMetaDataSupplier diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx index 85d33f8463a1..6ccdf3964527 100644 --- a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx +++ b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx @@ -335,15 +335,8 @@ private: }; -void URLParameter::open( const Command& aCommand, - sal_Int32 CommandId, - const Reference< XCommandEnvironment >& Environment, - const Reference< XOutputStream >& xDataSink ) +void URLParameter::open( const Reference< XOutputStream >& xDataSink ) { - (void)aCommand; - (void)CommandId; - (void)Environment; - if( ! xDataSink.is() ) return; @@ -361,15 +354,8 @@ void URLParameter::open( const Command& aCommand, } -void URLParameter::open( const Command& aCommand, - sal_Int32 CommandId, - const Reference< XCommandEnvironment >& Environment, - const Reference< XActiveDataSink >& xDataSink ) +void URLParameter::open( const Reference< XActiveDataSink >& xDataSink ) { - (void)aCommand; - (void)CommandId; - (void)Environment; - // a standard document or else an active help text, plug in the new input stream xDataSink->setInputStream( new InputStreamTransformer( this,m_pDatabases,isRoot() ) ); } diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.hxx b/xmlhelp/source/cxxhelp/provider/urlparameter.hxx index b261eaa99e96..29edea3d30db 100644 --- a/xmlhelp/source/cxxhelp/provider/urlparameter.hxx +++ b/xmlhelp/source/cxxhelp/provider/urlparameter.hxx @@ -23,10 +23,8 @@ #include <rtl/ustring.hxx> #include <rtl/string.hxx> #include <com/sun/star/ucb/IllegalIdentifierException.hpp> -#include <com/sun/star/ucb/XCommandEnvironment.hpp> #include <com/sun/star/io/XActiveDataSink.hpp> #include <com/sun/star/io/XOutputStream.hpp> -#include <com/sun/star/ucb/Command.hpp> namespace chelp { @@ -160,15 +158,9 @@ namespace chelp { OString getByName( const char* par ); - void open( const css::ucb::Command& aCommand, - sal_Int32 CommandId, - const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment, - const css::uno::Reference< css::io::XActiveDataSink >& xDataSink ); + void open( const css::uno::Reference< css::io::XActiveDataSink >& xDataSink ); - void open( const css::ucb::Command& aCommand, - sal_Int32 CommandId, - const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment, - const css::uno::Reference< css::io::XOutputStream >& xDataSink ); + void open( const css::uno::Reference< css::io::XOutputStream >& xDataSink ); private: diff --git a/xmlhelp/source/treeview/tvread.cxx b/xmlhelp/source/treeview/tvread.cxx index 7c79c74de755..9410a1886757 100644 --- a/xmlhelp/source/treeview/tvread.cxx +++ b/xmlhelp/source/treeview/tvread.cxx @@ -366,10 +366,8 @@ extern "C" void start_handler(void *userData, } extern "C" void end_handler(void *userData, - const XML_Char *name ) + SAL_UNUSED_PARAMETER const XML_Char * ) { - (void)name; - TVDom **tvDom = static_cast< TVDom** >( userData ); *tvDom = (*tvDom)->getParent(); } |