From d10c5e25f7545667cb347edef7e6690759d0efc5 Mon Sep 17 00:00:00 2001 From: Elton Chung Date: Sat, 25 Feb 2012 13:52:32 +0800 Subject: [PATCH] Remove unused code --- canvas/inc/canvas/verifyinput.hxx | 46 ------- canvas/source/tools/verifyinput.cxx | 126 -------------------- .../inc/comphelper/accessibleeventnotifier.hxx | 5 - comphelper/inc/comphelper/attributelist.hxx | 2 - comphelper/inc/comphelper/containermultiplexer.hxx | 2 - comphelper/inc/comphelper/interaction.hxx | 2 - comphelper/inc/comphelper/logging.hxx | 47 ------- comphelper/inc/comphelper/officeresourcebundle.hxx | 13 -- comphelper/inc/comphelper/propertysethelper.hxx | 4 - comphelper/inc/comphelper/propertysetinfo.hxx | 9 -- comphelper/inc/comphelper/serviceinfohelper.hxx | 2 - comphelper/inc/comphelper/streamsection.hxx | 4 - .../source/container/containermultiplexer.cxx | 12 -- comphelper/source/misc/accessibleeventnotifier.cxx | 14 -- comphelper/source/misc/interaction.cxx | 6 - comphelper/source/misc/logging.cxx | 85 ------------- comphelper/source/misc/officeresourcebundle.cxx | 8 -- comphelper/source/misc/serviceinfohelper.cxx | 24 ---- comphelper/source/property/propertysethelper.cxx | 17 --- comphelper/source/property/propertysetinfo.cxx | 5 - comphelper/source/streaming/streamsection.cxx | 14 -- comphelper/source/xml/attributelist.cxx | 25 ---- unusedcode.easy | 20 --- 23 files changed, 0 insertions(+), 492 deletions(-) diff --git a/canvas/inc/canvas/verifyinput.hxx b/canvas/inc/canvas/verifyinput.hxx index 8c4c11f..60b168e 100644 --- a/canvas/inc/canvas/verifyinput.hxx +++ b/canvas/inc/canvas/verifyinput.hxx @@ -61,7 +61,6 @@ namespace com { namespace sun { namespace star { namespace rendering struct Texture; struct ViewState; struct IntegerBitmapLayout; - struct FloatingPointBitmapLayout; struct FontRequest; struct FontInfo; class XCanvas; @@ -149,29 +148,6 @@ namespace canvas ::com::sun::star::uno::XInterface >& xIf, ::sal_Int16 nArgPos ); - /** Verify that the given size contains valid floating point - values. - - @param rSize - Size to check - - @param xIf - The interface that should be reported as the one - generating the exception. - - @param nArgPos - Argument position on the call site (i.e. the position of - the argument, checked here, on the UNO interface - method. Counting starts at 0). - - @throws an lang::IllegalArgumentException, if anything is wrong - */ - CANVASTOOLS_DLLPUBLIC void verifyInput( const ::com::sun::star::geometry::RealSize2D& rSize, - const char* pStr, - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XInterface >& xIf, - ::sal_Int16 nArgPos ); - /** Verify that the given bezier segment contains valid floating point values. @@ -356,28 +332,6 @@ namespace canvas ::com::sun::star::uno::XInterface >& xIf, ::sal_Int16 nArgPos ); - /** Basic check for bitmap layout validity. - - @param bitmapLayout - Bitmap layout to check - - @param xIf - The interface that should be reported as the one - generating the exception. - - @param nArgPos - Argument position on the call site (i.e. the position of - the argument, checked here, on the UNO interface - method. Counting starts at 0). - - @throws an lang::IllegalArgumentException, if anything is wrong - */ - CANVASTOOLS_DLLPUBLIC void verifyInput( const ::com::sun::star::rendering::FloatingPointBitmapLayout& bitmapLayout, - const char* pStr, - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XInterface >& xIf, - ::sal_Int16 nArgPos ); - /** Basic check for font info validity. @param fontInfo diff --git a/canvas/source/tools/verifyinput.cxx b/canvas/source/tools/verifyinput.cxx index f7929a4..32ac8bb 100644 --- a/canvas/source/tools/verifyinput.cxx +++ b/canvas/source/tools/verifyinput.cxx @@ -101,40 +101,6 @@ namespace canvas #endif } - void verifyInput( const geometry::RealSize2D& rSize, - const char* pStr, - const uno::Reference< uno::XInterface >& xIf, - ::sal_Int16 nArgPos ) - { - (void)pStr; (void)xIf; (void)nArgPos; - -#if OSL_DEBUG_LEVEL > 0 - if( !::rtl::math::isFinite( rSize.Width ) ) - { - throw lang::IllegalArgumentException( - ::rtl::OUString::createFromAscii(pStr) + - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyInput(): size.Width value contains infinite or NAN" )), - xIf, - nArgPos ); - } - - if( !::rtl::math::isFinite( rSize.Height ) ) - { - throw lang::IllegalArgumentException( - ::rtl::OUString::createFromAscii(pStr) + - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyInput(): size.Height value contains infinite or NAN" )), - xIf, - nArgPos ); - } -#else - if( !::rtl::math::isFinite( rSize.Width ) || - !::rtl::math::isFinite( rSize.Height ) ) - { - throw lang::IllegalArgumentException(); - } -#endif - } - void verifyInput( const geometry::RealBezierSegment2D& rSegment, const char* pStr, const uno::Reference< uno::XInterface >& xIf, @@ -667,98 +633,6 @@ namespace canvas } } - void verifyInput( const rendering::FloatingPointBitmapLayout& bitmapLayout, - const char* pStr, - const uno::Reference< uno::XInterface >& xIf, - ::sal_Int16 nArgPos ) - { - (void)pStr; (void)xIf; (void)nArgPos; - - if( bitmapLayout.ScanLines < 0 ) - { -#if OSL_DEBUG_LEVEL > 0 - throw lang::IllegalArgumentException( - ::rtl::OUString::createFromAscii(pStr) + - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyInput(): bitmap layout's ScanLines is negative" )), - xIf, - nArgPos ); -#else - throw lang::IllegalArgumentException(); -#endif - } - - if( bitmapLayout.ScanLineBytes < 0 ) - { -#if OSL_DEBUG_LEVEL > 0 - throw lang::IllegalArgumentException( - ::rtl::OUString::createFromAscii(pStr) + - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyInput(): bitmap layout's ScanLineBytes is negative" )), - xIf, - nArgPos ); -#else - throw lang::IllegalArgumentException(); -#endif - } - - if( !bitmapLayout.ColorSpace.is() ) - { -#if OSL_DEBUG_LEVEL > 0 - throw lang::IllegalArgumentException( - ::rtl::OUString::createFromAscii(pStr) + - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyInput(): bitmap layout's ColorSpace is invalid" )), - xIf, - nArgPos ); -#else - throw lang::IllegalArgumentException(); -#endif - } - - if( bitmapLayout.NumComponents < 0 ) - { -#if OSL_DEBUG_LEVEL > 0 - throw lang::IllegalArgumentException( - ::rtl::OUString::createFromAscii(pStr) + - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyInput(): bitmap layout's NumComponents is negative" )), - xIf, - nArgPos ); -#else - throw lang::IllegalArgumentException(); -#endif - } - - if( bitmapLayout.Endianness < util::Endianness::LITTLE || - bitmapLayout.Endianness > util::Endianness::BIG ) - { -#if OSL_DEBUG_LEVEL > 0 - throw lang::IllegalArgumentException( - ::rtl::OUString::createFromAscii(pStr) + - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyInput(): bitmap layout's Endianness value is out of range (" )) + - ::rtl::OUString::valueOf(sal::static_int_cast(bitmapLayout.Endianness)) + - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( " not known)" )), - xIf, - nArgPos ); -#else - throw lang::IllegalArgumentException(); -#endif - } - - if( bitmapLayout.Format < rendering::FloatingPointBitmapFormat::HALFFLOAT || - bitmapLayout.Format > rendering::FloatingPointBitmapFormat::DOUBLE ) - { -#if OSL_DEBUG_LEVEL > 0 - throw lang::IllegalArgumentException( - ::rtl::OUString::createFromAscii(pStr) + - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyInput(): bitmap layout's Format value is out of range (" )) + - ::rtl::OUString::valueOf(sal::static_int_cast(bitmapLayout.Format)) + - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( " not known)" )), - xIf, - nArgPos ); -#else - throw lang::IllegalArgumentException(); -#endif - } - } - void verifyInput( const rendering::FontInfo& /*fontInfo*/, const char* /*pStr*/, const uno::Reference< uno::XInterface >& /*xIf*/, diff --git a/comphelper/inc/comphelper/accessibleeventnotifier.hxx b/comphelper/inc/comphelper/accessibleeventnotifier.hxx index c80b8ff..385866a 100644 --- a/comphelper/inc/comphelper/accessibleeventnotifier.hxx +++ b/comphelper/inc/comphelper/accessibleeventnotifier.hxx @@ -129,11 +129,6 @@ namespace comphelper const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& _rxListener ) SAL_THROW( ( ) ); - /** retrieves the set of listeners registered for a given client - */ - static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > > - getEventListeners( const TClientId _nClient ) SAL_THROW( ( ) ); - /** adds an event, which is to be braodcasted, to the queue @param _nClient diff --git a/comphelper/inc/comphelper/attributelist.hxx b/comphelper/inc/comphelper/attributelist.hxx index ed5e397..50ad1aa 100644 --- a/comphelper/inc/comphelper/attributelist.hxx +++ b/comphelper/inc/comphelper/attributelist.hxx @@ -51,8 +51,6 @@ public: // methods that are not contained in any interface void AddAttribute( const ::rtl::OUString &sName , const ::rtl::OUString &sType , const ::rtl::OUString &sValue ); - void Clear(); - void AppendAttributeList( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & ); // ::com::sun::star::xml::sax::XAttributeList virtual sal_Int16 SAL_CALL getLength(void) diff --git a/comphelper/inc/comphelper/containermultiplexer.hxx b/comphelper/inc/comphelper/containermultiplexer.hxx index 68990ec..56124d2 100644 --- a/comphelper/inc/comphelper/containermultiplexer.hxx +++ b/comphelper/inc/comphelper/containermultiplexer.hxx @@ -97,8 +97,6 @@ namespace comphelper virtual void SAL_CALL elementReplaced( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException); // locking the multiplexer - void lock(); - void unlock(); sal_Int32 locked() const { return m_nLockCount; } /// dispose the object. No multiplexing anymore diff --git a/comphelper/inc/comphelper/interaction.hxx b/comphelper/inc/comphelper/interaction.hxx index a8f0df5..e55ae40 100644 --- a/comphelper/inc/comphelper/interaction.hxx +++ b/comphelper/inc/comphelper/interaction.hxx @@ -155,8 +155,6 @@ namespace comphelper /// add a new continuation void addContinuation(const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation >& _rxContinuation); - /// clear all continuations - void clearContinuations(); // XInteractionRequest virtual ::com::sun::star::uno::Any SAL_CALL getRequest( ) throw(::com::sun::star::uno::RuntimeException); diff --git a/comphelper/inc/comphelper/logging.hxx b/comphelper/inc/comphelper/logging.hxx index e332f05..5ad80ec 100644 --- a/comphelper/inc/comphelper/logging.hxx +++ b/comphelper/inc/comphelper/logging.hxx @@ -136,39 +136,9 @@ namespace comphelper ~EventLogger(); public: - /** returns the name of the logger - */ - const ::rtl::OUString& getName() const; - - /// returns the current log level threshold of the logger - sal_Int32 getLogLevel() const; - - /// sets a new log level threshold of the logger - void setLogLevel( const sal_Int32 _nLogLevel ) const; - /// determines whether an event with the given level would be logged bool isLoggable( const sal_Int32 _nLogLevel ) const; - /** adds the given log handler to the logger's set of handlers. - - Note that normally, you would not use this method: The logger implementations - initialize themselves from the configuration, where usually, a default log handler - is specified. In this case, the logger will create and use this handler. - - @return - if and only if the addition was successful (as far as this can be detected - from outside the XLogger's implementation. - */ - bool addLogHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::logging::XLogHandler >& _rxLogHandler ); - - /** removes the given log handler from the logger's set of handlers. - - @return - if and only if the addition was successful (as far as this can be detected - from outside the XLogger's implementation. - */ - bool removeLogHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::logging::XLogHandler >& _rxLogHandler ); - //---------------------------------------------------------------- //- XLogger::log equivalents/wrappers //- string messages @@ -572,23 +542,6 @@ namespace comphelper /** creates a resource based event logger @param _rxContext the component context for creating new components - @param _rResourceBundleBaseName - the base name of the resource bundle to use. Will be used - in conjunction with XResourceBundleLoader::loadResource. - @param _rLoggerName - the name of the logger to work with. If empty, the office-wide - default logger will be used. - - */ - ResourceBasedEventLogger( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, - const ::rtl::OUString& _rResourceBundleBaseName, - const ::rtl::OUString& _rLoggerName = ::rtl::OUString() - ); - - /** creates a resource based event logger - @param _rxContext - the component context for creating new components @param _pResourceBundleBaseName the ASCII base name of the resource bundle to use. Will be used in conjunction with XResourceBundleLoader::loadResource. diff --git a/comphelper/inc/comphelper/officeresourcebundle.hxx b/comphelper/inc/comphelper/officeresourcebundle.hxx index 345790e..4946fee 100644 --- a/comphelper/inc/comphelper/officeresourcebundle.hxx +++ b/comphelper/inc/comphelper/officeresourcebundle.hxx @@ -55,19 +55,6 @@ namespace comphelper ::std::auto_ptr< ResourceBundle_Impl > m_pImpl; public: - /** constructs a resource bundle - @param _context - the component context to operate in - @param _bundleBaseName - the base name of the resource file which should be accessed (*without* the SUPD!) - @raises ::com::sun::star::lang::NullPointerException - if the given component context is - */ - OfficeResourceBundle( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _context, - const ::rtl::OUString& _bundleBaseName - ); - /** constructs a resource bundle with the resource bundle given as 8-bit ASCII name This is a convenience constructor only, it does nothing different than the constructor diff --git a/comphelper/inc/comphelper/propertysethelper.hxx b/comphelper/inc/comphelper/propertysethelper.hxx index ea6204d..e22cb8d 100644 --- a/comphelper/inc/comphelper/propertysethelper.hxx +++ b/comphelper/inc/comphelper/propertysethelper.hxx @@ -62,11 +62,7 @@ protected: virtual void _setPropertyToDefault( const comphelper::PropertyMapEntry* pEntry ) throw(::com::sun::star::beans::UnknownPropertyException ); virtual ::com::sun::star::uno::Any _getPropertyDefault( const comphelper::PropertyMapEntry* pEntry ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException ); - // allow setting of properties after construction - void setInfo( comphelper::PropertySetInfo* pInfo ) throw(); - public: - PropertySetHelper( ); PropertySetHelper( comphelper::PropertySetInfo* pInfo ) throw(); PropertySetHelper( comphelper::PropertySetInfo* pInfo, __sal_NoAcquire ) throw(); virtual ~PropertySetHelper() throw(); diff --git a/comphelper/inc/comphelper/propertysetinfo.hxx b/comphelper/inc/comphelper/propertysetinfo.hxx index 80a200a..df031a4 100644 --- a/comphelper/inc/comphelper/propertysetinfo.hxx +++ b/comphelper/inc/comphelper/propertysetinfo.hxx @@ -79,15 +79,6 @@ public: */ void add( PropertyMapEntry* pMap ) throw(); - /** adds an array of PropertyMapEntry to this instance - -

At most the number of entries given will be added, if no terminating entry (mpName == ) is encountered.

- -

If nCount is less than 0, it is ignored and all entries (up to, but not including, the terminating - one) are added.

- */ - void add( PropertyMapEntry* pMap, sal_Int32 nCount ) throw(); - /** removes an already added PropertyMapEntry which string in mpName equals to aName */ void remove( const rtl::OUString& aName ) throw(); diff --git a/comphelper/inc/comphelper/serviceinfohelper.hxx b/comphelper/inc/comphelper/serviceinfohelper.hxx index 29ffe3b..e742c93 100644 --- a/comphelper/inc/comphelper/serviceinfohelper.hxx +++ b/comphelper/inc/comphelper/serviceinfohelper.hxx @@ -49,8 +49,6 @@ public: virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // helper - static ::com::sun::star::uno::Sequence< ::rtl::OUString > concatSequences( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rSeq1, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rSeq2 ) throw(); static void addToSequence( ::com::sun::star::uno::Sequence< ::rtl::OUString >& rSeq, sal_uInt16 nServices, /* sal_Char* */... ) throw(); static sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& SupportedServices ) throw(); }; diff --git a/comphelper/inc/comphelper/streamsection.hxx b/comphelper/inc/comphelper/streamsection.hxx index fb17581..3a39d9e 100644 --- a/comphelper/inc/comphelper/streamsection.hxx +++ b/comphelper/inc/comphelper/streamsection.hxx @@ -78,10 +78,6 @@ public: If constructed for reading, any remaining bytes 'til the end of the section will be skipped. */ ~OStreamSection(); - /** - return the number of bytes which are still available - */ - sal_Int32 available(); }; } // namespace comphelper diff --git a/comphelper/source/container/containermultiplexer.cxx b/comphelper/source/container/containermultiplexer.cxx index d5a957a..b4d5723 100644 --- a/comphelper/source/container/containermultiplexer.cxx +++ b/comphelper/source/container/containermultiplexer.cxx @@ -127,18 +127,6 @@ namespace comphelper } //------------------------------------------------------------------ - void OContainerListenerAdapter::lock() - { - ++m_nLockCount; - } - - //------------------------------------------------------------------ - void OContainerListenerAdapter::unlock() - { - --m_nLockCount; - } - - //------------------------------------------------------------------ void OContainerListenerAdapter::dispose() { if (m_xContainer.is()) diff --git a/comphelper/source/misc/accessibleeventnotifier.cxx b/comphelper/source/misc/accessibleeventnotifier.cxx index cae07bc..636d356 100644 --- a/comphelper/source/misc/accessibleeventnotifier.cxx +++ b/comphelper/source/misc/accessibleeventnotifier.cxx @@ -202,20 +202,6 @@ namespace comphelper } //--------------------------------------------------------------------- - Sequence< Reference< XInterface > > AccessibleEventNotifier::getEventListeners( const TClientId _nClient ) SAL_THROW( ( ) ) - { - Sequence< Reference< XInterface > > aListeners; - - ::osl::MutexGuard aGuard( lclMutex::get() ); - - ClientMap::iterator aClientPos; - if ( implLookupClient( _nClient, aClientPos ) ) - aListeners = aClientPos->second->getElements(); - - return aListeners; - } - - //--------------------------------------------------------------------- void AccessibleEventNotifier::addEvent( const TClientId _nClient, const AccessibleEventObject& _rEvent ) SAL_THROW( ( ) ) { Sequence< Reference< XInterface > > aListeners; diff --git a/comphelper/source/misc/interaction.cxx b/comphelper/source/misc/interaction.cxx index cce5e6a93..fd8bce0 100644 --- a/comphelper/source/misc/interaction.cxx +++ b/comphelper/source/misc/interaction.cxx @@ -74,12 +74,6 @@ namespace comphelper } //------------------------------------------------------------------------- - void OInteractionRequest::clearContinuations() - { - m_aContinuations.realloc(0); - } - - //------------------------------------------------------------------------- Any SAL_CALL OInteractionRequest::getRequest( ) throw(RuntimeException) { return m_aRequest; diff --git a/comphelper/source/misc/logging.cxx b/comphelper/source/misc/logging.cxx index 1d95b15..98a497c 100644 --- a/comphelper/source/misc/logging.cxx +++ b/comphelper/source/misc/logging.cxx @@ -127,44 +127,6 @@ namespace comphelper } //-------------------------------------------------------------------- - const ::rtl::OUString& EventLogger::getName() const - { - return m_pImpl->getName(); - } - - //-------------------------------------------------------------------- - sal_Int32 EventLogger::getLogLevel() const - { - try - { - if ( m_pImpl->isValid() ) - return m_pImpl->getLogger()->getLevel(); - } - catch( const Exception& e ) - { - (void)e; - OSL_FAIL( "EventLogger::getLogLevel: caught an exception!" ); - } - - return LogLevel::OFF; - } - - //-------------------------------------------------------------------- - void EventLogger::setLogLevel( const sal_Int32 _nLogLevel ) const - { - try - { - if ( m_pImpl->isValid() ) - m_pImpl->getLogger()->setLevel( _nLogLevel ); - } - catch( const Exception& e ) - { - (void)e; - OSL_FAIL( "EventLogger::setLogLevel: caught an exception!" ); - } - } - - //-------------------------------------------------------------------- bool EventLogger::isLoggable( const sal_Int32 _nLogLevel ) const { if ( !m_pImpl->isValid() ) @@ -184,44 +146,6 @@ namespace comphelper } //-------------------------------------------------------------------- - bool EventLogger::addLogHandler( const Reference< XLogHandler >& _rxLogHandler ) - { - try - { - if ( m_pImpl->isValid() ) - { - m_pImpl->getLogger()->addLogHandler( _rxLogHandler ); - return true; - } - } - catch( const Exception& e ) - { - (void)e; - OSL_FAIL( "EventLogger::addLogHandler: caught an exception!" ); - } - return false; - } - - //-------------------------------------------------------------------- - bool EventLogger::removeLogHandler( const Reference< XLogHandler >& _rxLogHandler ) - { - try - { - if ( m_pImpl->isValid() ) - { - m_pImpl->getLogger()->removeLogHandler( _rxLogHandler ); - return true; - } - } - catch( const Exception& e ) - { - (void)e; - OSL_FAIL( "EventLogger::removeLogHandler: caught an exception!" ); - } - return false; - } - - //-------------------------------------------------------------------- namespace { void lcl_replaceParameter( ::rtl::OUString& _inout_Message, const ::rtl::OUString& _rPlaceHolder, const ::rtl::OUString& _rReplacement ) @@ -363,15 +287,6 @@ namespace comphelper //= ResourceBasedEventLogger //==================================================================== //-------------------------------------------------------------------- - ResourceBasedEventLogger::ResourceBasedEventLogger( const Reference< XComponentContext >& _rxContext, const ::rtl::OUString& _rResourceBundleBaseName, - const ::rtl::OUString& _rLoggerName ) - :EventLogger( _rxContext, _rLoggerName ) - ,m_pData( new ResourceBasedEventLogger_Data ) - { - m_pData->sBundleBaseName = _rResourceBundleBaseName; - } - - //-------------------------------------------------------------------- ResourceBasedEventLogger::ResourceBasedEventLogger( const Reference< XComponentContext >& _rxContext, const sal_Char* _pResourceBundleBaseName, const sal_Char* _pAsciiLoggerName ) :EventLogger( _rxContext, _pAsciiLoggerName ) diff --git a/comphelper/source/misc/officeresourcebundle.cxx b/comphelper/source/misc/officeresourcebundle.cxx index 1619318..db51b13 100644 --- a/comphelper/source/misc/officeresourcebundle.cxx +++ b/comphelper/source/misc/officeresourcebundle.cxx @@ -202,14 +202,6 @@ namespace comphelper //= OfficeResourceBundle //==================================================================== //-------------------------------------------------------------------- - OfficeResourceBundle::OfficeResourceBundle( const Reference< XComponentContext >& _context, const ::rtl::OUString& _bundleBaseName ) - :m_pImpl( new ResourceBundle_Impl( _context, _bundleBaseName ) ) - { - if ( !_context.is() ) - throw NullPointerException(); - } - - //-------------------------------------------------------------------- OfficeResourceBundle::OfficeResourceBundle( const Reference< XComponentContext >& _context, const sal_Char* _bundleBaseAsciiName ) :m_pImpl( new ResourceBundle_Impl( _context, ::rtl::OUString::createFromAscii( _bundleBaseAsciiName ) ) ) { diff --git a/comphelper/source/misc/serviceinfohelper.cxx b/comphelper/source/misc/serviceinfohelper.cxx index f90598e..1d648ae 100644 --- a/comphelper/source/misc/serviceinfohelper.cxx +++ b/comphelper/source/misc/serviceinfohelper.cxx @@ -63,30 +63,6 @@ sal_Bool SAL_CALL ServiceInfoHelper::supportsService( const ::rtl::OUString& Ser return aSeq; } -/** this method concatenates the given sequences and returns the result - */ -::com::sun::star::uno::Sequence< ::rtl::OUString > ServiceInfoHelper::concatSequences( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rSeq1, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rSeq2 ) throw() -{ - const sal_Int32 nLen1 = rSeq1.getLength(); - const sal_Int32 nLen2 = rSeq2.getLength(); - - ::com::sun::star::uno::Sequence< ::rtl::OUString > aSeq( nLen1 + nLen2 ); - - ::rtl::OUString* pStrings = aSeq.getArray(); - - sal_Int32 nIdx; - const ::rtl::OUString* pStringSrc = rSeq1.getConstArray(); - for( nIdx = 0; nIdx < nLen1; nIdx++ ) - *pStrings++ = *pStringSrc++; - - pStringSrc = rSeq2.getConstArray(); - for( nIdx = 0; nIdx < nLen2; nIdx++ ) - *pStrings++ = *pStringSrc++; - - return aSeq; -} - /** this method adds a variable number of char pointer to a given Sequence */ void ServiceInfoHelper::addToSequence( ::com::sun::star::uno::Sequence< ::rtl::OUString >& rSeq, sal_uInt16 nServices, /* char * */ ... ) throw() diff --git a/comphelper/source/property/propertysethelper.cxx b/comphelper/source/property/propertysethelper.cxx index 19646af..43b2b4d 100644 --- a/comphelper/source/property/propertysethelper.cxx +++ b/comphelper/source/property/propertysethelper.cxx @@ -66,13 +66,6 @@ PropertyMapEntry* PropertySetHelperImpl::find( const OUString& aName ) const thr /////////////////////////////////////////////////////////////////////// -PropertySetHelper::PropertySetHelper( ) -{ - mp = new PropertySetHelperImpl; - mp->mpInfo = new PropertySetInfo; - mp->mpInfo->acquire(); -} - PropertySetHelper::PropertySetHelper( comphelper::PropertySetInfo* pInfo ) throw() { mp = new PropertySetHelperImpl; @@ -92,16 +85,6 @@ PropertySetHelper::~PropertySetHelper() throw() delete mp; } -void PropertySetHelper::setInfo( comphelper::PropertySetInfo* pInfo ) throw() -{ - OSL_ENSURE( pInfo != NULL, "need pInfo" ); - OSL_ENSURE( mp->mpInfo != NULL, "where's the old pInfo?" ); - - mp->mpInfo->release(); - mp->mpInfo = pInfo; - mp->mpInfo->acquire(); -} - // XPropertySet Reference< XPropertySetInfo > SAL_CALL PropertySetHelper::getPropertySetInfo( ) throw(RuntimeException) { diff --git a/comphelper/source/property/propertysetinfo.cxx b/comphelper/source/property/propertysetinfo.cxx index 5472777..c007f6b 100644 --- a/comphelper/source/property/propertysetinfo.cxx +++ b/comphelper/source/property/propertysetinfo.cxx @@ -182,11 +182,6 @@ void PropertySetInfo::add( PropertyMapEntry* pMap ) throw() mpMap->add( pMap ); } -void PropertySetInfo::add( PropertyMapEntry* pMap, sal_Int32 nCount ) throw() -{ - mpMap->add( pMap, nCount ); -} - void PropertySetInfo::remove( const rtl::OUString& aName ) throw() { mpMap->remove( aName ); diff --git a/comphelper/source/streaming/streamsection.cxx b/comphelper/source/streaming/streamsection.cxx index 249a164..25b1efe 100644 --- a/comphelper/source/streaming/streamsection.cxx +++ b/comphelper/source/streaming/streamsection.cxx @@ -101,20 +101,6 @@ OStreamSection::~OStreamSection() } } // ----------------------------------------------------------------------------- -sal_Int32 OStreamSection::available() -{ - sal_Int32 nBytes = 0; - try - { // don't allow any exceptions to leave this block, this may be called during the stack unwinding of an exception - if (m_xInStream.is() && m_xMarkStream.is()) - nBytes = m_xMarkStream->offsetToMark(m_nBlockStart) - sizeof(m_nBlockLen); - } - catch(const staruno::Exception&) - { - } - return nBytes; -} -// ----------------------------------------------------------------------------- } // namespace comphelper diff --git a/comphelper/source/xml/attributelist.cxx b/comphelper/source/xml/attributelist.cxx index a31ea94..5fbb81f 100644 --- a/comphelper/source/xml/attributelist.cxx +++ b/comphelper/source/xml/attributelist.cxx @@ -131,31 +131,6 @@ void AttributeList::AddAttribute( const OUString &sName , m_pImpl->vecAttribute.push_back( TagAttribute_Impl( sName , sType , sValue ) ); } -void AttributeList::Clear() -{ - m_pImpl->vecAttribute.clear(); - - OSL_ENSURE( ! getLength(), "Length > 0 after AttributeList::Clear!"); -} - -void AttributeList::AppendAttributeList( const uno::Reference< ::com::sun::star::xml::sax::XAttributeList > &r ) -{ - OSL_ENSURE( r.is(), "r isn't!" ); - - sal_Int32 nMax = r->getLength(); - sal_Int32 nTotalSize = m_pImpl->vecAttribute.size() + nMax; - m_pImpl->vecAttribute.reserve( nTotalSize ); - - for( sal_Int16 i = 0 ; i < nMax ; i ++ ) { - m_pImpl->vecAttribute.push_back( TagAttribute_Impl( - r->getNameByIndex( i ) , - r->getTypeByIndex( i ) , - r->getValueByIndex( i ))); - } - - OSL_ENSURE( nTotalSize == getLength(), "nTotalSize != getLength()"); -} - } // namespace comphelper /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unusedcode.easy b/unusedcode.easy index c08ba6f..05808d4 100755 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -948,34 +948,14 @@ canvas::createSurfaceProxyManager(boost::shared_ptr const canvas::tools::ElapsedTime::getTimeBase() const canvas::tools::calcRectToRectTransform(basegfx::B2DHomMatrix&, basegfx::B2DRange const&, basegfx::B2DRange const&, basegfx::B2DHomMatrix const&) canvas::tools::clipBlit(basegfx::B2IRange&, basegfx::B2IPoint&, basegfx::B2IRange const&, basegfx::B2IRange const&) -canvas::tools::verifyInput(com::sun::star::geometry::RealSize2D const&, char const*, com::sun::star::uno::Reference const&, short) -canvas::tools::verifyInput(com::sun::star::rendering::FloatingPointBitmapLayout const&, char const*, com::sun::star::uno::Reference const&, short) cmis::Content::exchangeIdentity(com::sun::star::uno::Reference const&) cmis::Content::queryChildren(std::__debug::list, std::allocator > >&) -comphelper::AccessibleEventNotifier::getEventListeners(unsigned int) -comphelper::AttributeList::AppendAttributeList(com::sun::star::uno::Reference const&) -comphelper::AttributeList::Clear() -comphelper::EventLogger::addLogHandler(com::sun::star::uno::Reference const&) -comphelper::EventLogger::getLogLevel() const -comphelper::EventLogger::getName() const -comphelper::EventLogger::removeLogHandler(com::sun::star::uno::Reference const&) -comphelper::EventLogger::setLogLevel(int) const comphelper::FastPropertySetInfo::FastPropertySetInfo() comphelper::FastPropertySetInfo::addProperty(com::sun::star::beans::Property const&) comphelper::OAccessibleSelectionHelper::OAccessibleSelectionHelper() comphelper::OAccessibleTextHelper::OAccessibleTextHelper() -comphelper::OContainerListenerAdapter::lock() -comphelper::OContainerListenerAdapter::unlock() -comphelper::OInteractionRequest::clearContinuations() comphelper::OPropertyContainerHelper::modifyAttributes(int, int, int) comphelper::OSelectionChangeListener::disposeAdapter() -comphelper::OStreamSection::available() -comphelper::OfficeResourceBundle::OfficeResourceBundle(com::sun::star::uno::Reference const&, rtl::OUString const&) -comphelper::PropertySetHelper::PropertySetHelper() -comphelper::PropertySetHelper::setInfo(comphelper::PropertySetInfo*) -comphelper::PropertySetInfo::add(comphelper::PropertyMapEntry*, int) -comphelper::ResourceBasedEventLogger::ResourceBasedEventLogger(com::sun::star::uno::Reference const&, rtl::OUString const&, rtl::OUString const&) -comphelper::ServiceInfoHelper::concatSequences(com::sun::star::uno::Sequence const&, com::sun::star::uno::Sequence const&) comphelper::detail::ConfigurationWrapper::getGroupReadWrite(boost::shared_ptr const&, rtl::OUString const&) const comphelper::detail::ConfigurationWrapper::getLocalizedPropertyValue(rtl::OUString const&) const comphelper::detail::ConfigurationWrapper::setLocalizedPropertyValue(boost::shared_ptr const&, rtl::OUString const&, com::sun::star::uno::Any const&) const -- 1.7.7.msysgit.1