diff options
author | Szabolcs Dezsi <dezsiszabi@hotmail.com> | 2012-02-27 11:23:51 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2012-02-27 11:23:51 +0000 |
commit | 2b179ca1744d12630488619f948e5eb860e1fb41 (patch) | |
tree | ea71499aee7ec222439a731578cd409c1efda571 /xmloff | |
parent | c58882fda80b63baac3360001b0fdf251d96e0eb (diff) |
Removed unused code
Diffstat (limited to 'xmloff')
-rw-r--r-- | xmloff/inc/xmloff/unoatrcn.hxx | 1 | ||||
-rw-r--r-- | xmloff/inc/xmloff/xmlexp.hxx | 23 | ||||
-rw-r--r-- | xmloff/inc/xmloff/xmlexppr.hxx | 8 | ||||
-rw-r--r-- | xmloff/inc/xmloff/xmlimp.hxx | 7 | ||||
-rw-r--r-- | xmloff/source/core/unoatrcn.cxx | 14 | ||||
-rw-r--r-- | xmloff/source/core/xmlexp.cxx | 71 | ||||
-rw-r--r-- | xmloff/source/core/xmlimp.cxx | 30 | ||||
-rw-r--r-- | xmloff/source/style/xmlexppr.cxx | 13 |
8 files changed, 0 insertions, 167 deletions
diff --git a/xmloff/inc/xmloff/unoatrcn.hxx b/xmloff/inc/xmloff/unoatrcn.hxx index a393b033ee10..242e5bd22455 100644 --- a/xmloff/inc/xmloff/unoatrcn.hxx +++ b/xmloff/inc/xmloff/unoatrcn.hxx @@ -59,7 +59,6 @@ public: SvXMLAttrContainerData* GetContainerImpl() const { return mpContainer; } static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw(); - static SvUnoAttributeContainer* getImplementation( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xInt ) throw(); virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::container::XElementAccess diff --git a/xmloff/inc/xmloff/xmlexp.hxx b/xmloff/inc/xmloff/xmlexp.hxx index 1fcdf5587e14..458ab571e0e1 100644 --- a/xmloff/inc/xmloff/xmlexp.hxx +++ b/xmloff/inc/xmloff/xmlexp.hxx @@ -308,23 +308,6 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > &, sal_Int16 const eDefaultFieldUnit ); - // #110680# - //SvXMLExport( const ::rtl::OUString& rFileName, - // const ::com::sun::star::uno::Reference< - // ::com::sun::star::xml::sax::XDocumentHandler > & rHandler, - // const ::com::sun::star::uno::Reference< - // ::com::sun::star::frame::XModel > &, - // const ::com::sun::star::uno::Reference< - // ::com::sun::star::document::XGraphicObjectResolver > &, - // sal_Int16 eDfltUnit ); - SvXMLExport( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, - const ::rtl::OUString& rFileName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > & rHandler, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > &, - const ::com::sun::star::uno::Reference< ::com::sun::star::document::XGraphicObjectResolver > &, - sal_Int16 const eDefaultFieldUnit ); - virtual ~SvXMLExport(); static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw(); @@ -696,12 +679,6 @@ public: // Thes constructors do nothing if bDoSomething is not set SvXMLElementExport( SvXMLExport& rExp, sal_Bool bDoSomething, - sal_uInt16 nPrefix, const sal_Char *pName, - sal_Bool bIgnWSOutside, sal_Bool bIgnWSInside ); - SvXMLElementExport( SvXMLExport& rExp, sal_Bool bDoSomething, - sal_uInt16 nPrefix, const ::rtl::OUString& rName, - sal_Bool bIgnWSOutside, sal_Bool bIgnWSInside ); - SvXMLElementExport( SvXMLExport& rExp, sal_Bool bDoSomething, sal_uInt16 nPrefix, enum ::xmloff::token::XMLTokenEnum eName, sal_Bool bIgnWSOutside, sal_Bool bIgnWSInside ); diff --git a/xmloff/inc/xmloff/xmlexppr.hxx b/xmloff/inc/xmloff/xmlexppr.hxx index fb5851e36e76..efd9101f3aaf 100644 --- a/xmloff/inc/xmloff/xmlexppr.hxx +++ b/xmloff/inc/xmloff/xmlexppr.hxx @@ -155,14 +155,6 @@ public: sal_Int32 nPropMapStartIdx, sal_Int32 nPropMapEndIdx, sal_uInt16 nFlags = 0 ) const; - /** fills the given attribute list with the representation of one item */ - void exportXML( - SvXMLAttributeList& rAttrList, - const XMLPropertyState& rProperty, - const SvXMLUnitConverter& rUnitConverter, - const SvXMLNamespaceMap& rNamespaceMap, - sal_uInt16 nFlags = 0 ) const; - void exportXML( SvXMLExport& rExport, const ::std::vector< XMLPropertyState >& rProperties, diff --git a/xmloff/inc/xmloff/xmlimp.hxx b/xmloff/inc/xmloff/xmlimp.hxx index 2f00ffa08142..31058c9cf846 100644 --- a/xmloff/inc/xmloff/xmlimp.hxx +++ b/xmloff/inc/xmloff/xmlimp.hxx @@ -371,13 +371,6 @@ public: void SetError( sal_Int32 nId, const rtl::OUString& rMsg1 ); void SetError( sal_Int32 nId, const rtl::OUString& rMsg1, const rtl::OUString& rMsg2 ); - void SetError( sal_Int32 nId, const rtl::OUString& rMsg1, - const rtl::OUString& rMsg2, - const rtl::OUString& rMsg3 ); - void SetError( sal_Int32 nId, const rtl::OUString& rMsg1, - const rtl::OUString& rMsg2, - const rtl::OUString& rMsg3, - const rtl::OUString& rMsg4 ); /** return current error flags */ sal_uInt16 GetErrorFlags() { return mnErrorFlags; } diff --git a/xmloff/source/core/unoatrcn.cxx b/xmloff/source/core/unoatrcn.cxx index 8fe03e48e517..56cb96080257 100644 --- a/xmloff/source/core/unoatrcn.cxx +++ b/xmloff/source/core/unoatrcn.cxx @@ -117,20 +117,6 @@ const ::com::sun::star::uno::Sequence< sal_Int8 > & SvUnoAttributeContainer::get return theSvUnoAttributeContainerUnoTunnelId::get().getSeq(); } -SvUnoAttributeContainer* SvUnoAttributeContainer::getImplementation( uno::Reference< uno::XInterface > xInt ) throw() -{ - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XUnoTunnel > xUT( xInt, ::com::sun::star::uno::UNO_QUERY ); - if( xUT.is() ) - { - return - reinterpret_cast<SvUnoAttributeContainer*>( - sal::static_int_cast<sal_IntPtr>( - xUT->getSomething( SvUnoAttributeContainer::getUnoTunnelId()))); - } - else - return NULL; -} - sal_Int64 SAL_CALL SvUnoAttributeContainer::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw(::com::sun::star::uno::RuntimeException) { if( rId.getLength() == 16 && 0 == rtl_compareMemory( getUnoTunnelId().getConstArray(), diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx index e92545c8dd91..8416a5ffc26d 100644 --- a/xmloff/source/core/xmlexp.cxx +++ b/xmloff/source/core/xmlexp.cxx @@ -550,46 +550,6 @@ SvXMLExport::SvXMLExport( mpNumExport = new SvXMLNumFmtExport(*this, mxNumberFormatsSupplier); } -SvXMLExport::SvXMLExport( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, - const OUString &rFileName, - const uno::Reference< xml::sax::XDocumentHandler > & rHandler, - const Reference< XModel >& rModel, - const Reference< document::XGraphicObjectResolver >& rEmbeddedGraphicObjects, - sal_Int16 const eDefaultFieldUnit) -: mpImpl( new SvXMLExport_Impl ), - mxServiceFactory(xServiceFactory), - mxModel( rModel ), - mxHandler( rHandler ), - mxExtHandler( rHandler, uno::UNO_QUERY ), - mxNumberFormatsSupplier (rModel, uno::UNO_QUERY), - mxGraphicResolver( rEmbeddedGraphicObjects ), - mpAttrList( new SvXMLAttributeList ), - msOrigFileName( rFileName ), - mpNamespaceMap( new SvXMLNamespaceMap ), - mpUnitConv( new SvXMLUnitConverter(getServiceFactory(), - util::MeasureUnit::MM_100TH, - SvXMLUnitConverter::GetMeasureUnit(eDefaultFieldUnit)) ), - mpNumExport(0L), - mpProgressBarHelper( NULL ), - mpEventExport( NULL ), - mpImageMapExport( NULL ), - mpXMLErrors( NULL ), - mbExtended( sal_False ), - meClass( XML_TOKEN_INVALID ), - mnExportFlags( 0 ), - mnErrorFlags( ERROR_NO ), - msWS( GetXMLToken(XML_WS) ), - mbSaveLinkedSections(sal_True) -{ - mpImpl->SetSchemeOf( msOrigFileName ); - DBG_ASSERT( mxServiceFactory.is(), "got no service manager" ); - _InitCtor(); - - if (mxNumberFormatsSupplier.is()) - mpNumExport = new SvXMLNumFmtExport(*this, mxNumberFormatsSupplier); -} - SvXMLExport::~SvXMLExport() { delete mpXMLErrors; @@ -2627,37 +2587,6 @@ SvXMLElementExport::SvXMLElementExport( SvXMLExport& rExp, SvXMLElementExport::SvXMLElementExport( SvXMLExport& rExp, sal_Bool bDoSth, sal_uInt16 nPrefixKey, - const sal_Char *pLName, - sal_Bool bIWSOutside, - sal_Bool bIWSInside ) : - rExport( rExp ), - bIgnWS( bIWSInside ), - bDoSomething( bDoSth ) -{ - if( bDoSomething ) - { - OUString sLName( OUString::createFromAscii(pLName) ); - StartElement( rExp, nPrefixKey, sLName, bIWSOutside ); - } -} - -SvXMLElementExport::SvXMLElementExport( SvXMLExport& rExp, - sal_Bool bDoSth, - sal_uInt16 nPrefixKey, - const OUString& rLName, - sal_Bool bIWSOutside, - sal_Bool bIWSInside ) : - rExport( rExp ), - bIgnWS( bIWSInside ), - bDoSomething( bDoSth ) -{ - if( bDoSomething ) - StartElement( rExp, nPrefixKey, rLName, bIWSOutside ); -} - -SvXMLElementExport::SvXMLElementExport( SvXMLExport& rExp, - sal_Bool bDoSth, - sal_uInt16 nPrefixKey, enum XMLTokenEnum eLName, sal_Bool bIWSOutside, sal_Bool bIWSInside ) : diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx index e8f59b50637d..e89a8cd9ceb0 100644 --- a/xmloff/source/core/xmlimp.cxx +++ b/xmloff/source/core/xmlimp.cxx @@ -1716,36 +1716,6 @@ void SvXMLImport::SetError( SetError( nId, aSeq ); } -void SvXMLImport::SetError( - sal_Int32 nId, - const OUString& rMsg1, - const OUString& rMsg2, - const OUString& rMsg3) -{ - Sequence<OUString> aSeq(3); - OUString* pSeq = aSeq.getArray(); - pSeq[0] = rMsg1; - pSeq[1] = rMsg2; - pSeq[2] = rMsg3; - SetError( nId, aSeq ); -} - -void SvXMLImport::SetError( - sal_Int32 nId, - const OUString& rMsg1, - const OUString& rMsg2, - const OUString& rMsg3, - const OUString& rMsg4) -{ - Sequence<OUString> aSeq(4); - OUString* pSeq = aSeq.getArray(); - pSeq[0] = rMsg1; - pSeq[1] = rMsg2; - pSeq[2] = rMsg3; - pSeq[3] = rMsg4; - SetError( nId, aSeq ); -} - void SvXMLImport::DisposingModel() { if( mxFontDecls.Is() ) diff --git a/xmloff/source/style/xmlexppr.cxx b/xmloff/source/style/xmlexppr.cxx index d610e4e0454a..10a054405a70 100644 --- a/xmloff/source/style/xmlexppr.cxx +++ b/xmloff/source/style/xmlexppr.cxx @@ -790,19 +790,6 @@ void SvXMLExportPropertyMapper::exportXML( SvXMLAttributeList& rAttrList, } */ - -void SvXMLExportPropertyMapper::exportXML( SvXMLAttributeList& rAttrList, - const XMLPropertyState& rProperty, - const SvXMLUnitConverter& rUnitConverter, - const SvXMLNamespaceMap& rNamespaceMap, - sal_uInt16 nFlags ) const -{ - if( ( maPropMapper->GetEntryFlags( rProperty.mnIndex ) & - MID_FLAG_ELEMENT_ITEM_EXPORT ) == 0 ) - _exportXML( rAttrList, rProperty, rUnitConverter, rNamespaceMap, - nFlags ); -} - void SvXMLExportPropertyMapper::exportXML( SvXMLExport& rExport, const ::std::vector< XMLPropertyState >& rProperties, |