diff options
-rw-r--r-- | lotuswordpro/source/filter/lwpfilter.cxx | 151 | ||||
-rw-r--r-- | lotuswordpro/source/filter/lwpfilter.hxx | 45 | ||||
-rw-r--r-- | sc/inc/scmod.hxx | 1 | ||||
-rw-r--r-- | sc/source/ui/app/scmod.cxx | 12 | ||||
-rw-r--r-- | unusedcode.easy | 11 |
5 files changed, 8 insertions, 212 deletions
diff --git a/lotuswordpro/source/filter/lwpfilter.cxx b/lotuswordpro/source/filter/lwpfilter.cxx index c316cc750c8d..edf53d5aec92 100644 --- a/lotuswordpro/source/filter/lwpfilter.cxx +++ b/lotuswordpro/source/filter/lwpfilter.cxx @@ -130,157 +130,6 @@ void LWPFilterReader::cancel() throw (com::sun::star::uno::RuntimeException, std { } -LWPFilterImportFilter::LWPFilterImportFilter( const uno::Reference< XMultiServiceFactory >& xFact ) -{ - try - { - uno::Reference< XDocumentHandler > xDoc( xFact->createInstance( OUString( STR_WRITER_IMPORTER_NAME ) ), UNO_QUERY ); - - LWPFilterReader *p = new LWPFilterReader; - p->setDocumentHandler( xDoc ); - - uno::Reference< XImporter > xImporter = uno::Reference< XImporter >( xDoc, UNO_QUERY ); - rImporter = xImporter; - uno::Reference< XFilter > xFilter = uno::Reference< XFilter >( p ); - rFilter = xFilter; - } - catch( Exception & ) - { - exit( 1 ); - } -} - -LWPFilterImportFilter::~LWPFilterImportFilter() -{ -} - -sal_Bool LWPFilterImportFilter::filter( const Sequence< PropertyValue >& aDescriptor ) - throw( RuntimeException, std::exception ) -{ - sal_Bool ret = rFilter->filter( aDescriptor ); - - return ret; -} - -void LWPFilterImportFilter::cancel() throw (::com::sun::star::uno::RuntimeException, std::exception) -{ - rFilter->cancel(); -} - -void LWPFilterImportFilter::setTargetDocument( const uno::Reference< XComponent >& xDoc ) - throw( IllegalArgumentException, RuntimeException, std::exception ) -{ - rImporter->setTargetDocument( xDoc ); -} - -OUString LWPFilterImportFilter::getImplementationName() throw(std::exception) -{ - return OUString( STR_IMPLEMENTATION_NAME ); -} - -sal_Bool LWPFilterImportFilter::supportsService( const OUString& ServiceName ) throw(std::exception) -{ - return cppu::supportsService(this, ServiceName); -} - -Sequence< OUString> LWPFilterImportFilter::getSupportedServiceNames( void ) throw(std::exception) -{ - Sequence< OUString > seq(1); - seq[0] = STR_SERVICE_NAME; - return seq; -} - -OUString SAL_CALL LWPFilterImportFilter::detect( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor ) - throw (::com::sun::star::uno::RuntimeException, std::exception) -{ - OUString ret; - OUString aTypeName; // a name describing the type (from MediaDescriptor, usually from flat detection) - // opening as template is done when a parameter tells to do so and a template filter can be detected - // (otherwise no valid filter would be found) or if the detected filter is a template filter and - // there is no parameter that forbids to open as template - sal_Bool bOpenAsTemplate = sal_False; - sal_Int32 nPropertyCount = aDescriptor.getLength(); - for( sal_Int32 nProperty=0; nProperty<nPropertyCount; ++nProperty ) - { - if ( aDescriptor[nProperty].Name == "TypeName" ) - { - aDescriptor[nProperty].Value >>= aTypeName; - } - else if ( aDescriptor[nProperty].Name == "AsTemplate" ) - { - bOpenAsTemplate = sal_True; - } - } - - for( sal_Int32 i = 0; i < aDescriptor.getLength(); i++ ) - { - OUString strTemp; - aDescriptor[i].Value >>= strTemp; - if ( aDescriptor[i].Name == "InputStream" ) - { - uno::Reference< XInputStream> rInputStream; - aDescriptor[i].Value >>= rInputStream; - - // TODO TRANSFORM IMPLEMENTATION HERE!!!!!! - // and call m_DocumentHandler's SAX mDochods - - if( IsWordproFile(rInputStream) ) - { - if ( aTypeName == "wordpro_template" ) - { - if(!bOpenAsTemplate) - { - aDescriptor.realloc( nPropertyCount + 1 ); - aDescriptor[nPropertyCount].Name = "AsTemplate"; - aDescriptor[nPropertyCount].Value <<= sal_True; - } - return OUString("wordpro_template"); - } - else - { - return OUString("wordpro"); - } - } - return ret; - } - else if ( aDescriptor[i].Name == "URL" ) - { - OUString sURL; - - aDescriptor[i].Value >>= sURL; - /* - osl::FileBase::RC rc = osl::FileBase::getSystemPathFromFileURL( sURL, sFileName ); - if(rc != osl::FileBase::E_None) - { - SAXException except; - except.Message = "GDocting system path from URL failed!"; - throw except; - } - */ - //end with .lwp: - if( IsWordproFile(sURL) ) - { - if ( aTypeName == "wordpro_template" ) - { - if(!bOpenAsTemplate) - { - aDescriptor.realloc( nPropertyCount + 1 ); - aDescriptor[nPropertyCount].Name = "AsTemplate"; - aDescriptor[nPropertyCount].Value <<= sal_True; - } - return OUString("wordpro_template"); - } - else - { - return OUString("wordpro"); - } - } - return ret; - } - } - return ret; -} - /** * @descr decompressed small file * @param pCompressed - real file stream diff --git a/lotuswordpro/source/filter/lwpfilter.hxx b/lotuswordpro/source/filter/lwpfilter.hxx index 06b73574dd99..b41fdc671657 100644 --- a/lotuswordpro/source/filter/lwpfilter.hxx +++ b/lotuswordpro/source/filter/lwpfilter.hxx @@ -123,51 +123,6 @@ private: uno::Reference< XDocumentHandler > m_DocumentHandler; }; -/** - * @brief - * Main entry for the xml filter framework. - * It's called by SfxObjectShell::ImportFrom. - */ -class LWPFilterImportFilter : public WeakImplHelper4< XFilter, XImporter, XServiceInfo, XExtendedFilterDetection > -{ -public: - LWPFilterImportFilter( const uno::Reference< XMultiServiceFactory >& xFact ); - virtual ~LWPFilterImportFilter(); - -public: - /** - * @descr see LWPFilterReader::filter. - */ - virtual sal_Bool SAL_CALL filter( const Sequence< PropertyValue >& aDescriptor ) - throw( RuntimeException, std::exception ) SAL_OVERRIDE; - - /** - * @descr see LWPFilterReader::cancel. - */ - virtual void SAL_CALL cancel() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - // XImporter - virtual void SAL_CALL setTargetDocument( const uno::Reference< XComponent >& xDoc) - throw( IllegalArgumentException, RuntimeException, std::exception ) SAL_OVERRIDE; - - // XServiceInfo - OUString SAL_CALL getImplementationName() throw (std::exception) SAL_OVERRIDE; - - Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw (std::exception) SAL_OVERRIDE; - - sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (std::exception) SAL_OVERRIDE; - - /** - * @descr function of interface XExtendedFilterDetection. If this interface is registered, it will be called whenever - * a file is to be loaded. - */ - virtual OUString SAL_CALL detect( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Descriptor ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - -public: - uno::Reference< XFilter > rFilter; - uno::Reference< XImporter > rImporter; -}; - //test code int ReadWordproFile(SvStream &rStream, uno::Reference<XDocumentHandler>& XDoc); diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx index dde6945212ac..f15ea3304a00 100644 --- a/sc/inc/scmod.hxx +++ b/sc/inc/scmod.hxx @@ -250,7 +250,6 @@ SC_DLLPUBLIC void SetAppOptions ( const ScAppOptions& rO SC_DLLPUBLIC bool RegisterRefWindow( sal_uInt16 nSlotId, Window *pWnd ); SC_DLLPUBLIC bool UnregisterRefWindow( sal_uInt16 nSlotId, Window *pWnd ); - SC_DLLPUBLIC bool IsAliveRefDlg( sal_uInt16 nSlotId, Window *pWnd ); SC_DLLPUBLIC Window * Find1RefWindow( sal_uInt16 nSlotId, Window *pWndAncestor ); ScAnyRefModalDlg* GetCurrentAnyRefDlg(); diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index 87174c10e1e8..7a471c0f149d 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -2301,18 +2301,6 @@ bool ScModule::UnregisterRefWindow( sal_uInt16 nSlotId, Window *pWnd ) return true; } -bool ScModule::IsAliveRefDlg( sal_uInt16 nSlotId, Window *pWnd ) -{ - std::map<sal_uInt16, std::list<Window*> >::iterator iSlot = m_mapRefWindow.find( nSlotId ); - - if( iSlot == m_mapRefWindow.end() ) - return false; - - std::list<Window*> & rlRefWindow = iSlot->second; - - return rlRefWindow.end() != std::find( rlRefWindow.begin(), rlRefWindow.end(), pWnd ); -} - Window * ScModule::Find1RefWindow( sal_uInt16 nSlotId, Window *pWndAncestor ) { if (!pWndAncestor) diff --git a/unusedcode.easy b/unusedcode.easy index ca506a63be98..696482c03b67 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -1,6 +1,5 @@ BigInt::BigInt(unsigned int) CalcUnoApiTest::CalcUnoApiTest(rtl::OUString const&) -Chart2ExportTest::testFdo74115WallGradientFill() ConfigurationAccess::getPath(rtl::OUString const&) DocxSdrExport::getFlyFrameGraphic() DocxSdrExport::setFlyFrameGraphic(bool) @@ -21,6 +20,7 @@ MenuBar::RemoveMenuBarButton(unsigned short) MenuBar::SetMenuBarButtonHighlightHdl(unsigned short, Link const&) OpenGLContext::getOpenGLWindow() OutputDevice::GetCanvas() const +OutputDevice::HasAlpha() OutputDevice::LogicToLogic(basegfx::B2DPolyPolygon const&, MapMode const&, MapMode const&) OutputDevice::LogicToPixel(Region const&, MapMode const&) const OutputDevice::LogicToPixel(basegfx::B2DPolygon const&) const @@ -36,7 +36,6 @@ ScVbaFormat<ooo::vba::excel::XStyle>::getAddIndent() ScVbaFormat<ooo::vba::excel::XStyle>::setAddIndent(com::sun::star::uno::Any const&) SdrItemBrowser::ForceParent() SdrItemBrowser::SdrItemBrowser(SdrView&) -SdrOpenGLObj::getOpenGLContext() SdrTextObj::NbcSetAutoGrowHeight(bool) SdrTextObj::NbcSetAutoGrowWidth(bool) SdrTextObj::NbcSetFitToSize(SdrFitToSizeType) @@ -56,7 +55,9 @@ StyleSettings::SetUseFlatBorders(bool) StyleSettings::SetUseFlatMenus(bool) SvpSalInstance::PostedEventsInQueue() SvtListener::IsListening(SvtBroadcaster&) const +SvxDummyShapeContainer::SvxDummyShapeContainer(com::sun::star::uno::Reference<com::sun::star::drawing::XShapes>) SvxNumberFormatShell::IsAdded_Impl(unsigned long) +SvxUnoTextBase::SvxUnoTextBase() SwAccessibleField::SwAccessibleField(SwField*, SwAccessibleParagraph*, short) SwAccessibleMap::FireColumnChangeEvent(unsigned short, unsigned short) SwAccessibleMap::FirePageChangeEvent(unsigned short, unsigned short) @@ -188,6 +189,9 @@ basegfx::tools::equal(basegfx::B2DPolygon const&, basegfx::B2DPolygon const&, do basegfx::tools::equal(basegfx::B3DPolygon const&, basegfx::B3DPolygon const&, double const&) basegfx::unotools::homMatrixFromMatrix(basegfx::B2DHomMatrix&, com::sun::star::geometry::Matrix2D const&) canvas::createSurfaceProxyManager(boost::shared_ptr<canvas::IRenderModule> const&) +chart::opengl3D::Line::Line(unsigned int) +chart::opengl3D::Rectangle::Rectangle(unsigned int) +chart::opengl3D::Text::Text(unsigned int) comphelper::detail::ConfigurationWrapper::getGroupReadWrite(boost::shared_ptr<comphelper::ConfigurationChanges> const&, rtl::OUString const&) const comphelper::detail::ConfigurationWrapper::getLocalizedPropertyValue(rtl::OUString const&) const comphelper::detail::ConfigurationWrapper::setLocalizedPropertyValue(boost::shared_ptr<comphelper::ConfigurationChanges> const&, rtl::OUString const&, com::sun::star::uno::Any const&) const @@ -198,6 +202,7 @@ connectivity::sdbcx::OGroup::OGroup(bool) connectivity::sdbcx::OGroup::OGroup(rtl::OUString const&, bool) oglcanvas::CanvasHelper::flush() const oglcanvas::TextLayout::draw(com::sun::star::rendering::ViewState const&, com::sun::star::rendering::RenderState const&, com::sun::star::uno::Reference<com::sun::star::rendering::XGraphicDevice> const&) const +oox::drawingml::CustomShapeProperties::initializePresetDataMap() oox::xls::BiffDrawingObjectBase::BiffDrawingObjectBase(oox::xls::WorksheetHelper const&) sc::CLBuildKernelThread::CLBuildKernelThread() sc::CLBuildKernelThread::consume() @@ -205,7 +210,7 @@ sc::CLBuildKernelThread::finish() sc::CLBuildKernelThread::produce() sd::LeftDrawPaneShell::RegisterInterface(SfxModule*) sd::LeftImpressPaneShell::RegisterInterface(SfxModule*) -sdr::contact::ViewObjectContactOfOpenGLObj::getWindow() const +sfx2::SvBaseLink::SvBaseLink(rtl::OUString const&, unsigned short, sfx2::SvLinkSource*) std::_Rb_tree<rtl::OUString, std::pair<rtl::OUString const, (anonymous namespace)::TemplateId>, std::_Select1st<std::pair<rtl::OUString const, (anonymous namespace)::TemplateId> >, std::less<rtl::OUString>, std::allocator<std::pair<rtl::OUString const, (anonymous namespace)::TemplateId> > >::_Rb_tree(std::_Rb_tree<rtl::OUString, std::pair<rtl::OUString const, (anonymous namespace)::TemplateId>, std::_Select1st<std::pair<rtl::OUString const, (anonymous namespace)::TemplateId> >, std::less<rtl::OUString>, std::allocator<std::pair<rtl::OUString const, (anonymous namespace)::TemplateId> > >&&) std::auto_ptr<formula::FormulaTokenArray>::auto_ptr(std::auto_ptr<formula::FormulaTokenArray>&) std::auto_ptr<formula::FormulaTokenArray>::auto_ptr(std::auto_ptr_ref<formula::FormulaTokenArray>) |