diff options
Diffstat (limited to 'xmloff')
-rw-r--r-- | xmloff/inc/XMLChartPropertySetMapper.hxx | 5 | ||||
-rw-r--r-- | xmloff/inc/XMLElementPropertyContext.hxx | 1 | ||||
-rw-r--r-- | xmloff/inc/XMLLineNumberingImportContext.hxx | 4 | ||||
-rw-r--r-- | xmloff/inc/txtvfldi.hxx | 4 | ||||
-rw-r--r-- | xmloff/source/draw/sdxmlexp.cxx | 3 | ||||
-rw-r--r-- | xmloff/source/draw/sdxmlexp_impl.hxx | 10 | ||||
-rw-r--r-- | xmloff/source/draw/sdxmlimp.cxx | 1 | ||||
-rw-r--r-- | xmloff/source/draw/sdxmlimp_impl.hxx | 4 | ||||
-rw-r--r-- | xmloff/source/draw/ximp3dscene.hxx | 12 | ||||
-rw-r--r-- | xmloff/source/draw/ximpgrp.hxx | 9 | ||||
-rw-r--r-- | xmloff/source/draw/ximppage.hxx | 3 | ||||
-rw-r--r-- | xmloff/source/draw/ximpshap.hxx | 2 | ||||
-rw-r--r-- | xmloff/source/draw/ximpstyl.hxx | 8 | ||||
-rw-r--r-- | xmloff/source/forms/elementimport.hxx | 4 | ||||
-rw-r--r-- | xmloff/source/forms/propertyimport.hxx | 6 | ||||
-rw-r--r-- | xmloff/source/style/PageMasterExportPropMapper.hxx | 4 | ||||
-rw-r--r-- | xmloff/source/text/XMLTextNumRuleInfo.hxx | 5 | ||||
-rw-r--r-- | xmloff/source/text/txtparaimphint.hxx | 2 | ||||
-rw-r--r-- | xmloff/source/transform/CreateElemTContext.hxx | 4 | ||||
-rw-r--r-- | xmloff/source/transform/TransformerBase.hxx | 5 |
20 files changed, 0 insertions, 96 deletions
diff --git a/xmloff/inc/XMLChartPropertySetMapper.hxx b/xmloff/inc/XMLChartPropertySetMapper.hxx index 7ead99500a84..e1827ae81328 100644 --- a/xmloff/inc/XMLChartPropertySetMapper.hxx +++ b/xmloff/inc/XMLChartPropertySetMapper.hxx @@ -30,9 +30,6 @@ class SvXMLExport; class XMLChartPropHdlFactory : public XMLPropertyHandlerFactory { -private: - const XMLPropertyHandler* GetShapePropertyHandler( sal_Int32 nType ) const; - public: virtual ~XMLChartPropHdlFactory(); virtual const XMLPropertyHandler* GetPropertyHandler( sal_Int32 nType ) const SAL_OVERRIDE; @@ -81,8 +78,6 @@ public: SvXMLExport& rExport ); virtual ~XMLChartExportPropertyMapper(); - void setAdaptPercentage( bool bNewValue ); - void setChartDoc( com::sun::star::uno::Reference< com::sun::star::chart2::XChartDocument > xChartDoc ); }; diff --git a/xmloff/inc/XMLElementPropertyContext.hxx b/xmloff/inc/XMLElementPropertyContext.hxx index f89630badd08..02f7c06267f5 100644 --- a/xmloff/inc/XMLElementPropertyContext.hxx +++ b/xmloff/inc/XMLElementPropertyContext.hxx @@ -36,7 +36,6 @@ protected: ::std::vector< XMLPropertyState > &rProperties; XMLPropertyState aProp; - bool IsInsert() const { return bInsert; } void SetInsert( bool bIns ) { bInsert = bIns; } public: diff --git a/xmloff/inc/XMLLineNumberingImportContext.hxx b/xmloff/inc/XMLLineNumberingImportContext.hxx index 3dd9aee2b972..0b93f456f8e4 100644 --- a/xmloff/inc/XMLLineNumberingImportContext.hxx +++ b/xmloff/inc/XMLLineNumberingImportContext.hxx @@ -109,10 +109,6 @@ protected: const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> & xAttrList ) SAL_OVERRIDE; - - void ProcessAttribute( - const OUString& sLocalName, - const OUString& sValue); }; #endif diff --git a/xmloff/inc/txtvfldi.hxx b/xmloff/inc/txtvfldi.hxx index 3bd5b92e7d4a..fdef070d9204 100644 --- a/xmloff/inc/txtvfldi.hxx +++ b/xmloff/inc/txtvfldi.hxx @@ -204,10 +204,6 @@ protected: // various accessor methods: inline OUString GetName() { return sName; } inline bool IsStringValue() { return aValueHelper.IsStringValue();} - inline bool IsNameOK() { return bNameOK; } - inline bool IsFormulaOK() { return bFormulaOK; } - inline bool IsDescriptionOK() { return bDescriptionOK; } - inline bool IsDisplayOK() { return bDisplayOK; } }; diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx index 17cba20c3825..59a3b42162a2 100644 --- a/xmloff/source/draw/sdxmlexp.cxx +++ b/xmloff/source/draw/sdxmlexp.cxx @@ -398,7 +398,6 @@ SdXMLExport::SdXMLExport( (bIsDraw) ? XML_GRAPHICS : XML_PRESENTATION, nExportFlags ), mnDocMasterPageCount(0L), mnDocDrawPageCount(0L), - mnShapeStyleInfoIndex(0L), mnObjectCount(0L), mpPageMasterInfoList(new ImpXMLEXPPageMasterList()), mpPageMasterUsageList(new ImpXMLEXPPageMasterList()), @@ -409,8 +408,6 @@ SdXMLExport::SdXMLExport( mpPropertySetMapper(0L), mpPresPagePropsMapper(0L), mbIsDraw(bIsDraw), - mbFamilyGraphicUsed(false), - mbFamilyPresentationUsed(false), msZIndex( GetXMLToken(XML_ZINDEX) ), msEmptyPres( "IsEmptyPresentationObject" ), msModel( "Model" ), diff --git a/xmloff/source/draw/sdxmlexp_impl.hxx b/xmloff/source/draw/sdxmlexp_impl.hxx index cff480cb0a8f..7b27f8cab0bc 100644 --- a/xmloff/source/draw/sdxmlexp_impl.hxx +++ b/xmloff/source/draw/sdxmlexp_impl.hxx @@ -82,7 +82,6 @@ class SdXMLExport : public SvXMLExport com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess > mxDocDrawPages; sal_Int32 mnDocMasterPageCount; sal_Int32 mnDocDrawPageCount; - sal_uInt32 mnShapeStyleInfoIndex; sal_uInt32 mnObjectCount; // temporary infos @@ -115,8 +114,6 @@ class SdXMLExport : public SvXMLExport SdXMLFormatMap maUsedTimeStyles; // this is a vector with the used formatings for time fields bool mbIsDraw; - bool mbFamilyGraphicUsed; - bool mbFamilyPresentationUsed; const OUString msZIndex; const OUString msEmptyPres; @@ -135,7 +132,6 @@ class SdXMLExport : public SvXMLExport ImpXMLEXPPageMasterInfo* ImpGetOrCreatePageMasterInfo( com::sun::star::uno::Reference< com::sun::star::drawing::XDrawPage > xMasterPage ); void ImpPrepPageMasterInfos(); - void ImpPrepDrawMasterInfos(); void ImpWritePageMasterInfos(); void ImpPrepAutoLayoutInfos(); HeaderFooterPageSettingsImpl ImpPrepDrawPageHeaderFooterDecls( const com::sun::star::uno::Reference< com::sun::star::drawing::XDrawPage >& xDrawPage ); @@ -181,18 +177,12 @@ public: virtual void SAL_CALL setSourceDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // get factories and mappers - XMLSdPropHdlFactory* GetSdPropHdlFactory() const { return mpSdPropHdlFactory; } XMLShapeExportPropertyMapper* GetPropertySetMapper() const { return mpPropertySetMapper; } XMLPageExportPropertyMapper* GetPresPagePropsMapper() const { return mpPresPagePropsMapper; } bool IsDraw() const { return mbIsDraw; } bool IsImpress() const { return !mbIsDraw; } - bool IsFamilyGraphicUsed() const { return mbFamilyGraphicUsed; } - void SetFamilyGraphicUsed() { mbFamilyGraphicUsed = true; } - bool IsFamilyPresentationUsed() const { return mbFamilyPresentationUsed; } - void SetFamilyPresentationUsed() { mbFamilyPresentationUsed = true; } - virtual void addDataStyle(const sal_Int32 nNumberFormat, bool bTimeFormat = false ) SAL_OVERRIDE; virtual void exportDataStyles() SAL_OVERRIDE; virtual void exportAutoDataStyles() SAL_OVERRIDE; diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx index b38d117ca590..4de2b980d23c 100644 --- a/xmloff/source/draw/sdxmlimp.cxx +++ b/xmloff/source/draw/sdxmlimp.cxx @@ -299,7 +299,6 @@ SdXMLImport::SdXMLImport( mpDrawPageAttrTokenMap(0L), mpDrawPageElemTokenMap(0L), mpPresentationPlaceholderAttrTokenMap(0L), - mnStyleFamilyMask(0), mnNewPageCount(0L), mnNewMasterPageCount(0L), mbIsDraw(bIsDraw), diff --git a/xmloff/source/draw/sdxmlimp_impl.hxx b/xmloff/source/draw/sdxmlimp_impl.hxx index 23e192903495..1f21426bbfbd 100644 --- a/xmloff/source/draw/sdxmlimp_impl.hxx +++ b/xmloff/source/draw/sdxmlimp_impl.hxx @@ -191,8 +191,6 @@ class SdXMLImport: public SvXMLImport SvXMLTokenMap* mpDrawPageElemTokenMap; SvXMLTokenMap* mpPresentationPlaceholderAttrTokenMap; - sal_uInt16 mnStyleFamilyMask; - sal_Int32 mnNewPageCount; sal_Int32 mnNewMasterPageCount; @@ -251,9 +249,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); // Styles and AutoStyles contexts - const SdXMLMasterStylesContext* GetMasterStylesContext() const { return mpMasterStylesContext; } - sal_uInt16 GetStyleFamilyMask() const { return mnStyleFamilyMask; } bool IsStylesOnlyMode() const { return !mbLoadDoc; } const SvXMLTokenMap& GetDocElemTokenMap(); diff --git a/xmloff/source/draw/ximp3dscene.hxx b/xmloff/source/draw/ximp3dscene.hxx index b2fd87275c49..4d94de3701a9 100644 --- a/xmloff/source/draw/ximp3dscene.hxx +++ b/xmloff/source/draw/ximp3dscene.hxx @@ -35,13 +35,6 @@ class SdXML3DSceneShapeContext : public SdXMLShapeContext, public SdXML3DSceneAt // this is the scene at the same time com::sun::star::uno::Reference< com::sun::star::drawing::XShapes > mxChildren; - const SdXMLImport& GetSdImport() const { return static_cast<const SdXMLImport&>(GetImport()); } - SdXMLImport& GetSdImport() { return static_cast<SdXMLImport&>(GetImport()); } - -protected: - void SetLocalShapesContext(com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rNew) - { mxChildren = rNew; } - public: TYPEINFO_OVERRIDE(); @@ -60,11 +53,6 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - - const com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& GetLocalShapesContext() const - { return mxShapes; } - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& GetLocalShapesContext() - { return mxShapes; } }; #endif // INCLUDED_XMLOFF_SOURCE_DRAW_XIMP3DSCENE_HXX diff --git a/xmloff/source/draw/ximpgrp.hxx b/xmloff/source/draw/ximpgrp.hxx index bf69293fec7f..7ad41a124773 100644 --- a/xmloff/source/draw/ximpgrp.hxx +++ b/xmloff/source/draw/ximpgrp.hxx @@ -34,10 +34,6 @@ class SdXMLGroupShapeContext : public SdXMLShapeContext // the shape group this group is working on com::sun::star::uno::Reference< com::sun::star::drawing::XShapes > mxChildren; -protected: - void SetLocalShapesContext(com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rNew) - { mxShapes = rNew; } - public: TYPEINFO_OVERRIDE(); @@ -52,11 +48,6 @@ public: const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; virtual void EndElement() SAL_OVERRIDE; - - const com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& GetLocalShapesContext() const - { return mxShapes; } - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& GetLocalShapesContext() - { return mxShapes; } }; #endif // INCLUDED_XMLOFF_SOURCE_DRAW_XIMPGRP_HXX diff --git a/xmloff/source/draw/ximppage.hxx b/xmloff/source/draw/ximppage.hxx index de944c8972fc..be34be6df376 100644 --- a/xmloff/source/draw/ximppage.hxx +++ b/xmloff/source/draw/ximppage.hxx @@ -43,9 +43,6 @@ protected: OUString maUseDateTimeDeclName; OUString msNavOrder; - void SetLocalShapesContext(com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rNew) - { mxShapes = rNew; } - /** sets the page style on this page */ void SetStyle( OUString& rStyleName ); diff --git a/xmloff/source/draw/ximpshap.hxx b/xmloff/source/draw/ximpshap.hxx index ac95e7d66cab..08cc0ff6496f 100644 --- a/xmloff/source/draw/ximpshap.hxx +++ b/xmloff/source/draw/ximpshap.hxx @@ -530,8 +530,6 @@ public: // this is called from the parent group for each unparsed attribute in the attribute list virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) SAL_OVERRIDE; - - const OUString& getMimeType() const { return maMimeType; } }; // draw:floating-frame diff --git a/xmloff/source/draw/ximpstyl.hxx b/xmloff/source/draw/ximpstyl.hxx index b1a693811cfc..593ff1892fed 100644 --- a/xmloff/source/draw/ximpstyl.hxx +++ b/xmloff/source/draw/ximpstyl.hxx @@ -88,7 +88,6 @@ public: sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; - const OUString& GetName() const { return msName; } const SdXMLPageMasterStyleContext* GetPageMasterStyle() const { return mpPageMasterStyle; } }; @@ -118,8 +117,6 @@ public: virtual void EndElement() SAL_OVERRIDE; - const OUString& GetPageMasterName() const { return msPageMasterName; } - const OUString& GetEncodedName() const { return msName; } const OUString& GetDisplayName() const { return msDisplayName; } }; @@ -148,9 +145,6 @@ public: const OUString& GetName() const { return msName; } sal_Int32 GetX() const { return mnX; } - sal_Int32 GetY() const { return mnY; } - sal_Int32 GetWidth() const { return mnWidth; } - sal_Int32 GetHeight() const { return mnHeight; } }; typedef ::std::vector< SdXMLPresentationPlaceholderContext* > ImpPlaceholderList; @@ -259,8 +253,6 @@ public: sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; - - const ImpMasterPageList& GetMasterPageList() const { return maMasterPageList; } }; // <pres:header-decl>, <pres:footer-decl> and <pres:date-time-decl> diff --git a/xmloff/source/forms/elementimport.hxx b/xmloff/source/forms/elementimport.hxx index a1a4344ff03c..c74ba87ef0a5 100644 --- a/xmloff/source/forms/elementimport.hxx +++ b/xmloff/source/forms/elementimport.hxx @@ -163,10 +163,6 @@ namespace xmloff void implApplyGenericProperties(); void implApplySpecificProperties(); - /** sets the style properties which have been read for the element (if any) - */ - void implSetStyleProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxObject ); - PropertyGroups::const_iterator impl_matchPropertyGroup( const PropertyGroups& i_propertyGroups ) const; virtual OUString determineDefaultServiceName() const; diff --git a/xmloff/source/forms/propertyimport.hxx b/xmloff/source/forms/propertyimport.hxx index fe4ec0e0192c..41b02d3e61c3 100644 --- a/xmloff/source/forms/propertyimport.hxx +++ b/xmloff/source/forms/propertyimport.hxx @@ -117,12 +117,6 @@ namespace xmloff */ bool encounteredAttribute(const OUString& _rAttributeName) const; - /** determine if the element imported by the object had an given attribute. - <p>Please be aware of the fact that the name given must be a local name, i.e. not contain a namespace. - All form relevant attributes are in the same namespace, so this would be an redundant information.</p> - */ - bool encounteredAttribute(const sal_Char* _pAttributeName) const { return encounteredAttribute(OUString::createFromAscii(_pAttributeName)); } - /** enables the tracking of the encountered attributes <p>The tracking will raise the import costs a little bit, but it's cheaper than derived classes tracking this themself.</p> diff --git a/xmloff/source/style/PageMasterExportPropMapper.hxx b/xmloff/source/style/PageMasterExportPropMapper.hxx index c2699a607960..26299be74dd5 100644 --- a/xmloff/source/style/PageMasterExportPropMapper.hxx +++ b/xmloff/source/style/PageMasterExportPropMapper.hxx @@ -60,10 +60,6 @@ public: const ::std::vector< XMLPropertyState >* pProperties = 0, sal_uInt32 nIdx = 0 ) const SAL_OVERRIDE; - - inline XMLBackgroundImageExport& GetBackgroundImageExport() - { return aBackgroundImageExport; } - }; #endif diff --git a/xmloff/source/text/XMLTextNumRuleInfo.hxx b/xmloff/source/text/XMLTextNumRuleInfo.hxx index 8ca93af9d6f4..9628e02fabd9 100644 --- a/xmloff/source/text/XMLTextNumRuleInfo.hxx +++ b/xmloff/source/text/XMLTextNumRuleInfo.hxx @@ -87,11 +87,6 @@ public: { return msNumRulesName; } - inline const ::com::sun::star::uno::Reference < - ::com::sun::star::container::XIndexReplace >& GetNumRules() const - { - return mxNumRules; - } inline sal_Int16 GetListLevelStartValue() const { return mnListLevelStartValue; diff --git a/xmloff/source/text/txtparaimphint.hxx b/xmloff/source/text/txtparaimphint.hxx index de1074866b39..5b28d9966d08 100644 --- a/xmloff/source/text/txtparaimphint.hxx +++ b/xmloff/source/text/txtparaimphint.hxx @@ -67,9 +67,7 @@ public: // We don't use virtual methods to differ between the sub classes, // because this seems to be to expensive if compared to inline methods. sal_uInt8 GetType() const { return nType; } - bool IsStyle() { return XML_HINT_STYLE==nType; } bool IsReference() { return XML_HINT_REFERENCE==nType; } - bool IsHyperlink() { return XML_HINT_HYPERLINK==nType; } bool IsIndexMark() { return XML_HINT_INDEX_MARK==nType; } }; diff --git a/xmloff/source/transform/CreateElemTContext.hxx b/xmloff/source/transform/CreateElemTContext.hxx index 67460899ced1..c8e1df9a3438 100644 --- a/xmloff/source/transform/CreateElemTContext.hxx +++ b/xmloff/source/transform/CreateElemTContext.hxx @@ -27,10 +27,6 @@ class XMLCreateElemTransformerContext : public XMLTransformerContext { sal_uInt16 m_nActionMap; -protected: - - sal_uInt16 GetActionMap() const { return m_nActionMap; } - public: XMLCreateElemTransformerContext( XMLTransformerBase& rTransformer, const OUString& rQName, diff --git a/xmloff/source/transform/TransformerBase.hxx b/xmloff/source/transform/TransformerBase.hxx index ec95efcda74a..6520e6528dd2 100644 --- a/xmloff/source/transform/TransformerBase.hxx +++ b/xmloff/source/transform/TransformerBase.hxx @@ -76,11 +76,6 @@ protected: const OUString& rLocalName, const OUString& rQName ); - // this method may return an empty reference when the transformer service - // was created outside the xmloff environment. - // It is strictly forbidden to use this as a write access to the model! - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& getModel() const { return mxModel; } - public: XMLTransformerBase( XMLTransformerActionInit *pInit=0, ::xmloff::token::XMLTokenEnum *pTKMapInit=0 ) throw(); |