diff options
author | Caolán McNamara <caolanm@redhat.com> | 2011-09-22 09:03:09 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-09-22 15:01:04 +0100 |
commit | 206a25585468c1ff7dd2f03affb37599ebaba4af (patch) | |
tree | 3a65e391d368dd8220a4cd2d58032c20d9ecb993 /framework | |
parent | ac58231a01186d0935d0ff5fb2485d8750ed5022 (diff) |
callcatcher: unused code
Diffstat (limited to 'framework')
-rw-r--r-- | framework/inc/framework/bmkmenu.hxx | 5 | ||||
-rw-r--r-- | framework/inc/xml/imagesconfiguration.hxx | 8 | ||||
-rw-r--r-- | framework/source/fwe/classes/bmkmenu.cxx | 16 | ||||
-rw-r--r-- | framework/source/xml/imagesconfiguration.cxx | 73 |
4 files changed, 1 insertions, 101 deletions
diff --git a/framework/inc/framework/bmkmenu.hxx b/framework/inc/framework/bmkmenu.hxx index ce42da483c3f..de3621eeaa32 100644 --- a/framework/inc/framework/bmkmenu.hxx +++ b/framework/inc/framework/bmkmenu.hxx @@ -60,7 +60,7 @@ class FWE_DLLPUBLIC BmkMenu : public AddonMenu BMK_WIZARDMENU }; - BmkMenu( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, + BmkMenu( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, BmkMenuType nType ); @@ -73,9 +73,6 @@ class FWE_DLLPUBLIC BmkMenu : public AddonMenu sal_uInt16 CreateMenuId(); private: - BmkMenu( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, - BmkMenuType, BmkMenu* pRoot - ); BmkMenu_Impl* _pImp; }; diff --git a/framework/inc/xml/imagesconfiguration.hxx b/framework/inc/xml/imagesconfiguration.hxx index 169116c7a911..68ab82ade1d1 100644 --- a/framework/inc/xml/imagesconfiguration.hxx +++ b/framework/inc/xml/imagesconfiguration.hxx @@ -104,14 +104,6 @@ class ImagesConfiguration public: static sal_Bool LoadImages( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, - SvStream& rInStream, ImageListsDescriptor& aItems ); - - static sal_Bool StoreImages( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, - SvStream& rOutStream, const ImageListsDescriptor& aItems ); - - static sal_Bool LoadImages( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rInputStream, ImageListsDescriptor& rItems ); diff --git a/framework/source/fwe/classes/bmkmenu.cxx b/framework/source/fwe/classes/bmkmenu.cxx index 66108f645a90..9ac8baf62d6e 100644 --- a/framework/source/fwe/classes/bmkmenu.cxx +++ b/framework/source/fwe/classes/bmkmenu.cxx @@ -88,10 +88,8 @@ class BmkMenu_Impl static sal_uInt16 m_nMID; public: - BmkMenu* m_pRoot; sal_Bool m_bInitialized; - BmkMenu_Impl( BmkMenu* pRoot ); BmkMenu_Impl(); ~BmkMenu_Impl(); @@ -100,14 +98,8 @@ class BmkMenu_Impl sal_uInt16 BmkMenu_Impl::m_nMID = BMKMENU_ITEMID_START; -BmkMenu_Impl::BmkMenu_Impl( BmkMenu* pRoot ) : - m_pRoot(pRoot), - m_bInitialized(sal_False) -{ -} BmkMenu_Impl::BmkMenu_Impl() : - m_pRoot(0), m_bInitialized(sal_False) { } @@ -126,14 +118,6 @@ sal_uInt16 BmkMenu_Impl::GetMID() // ------------------------------------------------------------------------ -BmkMenu::BmkMenu( com::sun::star::uno::Reference< XFrame >& xFrame, BmkMenu::BmkMenuType nType, BmkMenu* pRoot ) - :AddonMenu(xFrame) - ,m_nType( nType ) -{ - _pImp = new BmkMenu_Impl( pRoot ); - Initialize(); -} - BmkMenu::BmkMenu( Reference< XFrame >& xFrame, BmkMenu::BmkMenuType nType ) :AddonMenu(xFrame) ,m_nType( nType ) diff --git a/framework/source/xml/imagesconfiguration.cxx b/framework/source/xml/imagesconfiguration.cxx index 5f4b5f98408c..da3392f98f5b 100644 --- a/framework/source/xml/imagesconfiguration.cxx +++ b/framework/source/xml/imagesconfiguration.cxx @@ -84,79 +84,6 @@ static Reference< XDocumentHandler > GetSaxWriter( sal_Bool ImagesConfiguration::LoadImages( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, - SvStream& rInStream, ImageListsDescriptor& aItems ) -{ - Reference< XParser > xParser( GetSaxParser( xServiceFactory ) ); - Reference< XInputStream > xInputStream( - (::cppu::OWeakObject *)new utl::OInputStreamWrapper( rInStream ), - UNO_QUERY ); - - // connect stream to input stream to the parser - InputSource aInputSource; - - aInputSource.aInputStream = xInputStream; - - // create namespace filter and set document handler inside to support xml namespaces - Reference< XDocumentHandler > xDocHandler( new OReadImagesDocumentHandler( aItems )); - Reference< XDocumentHandler > xFilter( new SaxNamespaceFilter( xDocHandler )); - - // connect parser and filter - xParser->setDocumentHandler( xFilter ); - - try - { - xParser->parseStream( aInputSource ); - return sal_True; - } - catch ( RuntimeException& ) - { - return sal_False; - } - catch( SAXException& ) - { - return sal_False; - } - catch( ::com::sun::star::io::IOException& ) - { - return sal_False; - } -} - -sal_Bool ImagesConfiguration::StoreImages( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, - SvStream& rOutStream, const ImageListsDescriptor& aItems ) -{ - Reference< XDocumentHandler > xWriter( GetSaxWriter( xServiceFactory ) ); - - Reference< XOutputStream > xOutputStream( - (::cppu::OWeakObject *)new utl::OOutputStreamWrapper( rOutStream ), - UNO_QUERY ); - - Reference< ::com::sun::star::io::XActiveDataSource> xDataSource( xWriter , UNO_QUERY ); - xDataSource->setOutputStream( xOutputStream ); - - try - { - OWriteImagesDocumentHandler aWriteImagesDocumentHandler( aItems, xWriter ); - aWriteImagesDocumentHandler.WriteImagesDocument(); - return sal_True; - } - catch ( RuntimeException& ) - { - return sal_False; - } - catch ( SAXException& ) - { - return sal_False; - } - catch ( ::com::sun::star::io::IOException& ) - { - return sal_False; - } -} - -sal_Bool ImagesConfiguration::LoadImages( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rInputStream, ImageListsDescriptor& rItems ) { |