mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

com::sun::star->css in xmloff/

Browse Source 
Change-Id: Iee6e21e093fb1383f19a0716dbc1c341f446b8c2
Reviewed-on: https://gerrit.libreoffice.org/20192
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
This commit is contained in:
Noel Grandin 2015-11-26 08:43:00 +02:00 committed by Noel Grandin
parent 4112ecadd5
commit 80735fcbb0
353 changed files with 2437 additions and 2892 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
xmloff/inc/AttributeContainerHandler.hxx
View File

@ -30,10 +30,10 @@ class XMLAttributeContainerHandler : public XMLPropertyHandler
public: public:
virtual ~XMLAttributeContainerHandler(); virtual ~XMLAttributeContainerHandler();
virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const override; virtual bool equals( const css::uno::Any& r1, const css::uno::Any& r2 ) const override;
virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override;
virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override;
}; };
#endif // INCLUDED_XMLOFF_INC_ATTRIBUTECONTAINERHANDLER_HXX #endif // INCLUDED_XMLOFF_INC_ATTRIBUTECONTAINERHANDLER_HXX

10
xmloff/inc/DomBuilderContext.hxx
View File

@ -44,7 +44,7 @@ class SvXMLImportContext;
* XML data from a sequence of SAX events */ * XML data from a sequence of SAX events */
class DomBuilderContext : public SvXMLImportContext class DomBuilderContext : public SvXMLImportContext
{ {
com::sun::star::uno::Reference<com::sun::star::xml::dom::XNode> mxNode; css::uno::Reference<css::xml::dom::XNode> mxNode;
public: public:
@ -57,7 +57,7 @@ public:
DomBuilderContext( SvXMLImport& rImport, DomBuilderContext( SvXMLImport& rImport,
sal_uInt16 nPrefix, sal_uInt16 nPrefix,
const OUString& rLocalName, const OUString& rLocalName,
com::sun::star::uno::Reference<com::sun::star::xml::dom::XNode>& ); css::uno::Reference<css::xml::dom::XNode>& );
virtual ~DomBuilderContext(); virtual ~DomBuilderContext();
@ -67,7 +67,7 @@ public:
/** access the DOM tree */ /** access the DOM tree */
com::sun::star::uno::Reference<com::sun::star::xml::dom::XDocument> getTree(); css::uno::Reference<css::xml::dom::XDocument> getTree();
@ -77,10 +77,10 @@ public:
virtual SvXMLImportContext* CreateChildContext( virtual SvXMLImportContext* CreateChildContext(
sal_uInt16 nPrefix, sal_uInt16 nPrefix,
const OUString& rLocalName, const OUString& rLocalName,
const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; const css::uno::Reference<css::xml::sax::XAttributeList >& xAttrList ) override;
virtual void StartElement( virtual void StartElement(
const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override;
virtual void EndElement() override; virtual void EndElement() override;

2
xmloff/inc/DomExport.hxx
View File

@ -29,7 +29,7 @@ namespace com { namespace sun { namespace star {
namespace xml { namespace dom { class XNode; } } namespace xml { namespace dom { class XNode; } }
} } } } } }
void exportDom( SvXMLExport&, const com::sun::star::uno::Reference<com::sun::star::xml::dom::XDocument>& ); void exportDom( SvXMLExport&, const css::uno::Reference<css::xml::dom::XDocument>& );
#endif #endif

7
xmloff/inc/MetaExportComponent.hxx
View File

@ -26,12 +26,11 @@
class XMLMetaExportComponent : public SvXMLExport class XMLMetaExportComponent : public SvXMLExport
{ {
::com::sun::star::uno::Reference< css::uno::Reference< css::document::XDocumentProperties > mxDocProps;
::com::sun::star::document::XDocumentProperties > mxDocProps;
public: public:
XMLMetaExportComponent( XMLMetaExportComponent(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XComponentContext >& xContext,
OUString const & implementationName, SvXMLExportFlags nFlags OUString const & implementationName, SvXMLExportFlags nFlags
); );
@ -43,7 +42,7 @@ protected:
enum ::xmloff::token::XMLTokenEnum eClass = xmloff::token::XML_TOKEN_INVALID ) override; enum ::xmloff::token::XMLTokenEnum eClass = xmloff::token::XML_TOKEN_INVALID ) override;
// accept XDocumentProperties in addition to XModel // accept XDocumentProperties in addition to XModel
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) override; virtual void SAL_CALL setSourceDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
// override // override
virtual void _ExportMeta() override; virtual void _ExportMeta() override;

31
xmloff/inc/MultiPropertySetHelper.hxx
View File

@ -62,20 +62,20 @@ class MultiPropertySetHelper
/// the sequence of property names that the current (multi) /// the sequence of property names that the current (multi)
/// property set implementation supports /// property set implementation supports
::com::sun::star::uno::Sequence< OUString > aPropertySequence; css::uno::Sequence< OUString > aPropertySequence;
/// an array of indices that maps from pPropertyNames indices to /// an array of indices that maps from pPropertyNames indices to
/// aPropertySequence indices /// aPropertySequence indices
sal_Int16* pSequenceIndex; sal_Int16* pSequenceIndex;
/// the last set of values retrieved by getValues /// the last set of values retrieved by getValues
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > aValues; css::uno::Sequence< css::uno::Any > aValues;
/// result of aValues.getConstArray() /// result of aValues.getConstArray()
const ::com::sun::star::uno::Any* pValues; const css::uno::Any* pValues;
/// an empty Any /// an empty Any
::com::sun::star::uno::Any aEmptyAny; css::uno::Any aEmptyAny;
public: public:
@ -88,8 +88,7 @@ public:
* Call hasPropertiesByName for the provided XPropertySetInfo and build * Call hasPropertiesByName for the provided XPropertySetInfo and build
* list of allowed properties. * list of allowed properties.
*/ */
void hasProperties( const ::com::sun::star::uno::Reference< void hasProperties( const css::uno::Reference<css::beans::XPropertySetInfo> & );
::com::sun::star::beans::XPropertySetInfo> & );
/** /**
@ -104,8 +103,7 @@ public:
* May only be called after hasProperties() was called for the * May only be called after hasProperties() was called for the
* appropriate XPropertySetInfo. * appropriate XPropertySetInfo.
*/ */
void getValues( const ::com::sun::star::uno::Reference< void getValues( const css::uno::Reference<css::beans::XMultiPropertySet> & );
::com::sun::star::beans::XMultiPropertySet> & );
/** /**
* Get values from the XPropertySet. This can be much slower than * Get values from the XPropertySet. This can be much slower than
@ -115,8 +113,7 @@ public:
* May only be called after hasProperties() was called for the * May only be called after hasProperties() was called for the
* appropriate XPropertySetInfo. * appropriate XPropertySetInfo.
*/ */
void getValues( const ::com::sun::star::uno::Reference< void getValues( const css::uno::Reference<css::beans::XPropertySet> & );
::com::sun::star::beans::XPropertySet> & );
@ -125,7 +122,7 @@ public:
* *
* May only be called after getValues() was called. * May only be called after getValues() was called.
*/ */
inline const ::com::sun::star::uno::Any& getValue( sal_Int16 nIndex ); inline const css::uno::Any& getValue( sal_Int16 nIndex );
/** /**
* Find out if this property is supported. * Find out if this property is supported.
@ -144,9 +141,8 @@ public:
* bTryMult is set, the XMultiPropertySet is used to get the values. * bTryMult is set, the XMultiPropertySet is used to get the values.
* *
*/ */
const ::com::sun::star::uno::Any& getValue( sal_Int16 nIndex, const css::uno::Any& getValue( sal_Int16 nIndex,
const ::com::sun::star::uno::Reference< const css::uno::Reference<css::beans::XPropertySet> &,
::com::sun::star::beans::XPropertySet> &,
bool bTryMulti = false ); bool bTryMulti = false );
/** /**
@ -159,9 +155,8 @@ public:
* XMultiPropertySet is used to get the values. * XMultiPropertySet is used to get the values.
* *
*/ */
const ::com::sun::star::uno::Any& getValue( sal_Int16 nIndex, const css::uno::Any& getValue( sal_Int16 nIndex,
const ::com::sun::star::uno::Reference< const css::uno::Reference<css::beans::XMultiPropertySet> & );
::com::sun::star::beans::XMultiPropertySet> & );
inline void resetValues() { pValues = nullptr; } inline void resetValues() { pValues = nullptr; }
}; };
@ -169,7 +164,7 @@ public:
// inline implementations of the often-called methods getValue and hasProperty: // inline implementations of the often-called methods getValue and hasProperty:
const ::com::sun::star::uno::Any& MultiPropertySetHelper::getValue( const css::uno::Any& MultiPropertySetHelper::getValue(
sal_Int16 nValueNo ) sal_Int16 nValueNo )
{ {
assert(pValues && "called getValue() without calling getValues()"); assert(pValues && "called getValue() without calling getValues()");

7
xmloff/inc/PageMasterImportContext.hxx
View File

@ -42,7 +42,7 @@ public:
PageStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, PageStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName, const OUString& rLName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList,
SvXMLStylesContext& rStyles, SvXMLStylesContext& rStyles,
bool bDefaultStyle=false); bool bDefaultStyle=false);
virtual ~PageStyleContext(); virtual ~PageStyleContext();
@ -50,11 +50,10 @@ public:
virtual SvXMLImportContext *CreateChildContext( virtual SvXMLImportContext *CreateChildContext(
sal_uInt16 nPrefix, sal_uInt16 nPrefix,
const OUString& rLocalName, const OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override; const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override;
virtual void FillPropertySet( virtual void FillPropertySet(
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::beans::XPropertySet > & rPropSet ) override;
::com::sun::star::beans::XPropertySet > & rPropSet ) override;
//text grid enhancement //text grid enhancement
virtual void SetDefaults() override; virtual void SetDefaults() override;

6
xmloff/inc/PropertySetMerger.hxx
View File

@ -22,10 +22,10 @@
#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XPropertySet.hpp>
extern ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > extern css::uno::Reference< css::beans::XPropertySet >
PropertySetMerger_CreateInstance( PropertySetMerger_CreateInstance(
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rPropSet1, css::uno::Reference< css::beans::XPropertySet > rPropSet1,
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rPropSet2 ) throw(); css::uno::Reference< css::beans::XPropertySet > rPropSet2 ) throw();
#endif #endif

9
xmloff/inc/RDFaExportHelper.hxx
View File

@ -42,8 +42,7 @@ class RDFaExportHelper
private: private:
SvXMLExport & m_rExport; SvXMLExport & m_rExport;
::com::sun::star::uno::Reference< css::uno::Reference<css::rdf::XDocumentRepository> m_xRepository;
::com::sun::star::rdf::XDocumentRepository> m_xRepository;
typedef ::std::map< OUString, OUString > typedef ::std::map< OUString, OUString >
BlankNodeMap_t; BlankNodeMap_t;
@ -53,15 +52,13 @@ private:
long m_Counter; long m_Counter;
OUString OUString
LookupBlankNode( ::com::sun::star::uno::Reference< LookupBlankNode( css::uno::Reference<css::rdf::XBlankNode> const & i_xBlankNode);
::com::sun::star::rdf::XBlankNode> const & i_xBlankNode);
public: public:
RDFaExportHelper(SvXMLExport & i_rExport); RDFaExportHelper(SvXMLExport & i_rExport);
void void
AddRDFa(::com::sun::star::uno::Reference< AddRDFa(css::uno::Reference<css::rdf::XMetadatable> const & i_xMetadatable);
::com::sun::star::rdf::XMetadatable> const & i_xMetadatable);
}; };
} // namespace xmloff } // namespace xmloff

9
xmloff/inc/RDFaImportHelper.hxx
View File

@ -66,14 +66,12 @@ public:
/** Add a RDFa statement; must have been parsed with ParseRDFa */ /** Add a RDFa statement; must have been parsed with ParseRDFa */
void AddRDFa( void AddRDFa(
::com::sun::star::uno::Reference< ::com::sun::star::rdf::XMetadatable> css::uno::Reference< css::rdf::XMetadatable> const & i_xObject,
const & i_xObject,
std::shared_ptr<ParsedRDFaAttributes> & i_pRDFaAttributes); std::shared_ptr<ParsedRDFaAttributes> & i_pRDFaAttributes);
/** Parse and add a RDFa statement; parameters are XML attribute values */ /** Parse and add a RDFa statement; parameters are XML attribute values */
void ParseAndAddRDFa( void ParseAndAddRDFa(
::com::sun::star::uno::Reference< ::com::sun::star::rdf::XMetadatable> css::uno::Reference< css::rdf::XMetadatable> const & i_xObject,
const & i_xObject,
OUString const & i_rAbout, OUString const & i_rAbout,
OUString const & i_rProperty, OUString const & i_rProperty,
OUString const & i_rContent, OUString const & i_rContent,
@ -83,8 +81,7 @@ public:
<p> This is done <em>after</em> the input file has been read, <p> This is done <em>after</em> the input file has been read,
to prevent collision between generated ids and ids in the file.</p> to prevent collision between generated ids and ids in the file.</p>
*/ */
void InsertRDFa( ::com::sun::star::uno::Reference< void InsertRDFa( css::uno::Reference< css::rdf::XRepositorySupplier > const & i_xModel);
::com::sun::star::rdf::XRepositorySupplier > const & i_xModel);
}; };
} // namespace xmloff } // namespace xmloff

4
xmloff/inc/SchXMLExport.hxx
View File

@ -36,7 +36,7 @@ namespace com { namespace sun { namespace star {
class SchXMLExport : public SvXMLExport class SchXMLExport : public SvXMLExport
{ {
private: private:
com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator > mxStatusIndicator; css::uno::Reference< css::task::XStatusIndicator > mxStatusIndicator;
rtl::Reference<SchXMLAutoStylePoolP> maAutoStylePool; rtl::Reference<SchXMLAutoStylePoolP> maAutoStylePool;
rtl::Reference<SchXMLExportHelper> maExportHelper; rtl::Reference<SchXMLExportHelper> maExportHelper;
@ -51,7 +51,7 @@ protected:
public: public:
SchXMLExport( SchXMLExport(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XComponentContext >& xContext,
OUString const & implementationName, OUString const & implementationName,
SvXMLExportFlags nExportFlags = SvXMLExportFlags::ALL ); SvXMLExportFlags nExportFlags = SvXMLExportFlags::ALL );
virtual ~SchXMLExport(); virtual ~SchXMLExport();

10
xmloff/inc/SchXMLImport.hxx
View File

@ -158,7 +158,7 @@ enum SchXMLRegEquationAttrMap
class SchXMLImport : public SvXMLImport class SchXMLImport : public SvXMLImport
{ {
private: private:
com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator > mxStatusIndicator; css::uno::Reference< css::task::XStatusIndicator > mxStatusIndicator;
rtl::Reference<SchXMLImportHelper> maImportHelper; rtl::Reference<SchXMLImportHelper> maImportHelper;
@ -166,20 +166,20 @@ protected:
virtual SvXMLImportContext *CreateContext( virtual SvXMLImportContext *CreateContext(
sal_uInt16 nPrefix, sal_uInt16 nPrefix,
const OUString& rLocalName, const OUString& rLocalName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
public: public:
SchXMLImport( SchXMLImport(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XComponentContext >& xContext,
OUString const & implementationName, SvXMLImportFlags nImportFlags ); OUString const & implementationName, SvXMLImportFlags nImportFlags );
virtual ~SchXMLImport() throw (); virtual ~SchXMLImport() throw ();
SvXMLImportContext* CreateStylesContext( const OUString& rLocalName, SvXMLImportContext* CreateStylesContext( const OUString& rLocalName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ); const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList );
// XImporter // XImporter
virtual void SAL_CALL setTargetDocument( 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) override; virtual void SAL_CALL setTargetDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
}; };
#endif // INCLUDED_XMLOFF_INC_SCHXMLIMPORT_HXX #endif // INCLUDED_XMLOFF_INC_SCHXMLIMPORT_HXX

9
xmloff/inc/StyleMap.hxx
View File

@ -63,7 +63,7 @@ inline bool StyleNameHash_Impl::operator()(
} }
class StyleMap : class StyleMap :
public ::cppu::WeakImplHelper< ::com::sun::star::lang::XUnoTunnel>, public ::cppu::WeakImplHelper< css::lang::XUnoTunnel>,
public std::unordered_map< StyleNameKey_Impl, OUString, public std::unordered_map< StyleNameKey_Impl, OUString,
StyleNameHash_Impl, StyleNameHash_Impl > StyleNameHash_Impl, StyleNameHash_Impl >
{ {
@ -73,14 +73,13 @@ public:
StyleMap(); StyleMap();
virtual ~StyleMap(); virtual ~StyleMap();
static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw(); static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw();
static StyleMap* getImplementation( static StyleMap* getImplementation(
::com::sun::star::uno::Reference< css::uno::Reference< css::uno::XInterface > ) throw();
::com::sun::star::uno::XInterface > ) throw();
// XUnoTunnel // XUnoTunnel
virtual sal_Int64 SAL_CALL getSomething( virtual sal_Int64 SAL_CALL getSomething(
const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
}; };
#endif // INCLUDED_XMLOFF_INC_STYLEMAP_HXX #endif // INCLUDED_XMLOFF_INC_STYLEMAP_HXX

7
xmloff/inc/TransGradientStyle.hxx
View File

@ -42,9 +42,8 @@ public:
~XMLTransGradientStyleImport(); ~XMLTransGradientStyleImport();
bool importXML( bool importXML(
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList,
::com::sun::star::xml::sax::XAttributeList >& xAttrList, css::uno::Any& rValue,
::com::sun::star::uno::Any& rValue,
OUString& rStrName ); OUString& rStrName );
}; };
@ -56,7 +55,7 @@ public:
XMLTransGradientStyleExport( SvXMLExport& rExport ); XMLTransGradientStyleExport( SvXMLExport& rExport );
~XMLTransGradientStyleExport(); ~XMLTransGradientStyleExport();
bool exportXML( const OUString& rStrName, const ::com::sun::star::uno::Any& rValue ); bool exportXML( const OUString& rStrName, const css::uno::Any& rValue );
}; };
#endif // INCLUDED_XMLOFF_INC_TRANSGRADIENTSTYLE_HXX #endif // INCLUDED_XMLOFF_INC_TRANSGRADIENTSTYLE_HXX

13
xmloff/inc/XMLBackgroundImageContext.hxx
View File

@ -34,17 +34,16 @@ class XMLBackgroundImageContext : public XMLElementPropertyContext
XMLPropertyState aFilterProp; XMLPropertyState aFilterProp;
XMLPropertyState aTransparencyProp; XMLPropertyState aTransparencyProp;
::com::sun::star::style::GraphicLocation ePos; css::style::GraphicLocation ePos;
OUString sURL; OUString sURL;
OUString sFilter; OUString sFilter;
sal_Int8 nTransparency; sal_Int8 nTransparency;
::com::sun::star::uno::Reference < ::com::sun::star::io::XOutputStream > xBase64Stream; css::uno::Reference < css::io::XOutputStream > xBase64Stream;
private: private:
void ProcessAttrs( void ProcessAttrs(
const ::com::sun::star::uno::Reference< const css::uno::Reference<css::xml::sax::XAttributeList > & xAttrList );
::com::sun::star::xml::sax::XAttributeList > & xAttrList );
public: public:
@ -52,8 +51,7 @@ public:
SvXMLImport& rImport, SvXMLImport& rImport,
sal_uInt16 nPrfx, sal_uInt16 nPrfx,
const OUString& rLName, const OUString& rLName,
const ::com::sun::star::uno::Reference< const css::uno::Reference<css::xml::sax::XAttributeList > & xAttrList,
::com::sun::star::xml::sax::XAttributeList > & xAttrList,
const XMLPropertyState& rProp, const XMLPropertyState& rProp,
sal_Int32 nPosIdx, sal_Int32 nPosIdx,
sal_Int32 nFilterIdx, sal_Int32 nFilterIdx,
@ -65,8 +63,7 @@ public:
SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName, const OUString& rLocalName,
const ::com::sun::star::uno::Reference< const css::uno::Reference<css::xml::sax::XAttributeList > & xAttrList ) override;
::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override;
virtual void EndElement() override; virtual void EndElement() override;
}; };

8
xmloff/inc/XMLBackgroundImageExport.hxx
View File

@ -41,10 +41,10 @@ public:
~XMLBackgroundImageExport(); ~XMLBackgroundImageExport();
void exportXML( const ::com::sun::star::uno::Any& rURL, void exportXML( const css::uno::Any& rURL,
const ::com::sun::star::uno::Any *pPos, const css::uno::Any *pPos,
const ::com::sun::star::uno::Any *pFilter, const css::uno::Any *pFilter,
const ::com::sun::star::uno::Any *pTransparency, const css::uno::Any *pTransparency,
sal_uInt16 nPrefix, sal_uInt16 nPrefix,
const OUString& rLocalName ); const OUString& rLocalName );
}; };

9
xmloff/inc/XMLBase64Export.hxx
View File

@ -37,15 +37,12 @@ public:
XMLBase64Export( SvXMLExport& rExport ); XMLBase64Export( SvXMLExport& rExport );
bool exportXML( const ::com::sun::star::uno::Reference < bool exportXML( const css::uno::Reference < css::io::XInputStream > & rIn );
::com::sun::star::io::XInputStream > & rIn ); bool exportElement( const css::uno::Reference < css::io::XInputStream > & rIn,
bool exportElement( const ::com::sun::star::uno::Reference <
::com::sun::star::io::XInputStream > & rIn,
sal_uInt16 nNamespace, sal_uInt16 nNamespace,
enum ::xmloff::token::XMLTokenEnum eName ); enum ::xmloff::token::XMLTokenEnum eName );
bool exportOfficeBinaryDataElement( bool exportOfficeBinaryDataElement(
const ::com::sun::star::uno::Reference < const css::uno::Reference < css::io::XInputStream > & rIn );
::com::sun::star::io::XInputStream > & rIn );
}; };

26
xmloff/inc/XMLBasicExportFilter.hxx
View File

@ -26,36 +26,36 @@
// class XMLBasicExportFilter // class XMLBasicExportFilter
typedef ::cppu::WeakImplHelper< typedef ::cppu::WeakImplHelper<
::com::sun::star::xml::sax::XDocumentHandler > XMLBasicExportFilter_BASE; css::xml::sax::XDocumentHandler > XMLBasicExportFilter_BASE;
class XMLBasicExportFilter : public XMLBasicExportFilter_BASE class XMLBasicExportFilter : public XMLBasicExportFilter_BASE
{ {
private: private:
::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > m_xHandler; css::uno::Reference< css::xml::sax::XDocumentHandler > m_xHandler;
public: public:
XMLBasicExportFilter( XMLBasicExportFilter(
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler >& rxHandler ); const css::uno::Reference< css::xml::sax::XDocumentHandler >& rxHandler );
virtual ~XMLBasicExportFilter(); virtual ~XMLBasicExportFilter();
// XDocumentHandler // XDocumentHandler
virtual void SAL_CALL startDocument() virtual void SAL_CALL startDocument()
throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL endDocument() virtual void SAL_CALL endDocument()
throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL startElement( const OUString& aName, virtual void SAL_CALL startElement( const OUString& aName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttribs ) const css::uno::Reference< css::xml::sax::XAttributeList >& xAttribs )
throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL endElement( const OUString& aName ) virtual void SAL_CALL endElement( const OUString& aName )
throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL characters( const OUString& aChars ) virtual void SAL_CALL characters( const OUString& aChars )
throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces )
throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData )
throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setDocumentLocator( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator >& xLocator ) virtual void SAL_CALL setDocumentLocator( const css::uno::Reference< css::xml::sax::XLocator >& xLocator )
throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
}; };
#endif // INCLUDED_XMLOFF_INC_XMLBASICEXPORTFILTER_HXX #endif // INCLUDED_XMLOFF_INC_XMLBASICEXPORTFILTER_HXX

4
xmloff/inc/XMLBitmapLogicalSizePropertyHandler.hxx
View File

@ -40,13 +40,13 @@ public:
/// Imports the given value in cas of the given XML-data-type /// Imports the given value in cas of the given XML-data-type
virtual bool importXML( virtual bool importXML(
const OUString& rStrImpValue, const OUString& rStrImpValue,
::com::sun::star::uno::Any& rValue, css::uno::Any& rValue,
const SvXMLUnitConverter& rUnitConverter ) const override; const SvXMLUnitConverter& rUnitConverter ) const override;
/// Exports the given value in cas of the given XML-data-type /// Exports the given value in cas of the given XML-data-type
virtual bool exportXML( virtual bool exportXML(
OUString& rStrExpValue, OUString& rStrExpValue,
const ::com::sun::star::uno::Any& rValue, const css::uno::Any& rValue,
const SvXMLUnitConverter& rUnitConverter ) const override; const SvXMLUnitConverter& rUnitConverter ) const override;
}; };

4
xmloff/inc/XMLBitmapRepeatOffsetPropertyHandler.hxx
View File

@ -42,13 +42,13 @@ public:
/// Imports the given value in cas of the given XML-data-type /// Imports the given value in cas of the given XML-data-type
virtual bool importXML( virtual bool importXML(
const OUString& rStrImpValue, const OUString& rStrImpValue,
::com::sun::star::uno::Any& rValue, css::uno::Any& rValue,
const SvXMLUnitConverter& rUnitConverter ) const override; const SvXMLUnitConverter& rUnitConverter ) const override;
/// Exports the given value in cas of the given XML-data-type /// Exports the given value in cas of the given XML-data-type
virtual bool exportXML( virtual bool exportXML(
OUString& rStrExpValue, OUString& rStrExpValue,
const ::com::sun::star::uno::Any& rValue, const css::uno::Any& rValue,
const SvXMLUnitConverter& rUnitConverter ) const override; const SvXMLUnitConverter& rUnitConverter ) const override;
}; };

8
xmloff/inc/XMLChartPropertySetMapper.hxx
View File

@ -46,14 +46,13 @@ class XMLChartExportPropertyMapper : public SvXMLExportPropertyMapper
{ {
private: private:
SvXMLExport& mrExport; SvXMLExport& mrExport;
com::sun::star::uno::Reference< com::sun::star::chart2::XChartDocument > mxChartDoc; css::uno::Reference< css::chart2::XChartDocument > mxChartDoc;
protected: protected:
virtual void ContextFilter( virtual void ContextFilter(
bool bEnableFoFontFamily, bool bEnableFoFontFamily,
::std::vector< XMLPropertyState >& rProperties, ::std::vector< XMLPropertyState >& rProperties,
::com::sun::star::uno::Reference< css::uno::Reference<css::beans::XPropertySet > rPropSet ) const override;
::com::sun::star::beans::XPropertySet > rPropSet ) const override;
private: private:
/// this method is called for every item that has the MID_FLAG_ELEMENT_EXPORT flag set /// this method is called for every item that has the MID_FLAG_ELEMENT_EXPORT flag set
@ -75,8 +74,7 @@ public:
SvXMLExport& rExport ); SvXMLExport& rExport );
virtual ~XMLChartExportPropertyMapper(); virtual ~XMLChartExportPropertyMapper();
void setChartDoc( com::sun::star::uno::Reference< void setChartDoc( css::uno::Reference< css::chart2::XChartDocument > xChartDoc );
com::sun::star::chart2::XChartDocument > xChartDoc );
}; };
class XMLChartImportPropertyMapper : public SvXMLImportPropertyMapper class XMLChartImportPropertyMapper : public SvXMLImportPropertyMapper

7
xmloff/inc/XMLChartStyleContext.hxx
View File

@ -39,20 +39,19 @@ public:
XMLChartStyleContext( XMLChartStyleContext(
SvXMLImport& rImport, sal_uInt16 nPrfx, SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName, const OUString& rLName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList,
SvXMLStylesContext& rStyles, sal_uInt16 nFamily ); SvXMLStylesContext& rStyles, sal_uInt16 nFamily );
virtual ~XMLChartStyleContext(); virtual ~XMLChartStyleContext();
/// is called after all styles have been read to apply styles /// is called after all styles have been read to apply styles
void FillPropertySet( void FillPropertySet(
const ::com::sun::star::uno::Reference< const css::uno::Reference<css::beans::XPropertySet > & rPropSet ) override;
::com::sun::star::beans::XPropertySet > & rPropSet ) override;
/// necessary for property context (element-property symbol-image) /// necessary for property context (element-property symbol-image)
virtual SvXMLImportContext *CreateChildContext( virtual SvXMLImportContext *CreateChildContext(
sal_uInt16 nPrefix, sal_uInt16 nPrefix,
const OUString& rLocalName, const OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override; const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override;
}; };
#endif // INCLUDED_XMLOFF_INC_XMLCHARTSTYLECONTEXT_HXX #endif // INCLUDED_XMLOFF_INC_XMLCHARTSTYLECONTEXT_HXX

6
xmloff/inc/XMLClipPropertyHandler.hxx
View File

@ -32,9 +32,9 @@ public:
XMLClipPropertyHandler( bool bODF11 ); XMLClipPropertyHandler( bool bODF11 );
virtual ~XMLClipPropertyHandler(); virtual ~XMLClipPropertyHandler();
virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const override; virtual bool equals( const css::uno::Any& r1, const css::uno::Any& r2 ) const override;
virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override;
virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override;
}; };
#endif // INCLUDED_XMLOFF_INC_XMLCLIPPROPERTYHANDLER_HXX #endif // INCLUDED_XMLOFF_INC_XMLCLIPPROPERTYHANDLER_HXX

16
xmloff/inc/XMLEmbeddedObjectImportContext.hxx
View File

@ -28,10 +28,8 @@ namespace com { namespace sun { namespace star { namespace lang {
class XMLEmbeddedObjectImportContext : public SvXMLImportContext class XMLEmbeddedObjectImportContext : public SvXMLImportContext
{ {
::com::sun::star::uno::Reference< css::uno::Reference<css::xml::sax::XDocumentHandler > xHandler;
::com::sun::star::xml::sax::XDocumentHandler > xHandler; css::uno::Reference<css::lang::XComponent > xComp;
::com::sun::star::uno::Reference<
::com::sun::star::lang::XComponent > xComp;
OUString sFilterService; OUString sFilterService;
OUString sCLSID; OUString sCLSID;
@ -43,24 +41,22 @@ public:
XMLEmbeddedObjectImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, XMLEmbeddedObjectImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName, const OUString& rLName,
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList );
::com::sun::star::xml::sax::XAttributeList >& xAttrList );
virtual ~XMLEmbeddedObjectImportContext(); virtual ~XMLEmbeddedObjectImportContext();
virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName, const OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
virtual void EndElement() override; virtual void EndElement() override;
virtual void Characters( const OUString& rChars ) override; virtual void Characters( const OUString& rChars ) override;
bool SetComponent( bool SetComponent(
::com::sun::star::uno::Reference< css::uno::Reference< css::lang::XComponent >& rComp );
::com::sun::star::lang::XComponent >& rComp );
}; };

3
xmloff/inc/XMLEventImportHelper.hxx
View File

@ -85,8 +85,7 @@ public:
SvXMLImport& rImport, SvXMLImport& rImport,
sal_uInt16 nPrefix, sal_uInt16 nPrefix,
const OUString& rLocalName, const OUString& rLocalName,
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::xml::sax::XAttributeList> & xAttrList,
::com::sun::star::xml::sax::XAttributeList> & xAttrList,
XMLEventsImportContext* rEvents, XMLEventsImportContext* rEvents,
const OUString& rXmlEventName, const OUString& rXmlEventName,
const OUString& rLanguage); const OUString& rLanguage);

4
xmloff/inc/XMLFillBitmapSizePropertyHandler.hxx
View File

@ -40,13 +40,13 @@ public:
/// Imports the given value in cas of the given XML-data-type /// Imports the given value in cas of the given XML-data-type
virtual bool importXML( virtual bool importXML(
const OUString& rStrImpValue, const OUString& rStrImpValue,
::com::sun::star::uno::Any& rValue, css::uno::Any& rValue,
const SvXMLUnitConverter& rUnitConverter ) const override; const SvXMLUnitConverter& rUnitConverter ) const override;
/// Exports the given value in cas of the given XML-data-type /// Exports the given value in cas of the given XML-data-type
virtual bool exportXML( virtual bool exportXML(
OUString& rStrExpValue, OUString& rStrExpValue,
const ::com::sun::star::uno::Any& rValue, const css::uno::Any& rValue,
const SvXMLUnitConverter& rUnitConverter ) const override; const SvXMLUnitConverter& rUnitConverter ) const override;
}; };

12
xmloff/inc/XMLFootnoteConfigurationImportContext.hxx
View File

@ -70,22 +70,19 @@ public:
SvXMLImport& rImport, SvXMLImport& rImport,
sal_uInt16 nPrfx, sal_uInt16 nPrfx,
const OUString& rLName, const OUString& rLName,
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::xml::sax::XAttributeList> & xAttrList);
::com::sun::star::xml::sax::XAttributeList> & xAttrList);
virtual ~XMLFootnoteConfigurationImportContext(); virtual ~XMLFootnoteConfigurationImportContext();
/// parse attributes /// parse attributes
virtual void StartElement( virtual void StartElement(
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::xml::sax::XAttributeList> & xAttrList ) override;
::com::sun::star::xml::sax::XAttributeList> & xAttrList ) override;
/// for footnotes, also parse begin and end notices /// for footnotes, also parse begin and end notices
virtual SvXMLImportContext *CreateChildContext( virtual SvXMLImportContext *CreateChildContext(
sal_uInt16 nPrefix, sal_uInt16 nPrefix,
const OUString& rLocalName, const OUString& rLocalName,
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::xml::sax::XAttributeList> & xAttrList ) override;
::com::sun::star::xml::sax::XAttributeList> & xAttrList ) override;
/// get token map for attributes /// get token map for attributes
const SvXMLTokenMap& GetFtnConfigAttrTokenMap(); const SvXMLTokenMap& GetFtnConfigAttrTokenMap();
@ -98,8 +95,7 @@ public:
/// set configuration at document /// set configuration at document
void ProcessSettings( void ProcessSettings(
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::beans::XPropertySet> & rConfig);
::com::sun::star::beans::XPropertySet> & rConfig);
/// for helper class: set begin notice /// for helper class: set begin notice
void SetBeginNotice( const OUString& sText); void SetBeginNotice( const OUString& sText);

12
xmloff/inc/XMLImageMapContext.hxx
View File

@ -36,13 +36,11 @@ class XMLImageMapContext : public SvXMLImportContext
const OUString sImageMap; const OUString sImageMap;
/// the image map to be imported /// the image map to be imported
::com::sun::star::uno::Reference< css::uno::Reference< css::container::XIndexContainer> xImageMap;
::com::sun::star::container::XIndexContainer> xImageMap;
/// the property set from which to get and where eventually to set the /// the property set from which to get and where eventually to set the
/// image map /// image map
::com::sun::star::uno::Reference< css::uno::Reference< css::beans::XPropertySet> xPropertySet;
::com::sun::star::beans::XPropertySet> xPropertySet;
public: public:
@ -50,16 +48,14 @@ public:
SvXMLImport& rImport, SvXMLImport& rImport,
sal_uInt16 nPrefix, sal_uInt16 nPrefix,
const OUString& rLocalName, const OUString& rLocalName,
::com::sun::star::uno::Reference< css::uno::Reference< css::beans::XPropertySet> & rPropertySet);
::com::sun::star::beans::XPropertySet> & rPropertySet);
virtual ~XMLImageMapContext(); virtual ~XMLImageMapContext();
virtual SvXMLImportContext *CreateChildContext( virtual SvXMLImportContext *CreateChildContext(
sal_uInt16 nPrefix, sal_uInt16 nPrefix,
const OUString& rLocalName, const OUString& rLocalName,
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override;
virtual void EndElement() override; virtual void EndElement() override;
}; };

18
xmloff/inc/XMLImageMapExport.hxx
View File

@ -62,15 +62,13 @@ public:
*/ */
void Export( void Export(
/// the property set containing the ImageMap property /// the property set containing the ImageMap property
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::beans::XPropertySet> & rPropertySet);
::com::sun::star::beans::XPropertySet> & rPropertySet);
/** /**
* Export an ImageMap (XIndexContainer). * Export an ImageMap (XIndexContainer).
*/ */
void Export( void Export(
/// the container containing the image map elements /// the container containing the image map elements
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::container::XIndexContainer> & rContainer);
::com::sun::star::container::XIndexContainer> & rContainer);
protected: protected:
@ -80,32 +78,28 @@ protected:
* Calls methods for specific image map entries. * Calls methods for specific image map entries.
*/ */
void ExportMapEntry( void ExportMapEntry(
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::beans::XPropertySet> & rPropertySet);
::com::sun::star::beans::XPropertySet> & rPropertySet);
/** /**
* Export the specifics of a rectangular image map entry. * Export the specifics of a rectangular image map entry.
* To be called by ExportMapEntry. * To be called by ExportMapEntry.
*/ */
void ExportRectangle( void ExportRectangle(
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::beans::XPropertySet> & rPropertySet);
::com::sun::star::beans::XPropertySet> & rPropertySet);
/** /**
* Export the specifics of a circular image map entry. * Export the specifics of a circular image map entry.
* To be called by ExportMapEntry. * To be called by ExportMapEntry.
*/ */
void ExportCircle( void ExportCircle(
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::beans::XPropertySet> & rPropertySet);
::com::sun::star::beans::XPropertySet> & rPropertySet);
/** /**
* Export the specifics of a polygonal image map entry; * Export the specifics of a polygonal image map entry;
* To be called by ExportMapEntry. * To be called by ExportMapEntry.
*/ */
void ExportPolygon( void ExportPolygon(
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::beans::XPropertySet> & rPropertySet);
::com::sun::star::beans::XPropertySet> & rPropertySet);
}; };
#endif #endif

12
xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx
View File

@ -61,8 +61,7 @@ class XMLIndexBibliographyConfigurationContext : public SvXMLStyleContext
bool bNumberedEntries; bool bNumberedEntries;
bool bSortByPosition; bool bSortByPosition;
::std::vector< ::com::sun::star::uno::Sequence< ::std::vector< css::uno::Sequence< css::beans::PropertyValue> > aSortKeys;
::com::sun::star::beans::PropertyValue> > aSortKeys;
public: public:
@ -71,24 +70,21 @@ public:
SvXMLImport& rImport, SvXMLImport& rImport,
sal_uInt16 nPrfx, sal_uInt16 nPrfx,
const OUString& rLocalName, const OUString& rLocalName,
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::xml::sax::XAttributeList> & xAttrList);
::com::sun::star::xml::sax::XAttributeList> & xAttrList);
virtual ~XMLIndexBibliographyConfigurationContext(); virtual ~XMLIndexBibliographyConfigurationContext();
protected: protected:
virtual void StartElement( virtual void StartElement(
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::xml::sax::XAttributeList> & xAttrList) override;
::com::sun::star::xml::sax::XAttributeList> & xAttrList) override;
virtual void CreateAndInsert( bool bOverwrite ) override; virtual void CreateAndInsert( bool bOverwrite ) override;
virtual SvXMLImportContext *CreateChildContext( virtual SvXMLImportContext *CreateChildContext(
sal_uInt16 nPrefix, sal_uInt16 nPrefix,
const OUString& rLocalName, const OUString& rLocalName,
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::xml::sax::XAttributeList> & xAttrList ) override;
::com::sun::star::xml::sax::XAttributeList> & xAttrList ) override;
void ProcessAttribute( void ProcessAttribute(
sal_uInt16 nPrefix, sal_uInt16 nPrefix,

4
xmloff/inc/XMLIsPercentagePropertyHandler.hxx
View File

@ -33,11 +33,11 @@ public:
virtual bool importXML( virtual bool importXML(
const OUString& rStrImpValue, const OUString& rStrImpValue,
::com::sun::star::uno::Any& rValue, css::uno::Any& rValue,
const SvXMLUnitConverter& rUnitConverter ) const override; const SvXMLUnitConverter& rUnitConverter ) const override;
virtual bool exportXML( virtual bool exportXML(
OUString& rStrExpValue, OUString& rStrExpValue,
const ::com::sun::star::uno::Any& rValue, const css::uno::Any& rValue,
const SvXMLUnitConverter& rUnitConverter ) const override; const SvXMLUnitConverter& rUnitConverter ) const override;
}; };

9
xmloff/inc/XMLLineNumberingImportContext.hxx
View File

@ -82,8 +82,7 @@ public:
SvXMLImport& rImport, SvXMLImport& rImport,
sal_uInt16 nPrfx, sal_uInt16 nPrfx,
const OUString& rLocalName, const OUString& rLocalName,
const ::com::sun::star::uno::Reference< const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList);
::com::sun::star::xml::sax::XAttributeList> & xAttrList);
virtual ~XMLLineNumberingImportContext(); virtual ~XMLLineNumberingImportContext();
@ -94,8 +93,7 @@ public:
protected: protected:
virtual void StartElement( virtual void StartElement(
const ::com::sun::star::uno::Reference< const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList) override;
::com::sun::star::xml::sax::XAttributeList> & xAttrList) override;
void ProcessAttribute( void ProcessAttribute(
enum LineNumberingToken eToken, enum LineNumberingToken eToken,
@ -106,8 +104,7 @@ protected:
virtual SvXMLImportContext *CreateChildContext( virtual SvXMLImportContext *CreateChildContext(
sal_uInt16 nPrefix, sal_uInt16 nPrefix,
const OUString& rLocalName, const OUString& rLocalName,
const ::com::sun::star::uno::Reference< const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList ) override;
::com::sun::star::xml::sax::XAttributeList> & xAttrList ) override;
}; };
#endif #endif

4
xmloff/inc/XMLNumberStylesImport.hxx
View File

@ -51,14 +51,14 @@ public:
sal_uInt16 nPrfx, sal_uInt16 nPrfx,
const OUString& rLocalName, const OUString& rLocalName,
SvXMLNumImpData* pNewData, sal_uInt16 nNewType, SvXMLNumImpData* pNewData, sal_uInt16 nNewType,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
SvXMLStylesContext& rStyles); SvXMLStylesContext& rStyles);
virtual ~SdXMLNumberFormatImportContext(); virtual ~SdXMLNumberFormatImportContext();
virtual void EndElement() override; virtual void EndElement() override;
virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override;
sal_Int32 GetDrawKey() const { return mnKey; } sal_Int32 GetDrawKey() const { return mnKey; }
}; };

4
xmloff/inc/XMLPercentOrMeasurePropertyHandler.hxx
View File

@ -35,11 +35,11 @@ public:
virtual bool importXML( virtual bool importXML(
const OUString& rStrImpValue, const OUString& rStrImpValue,
::com::sun::star::uno::Any& rValue, css::uno::Any& rValue,
const SvXMLUnitConverter& rUnitConverter ) const override; const SvXMLUnitConverter& rUnitConverter ) const override;
virtual bool exportXML( virtual bool exportXML(
OUString& rStrExpValue, OUString& rStrExpValue,
const ::com::sun::star::uno::Any& rValue, const css::uno::Any& rValue,
const SvXMLUnitConverter& rUnitConverter ) const override; const SvXMLUnitConverter& rUnitConverter ) const override;
}; };

4
xmloff/inc/XMLRectangleMembersHandler.hxx
View File

@ -42,13 +42,13 @@ public:
/// Imports the given value in cas of the given XML-data-type /// Imports the given value in cas of the given XML-data-type
virtual bool importXML( virtual bool importXML(
const OUString& rStrImpValue, const OUString& rStrImpValue,
::com::sun::star::uno::Any& rValue, css::uno::Any& rValue,
const SvXMLUnitConverter& rUnitConverter ) const override; const SvXMLUnitConverter& rUnitConverter ) const override;
/// Exports the given value in cas of the given XML-data-type /// Exports the given value in cas of the given XML-data-type
virtual bool exportXML( virtual bool exportXML(
OUString& rStrExpValue, OUString& rStrExpValue,
const ::com::sun::star::uno::Any& rValue, const css::uno::Any& rValue,
const SvXMLUnitConverter& rUnitConverter ) const override; const SvXMLUnitConverter& rUnitConverter ) const override;
}; };

15
xmloff/inc/XMLReplacementImageContext.hxx
View File

@ -30,10 +30,8 @@ namespace com { namespace sun { namespace star {
class XMLReplacementImageContext : public SvXMLImportContext class XMLReplacementImageContext : public SvXMLImportContext
{ {
::com::sun::star::uno::Reference < css::uno::Reference < css::io::XOutputStream > m_xBase64Stream;
::com::sun::star::io::XOutputStream > m_xBase64Stream; css::uno::Reference < css::beans::XPropertySet > m_xPropSet;
::com::sun::star::uno::Reference <
::com::sun::star::beans::XPropertySet > m_xPropSet;
OUString m_sHRef; OUString m_sHRef;
const OUString m_sGraphicURL; const OUString m_sGraphicURL;
@ -44,18 +42,15 @@ public:
XMLReplacementImageContext( SvXMLImport& rImport, XMLReplacementImageContext( SvXMLImport& rImport,
sal_uInt16 nPrfx, sal_uInt16 nPrfx,
const OUString& rLName, const OUString& rLName,
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::xml::sax::XAttributeList > & rAttrList,
::com::sun::star::xml::sax::XAttributeList > & rAttrList, const css::uno::Reference< css::beans::XPropertySet >& rPropSet );
const ::com::sun::star::uno::Reference <
::com::sun::star::beans::XPropertySet >& rPropSet );
virtual ~XMLReplacementImageContext(); virtual ~XMLReplacementImageContext();
virtual void EndElement() override; virtual void EndElement() override;
SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName, const OUString& rLocalName,
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override;
::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override;
}; };

3
xmloff/inc/XMLScriptContextFactory.hxx
View File

@ -45,8 +45,7 @@ public:
sal_uInt16 nPrefix, /// element: namespace prefix sal_uInt16 nPrefix, /// element: namespace prefix
const OUString & rLocalName, /// element: local name const OUString & rLocalName, /// element: local name
/// attribute list /// attribute list
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::xml::sax::XAttributeList> & xAttrList,
::com::sun::star::xml::sax::XAttributeList> & xAttrList,
/// the context for the enclosing <script:events> element /// the context for the enclosing <script:events> element
XMLEventsImportContext * rEvents, XMLEventsImportContext * rEvents,
/// the event name (as understood by the API) /// the event name (as understood by the API)

3
xmloff/inc/XMLScriptExportHandler.hxx
View File

@ -43,8 +43,7 @@ public:
virtual void Export( virtual void Export(
SvXMLExport& rExport, SvXMLExport& rExport,
const OUString& rEventName, const OUString& rEventName,
::com::sun::star::uno::Sequence< css::uno::Sequence<css::beans::PropertyValue> & rValues,
::com::sun::star::beans::PropertyValue> & rValues,
bool bUseWhitespace) override; bool bUseWhitespace) override;
}; };

5
xmloff/inc/XMLShapePropertySetContext.hxx
View File

@ -32,8 +32,7 @@ public:
XMLShapePropertySetContext( SvXMLImport& rImport, sal_uInt16 nPrfx, XMLShapePropertySetContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName, const OUString& rLName,
const ::com::sun::star::uno::Reference< const css::uno::Reference<css::xml::sax::XAttributeList >& xAttrList,
::com::sun::star::xml::sax::XAttributeList >& xAttrList,
sal_uInt32 nFam, sal_uInt32 nFam,
::std::vector< XMLPropertyState > &rProps, ::std::vector< XMLPropertyState > &rProps,
const rtl::Reference < SvXMLImportPropertyMapper > &rMap ); const rtl::Reference < SvXMLImportPropertyMapper > &rMap );
@ -45,7 +44,7 @@ public:
using SvXMLPropertySetContext::CreateChildContext; using SvXMLPropertySetContext::CreateChildContext;
virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName, const OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList, const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList,
::std::vector< XMLPropertyState > &rProperties, ::std::vector< XMLPropertyState > &rProperties,
const XMLPropertyState& rProp) override; const XMLPropertyState& rProp) override;
}; };

3
xmloff/inc/XMLStarBasicContextFactory.hxx
View File

@ -46,8 +46,7 @@ public:
SvXMLImport& rImport, /// import context SvXMLImport& rImport, /// import context
sal_uInt16 nPrefix, /// element: namespace prefix sal_uInt16 nPrefix, /// element: namespace prefix
const OUString& rLocalName, /// element: local name const OUString& rLocalName, /// element: local name
const ::com::sun::star::uno::Reference< /// attribute list const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList,/// attribute list
::com::sun::star::xml::sax::XAttributeList> & xAttrList,
/// the context for the enclosing <script:events> element /// the context for the enclosing <script:events> element
XMLEventsImportContext* rEvents, XMLEventsImportContext* rEvents,
/// the event name (as understood by the API) /// the event name (as understood by the API)

3
xmloff/inc/XMLStarBasicExportHandler.hxx
View File

@ -47,8 +47,7 @@ public:
virtual void Export( virtual void Export(
SvXMLExport& rExport, SvXMLExport& rExport,
const OUString& rEventName, const OUString& rEventName,
::com::sun::star::uno::Sequence< css::uno::Sequence<css::beans::PropertyValue> & rValues,
::com::sun::star::beans::PropertyValue> & rValues,
bool bUseWhitespace) override; bool bUseWhitespace) override;
}; };

3
xmloff/inc/XMLStringBufferImportContext.hxx
View File

@ -48,8 +48,7 @@ public:
virtual SvXMLImportContext *CreateChildContext( virtual SvXMLImportContext *CreateChildContext(
sal_uInt16 nPrefix, sal_uInt16 nPrefix,
const OUString& rLocalName, const OUString& rLocalName,
const ::com::sun::star::uno::Reference< const css::uno::Reference<css::xml::sax::XAttributeList >& xAttrList ) override;
::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override;
virtual void Characters( virtual void Characters(
const OUString& rChars ) override; const OUString& rChars ) override;

5
xmloff/inc/XMLTextColumnsContext.hxx
View File

@ -52,8 +52,7 @@ public:
XMLTextColumnsContext( XMLTextColumnsContext(
SvXMLImport& rImport, sal_uInt16 nPrfx, SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName, const OUString& rLName,
const ::com::sun::star::uno::Reference< const css::uno::Reference<css::xml::sax::XAttributeList > & xAttrList,
::com::sun::star::xml::sax::XAttributeList > & xAttrList,
const XMLPropertyState& rProp, const XMLPropertyState& rProp,
::std::vector< XMLPropertyState > &rProps ); ::std::vector< XMLPropertyState > &rProps );
@ -61,7 +60,7 @@ public:
virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName, const OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override; const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override;
virtual void EndElement() override; virtual void EndElement() override;
}; };

2
xmloff/inc/XMLTextColumnsExport.hxx
View File

@ -44,7 +44,7 @@ public:
XMLTextColumnsExport( SvXMLExport& rExport ); XMLTextColumnsExport( SvXMLExport& rExport );
void exportXML( const ::com::sun::star::uno::Any& rAny ); void exportXML( const css::uno::Any& rAny );
}; };

8
xmloff/inc/XMLTextColumnsPropertyHandler.hxx
View File

@ -31,17 +31,17 @@ public:
virtual ~XMLTextColumnsPropertyHandler (); virtual ~XMLTextColumnsPropertyHandler ();
virtual bool equals( virtual bool equals(
const ::com::sun::star::uno::Any& r1, const css::uno::Any& r1,
const ::com::sun::star::uno::Any& r2 ) const override; const css::uno::Any& r2 ) const override;
/// TabStops will be imported/exported as XML-Elements. So the Import/Export-work must be done at another place. /// TabStops will be imported/exported as XML-Elements. So the Import/Export-work must be done at another place.
virtual bool importXML( virtual bool importXML(
const OUString& rStrImpValue, const OUString& rStrImpValue,
::com::sun::star::uno::Any& rValue, css::uno::Any& rValue,
const SvXMLUnitConverter& rUnitConverter ) const override; const SvXMLUnitConverter& rUnitConverter ) const override;
virtual bool exportXML( virtual bool exportXML(
OUString& rStrExpValue, OUString& rStrExpValue,
const ::com::sun::star::uno::Any& rValue, const css::uno::Any& rValue,
const SvXMLUnitConverter& rUnitConverter ) const override; const SvXMLUnitConverter& rUnitConverter ) const override;
}; };

14
xmloff/inc/XMLTextHeaderFooterContext.hxx
View File

@ -29,10 +29,8 @@ namespace com { namespace sun { namespace star {
class XMLTextHeaderFooterContext: public SvXMLImportContext class XMLTextHeaderFooterContext: public SvXMLImportContext
{ {
::com::sun::star::uno::Reference < css::uno::Reference< css::text::XTextCursor > xOldTextCursor;
::com::sun::star::text::XTextCursor > xOldTextCursor; css::uno::Reference< css::beans::XPropertySet > xPropSet;
::com::sun::star::uno::Reference <
::com::sun::star::beans::XPropertySet > xPropSet;
const OUString sOn; const OUString sOn;
const OUString sShareContent; const OUString sShareContent;
@ -49,10 +47,8 @@ public:
XMLTextHeaderFooterContext( SvXMLImport& rImport, sal_uInt16 nPrfx, XMLTextHeaderFooterContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName, const OUString& rLName,
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList,
::com::sun::star::xml::sax::XAttributeList > & xAttrList, const css::uno::Reference< css::beans::XPropertySet > & rPageStylePropSet,
const ::com::sun::star::uno::Reference <
::com::sun::star::beans::XPropertySet > & rPageStylePropSet,
bool bFooter, bool bLft, bool bFrst ); bool bFooter, bool bLft, bool bFrst );
virtual ~XMLTextHeaderFooterContext(); virtual ~XMLTextHeaderFooterContext();
@ -60,7 +56,7 @@ public:
virtual SvXMLImportContext *CreateChildContext( virtual SvXMLImportContext *CreateChildContext(
sal_uInt16 nPrefix, sal_uInt16 nPrefix,
const OUString& rLocalName, const OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override; const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override;
virtual void EndElement() override; virtual void EndElement() override;
}; };

4
xmloff/inc/anim.hxx
View File

@ -88,8 +88,8 @@ extern SvXMLEnumMapEntry aXML_AnimationDirection_EnumMap[];
extern SvXMLEnumMapEntry aXML_AnimationSpeed_EnumMap[]; extern SvXMLEnumMapEntry aXML_AnimationSpeed_EnumMap[];
void SdXMLImplSetEffect( ::com::sun::star::presentation::AnimationEffect eEffect, XMLEffect& eKind, XMLEffectDirection& eDirection, sal_Int16& nStartScale, bool& bIn ); void SdXMLImplSetEffect( css::presentation::AnimationEffect eEffect, XMLEffect& eKind, XMLEffectDirection& eDirection, sal_Int16& nStartScale, bool& bIn );
::com::sun::star::presentation::AnimationEffect ImplSdXMLgetEffect( XMLEffect eKind, XMLEffectDirection eDirection, sal_Int16 nStartScale, bool bIn ); css::presentation::AnimationEffect ImplSdXMLgetEffect( XMLEffect eKind, XMLEffectDirection eDirection, sal_Int16 nStartScale, bool bIn );
#endif // INCLUDED_XMLOFF_INC_ANIM_HXX #endif // INCLUDED_XMLOFF_INC_ANIM_HXX

14
xmloff/inc/animationimport.hxx
View File

@ -33,27 +33,27 @@ class AnimationNodeContext : public SvXMLImportContext
{ {
AnimationsImportHelperImpl* mpHelper; AnimationsImportHelperImpl* mpHelper;
bool mbRootContext; bool mbRootContext;
::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > mxNode; css::uno::Reference< css::animations::XAnimationNode > mxNode;
void init_node( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); void init_node( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList );
public: public:
AnimationNodeContext( AnimationNodeContext(
const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xParentNode, const css::uno::Reference< css::animations::XAnimationNode >& xParentNode,
SvXMLImport& rImport, SvXMLImport& rImport,
sal_uInt16 nPrfx, sal_uInt16 nPrfx,
const OUString& rLocalName, const OUString& rLocalName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
AnimationsImportHelperImpl* mpImpl = nullptr ); AnimationsImportHelperImpl* mpImpl = nullptr );
virtual ~AnimationNodeContext(); virtual ~AnimationNodeContext();
virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override;
static void postProcessRootNode( SvXMLImport& rImport, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xPageProps ); static void postProcessRootNode( SvXMLImport& rImport, const css::uno::Reference< css::animations::XAnimationNode >& xNode, css::uno::Reference< css::beans::XPropertySet >& xPageProps );
}; };
} }

4
xmloff/inc/animimp.hxx
View File

@ -36,11 +36,11 @@ public:
XMLAnimationsContext( SvXMLImport& rImport, XMLAnimationsContext( SvXMLImport& rImport,
sal_uInt16 nPrfx, sal_uInt16 nPrfx,
const OUString& rLocalName, const OUString& rLocalName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList); const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList);
virtual ~XMLAnimationsContext(); virtual ~XMLAnimationsContext();
virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override;
}; };
#endif // INCLUDED_XMLOFF_INC_ANIMIMP_HXX #endif // INCLUDED_XMLOFF_INC_ANIMIMP_HXX

4
xmloff/inc/forms/property_handler.hxx
View File

@ -33,7 +33,7 @@
namespace xmloff namespace xmloff
{ {
typedef ::std::map< PropertyId, ::com::sun::star::uno::Any > PropertyValues; typedef ::std::map< PropertyId, css::uno::Any > PropertyValues;
class PropertyHandlerBase : public ::salhelper::SimpleReferenceObject class PropertyHandlerBase : public ::salhelper::SimpleReferenceObject
{ {
@ -46,7 +46,7 @@ namespace xmloff
/** is a convenience method for XML attributes whose value comprises of only one UNO API property /** is a convenience method for XML attributes whose value comprises of only one UNO API property
*/ */
virtual OUString virtual OUString
getAttributeValue( const ::com::sun::star::uno::Any& i_propertyValue ) const = 0; getAttributeValue( const css::uno::Any& i_propertyValue ) const = 0;
/** retrieves the values of the properties controlled by an XML attributed, described by a given attribute value /** retrieves the values of the properties controlled by an XML attributed, described by a given attribute value
*/ */

78
xmloff/inc/txtflde.hxx
View File

@ -156,7 +156,7 @@ class XMLTextFieldExport
/// store used text field master names (NULL means: don't collect) /// store used text field master names (NULL means: don't collect)
::std::map< ::std::map<
::com::sun::star::uno::Reference< ::com::sun::star::text::XText >, css::uno::Reference< css::text::XText >,
::std::set< OUString > > * ::std::set< OUString > > *
pUsedMasters; pUsedMasters;
@ -169,16 +169,14 @@ public:
/// Export this field and the surrounding span element with the formatting. /// Export this field and the surrounding span element with the formatting.
/// To be called for every field in the document body. /// To be called for every field in the document body.
void ExportField(const ::com::sun::star::uno::Reference < void ExportField(const css::uno::Reference < css::text::XTextField > & rTextField,
::com::sun::star::text::XTextField > & rTextField,
bool bProgress ); bool bProgress );
/// collect styles (character styles, data styles, ...) for this field /// collect styles (character styles, data styles, ...) for this field
/// (if appropriate). /// (if appropriate).
/// Also collect used field masters (if pUsedMasters is set) /// Also collect used field masters (if pUsedMasters is set)
/// to be called for every field during style export. /// to be called for every field during style export.
void ExportFieldAutoStyle(const ::com::sun::star::uno::Reference < void ExportFieldAutoStyle(const css::uno::Reference < css::text::XTextField > & rTextField,
::com::sun::star::text::XTextField > & rTextField,
const bool bProgress, const bool bRecursive ); const bool bProgress, const bool bRecursive );
/// export field declarations. /// export field declarations.
@ -189,8 +187,7 @@ public:
/// (Requires that a list of used field declarations has previously been /// (Requires that a list of used field declarations has previously been
/// built-up in ExportFieldAutoStyle() ) /// built-up in ExportFieldAutoStyle() )
void ExportFieldDeclarations( void ExportFieldDeclarations(
const ::com::sun::star::uno::Reference < const css::uno::Reference < css::text::XText > & rText);
::com::sun::star::text::XText > & rText);
/// export all field declarations, or only those that have been used? /// export all field declarations, or only those that have been used?
/// Calling this method will reset the list of used field declataions. /// Calling this method will reset the list of used field declataions.
@ -209,13 +206,10 @@ public:
static enum ::xmloff::token::XMLTokenEnum MapCountFieldName(FieldIdEnum nToken); static enum ::xmloff::token::XMLTokenEnum MapCountFieldName(FieldIdEnum nToken);
static enum ::xmloff::token::XMLTokenEnum MapBibliographyFieldName(const OUString& sName); static enum ::xmloff::token::XMLTokenEnum MapBibliographyFieldName(const OUString& sName);
static enum ::xmloff::token::XMLTokenEnum MapMeasureKind(sal_Int16 nKind); static enum ::xmloff::token::XMLTokenEnum MapMeasureKind(sal_Int16 nKind);
enum ::xmloff::token::XMLTokenEnum MapPageNumberName(const ::com::sun::star::uno::Reference< enum ::xmloff::token::XMLTokenEnum MapPageNumberName(const css::uno::Reference< css::beans::XPropertySet> & xPropSet,
::com::sun::star::beans::XPropertySet> & xPropSet,
sal_Int32& nOffset); /// also adjust page offset sal_Int32& nOffset); /// also adjust page offset
enum ::xmloff::token::XMLTokenEnum MapAuthorFieldName(const ::com::sun::star::uno::Reference < enum ::xmloff::token::XMLTokenEnum MapAuthorFieldName(const css::uno::Reference< css::beans::XPropertySet > & xPropSet);
::com::sun::star::beans::XPropertySet > & xPropSet); enum ::xmloff::token::XMLTokenEnum MapSenderFieldName(const css::uno::Reference< css::beans::XPropertySet > & xPropSet);
enum ::xmloff::token::XMLTokenEnum MapSenderFieldName(const ::com::sun::star::uno::Reference <
::com::sun::star::beans::XPropertySet > & xPropSet);
protected: protected:
@ -223,12 +217,9 @@ protected:
/// export a field after <text:span> is already written /// export a field after <text:span> is already written
void ExportFieldHelper( void ExportFieldHelper(
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::text::XTextField> & rTextField,
::com::sun::star::text::XTextField> & rTextField, const css::uno::Reference< css::beans::XPropertySet> & rPropSet,
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::beans::XPropertySet> & rRangePropSet,
::com::sun::star::beans::XPropertySet> & rPropSet,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet> & rRangePropSet,
enum FieldIdEnum nToken, enum FieldIdEnum nToken,
bool bProgress ); bool bProgress );
@ -244,13 +235,11 @@ protected:
/// element? /// element?
/// export a macro (as used in the macro field) /// export a macro (as used in the macro field)
void ExportMacro( const ::com::sun::star::uno::Reference< void ExportMacro( const css::uno::Reference< css::beans::XPropertySet> & rPropSet,
::com::sun::star::beans::XPropertySet> & rPropSet,
const OUString& rContent); const OUString& rContent);
/// export text:meta-field (RDF metadata) /// export text:meta-field (RDF metadata)
void ExportMetaField( const ::com::sun::star::uno::Reference< void ExportMetaField( const css::uno::Reference< css::beans::XPropertySet> & i_xMeta,
::com::sun::star::beans::XPropertySet> & i_xMeta,
bool i_bAutoStyles, bool i_bProgress ); bool i_bAutoStyles, bool i_bProgress );
/// export a boolean attribute /// export a boolean attribute
@ -363,70 +352,61 @@ protected:
/// export times, dates and durations according to ISO 8601 /// export times, dates and durations according to ISO 8601
void ProcessDateTime( void ProcessDateTime(
enum ::xmloff::token::XMLTokenEnum eXMLName, /// attribute token enum ::xmloff::token::XMLTokenEnum eXMLName, /// attribute token
const ::com::sun::star::util::DateTime& rTime, /// date/time value const css::util::DateTime& rTime, /// date/time value
bool bIsDate, /// export as date (rather than date/time)? bool bIsDate, /// export as date (rather than date/time)?
sal_uInt16 nPrefix = XML_NAMESPACE_TEXT); /// attribute name prefix sal_uInt16 nPrefix = XML_NAMESPACE_TEXT); /// attribute name prefix
/// export time or dateTime /// export time or dateTime
void ProcessTimeOrDateTime( void ProcessTimeOrDateTime(
enum ::xmloff::token::XMLTokenEnum eXMLName, /// attribute token enum ::xmloff::token::XMLTokenEnum eXMLName, /// attribute token
const ::com::sun::star::util::DateTime& rTime, /// date/time value const css::util::DateTime& rTime, /// date/time value
sal_uInt16 nPrefix = XML_NAMESPACE_TEXT); /// attribute name prefix sal_uInt16 nPrefix = XML_NAMESPACE_TEXT); /// attribute name prefix
/// export all attributes for bibliography data fields /// export all attributes for bibliography data fields
void ProcessBibliographyData( void ProcessBibliographyData(
const ::com::sun::star::uno::Reference < const css::uno::Reference <
::com::sun::star::beans::XPropertySet > & rPropertySet); css::beans::XPropertySet > & rPropertySet);
/// export CommandTypeAttribute /// export CommandTypeAttribute
void ProcessCommandType( void ProcessCommandType(
sal_Int32 nCommandType); /// com::sun::star::sdb::CommandType sal_Int32 nCommandType); /// css::sdb::CommandType
void ProcessStringSequence( void ProcessStringSequence(
const ::com::sun::star::uno::Sequence<OUString>& rSequence, const css::uno::Sequence<OUString>& rSequence,
const OUString& sSelected ); const OUString& sSelected );
void ProcessStringSequence( void ProcessStringSequence(
const ::com::sun::star::uno::Sequence<OUString>& rSequence, const css::uno::Sequence<OUString>& rSequence,
sal_Int32 nSelected ); sal_Int32 nSelected );
/// export attributes that describe a data source /// export attributes that describe a data source
void ExportDataBaseElement( void ExportDataBaseElement(
enum ::xmloff::token::XMLTokenEnum eElement, enum ::xmloff::token::XMLTokenEnum eElement,
const OUString& sContent, const OUString& sContent,
const ::com::sun::star::uno::Reference < const css::uno::Reference < css::beans::XPropertySet > & rPropertySet,
::com::sun::star::beans::XPropertySet > & rPropertySet, const css::uno::Reference < css::beans::XPropertySetInfo > & rPropertySetInfo );
const ::com::sun::star::uno::Reference <
::com::sun::star::beans::XPropertySetInfo > & rPropertySetInfo );
/// for XDependentTextFields, get PropertySet of FieldMaster /// for XDependentTextFields, get PropertySet of FieldMaster
static ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > static css::uno::Reference < css::beans::XPropertySet >
GetMasterPropertySet(const ::com::sun::star::uno::Reference < GetMasterPropertySet(const css::uno::Reference < css::text::XTextField > & rTextField);
::com::sun::star::text::XTextField > & rTextField);
/// get PropertySet of (any) DependentTextField for this FieldMaster /// get PropertySet of (any) DependentTextField for this FieldMaster
bool GetDependentFieldPropertySet( bool GetDependentFieldPropertySet(
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::beans::XPropertySet> & xmaster,
::com::sun::star::beans::XPropertySet> & xmaster, css::uno::Reference< css::beans::XPropertySet> & xField);
::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet> & xField);
/// get field ID from XTextField (and it's Property-Set) /// get field ID from XTextField (and it's Property-Set)
enum FieldIdEnum GetFieldID(const ::com::sun::star::uno::Reference < enum FieldIdEnum GetFieldID(const css::uno::Reference < css::text::XTextField > & rTextField,
::com::sun::star::text::XTextField > & rTextField, const css::uno::Reference < css::beans::XPropertySet > & xPropSet);
const ::com::sun::star::uno::Reference <
::com::sun::star::beans::XPropertySet > & xPropSet);
/// get field ID from XTextField service name (and it's PropertySet) /// get field ID from XTextField service name (and it's PropertySet)
enum FieldIdEnum MapFieldName(const OUString& sFieldName, enum FieldIdEnum MapFieldName(const OUString& sFieldName,
const ::com::sun::star::uno::Reference < const css::uno::Reference < css::beans::XPropertySet> & xPropSet);
::com::sun::star::beans::XPropertySet> & xPropSet);
/// determine, whether field has string or numeric content /// determine, whether field has string or numeric content
bool IsStringField(FieldIdEnum nFieldType, /// field ID bool IsStringField(FieldIdEnum nFieldType, /// field ID
const ::com::sun::star::uno::Reference < const css::uno::Reference < css::beans::XPropertySet > & xPropSet);
::com::sun::star::beans::XPropertySet > & xPropSet);
/// explode a field master name into field type and field name /// explode a field master name into field type and field name

171
xmloff/inc/txtfldi.hxx
View File

@ -139,8 +139,7 @@ public:
/// parses attributes and calls ProcessAttribute /// parses attributes and calls ProcessAttribute
virtual void StartElement( virtual void StartElement(
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::xml::sax::XAttributeList> & xAttrList) override;
::com::sun::star::xml::sax::XAttributeList> & xAttrList) override;
/// create XTextField and insert into document; calls PrepareTextField /// create XTextField and insert into document; calls PrepareTextField
virtual void EndElement() override; virtual void EndElement() override;
@ -169,19 +168,16 @@ protected:
/// prepare XTextField for insertion into document /// prepare XTextField for insertion into document
virtual void PrepareField( virtual void PrepareField(
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::beans::XPropertySet> & xPropertySet) = 0;
::com::sun::star::beans::XPropertySet> & xPropertySet) = 0;
/// create field from ServiceName /// create field from ServiceName
bool CreateField(::com::sun::star::uno::Reference< bool CreateField(css::uno::Reference< css::beans::XPropertySet> & xField,
::com::sun::star::beans::XPropertySet> & xField,
const OUString& sServiceName); const OUString& sServiceName);
/// force an update of the field's value /// force an update of the field's value
/// call update on optional XUptadeable interface; (disable Fixed property) /// call update on optional XUptadeable interface; (disable Fixed property)
static void ForceUpdate( static void ForceUpdate(
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::beans::XPropertySet> & rPropertySet);
::com::sun::star::beans::XPropertySet> & rPropertySet);
}; };
class XMLSenderFieldImportContext : public XMLTextFieldImportContext class XMLSenderFieldImportContext : public XMLTextFieldImportContext
@ -210,8 +206,7 @@ public:
protected: protected:
/// start element /// start element
virtual void StartElement( virtual void StartElement(
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::xml::sax::XAttributeList> & xAttrList) override;
::com::sun::star::xml::sax::XAttributeList> & xAttrList) override;
/// process attribute values /// process attribute values
virtual void ProcessAttribute( sal_uInt16 nAttrToken, virtual void ProcessAttribute( sal_uInt16 nAttrToken,
@ -219,8 +214,7 @@ protected:
/// prepare XTextField for insertion into document /// prepare XTextField for insertion into document
virtual void PrepareField( virtual void PrepareField(
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::beans::XPropertySet> & xPropertySet) override;
::com::sun::star::beans::XPropertySet> & xPropertySet) override;
}; };
/** inherit sender field because of fixed attribute in ProcessAttributes */ /** inherit sender field because of fixed attribute in ProcessAttributes */
@ -244,13 +238,11 @@ public:
protected: protected:
/// start element /// start element
virtual void StartElement( virtual void StartElement(
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::xml::sax::XAttributeList> & xAttrList) override;
::com::sun::star::xml::sax::XAttributeList> & xAttrList) override;
/// prepare XTextField for insertion into document /// prepare XTextField for insertion into document
virtual void PrepareField( virtual void PrepareField(
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::beans::XPropertySet> & xPropertySet) override;
::com::sun::star::beans::XPropertySet> & xPropertySet) override;
}; };
class XMLPlaceholderFieldImportContext : public XMLTextFieldImportContext class XMLPlaceholderFieldImportContext : public XMLTextFieldImportContext
@ -278,8 +270,7 @@ protected:
/// prepare XTextField for insertion into document /// prepare XTextField for insertion into document
virtual void PrepareField( virtual void PrepareField(
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::beans::XPropertySet> & xPropertySet) override;
::com::sun::star::beans::XPropertySet> & xPropertySet) override;
}; };
class XMLTimeFieldImportContext : public XMLTextFieldImportContext class XMLTimeFieldImportContext : public XMLTextFieldImportContext
@ -293,7 +284,7 @@ protected:
const OUString sPropertyIsDate; const OUString sPropertyIsDate;
const OUString sPropertyIsFixedLanguage; const OUString sPropertyIsFixedLanguage;
::com::sun::star::util::DateTime aDateTimeValue; css::util::DateTime aDateTimeValue;
sal_Int32 nAdjust; sal_Int32 nAdjust;
sal_Int32 nFormatKey; sal_Int32 nFormatKey;
bool bTimeOK; bool bTimeOK;
@ -317,8 +308,7 @@ public:
/// prepare XTextField for insertion into document /// prepare XTextField for insertion into document
virtual void PrepareField( virtual void PrepareField(
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::beans::XPropertySet> & xPropertySet) override;
::com::sun::star::beans::XPropertySet> & xPropertySet) override;
}; };
/** import date fields (<text:date>); /** import date fields (<text:date>);
@ -346,7 +336,7 @@ class XMLPageContinuationImportContext : public XMLTextFieldImportContext
const OUString sPropertyNumberingType; const OUString sPropertyNumberingType;
OUString sString; /// continuation string OUString sString; /// continuation string
com::sun::star::text::PageNumberType eSelectPage; /// previous, current css::text::PageNumberType eSelectPage; /// previous, current
/// or next page /// or next page
bool sStringOK; /// continuation string encountered? bool sStringOK; /// continuation string encountered?
@ -364,8 +354,7 @@ public:
/// prepare XTextField for insertion into document /// prepare XTextField for insertion into document
virtual void PrepareField( virtual void PrepareField(
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::beans::XPropertySet> & xPropertySet) override;
::com::sun::star::beans::XPropertySet> & xPropertySet) override;
}; };
/** import page number fields (<text:page-number>) */ /** import page number fields (<text:page-number>) */
@ -378,7 +367,7 @@ class XMLPageNumberImportContext : public XMLTextFieldImportContext
OUString sNumberFormat; OUString sNumberFormat;
OUString sNumberSync; OUString sNumberSync;
sal_Int16 nPageAdjust; sal_Int16 nPageAdjust;
com::sun::star::text::PageNumberType eSelectPage; /// previous, current css::text::PageNumberType eSelectPage; /// previous, current
/// or next page /// or next page
bool sNumberFormatOK; bool sNumberFormatOK;
@ -397,8 +386,7 @@ public:
/// prepare XTextField for insertion into document /// prepare XTextField for insertion into document
virtual void PrepareField( virtual void PrepareField(
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::beans::XPropertySet> & xPropertySet) override;
::com::sun::star::beans::XPropertySet> & xPropertySet) override;
}; };
/** superclass for database fields: handle database and table names */ /** superclass for database fields: handle database and table names */
@ -443,15 +431,13 @@ public:
/// prepare XTextField for insertion into document /// prepare XTextField for insertion into document
virtual void PrepareField( virtual void PrepareField(
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::beans::XPropertySet> & xPropertySet) override;
::com::sun::star::beans::XPropertySet> & xPropertySet) override;
/// handle database-location children /// handle database-location children
virtual SvXMLImportContext *CreateChildContext( virtual SvXMLImportContext *CreateChildContext(
sal_uInt16 nPrefix, sal_uInt16 nPrefix,
const OUString& rLocalName, const OUString& rLocalName,
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::xml::sax::XAttributeList> & xAttrList ) override;
::com::sun::star::xml::sax::XAttributeList> & xAttrList ) override;
}; };
/** import database name fields (<text:database-name>) */ /** import database name fields (<text:database-name>) */
@ -498,8 +484,7 @@ public:
/// prepare XTextField for insertion into document /// prepare XTextField for insertion into document
virtual void PrepareField( virtual void PrepareField(
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::beans::XPropertySet> & xPropertySet) override;
::com::sun::star::beans::XPropertySet> & xPropertySet) override;
}; };
/** import database select fields (<text:database-select>) */ /** import database select fields (<text:database-select>) */
@ -522,8 +507,8 @@ public:
/// prepare XTextField for insertion into document /// prepare XTextField for insertion into document
virtual void PrepareField( virtual void PrepareField(
const ::com::sun::star::uno::Reference< const css::uno::Reference<
::com::sun::star::beans::XPropertySet> & xPropertySet) override; css::beans::XPropertySet> & xPropertySet) override;
}; };
/** import database display number fields (<text:database-row-number>) */ /** import database display number fields (<text:database-row-number>) */
@ -549,8 +534,7 @@ public:
/// prepare XTextField for insertion into document /// prepare XTextField for insertion into document
virtual void PrepareField( virtual void PrepareField(
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::beans::XPropertySet> & xPropertySet) override;
::com::sun::star::beans::XPropertySet> & xPropertySet) override;
}; };
/** import docinfo fields with only fixed attribute */ /** import docinfo fields with only fixed attribute */
@ -583,8 +567,7 @@ protected:
/// prepare XTextField for insertion into document /// prepare XTextField for insertion into document
virtual void PrepareField( virtual void PrepareField(
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::beans::XPropertySet> & xPropertySet) override;
::com::sun::star::beans::XPropertySet> & xPropertySet) override;
static const sal_Char* MapTokenToServiceName(sal_uInt16 nToken); static const sal_Char* MapTokenToServiceName(sal_uInt16 nToken);
}; };
@ -617,8 +600,7 @@ protected:
/// prepare XTextField for insertion into document /// prepare XTextField for insertion into document
virtual void PrepareField( virtual void PrepareField(
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::beans::XPropertySet> & xPropertySet) override;
::com::sun::star::beans::XPropertySet> & xPropertySet) override;
}; };
/** import revision field (<text:editing-cycles>) */ /** import revision field (<text:editing-cycles>) */
@ -637,8 +619,7 @@ public:
protected: protected:
/// prepare XTextField for insertion into document /// prepare XTextField for insertion into document
virtual void PrepareField( virtual void PrepareField(
const ::com::sun::star::uno::Reference< const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override;
::com::sun::star::beans::XPropertySet> & xPropertySet) override;
}; };
/** import user docinfo field (<text:user-defined>) */ /** import user docinfo field (<text:user-defined>) */
@ -665,8 +646,7 @@ protected:
virtual void ProcessAttribute( sal_uInt16 nAttrToken, virtual void ProcessAttribute( sal_uInt16 nAttrToken,
const OUString& sAttrValue ) override; const OUString& sAttrValue ) override;
virtual void PrepareField( virtual void PrepareField(
const ::com::sun::star::uno::Reference< const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override;
::com::sun::star::beans::XPropertySet> & xPropertySet) override;
}; };
/** import hidden paragraph fields (<text:hidden-paragraph>) */ /** import hidden paragraph fields (<text:hidden-paragraph>) */
@ -692,8 +672,7 @@ protected:
/// prepare XTextField for insertion into document /// prepare XTextField for insertion into document
virtual void PrepareField( virtual void PrepareField(
const ::com::sun::star::uno::Reference< const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override;
::com::sun::star::beans::XPropertySet> & xPropertySet) override;
}; };
/** import conditional text fields (<text:conditional-text>) */ /** import conditional text fields (<text:conditional-text>) */
@ -728,8 +707,7 @@ protected:
/// prepare XTextField for insertion into document /// prepare XTextField for insertion into document
virtual void PrepareField( virtual void PrepareField(
const ::com::sun::star::uno::Reference< const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override;
::com::sun::star::beans::XPropertySet> & xPropertySet) override;
}; };
/** import conditional text fields (<text:hidden-text>) */ /** import conditional text fields (<text:hidden-text>) */
@ -760,8 +738,7 @@ protected:
/// prepare XTextField for insertion into document /// prepare XTextField for insertion into document
virtual void PrepareField( virtual void PrepareField(
const ::com::sun::star::uno::Reference< const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override;
::com::sun::star::beans::XPropertySet> & xPropertySet) override;
}; };
/** import file name fields (<text:file-name>) */ /** import file name fields (<text:file-name>) */
@ -788,8 +765,7 @@ protected:
/// prepare XTextField for insertion into document /// prepare XTextField for insertion into document
virtual void PrepareField( virtual void PrepareField(
const ::com::sun::star::uno::Reference< const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override;
::com::sun::star::beans::XPropertySet> & xPropertySet) override;
}; };
/** import document template name fields (<text:template-name>) */ /** import document template name fields (<text:template-name>) */
@ -813,8 +789,7 @@ protected:
/// prepare XTextField for insertion into document /// prepare XTextField for insertion into document
virtual void PrepareField( virtual void PrepareField(
const ::com::sun::star::uno::Reference< const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override;
::com::sun::star::beans::XPropertySet> & xPropertySet) override;
}; };
/** import chapter fields (<text:chapter>) */ /** import chapter fields (<text:chapter>) */
@ -840,8 +815,7 @@ protected:
/// prepare XTextField for insertion into document /// prepare XTextField for insertion into document
virtual void PrepareField( virtual void PrepareField(
const ::com::sun::star::uno::Reference< const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override;
::com::sun::star::beans::XPropertySet> & xPropertySet) override;
}; };
/** import count fields (<text:[XXX]-count>) */ /** import count fields (<text:[XXX]-count>) */
@ -869,8 +843,7 @@ protected:
/// prepare XTextField for insertion into document /// prepare XTextField for insertion into document
virtual void PrepareField( virtual void PrepareField(
const ::com::sun::star::uno::Reference< const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override;
::com::sun::star::beans::XPropertySet> & xPropertySet) override;
static const sal_Char* MapTokenToServiceName(sal_uInt16 nToken); static const sal_Char* MapTokenToServiceName(sal_uInt16 nToken);
}; };
@ -899,8 +872,7 @@ protected:
/// prepare XTextField for insertion into document /// prepare XTextField for insertion into document
virtual void PrepareField( virtual void PrepareField(
const ::com::sun::star::uno::Reference< const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override;
::com::sun::star::beans::XPropertySet> & xPropertySet) override;
}; };
/** import page variable fields (<text:get-page-variable>) */ /** import page variable fields (<text:get-page-variable>) */
@ -926,8 +898,7 @@ protected:
/// prepare XTextField for insertion into document /// prepare XTextField for insertion into document
virtual void PrepareField( virtual void PrepareField(
const ::com::sun::star::uno::Reference< const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override;
::com::sun::star::beans::XPropertySet> & xPropertySet) override;
}; };
/** import macro fields (<text:execute-macro>) */ /** import macro fields (<text:execute-macro>) */
@ -956,8 +927,7 @@ protected:
virtual SvXMLImportContext *CreateChildContext( virtual SvXMLImportContext *CreateChildContext(
sal_uInt16 nPrefix, sal_uInt16 nPrefix,
const OUString& rLocalName, const OUString& rLocalName,
const ::com::sun::star::uno::Reference< const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList ) override;
::com::sun::star::xml::sax::XAttributeList> & xAttrList ) override;
/// process attribute values /// process attribute values
virtual void ProcessAttribute( sal_uInt16 nAttrToken, virtual void ProcessAttribute( sal_uInt16 nAttrToken,
@ -965,8 +935,7 @@ protected:
/// prepare XTextField for insertion into document /// prepare XTextField for insertion into document
virtual void PrepareField( virtual void PrepareField(
const ::com::sun::star::uno::Reference< const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override;
::com::sun::star::beans::XPropertySet> & xPropertySet) override;
}; };
/** import reference fields (<text:reference-get>) */ /** import reference fields (<text:reference-get>) */
@ -996,8 +965,7 @@ public:
protected: protected:
/// start element /// start element
virtual void StartElement( virtual void StartElement(
const ::com::sun::star::uno::Reference< const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList) override;
::com::sun::star::xml::sax::XAttributeList> & xAttrList) override;
/// process attribute values /// process attribute values
virtual void ProcessAttribute( sal_uInt16 nAttrToken, virtual void ProcessAttribute( sal_uInt16 nAttrToken,
@ -1005,8 +973,7 @@ protected:
/// prepare XTextField for insertion into document /// prepare XTextField for insertion into document
virtual void PrepareField( virtual void PrepareField(
const ::com::sun::star::uno::Reference< const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override;
::com::sun::star::beans::XPropertySet> & xPropertySet) override;
}; };
/** import dde field declaration container (<text:dde-connection-decls>) */ /** import dde field declaration container (<text:dde-connection-decls>) */
@ -1023,8 +990,7 @@ public:
virtual SvXMLImportContext *CreateChildContext( virtual SvXMLImportContext *CreateChildContext(
sal_uInt16 nPrefix, sal_uInt16 nPrefix,
const OUString& rLocalName, const OUString& rLocalName,
const ::com::sun::star::uno::Reference< const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList ) override;
::com::sun::star::xml::sax::XAttributeList> & xAttrList ) override;
}; };
/** import dde field declaration (<text:dde-connection-decl>) */ /** import dde field declaration (<text:dde-connection-decl>) */
@ -1047,8 +1013,7 @@ public:
// create fieldmaster // create fieldmaster
virtual void StartElement( virtual void StartElement(
const ::com::sun::star::uno::Reference< const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList) override;
::com::sun::star::xml::sax::XAttributeList> & xAttrList) override;
}; };
/** import dde fields (<text:dde-connection>) */ /** import dde fields (<text:dde-connection>) */
@ -1074,8 +1039,7 @@ protected:
/// empty method /// empty method
virtual void PrepareField( virtual void PrepareField(
const ::com::sun::star::uno::Reference< const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override;
::com::sun::star::beans::XPropertySet> & xPropertySet) override;
}; };
/** import sheet name fields (Calc) dde fields (<text:sheet-name>) */ /** import sheet name fields (Calc) dde fields (<text:sheet-name>) */
@ -1096,8 +1060,7 @@ protected:
/// no attributes -> empty method /// no attributes -> empty method
virtual void PrepareField( virtual void PrepareField(
const ::com::sun::star::uno::Reference< const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override;
::com::sun::star::beans::XPropertySet> & xPropertySet) override;
}; };
/** import page|slide name fields (<text:page-name>) */ /** import page|slide name fields (<text:page-name>) */
@ -1117,8 +1080,7 @@ public:
/// prepare XTextField for insertion into document /// prepare XTextField for insertion into document
virtual void PrepareField( virtual void PrepareField(
const ::com::sun::star::uno::Reference< const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override;
::com::sun::star::beans::XPropertySet> & xPropertySet) override;
}; };
/** import hyperlinks as URL fields (Calc, Impress, Draw) (<office:a>) */ /** import hyperlinks as URL fields (Calc, Impress, Draw) (<office:a>) */
@ -1146,8 +1108,7 @@ protected:
/// no attributes -> empty method /// no attributes -> empty method
virtual void PrepareField( virtual void PrepareField(
const ::com::sun::star::uno::Reference< const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override;
::com::sun::star::beans::XPropertySet> & xPropertySet) override;
}; };
/** import bibliography info fields (<text:bibliography-mark>) */ /** import bibliography info fields (<text:bibliography-mark>) */
@ -1155,7 +1116,7 @@ class XMLBibliographyFieldImportContext : public XMLTextFieldImportContext
{ {
const OUString sPropertyFields; const OUString sPropertyFields;
::std::vector< ::com::sun::star::beans::PropertyValue> aValues; ::std::vector< css::beans::PropertyValue> aValues;
public: public:
@ -1167,8 +1128,7 @@ public:
protected: protected:
/// process attributes (fill aValues) /// process attributes (fill aValues)
virtual void StartElement( virtual void StartElement(
const ::com::sun::star::uno::Reference< const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList) override;
::com::sun::star::xml::sax::XAttributeList> & xAttrList) override;
/// empty method; all attributes are handled in StartElement /// empty method; all attributes are handled in StartElement
virtual void ProcessAttribute( sal_uInt16 nAttrToken, virtual void ProcessAttribute( sal_uInt16 nAttrToken,
@ -1176,8 +1136,7 @@ protected:
/// convert aValues into sequence and set property /// convert aValues into sequence and set property
virtual void PrepareField( virtual void PrepareField(
const ::com::sun::star::uno::Reference< const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override;
::com::sun::star::beans::XPropertySet> & xPropertySet) override;
static const sal_Char* MapBibliographyFieldName(const OUString& sName); static const sal_Char* MapBibliographyFieldName(const OUString& sName);
}; };
@ -1198,9 +1157,9 @@ class XMLAnnotationImportContext : public XMLTextFieldImportContext
OUStringBuffer aTextBuffer; OUStringBuffer aTextBuffer;
OUStringBuffer aDateBuffer; OUStringBuffer aDateBuffer;
com::sun::star::uno::Reference < com::sun::star::beans::XPropertySet > mxField; css::uno::Reference < css::beans::XPropertySet > mxField;
com::sun::star::uno::Reference < com::sun::star::text::XTextCursor > mxCursor; css::uno::Reference < css::text::XTextCursor > mxCursor;
com::sun::star::uno::Reference < com::sun::star::text::XTextCursor > mxOldCursor; css::uno::Reference < css::text::XTextCursor > mxOldCursor;
sal_uInt16 m_nToken; sal_uInt16 m_nToken;
@ -1219,13 +1178,12 @@ protected:
/// set properties /// set properties
virtual void PrepareField( virtual void PrepareField(
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & xPropertySet) override; const css::uno::Reference< css::beans::XPropertySet > & xPropertySet) override;
virtual SvXMLImportContext *CreateChildContext( virtual SvXMLImportContext *CreateChildContext(
sal_uInt16 nPrefix, sal_uInt16 nPrefix,
const OUString& rLocalName, const OUString& rLocalName,
const ::com::sun::star::uno::Reference< const css::uno::Reference<css::xml::sax::XAttributeList >& xAttrList ) override;
::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override;
virtual void EndElement() override; virtual void EndElement() override;
}; };
@ -1256,8 +1214,7 @@ protected:
/// set properties /// set properties
virtual void PrepareField( virtual void PrepareField(
const ::com::sun::star::uno::Reference< const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override;
::com::sun::star::beans::XPropertySet> & xPropertySet) override;
}; };
/** import measure fields (<text:measure>) */ /** import measure fields (<text:measure>) */
@ -1279,8 +1236,7 @@ protected:
/// prepare XTextField for insertion into document /// prepare XTextField for insertion into document
virtual void PrepareField( virtual void PrepareField(
const ::com::sun::star::uno::Reference< const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override;
::com::sun::star::beans::XPropertySet> & xPropertySet) override;
}; };
/** dropdown field (filter legacy) */ /** dropdown field (filter legacy) */
@ -1311,7 +1267,7 @@ public:
virtual SvXMLImportContext* CreateChildContext( virtual SvXMLImportContext* CreateChildContext(
sal_uInt16 nPrefix, sal_uInt16 nPrefix,
const OUString& rLocalName, const OUString& rLocalName,
const ::com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; const css::uno::Reference<css::xml::sax::XAttributeList >& xAttrList ) override;
protected: protected:
/// process attribute values /// process attribute values
@ -1320,8 +1276,7 @@ protected:
/// prepare XTextField for insertion into document /// prepare XTextField for insertion into document
virtual void PrepareField( virtual void PrepareField(
const ::com::sun::star::uno::Reference< const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override;
::com::sun::star::beans::XPropertySet> & xPropertySet) override;
}; };
/** import header fields (<draw:header>) */ /** import header fields (<draw:header>) */
@ -1341,8 +1296,7 @@ public:
/// prepare XTextField for insertion into document /// prepare XTextField for insertion into document
virtual void PrepareField( virtual void PrepareField(
const ::com::sun::star::uno::Reference< const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override;
::com::sun::star::beans::XPropertySet> & xPropertySet) override;
}; };
/** import footer fields (<draw:footer>) */ /** import footer fields (<draw:footer>) */
@ -1362,8 +1316,7 @@ public:
/// prepare XTextField for insertion into document /// prepare XTextField for insertion into document
virtual void PrepareField( virtual void PrepareField(
const ::com::sun::star::uno::Reference< const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override;
::com::sun::star::beans::XPropertySet> & xPropertySet) override;
}; };
/** import footer fields (<draw:date-and-time>) */ /** import footer fields (<draw:date-and-time>) */
@ -1383,13 +1336,12 @@ public:
/// prepare XTextField for insertion into document /// prepare XTextField for insertion into document
virtual void PrepareField( virtual void PrepareField(
const ::com::sun::star::uno::Reference< const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override;
::com::sun::star::beans::XPropertySet> & xPropertySet) override;
}; };
class XMLCustomPropertyFieldImportContext : public XMLTextFieldImportContext class XMLCustomPropertyFieldImportContext : public XMLTextFieldImportContext
{ {
::com::sun::star::uno::Any aValue; css::uno::Any aValue;
public: public:
@ -1405,8 +1357,7 @@ protected:
/// prepare XTextField for insertion into document /// prepare XTextField for insertion into document
virtual void PrepareField( virtual void PrepareField(
const ::com::sun::star::uno::Reference< const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override;
::com::sun::star::beans::XPropertySet> & xPropertySet) override;
}; };
#endif #endif

16
xmloff/inc/txtlists.hxx
View File

@ -91,8 +91,7 @@ class XMLTextListsHelper : private boost::noncopyable
note that the ID namespace for numbered-paragraph and regular list note that the ID namespace for numbered-paragraph and regular list
is distinct; we never combine a list and a n-p is distinct; we never combine a list and a n-p
*/ */
::com::sun::star::uno::Reference< css::uno::Reference< css::container::XIndexReplace>
::com::sun::star::container::XIndexReplace>
EnsureNumberedParagraph( EnsureNumberedParagraph(
SvXMLImport & i_rImport, SvXMLImport & i_rImport,
const OUString& i_ListId, const OUString& i_ListId,
@ -112,11 +111,9 @@ class XMLTextListsHelper : private boost::noncopyable
@param o_rRestartNumbering set to true if no style (defaulting) @param o_rRestartNumbering set to true if no style (defaulting)
@param io_rSetDefaults set to true if no style (defaulting) @param io_rSetDefaults set to true if no style (defaulting)
*/ */
static ::com::sun::star::uno::Reference< static css::uno::Reference< css::container::XIndexReplace> MakeNumRule(
::com::sun::star::container::XIndexReplace> MakeNumRule(
SvXMLImport & i_rImport, SvXMLImport & i_rImport,
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::container::XIndexReplace>& i_xNumRule,
::com::sun::star::container::XIndexReplace>& i_xNumRule,
const OUString& i_ParentStyleName, const OUString& i_ParentStyleName,
const OUString& i_StyleName, const OUString& i_StyleName,
sal_Int16 & io_rLevel, sal_Int16 & io_rLevel,
@ -168,9 +165,10 @@ class XMLTextListsHelper : private boost::noncopyable
LastNumberedParagraphs_t mLastNumberedParagraphs; LastNumberedParagraphs_t mLastNumberedParagraphs;
/// numbered-paragraphs /// numbered-paragraphs
typedef ::std::vector< ::std::pair< OUString, typedef ::std::vector<
::com::sun::star::uno::Reference< ::std::pair<
::com::sun::star::container::XIndexReplace > > > NumParaList_t; OUString,
css::uno::Reference< css::container::XIndexReplace > > > NumParaList_t;
::std::map< OUString, NumParaList_t > mNPLists; ::std::map< OUString, NumParaList_t > mNPLists;
}; };

47
xmloff/inc/txtvfldi.hxx
View File

@ -81,8 +81,7 @@ public:
/// prepare XTextField for insertion into document /// prepare XTextField for insertion into document
void PrepareField( void PrepareField(
const ::com::sun::star::uno::Reference< const css::uno::Reference<css::beans::XPropertySet> & xPropertySet);
::com::sun::star::beans::XPropertySet> & xPropertySet);
/// is value a string (rather than double)? /// is value a string (rather than double)?
inline bool IsStringValue() { return bStringType; } inline bool IsStringValue() { return bStringType; }
@ -186,8 +185,8 @@ protected:
/// prepare XTextField for insertion into document /// prepare XTextField for insertion into document
virtual void PrepareField( virtual void PrepareField(
const ::com::sun::star::uno::Reference< const css::uno::Reference<
::com::sun::star::beans::XPropertySet> & xPropertySet) override; css::beans::XPropertySet> & xPropertySet) override;
// various accessor methods: // various accessor methods:
inline OUString GetName() { return sName; } inline OUString GetName() { return sName; }
@ -212,8 +211,8 @@ public:
protected: protected:
/// prepare XTextField for insertion into document /// prepare XTextField for insertion into document
virtual void PrepareField( virtual void PrepareField(
const ::com::sun::star::uno::Reference< const css::uno::Reference<
::com::sun::star::beans::XPropertySet> & xPropertySet) override; css::beans::XPropertySet> & xPropertySet) override;
}; };
@ -234,8 +233,8 @@ public:
protected: protected:
virtual void PrepareField( virtual void PrepareField(
const ::com::sun::star::uno::Reference< const css::uno::Reference<
::com::sun::star::beans::XPropertySet> & xPropertySet) override; css::beans::XPropertySet> & xPropertySet) override;
}; };
/*** import text input fields (<text:text-input>) */ /*** import text input fields (<text:text-input>) */
@ -254,8 +253,8 @@ public:
protected: protected:
virtual void PrepareField( virtual void PrepareField(
const ::com::sun::star::uno::Reference< const css::uno::Reference<
::com::sun::star::beans::XPropertySet> & xPropertySet) override; css::beans::XPropertySet> & xPropertySet) override;
}; };
@ -304,8 +303,8 @@ protected:
/// find appropriate field master /// find appropriate field master
bool FindFieldMaster( bool FindFieldMaster(
::com::sun::star::uno::Reference< css::uno::Reference<
::com::sun::star::beans::XPropertySet> & xMaster); css::beans::XPropertySet> & xMaster);
}; };
@ -327,8 +326,7 @@ public:
protected: protected:
/// prepare XTextField for insertion into document /// prepare XTextField for insertion into document
virtual void PrepareField( virtual void PrepareField(
const ::com::sun::star::uno::Reference< const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override;
::com::sun::star::beans::XPropertySet> & xPropertySet) override;
}; };
@ -352,8 +350,7 @@ protected:
/// prepare XTextField for insertion into document /// prepare XTextField for insertion into document
virtual void PrepareField( virtual void PrepareField(
const ::com::sun::star::uno::Reference< const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override;
::com::sun::star::beans::XPropertySet> & xPropertySet) override;
}; };
@ -386,8 +383,7 @@ public:
const OUString& rLocalName); /// element name w/o prefix const OUString& rLocalName); /// element name w/o prefix
virtual void PrepareField( virtual void PrepareField(
const ::com::sun::star::uno::Reference< const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override;
::com::sun::star::beans::XPropertySet> & xPropertySet) override;
}; };
@ -420,8 +416,7 @@ protected:
/// prepare XTextField for insertion into document /// prepare XTextField for insertion into document
virtual void PrepareField( virtual void PrepareField(
const ::com::sun::star::uno::Reference< const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override;
::com::sun::star::beans::XPropertySet> & xPropertySet) override;
}; };
@ -451,8 +446,7 @@ public:
virtual SvXMLImportContext *CreateChildContext( virtual SvXMLImportContext *CreateChildContext(
sal_uInt16 nPrefix, sal_uInt16 nPrefix,
const OUString& rLocalName, const OUString& rLocalName,
const ::com::sun::star::uno::Reference< const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList ) override;
::com::sun::star::xml::sax::XAttributeList> & xAttrList ) override;
}; };
/** /**
@ -479,13 +473,11 @@ public:
XMLTextImportHelper& rHlp, /// text import helper XMLTextImportHelper& rHlp, /// text import helper
sal_uInt16 nPrfx, /// namespace prefix sal_uInt16 nPrfx, /// namespace prefix
const OUString& rLocalName, /// element name w/o prefix const OUString& rLocalName, /// element name w/o prefix
const ::com::sun::star::uno::Reference< /// list of element attributes const css::uno::Reference< css::xml::sax::XAttributeList> & xAttrList,/// list of element attributes
::com::sun::star::xml::sax::XAttributeList> & xAttrList,
enum VarType eVarType); /// variable type enum VarType eVarType); /// variable type
/// get field master for name and rename if appropriate /// get field master for name and rename if appropriate
static bool FindFieldMaster(::com::sun::star::uno::Reference< static bool FindFieldMaster(css::uno::Reference<css::beans::XPropertySet> & xMaster,
::com::sun::star::beans::XPropertySet> & xMaster,
SvXMLImport& rImport, SvXMLImport& rImport,
XMLTextImportHelper& rHelper, XMLTextImportHelper& rHelper,
const OUString& sVarName, const OUString& sVarName,
@ -522,8 +514,7 @@ protected:
/// prepare XTextField for insertion into document /// prepare XTextField for insertion into document
virtual void PrepareField( virtual void PrepareField(
const ::com::sun::star::uno::Reference< const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override;
::com::sun::star::beans::XPropertySet> & xPropertySet) override;
}; };

4
xmloff/inc/xexptran.hxx
View File

@ -78,10 +78,10 @@ public:
void AddMatrix(const ::basegfx::B3DHomMatrix& rNew); void AddMatrix(const ::basegfx::B3DHomMatrix& rNew);
void AddHomogenMatrix(const com::sun::star::drawing::HomogenMatrix& xHomMat); void AddHomogenMatrix(const css::drawing::HomogenMatrix& xHomMat);
bool NeedsAction() const { return !maList.empty(); } bool NeedsAction() const { return !maList.empty(); }
void GetFullTransform(::basegfx::B3DHomMatrix& rFullTrans); void GetFullTransform(::basegfx::B3DHomMatrix& rFullTrans);
bool GetFullHomogenTransform(com::sun::star::drawing::HomogenMatrix& xHomMat); bool GetFullHomogenTransform(css::drawing::HomogenMatrix& xHomMat);
const OUString& GetExportString(const SvXMLUnitConverter& rConv); const OUString& GetExportString(const SvXMLUnitConverter& rConv);
void SetString(const OUString& rNew, const SvXMLUnitConverter& rConv); void SetString(const OUString& rNew, const SvXMLUnitConverter& rConv);
}; };

2
xmloff/inc/xmltabi.hxx
View File

@ -43,7 +43,7 @@ public:
virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName, const OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override; const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override;
virtual void EndElement() override; virtual void EndElement() override;
}; };

36
xmloff/inc/xmlversion.hxx
View File

@ -35,13 +35,13 @@
class XMLVersionListExport : public SvXMLExport class XMLVersionListExport : public SvXMLExport
{ {
private: private:
const com::sun::star::uno::Sequence < com::sun::star::util::RevisionTag >& maVersions; const css::uno::Sequence < css::util::RevisionTag >& maVersions;
public: public:
XMLVersionListExport( XMLVersionListExport(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rContext, const css::uno::Reference< css::uno::XComponentContext >& rContext,
const com::sun::star::uno::Sequence < com::sun::star::util::RevisionTag >& rVersions, const css::uno::Sequence < css::util::RevisionTag >& rVersions,
const OUString &rFileName, const OUString &rFileName,
com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler > &rHandler ); css::uno::Reference< css::xml::sax::XDocumentHandler > &rHandler );
virtual ~XMLVersionListExport() {} virtual ~XMLVersionListExport() {}
sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum eClass ) override; sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum eClass ) override;
@ -53,7 +53,7 @@ public:
class XMLVersionListImport : public SvXMLImport class XMLVersionListImport : public SvXMLImport
{ {
private: private:
com::sun::star::uno::Sequence < com::sun::star::util::RevisionTag >& maVersions; css::uno::Sequence < css::util::RevisionTag >& maVersions;
protected: protected:
@ -61,17 +61,16 @@ protected:
// before a context for the current element has been pushed. // before a context for the current element has been pushed.
virtual SvXMLImportContext *CreateContext( sal_uInt16 nPrefix, virtual SvXMLImportContext *CreateContext( sal_uInt16 nPrefix,
const OUString& rLocalName, const OUString& rLocalName,
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override;
::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override;
public: public:
XMLVersionListImport( XMLVersionListImport(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rContext, const css::uno::Reference< css::uno::XComponentContext >& rContext,
com::sun::star::uno::Sequence < com::sun::star::util::RevisionTag >& rVersions ); css::uno::Sequence < css::util::RevisionTag >& rVersions );
virtual ~XMLVersionListImport() throw(); virtual ~XMLVersionListImport() throw();
com::sun::star::uno::Sequence < com::sun::star::util::RevisionTag >& css::uno::Sequence < css::util::RevisionTag >&
GetList() { return maVersions; } GetList() { return maVersions; }
}; };
@ -85,15 +84,13 @@ public:
XMLVersionListContext( XMLVersionListImport& rImport, XMLVersionListContext( XMLVersionListImport& rImport,
sal_uInt16 nPrefix, sal_uInt16 nPrefix,
const OUString& rLocalName, const OUString& rLocalName,
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList );
::com::sun::star::xml::sax::XAttributeList > & xAttrList );
virtual ~XMLVersionListContext(); virtual ~XMLVersionListContext();
virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName, const OUString& rLocalName,
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override;
::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override;
}; };
@ -104,24 +101,23 @@ private:
static bool ParseISODateTimeString( static bool ParseISODateTimeString(
const OUString& rString, const OUString& rString,
com::sun::star::util::DateTime& rDateTime ); css::util::DateTime& rDateTime );
public: public:
XMLVersionContext( XMLVersionListImport& rImport, XMLVersionContext( XMLVersionListImport& rImport,
sal_uInt16 nPrefix, sal_uInt16 nPrefix,
const OUString& rLocalName, const OUString& rLocalName,
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList );
::com::sun::star::xml::sax::XAttributeList > & xAttrList );
virtual ~XMLVersionContext(); virtual ~XMLVersionContext();
}; };
class XMLVersionListPersistence : public ::cppu::WeakImplHelper< ::com::sun::star::document::XDocumentRevisionListPersistence, css::lang::XServiceInfo > class XMLVersionListPersistence : public ::cppu::WeakImplHelper< css::document::XDocumentRevisionListPersistence, css::lang::XServiceInfo >
{ {
public: public:
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::util::RevisionTag > SAL_CALL load( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& Storage ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< css::util::RevisionTag > SAL_CALL load( const css::uno::Reference< css::embed::XStorage >& Storage ) throw (css::container::NoSuchElementException, css::io::IOException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL store( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& Storage, const ::com::sun::star::uno::Sequence< ::com::sun::star::util::RevisionTag >& List ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL store( const css::uno::Reference< css::embed::XStorage >& Storage, const css::uno::Sequence< css::util::RevisionTag >& List ) throw (css::io::IOException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
OUString SAL_CALL getImplementationName() OUString SAL_CALL getImplementationName()
throw (css::uno::RuntimeException, std::exception) override; throw (css::uno::RuntimeException, std::exception) override;

89
xmloff/source/chart/ColorPropertySet.hxx
View File

@ -30,8 +30,8 @@ namespace chart
{ {
class ColorPropertySet : public ::cppu::WeakImplHelper< class ColorPropertySet : public ::cppu::WeakImplHelper<
::com::sun::star::beans::XPropertySet, css::beans::XPropertySet,
::com::sun::star::beans::XPropertyState > css::beans::XPropertyState >
{ {
public: public:
// if bFillColor == false, the color is a LineColor // if bFillColor == false, the color is a LineColor
@ -40,68 +40,67 @@ public:
protected: protected:
// ____ XPropertySet ____ // ____ XPropertySet ____
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo()
throw (::com::sun::star::uno::RuntimeException, std::exception) override; throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setPropertyValue( virtual void SAL_CALL setPropertyValue(
const OUString& aPropertyName, const OUString& aPropertyName,
const ::com::sun::star::uno::Any& aValue ) const css::uno::Any& aValue )
throw (::com::sun::star::beans::UnknownPropertyException, throw (css::beans::UnknownPropertyException,
::com::sun::star::beans::PropertyVetoException, css::beans::PropertyVetoException,
::com::sun::star::lang::IllegalArgumentException, css::lang::IllegalArgumentException,
::com::sun::star::lang::WrappedTargetException, css::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException, std::exception) override; css::uno::RuntimeException, std::exception) override;
virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( virtual css::uno::Any SAL_CALL getPropertyValue(
const OUString& PropertyName ) const OUString& PropertyName )
throw (::com::sun::star::beans::UnknownPropertyException, throw (css::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException, css::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException, std::exception) override; css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL addPropertyChangeListener( virtual void SAL_CALL addPropertyChangeListener(
const OUString& aPropertyName, const OUString& aPropertyName,
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener )
throw (::com::sun::star::beans::UnknownPropertyException, throw (css::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException, css::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException, std::exception) override; css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL removePropertyChangeListener( virtual void SAL_CALL removePropertyChangeListener(
const OUString& aPropertyName, const OUString& aPropertyName,
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener )
throw (::com::sun::star::beans::UnknownPropertyException, throw (css::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException, css::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException, std::exception) override; css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL addVetoableChangeListener( virtual void SAL_CALL addVetoableChangeListener(
const OUString& PropertyName, const OUString& PropertyName,
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
throw (::com::sun::star::beans::UnknownPropertyException, throw (css::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException, css::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException, std::exception) override; css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL removeVetoableChangeListener( virtual void SAL_CALL removeVetoableChangeListener(
const OUString& PropertyName, const OUString& PropertyName,
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
throw (::com::sun::star::beans::UnknownPropertyException, throw (css::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException, css::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException, std::exception) override; css::uno::RuntimeException, std::exception) override;
// ____ XPropertyState ____ // ____ XPropertyState ____
virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( virtual css::beans::PropertyState SAL_CALL getPropertyState(
const OUString& PropertyName ) const OUString& PropertyName )
throw (::com::sun::star::beans::UnknownPropertyException, throw (css::beans::UnknownPropertyException,
::com::sun::star::uno::RuntimeException, std::exception) override; css::uno::RuntimeException, std::exception) override;
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates(
const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) const css::uno::Sequence< OUString >& aPropertyName )
throw (::com::sun::star::beans::UnknownPropertyException, throw (css::beans::UnknownPropertyException,
::com::sun::star::uno::RuntimeException, std::exception) override; css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setPropertyToDefault( virtual void SAL_CALL setPropertyToDefault(
const OUString& PropertyName ) const OUString& PropertyName )
throw (::com::sun::star::beans::UnknownPropertyException, throw (css::beans::UnknownPropertyException,
::com::sun::star::uno::RuntimeException, std::exception) override; css::uno::RuntimeException, std::exception) override;
virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( virtual css::uno::Any SAL_CALL getPropertyDefault(
const OUString& aPropertyName ) const OUString& aPropertyName )
throw (::com::sun::star::beans::UnknownPropertyException, throw (css::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException, css::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException, std::exception) override; css::uno::RuntimeException, std::exception) override;
private: private:
::com::sun::star::uno::Reference< css::uno::Reference< css::beans::XPropertySetInfo > m_xInfo;
::com::sun::star::beans::XPropertySetInfo > m_xInfo;
OUString m_aColorPropName; OUString m_aColorPropName;
sal_Int32 m_nColor; sal_Int32 m_nColor;
bool m_bIsFillColor; bool m_bIsFillColor;

38
xmloff/source/chart/MultiPropertySetHandler.hxx
View File

@ -54,7 +54,7 @@ public:
/** @descr Abstract interface of a method for setting a variables /** @descr Abstract interface of a method for setting a variables
value to that of the property. value to that of the property.
*/ */
virtual void SetValue (const ::com::sun::star::uno::Any & rValue) = 0; virtual void SetValue (const css::uno::Any & rValue) = 0;
const OUString msName; const OUString msName;
}; };
@ -75,7 +75,7 @@ public:
/** descr Set the given value inside an Any to the variable referenced /** descr Set the given value inside an Any to the variable referenced
by the data member. by the data member.
*/ */
virtual void SetValue (const ::com::sun::star::uno::Any & rValue) override virtual void SetValue (const css::uno::Any & rValue) override
{ {
rValue >>= mrValue; rValue >>= mrValue;
} }
@ -121,8 +121,8 @@ public:
not necessarily XPropertySet or XMultiPropertySet. It not necessarily XPropertySet or XMultiPropertySet. It
is casted later to one of the two of them. is casted later to one of the two of them.
*/ */
explicit MultiPropertySetHandler (::com::sun::star::uno::Reference< explicit MultiPropertySetHandler (css::uno::Reference<
::com::sun::star::uno::XInterface> xObject); css::uno::XInterface> xObject);
~MultiPropertySetHandler(); ~MultiPropertySetHandler();
/** @descr Add a property to handle. The type given implicitly by the /** @descr Add a property to handle. The type given implicitly by the
reference to a variable is used to create an instance of reference to a variable is used to create an instance of
@ -152,7 +152,7 @@ private:
containing the properties names. containing the properties names.
@return True if values could be derived. @return True if values could be derived.
*/ */
inline bool MultiGet (const ::com::sun::star::uno::Sequence< inline bool MultiGet (const css::uno::Sequence<
OUString> & rNameList); OUString> & rNameList);
/** @descr Try to use the XPropertySet interface to get the property /** @descr Try to use the XPropertySet interface to get the property
@ -161,7 +161,7 @@ private:
containing the properties names. containing the properties names.
@return True if values could be derived. @return True if values could be derived.
*/ */
inline bool SingleGet (const ::com::sun::star::uno::Sequence< inline bool SingleGet (const css::uno::Sequence<
OUString> & rNameList); OUString> & rNameList);
/** @descr STL map that maps from property names to polymorphic instances of /** @descr STL map that maps from property names to polymorphic instances of
@ -171,11 +171,11 @@ private:
::std::map< OUString, PropertyWrapperBase*, OUStringComparison> aPropertyList; ::std::map< OUString, PropertyWrapperBase*, OUStringComparison> aPropertyList;
/// The object from which to get the property values. /// The object from which to get the property values.
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> mxObject; css::uno::Reference< css::uno::XInterface> mxObject;
}; };
MultiPropertySetHandler::MultiPropertySetHandler (::com::sun::star::uno::Reference< MultiPropertySetHandler::MultiPropertySetHandler (css::uno::Reference<
::com::sun::star::uno::XInterface> xObject) css::uno::XInterface> xObject)
: mxObject (xObject) : mxObject (xObject)
{ {
} }
@ -190,7 +190,7 @@ MultiPropertySetHandler::~MultiPropertySetHandler()
bool MultiPropertySetHandler::GetProperties() bool MultiPropertySetHandler::GetProperties()
{ {
::std::map< OUString, PropertyWrapperBase*, OUStringComparison>::iterator I; ::std::map< OUString, PropertyWrapperBase*, OUStringComparison>::iterator I;
::com::sun::star::uno::Sequence< OUString> aNameList (aPropertyList.size()); css::uno::Sequence< OUString> aNameList (aPropertyList.size());
int i; int i;
for (I=aPropertyList.begin(),i=0; I!=aPropertyList.end(); ++I) for (I=aPropertyList.begin(),i=0; I!=aPropertyList.end(); ++I)
aNameList[i++] = I->second->msName; aNameList[i++] = I->second->msName;
@ -200,22 +200,22 @@ bool MultiPropertySetHandler::GetProperties()
return true; return true;
} }
bool MultiPropertySetHandler::MultiGet (const ::com::sun::star::uno::Sequence< bool MultiPropertySetHandler::MultiGet (const css::uno::Sequence<
OUString> & rNameList) OUString> & rNameList)
{ {
::com::sun::star::uno::Reference< ::com::sun::star::beans::XMultiPropertySet> xMultiSet ( css::uno::Reference< css::beans::XMultiPropertySet> xMultiSet (
mxObject, ::com::sun::star::uno::UNO_QUERY); mxObject, css::uno::UNO_QUERY);
if (xMultiSet.is()) if (xMultiSet.is())
try try
{ {
::std::map< OUString, PropertyWrapperBase*, OUStringComparison>::iterator I; ::std::map< OUString, PropertyWrapperBase*, OUStringComparison>::iterator I;
int i; int i;
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any> aValueList = css::uno::Sequence< css::uno::Any> aValueList =
xMultiSet->getPropertyValues (rNameList); xMultiSet->getPropertyValues (rNameList);
for (I=aPropertyList.begin(),i=0; I!=aPropertyList.end(); ++I) for (I=aPropertyList.begin(),i=0; I!=aPropertyList.end(); ++I)
I->second->SetValue (aValueList[i++]); I->second->SetValue (aValueList[i++]);
} }
catch (const ::com::sun::star::beans::UnknownPropertyException&) catch (const css::beans::UnknownPropertyException&)
{ {
return false; return false;
} }
@ -225,11 +225,11 @@ bool MultiPropertySetHandler::MultiGet (const ::com::sun::star::uno::Sequen
return true; return true;
} }
bool MultiPropertySetHandler::SingleGet (const ::com::sun::star::uno::Sequence< bool MultiPropertySetHandler::SingleGet (const css::uno::Sequence<
OUString> & rNameList) OUString> & rNameList)
{ {
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> xSingleSet ( css::uno::Reference< css::beans::XPropertySet> xSingleSet (
mxObject, ::com::sun::star::uno::UNO_QUERY); mxObject, css::uno::UNO_QUERY);
if (xSingleSet.is()) if (xSingleSet.is())
try try
{ {
@ -238,7 +238,7 @@ bool MultiPropertySetHandler::SingleGet (const ::com::sun::star::uno::Sequen
for (I=aPropertyList.begin(),i=0; I!=aPropertyList.end(); ++I) for (I=aPropertyList.begin(),i=0; I!=aPropertyList.end(); ++I)
I->second->SetValue (xSingleSet->getPropertyValue (rNameList[i++])); I->second->SetValue (xSingleSet->getPropertyValue (rNameList[i++]));
} }
catch (const ::com::sun::star::beans::UnknownPropertyException&) catch (const css::beans::UnknownPropertyException&)
{ {
return false; return false;
} }

84
xmloff/source/chart/PropertyMap.hxx
View File

@ -260,57 +260,57 @@ const XMLPropertyMapEntry aXMLChartPropMap[] =
const SvXMLEnumMapEntry aXMLChartAxisLabelPositionEnumMap[] = const SvXMLEnumMapEntry aXMLChartAxisLabelPositionEnumMap[] =
{ {
{ ::xmloff::token::XML_NEAR_AXIS, ::com::sun::star::chart::ChartAxisLabelPosition_NEAR_AXIS }, { ::xmloff::token::XML_NEAR_AXIS, css::chart::ChartAxisLabelPosition_NEAR_AXIS },
{ ::xmloff::token::XML_NEAR_AXIS_OTHER_SIDE, ::com::sun::star::chart::ChartAxisLabelPosition_NEAR_AXIS_OTHER_SIDE }, { ::xmloff::token::XML_NEAR_AXIS_OTHER_SIDE, css::chart::ChartAxisLabelPosition_NEAR_AXIS_OTHER_SIDE },
{ ::xmloff::token::XML_OUTSIDE_START, ::com::sun::star::chart::ChartAxisLabelPosition_OUTSIDE_START }, { ::xmloff::token::XML_OUTSIDE_START, css::chart::ChartAxisLabelPosition_OUTSIDE_START },
{ ::xmloff::token::XML_OUTSIDE_END, ::com::sun::star::chart::ChartAxisLabelPosition_OUTSIDE_END }, { ::xmloff::token::XML_OUTSIDE_END, css::chart::ChartAxisLabelPosition_OUTSIDE_END },
{ ::xmloff::token::XML_OUTSIDE_MINIMUM, ::com::sun::star::chart::ChartAxisLabelPosition_OUTSIDE_START },//#i114142# { ::xmloff::token::XML_OUTSIDE_MINIMUM, css::chart::ChartAxisLabelPosition_OUTSIDE_START },//#i114142#
{ ::xmloff::token::XML_OUTSIDE_MAXIMUM, ::com::sun::star::chart::ChartAxisLabelPosition_OUTSIDE_END },//#i114142# { ::xmloff::token::XML_OUTSIDE_MAXIMUM, css::chart::ChartAxisLabelPosition_OUTSIDE_END },//#i114142#
{ ::xmloff::token::XML_TOKEN_INVALID, 0 } { ::xmloff::token::XML_TOKEN_INVALID, 0 }
}; };
const SvXMLEnumMapEntry aXMLChartAxisMarkPositionEnumMap[] = const SvXMLEnumMapEntry aXMLChartAxisMarkPositionEnumMap[] =
{ {
{ ::xmloff::token::XML_AT_LABELS, ::com::sun::star::chart::ChartAxisMarkPosition_AT_LABELS }, { ::xmloff::token::XML_AT_LABELS, css::chart::ChartAxisMarkPosition_AT_LABELS },
{ ::xmloff::token::XML_AT_AXIS, ::com::sun::star::chart::ChartAxisMarkPosition_AT_AXIS }, { ::xmloff::token::XML_AT_AXIS, css::chart::ChartAxisMarkPosition_AT_AXIS },
{ ::xmloff::token::XML_AT_LABELS_AND_AXIS, ::com::sun::star::chart::ChartAxisMarkPosition_AT_LABELS_AND_AXIS }, { ::xmloff::token::XML_AT_LABELS_AND_AXIS, css::chart::ChartAxisMarkPosition_AT_LABELS_AND_AXIS },
{ ::xmloff::token::XML_TOKEN_INVALID, 0 } { ::xmloff::token::XML_TOKEN_INVALID, 0 }
}; };
const SvXMLEnumMapEntry aXMLChartAxisArrangementEnumMap[] = const SvXMLEnumMapEntry aXMLChartAxisArrangementEnumMap[] =
{ {
{ ::xmloff::token::XML_SIDE_BY_SIDE, ::com::sun::star::chart::ChartAxisArrangeOrderType_SIDE_BY_SIDE }, { ::xmloff::token::XML_SIDE_BY_SIDE, css::chart::ChartAxisArrangeOrderType_SIDE_BY_SIDE },
{ ::xmloff::token::XML_STAGGER_EVEN, ::com::sun::star::chart::ChartAxisArrangeOrderType_STAGGER_EVEN }, { ::xmloff::token::XML_STAGGER_EVEN, css::chart::ChartAxisArrangeOrderType_STAGGER_EVEN },
{ ::xmloff::token::XML_STAGGER_ODD, ::com::sun::star::chart::ChartAxisArrangeOrderType_STAGGER_ODD }, { ::xmloff::token::XML_STAGGER_ODD, css::chart::ChartAxisArrangeOrderType_STAGGER_ODD },
{ ::xmloff::token::XML_TOKEN_INVALID, 0 } { ::xmloff::token::XML_TOKEN_INVALID, 0 }
}; };
const SvXMLEnumMapEntry aXMLChartErrorBarStyleEnumMap[] = const SvXMLEnumMapEntry aXMLChartErrorBarStyleEnumMap[] =
{ {
{ ::xmloff::token::XML_NONE, ::com::sun::star::chart::ErrorBarStyle::NONE }, { ::xmloff::token::XML_NONE, css::chart::ErrorBarStyle::NONE },
{ ::xmloff::token::XML_VARIANCE, ::com::sun::star::chart::ErrorBarStyle::VARIANCE }, { ::xmloff::token::XML_VARIANCE, css::chart::ErrorBarStyle::VARIANCE },
{ ::xmloff::token::XML_STANDARD_DEVIATION, ::com::sun::star::chart::ErrorBarStyle::STANDARD_DEVIATION }, { ::xmloff::token::XML_STANDARD_DEVIATION, css::chart::ErrorBarStyle::STANDARD_DEVIATION },
{ ::xmloff::token::XML_CONSTANT, ::com::sun::star::chart::ErrorBarStyle::ABSOLUTE }, { ::xmloff::token::XML_CONSTANT, css::chart::ErrorBarStyle::ABSOLUTE },
{ ::xmloff::token::XML_PERCENTAGE, ::com::sun::star::chart::ErrorBarStyle::RELATIVE }, { ::xmloff::token::XML_PERCENTAGE, css::chart::ErrorBarStyle::RELATIVE },
{ ::xmloff::token::XML_ERROR_MARGIN, ::com::sun::star::chart::ErrorBarStyle::ERROR_MARGIN }, { ::xmloff::token::XML_ERROR_MARGIN, css::chart::ErrorBarStyle::ERROR_MARGIN },
{ ::xmloff::token::XML_STANDARD_ERROR, ::com::sun::star::chart::ErrorBarStyle::STANDARD_ERROR }, { ::xmloff::token::XML_STANDARD_ERROR, css::chart::ErrorBarStyle::STANDARD_ERROR },
{ ::xmloff::token::XML_CELL_RANGE, ::com::sun::star::chart::ErrorBarStyle::FROM_DATA }, { ::xmloff::token::XML_CELL_RANGE, css::chart::ErrorBarStyle::FROM_DATA },
{ ::xmloff::token::XML_TOKEN_INVALID, 0 } { ::xmloff::token::XML_TOKEN_INVALID, 0 }
}; };
const SvXMLEnumMapEntry aXMLChartSolidTypeEnumMap[] = const SvXMLEnumMapEntry aXMLChartSolidTypeEnumMap[] =
{ {
{ ::xmloff::token::XML_CUBOID, ::com::sun::star::chart::ChartSolidType::RECTANGULAR_SOLID }, { ::xmloff::token::XML_CUBOID, css::chart::ChartSolidType::RECTANGULAR_SOLID },
{ ::xmloff::token::XML_CYLINDER, ::com::sun::star::chart::ChartSolidType::CYLINDER }, { ::xmloff::token::XML_CYLINDER, css::chart::ChartSolidType::CYLINDER },
{ ::xmloff::token::XML_CONE, ::com::sun::star::chart::ChartSolidType::CONE }, { ::xmloff::token::XML_CONE, css::chart::ChartSolidType::CONE },
{ ::xmloff::token::XML_PYRAMID, ::com::sun::star::chart::ChartSolidType::PYRAMID }, { ::xmloff::token::XML_PYRAMID, css::chart::ChartSolidType::PYRAMID },
{ ::xmloff::token::XML_TOKEN_INVALID, 0 } { ::xmloff::token::XML_TOKEN_INVALID, 0 }
}; };
const SvXMLEnumMapEntry aXMLChartDataRowSourceTypeEnumMap[] = const SvXMLEnumMapEntry aXMLChartDataRowSourceTypeEnumMap[] =
{ {
{ ::xmloff::token::XML_COLUMNS, ::com::sun::star::chart::ChartDataRowSource_COLUMNS }, { ::xmloff::token::XML_COLUMNS, css::chart::ChartDataRowSource_COLUMNS },
{ ::xmloff::token::XML_ROWS, ::com::sun::star::chart::ChartDataRowSource_ROWS }, { ::xmloff::token::XML_ROWS, css::chart::ChartDataRowSource_ROWS },
{ ::xmloff::token::XML_TOKEN_INVALID, 0 } { ::xmloff::token::XML_TOKEN_INVALID, 0 }
}; };
@ -336,27 +336,27 @@ const SvXMLEnumMapEntry aXMLChartInterpolationTypeEnumMap[] =
const SvXMLEnumMapEntry aXMLChartDataLabelPlacementEnumMap[] = const SvXMLEnumMapEntry aXMLChartDataLabelPlacementEnumMap[] =
{ {
{ ::xmloff::token::XML_AVOID_OVERLAP, ::com::sun::star::chart::DataLabelPlacement::AVOID_OVERLAP }, { ::xmloff::token::XML_AVOID_OVERLAP, css::chart::DataLabelPlacement::AVOID_OVERLAP },
{ ::xmloff::token::XML_CENTER, ::com::sun::star::chart::DataLabelPlacement::CENTER }, { ::xmloff::token::XML_CENTER, css::chart::DataLabelPlacement::CENTER },
{ ::xmloff::token::XML_TOP, ::com::sun::star::chart::DataLabelPlacement::TOP }, { ::xmloff::token::XML_TOP, css::chart::DataLabelPlacement::TOP },
{ ::xmloff::token::XML_TOP_LEFT, ::com::sun::star::chart::DataLabelPlacement::TOP_LEFT }, { ::xmloff::token::XML_TOP_LEFT, css::chart::DataLabelPlacement::TOP_LEFT },
{ ::xmloff::token::XML_LEFT, ::com::sun::star::chart::DataLabelPlacement::LEFT }, { ::xmloff::token::XML_LEFT, css::chart::DataLabelPlacement::LEFT },
{ ::xmloff::token::XML_BOTTOM_LEFT, ::com::sun::star::chart::DataLabelPlacement::BOTTOM_LEFT }, { ::xmloff::token::XML_BOTTOM_LEFT, css::chart::DataLabelPlacement::BOTTOM_LEFT },
{ ::xmloff::token::XML_BOTTOM, ::com::sun::star::chart::DataLabelPlacement::BOTTOM }, { ::xmloff::token::XML_BOTTOM, css::chart::DataLabelPlacement::BOTTOM },
{ ::xmloff::token::XML_BOTTOM_RIGHT, ::com::sun::star::chart::DataLabelPlacement::BOTTOM_RIGHT }, { ::xmloff::token::XML_BOTTOM_RIGHT, css::chart::DataLabelPlacement::BOTTOM_RIGHT },
{ ::xmloff::token::XML_RIGHT, ::com::sun::star::chart::DataLabelPlacement::RIGHT }, { ::xmloff::token::XML_RIGHT, css::chart::DataLabelPlacement::RIGHT },
{ ::xmloff::token::XML_TOP_RIGHT, ::com::sun::star::chart::DataLabelPlacement::TOP_RIGHT }, { ::xmloff::token::XML_TOP_RIGHT, css::chart::DataLabelPlacement::TOP_RIGHT },
{ ::xmloff::token::XML_INSIDE, ::com::sun::star::chart::DataLabelPlacement::INSIDE }, { ::xmloff::token::XML_INSIDE, css::chart::DataLabelPlacement::INSIDE },
{ ::xmloff::token::XML_OUTSIDE, ::com::sun::star::chart::DataLabelPlacement::OUTSIDE }, { ::xmloff::token::XML_OUTSIDE, css::chart::DataLabelPlacement::OUTSIDE },
{ ::xmloff::token::XML_NEAR_ORIGIN, ::com::sun::star::chart::DataLabelPlacement::NEAR_ORIGIN }, { ::xmloff::token::XML_NEAR_ORIGIN, css::chart::DataLabelPlacement::NEAR_ORIGIN },
{ ::xmloff::token::XML_TOKEN_INVALID, 0 } { ::xmloff::token::XML_TOKEN_INVALID, 0 }
}; };
const SvXMLEnumMapEntry aXMLChartMissingValueTreatmentEnumMap[] = const SvXMLEnumMapEntry aXMLChartMissingValueTreatmentEnumMap[] =
{ {
{ ::xmloff::token::XML_LEAVE_GAP, ::com::sun::star::chart::MissingValueTreatment::LEAVE_GAP }, { ::xmloff::token::XML_LEAVE_GAP, css::chart::MissingValueTreatment::LEAVE_GAP },
{ ::xmloff::token::XML_USE_ZERO, ::com::sun::star::chart::MissingValueTreatment::USE_ZERO }, { ::xmloff::token::XML_USE_ZERO, css::chart::MissingValueTreatment::USE_ZERO },
{ ::xmloff::token::XML_IGNORE, ::com::sun::star::chart::MissingValueTreatment::CONTINUE }, { ::xmloff::token::XML_IGNORE, css::chart::MissingValueTreatment::CONTINUE },
{ ::xmloff::token::XML_TOKEN_INVALID,0 }, { ::xmloff::token::XML_TOKEN_INVALID,0 },
}; };

54
xmloff/source/chart/SchXMLAxisContext.cxx
View File

@ -61,9 +61,9 @@ static const SvXMLEnumMapEntry aXMLAxisDimensionMap[] =
static const SvXMLEnumMapEntry aXMLAxisTypeMap[] = static const SvXMLEnumMapEntry aXMLAxisTypeMap[] =
{ {
{ XML_AUTO, ::com::sun::star::chart::ChartAxisType::AUTOMATIC }, { XML_AUTO, css::chart::ChartAxisType::AUTOMATIC },
{ XML_TEXT, ::com::sun::star::chart::ChartAxisType::CATEGORY }, { XML_TEXT, css::chart::ChartAxisType::CATEGORY },
{ XML_DATE, ::com::sun::star::chart::ChartAxisType::DATE }, { XML_DATE, css::chart::ChartAxisType::DATE },
{ XML_TOKEN_INVALID, 0 } { XML_TOKEN_INVALID, 0 }
}; };
@ -78,7 +78,7 @@ public:
const OUString& rLocalName, const OUString& rLocalName,
OUString& rAddress ); OUString& rAddress );
virtual ~SchXMLCategoriesContext(); virtual ~SchXMLCategoriesContext();
virtual void StartElement( const Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; virtual void StartElement( const Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
}; };
class DateScaleContext : public SvXMLImportContext class DateScaleContext : public SvXMLImportContext
@ -89,7 +89,7 @@ public:
const Reference< beans::XPropertySet >& rAxisProps ); const Reference< beans::XPropertySet >& rAxisProps );
virtual ~DateScaleContext(); virtual ~DateScaleContext();
virtual void StartElement( const Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; virtual void StartElement( const Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
private: private:
Reference< beans::XPropertySet > m_xAxisProps; Reference< beans::XPropertySet > m_xAxisProps;
@ -769,7 +769,7 @@ void SchXMLAxisContext::CorrectAxisPositions( const Reference< chart2::XChartDoc
if( rChartTypeServiceName == "com.sun.star.chart2.ScatterChartType" ) if( rChartTypeServiceName == "com.sun.star.chart2.ScatterChartType" )
{ {
xMainYAxisProp->setPropertyValue("CrossoverPosition" xMainYAxisProp->setPropertyValue("CrossoverPosition"
, uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_VALUE) ); , uno::makeAny( css::chart::ChartAxisPosition_VALUE) );
double fCrossoverValue = 0.0; double fCrossoverValue = 0.0;
aMainXScale.Origin >>= fCrossoverValue; aMainXScale.Origin >>= fCrossoverValue;
xMainYAxisProp->setPropertyValue("CrossoverValue" xMainYAxisProp->setPropertyValue("CrossoverValue"
@ -778,22 +778,22 @@ void SchXMLAxisContext::CorrectAxisPositions( const Reference< chart2::XChartDoc
if( aMainXScale.Orientation == chart2::AxisOrientation_REVERSE ) if( aMainXScale.Orientation == chart2::AxisOrientation_REVERSE )
{ {
xMainYAxisProp->setPropertyValue("LabelPosition" xMainYAxisProp->setPropertyValue("LabelPosition"
, uno::makeAny( ::com::sun::star::chart::ChartAxisLabelPosition_OUTSIDE_END) ); , uno::makeAny( css::chart::ChartAxisLabelPosition_OUTSIDE_END) );
xMainYAxisProp->setPropertyValue("MarkPosition" xMainYAxisProp->setPropertyValue("MarkPosition"
, uno::makeAny( ::com::sun::star::chart::ChartAxisMarkPosition_AT_LABELS) ); , uno::makeAny( css::chart::ChartAxisMarkPosition_AT_LABELS) );
if( xSecondaryYAxisProp.is() ) if( xSecondaryYAxisProp.is() )
xSecondaryYAxisProp->setPropertyValue("CrossoverPosition" xSecondaryYAxisProp->setPropertyValue("CrossoverPosition"
, uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_START) ); , uno::makeAny( css::chart::ChartAxisPosition_START) );
} }
else else
{ {
xMainYAxisProp->setPropertyValue("LabelPosition" xMainYAxisProp->setPropertyValue("LabelPosition"
, uno::makeAny( ::com::sun::star::chart::ChartAxisLabelPosition_OUTSIDE_START) ); , uno::makeAny( css::chart::ChartAxisLabelPosition_OUTSIDE_START) );
xMainYAxisProp->setPropertyValue("MarkPosition" xMainYAxisProp->setPropertyValue("MarkPosition"
, uno::makeAny( ::com::sun::star::chart::ChartAxisMarkPosition_AT_LABELS) ); , uno::makeAny( css::chart::ChartAxisMarkPosition_AT_LABELS) );
if( xSecondaryYAxisProp.is() ) if( xSecondaryYAxisProp.is() )
xSecondaryYAxisProp->setPropertyValue("CrossoverPosition" xSecondaryYAxisProp->setPropertyValue("CrossoverPosition"
, uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_END) ); , uno::makeAny( css::chart::ChartAxisPosition_END) );
} }
} }
else else
@ -801,24 +801,24 @@ void SchXMLAxisContext::CorrectAxisPositions( const Reference< chart2::XChartDoc
if( aMainXScale.Orientation == chart2::AxisOrientation_REVERSE ) if( aMainXScale.Orientation == chart2::AxisOrientation_REVERSE )
{ {
xMainYAxisProp->setPropertyValue("CrossoverPosition" xMainYAxisProp->setPropertyValue("CrossoverPosition"
, uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_END) ); , uno::makeAny( css::chart::ChartAxisPosition_END) );
if( xSecondaryYAxisProp.is() ) if( xSecondaryYAxisProp.is() )
xSecondaryYAxisProp->setPropertyValue("CrossoverPosition" xSecondaryYAxisProp->setPropertyValue("CrossoverPosition"
, uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_START) ); , uno::makeAny( css::chart::ChartAxisPosition_START) );
} }
else else
{ {
xMainYAxisProp->setPropertyValue("CrossoverPosition" xMainYAxisProp->setPropertyValue("CrossoverPosition"
, uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_START) ); , uno::makeAny( css::chart::ChartAxisPosition_START) );
if( xSecondaryYAxisProp.is() ) if( xSecondaryYAxisProp.is() )
xSecondaryYAxisProp->setPropertyValue("CrossoverPosition" xSecondaryYAxisProp->setPropertyValue("CrossoverPosition"
, uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_END) ); , uno::makeAny( css::chart::ChartAxisPosition_END) );
} }
} }
chart2::ScaleData aMainYScale = xMainYAxis->getScaleData(); chart2::ScaleData aMainYScale = xMainYAxis->getScaleData();
xMainXAxisProp->setPropertyValue("CrossoverPosition" xMainXAxisProp->setPropertyValue("CrossoverPosition"
, uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_VALUE) ); , uno::makeAny( css::chart::ChartAxisPosition_VALUE) );
double fCrossoverValue = 0.0; double fCrossoverValue = 0.0;
aMainYScale.Origin >>= fCrossoverValue; aMainYScale.Origin >>= fCrossoverValue;
xMainXAxisProp->setPropertyValue("CrossoverValue" xMainXAxisProp->setPropertyValue("CrossoverValue"
@ -827,22 +827,22 @@ void SchXMLAxisContext::CorrectAxisPositions( const Reference< chart2::XChartDoc
if( aMainYScale.Orientation == chart2::AxisOrientation_REVERSE ) if( aMainYScale.Orientation == chart2::AxisOrientation_REVERSE )
{ {
xMainXAxisProp->setPropertyValue("LabelPosition" xMainXAxisProp->setPropertyValue("LabelPosition"
, uno::makeAny( ::com::sun::star::chart::ChartAxisLabelPosition_OUTSIDE_END) ); , uno::makeAny( css::chart::ChartAxisLabelPosition_OUTSIDE_END) );
xMainXAxisProp->setPropertyValue("MarkPosition" xMainXAxisProp->setPropertyValue("MarkPosition"
, uno::makeAny( ::com::sun::star::chart::ChartAxisMarkPosition_AT_LABELS) ); , uno::makeAny( css::chart::ChartAxisMarkPosition_AT_LABELS) );
if( xSecondaryXAxisProp.is() ) if( xSecondaryXAxisProp.is() )
xSecondaryXAxisProp->setPropertyValue("CrossoverPosition" xSecondaryXAxisProp->setPropertyValue("CrossoverPosition"
, uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_START) ); , uno::makeAny( css::chart::ChartAxisPosition_START) );
} }
else else
{ {
xMainXAxisProp->setPropertyValue("LabelPosition" xMainXAxisProp->setPropertyValue("LabelPosition"
, uno::makeAny( ::com::sun::star::chart::ChartAxisLabelPosition_OUTSIDE_START) ); , uno::makeAny( css::chart::ChartAxisLabelPosition_OUTSIDE_START) );
xMainXAxisProp->setPropertyValue("MarkPosition" xMainXAxisProp->setPropertyValue("MarkPosition"
, uno::makeAny( ::com::sun::star::chart::ChartAxisMarkPosition_AT_LABELS) ); , uno::makeAny( css::chart::ChartAxisMarkPosition_AT_LABELS) );
if( xSecondaryXAxisProp.is() ) if( xSecondaryXAxisProp.is() )
xSecondaryXAxisProp->setPropertyValue("CrossoverPosition" xSecondaryXAxisProp->setPropertyValue("CrossoverPosition"
, uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_END) ); , uno::makeAny( css::chart::ChartAxisPosition_END) );
} }
} }
} }
@ -933,13 +933,13 @@ struct theDateScaleAttributeTokenMap : public rtl::Static< DateScaleAttributeTok
sal_Int32 lcl_getTimeUnit( const OUString& rValue ) sal_Int32 lcl_getTimeUnit( const OUString& rValue )
{ {
sal_Int32 nTimeUnit = ::com::sun::star::chart::TimeUnit::DAY; sal_Int32 nTimeUnit = css::chart::TimeUnit::DAY;
if( IsXMLToken( rValue, XML_DAYS ) ) if( IsXMLToken( rValue, XML_DAYS ) )
nTimeUnit = ::com::sun::star::chart::TimeUnit::DAY; nTimeUnit = css::chart::TimeUnit::DAY;
else if( IsXMLToken( rValue, XML_MONTHS ) ) else if( IsXMLToken( rValue, XML_MONTHS ) )
nTimeUnit = ::com::sun::star::chart::TimeUnit::MONTH; nTimeUnit = css::chart::TimeUnit::MONTH;
else if( IsXMLToken( rValue, XML_YEARS ) ) else if( IsXMLToken( rValue, XML_YEARS ) )
nTimeUnit = ::com::sun::star::chart::TimeUnit::YEAR; nTimeUnit = css::chart::TimeUnit::YEAR;
return nTimeUnit; return nTimeUnit;
} }

16
xmloff/source/chart/SchXMLAxisContext.hxx
View File

@ -27,7 +27,7 @@ class SchXMLAxisContext : public SvXMLImportContext
public: public:
SchXMLAxisContext( SchXMLImportHelper& rImpHelper, SchXMLAxisContext( SchXMLImportHelper& rImpHelper,
SvXMLImport& rImport, const OUString& rLocalName, SvXMLImport& rImport, const OUString& rLocalName,
::com::sun::star::uno::Reference< ::com::sun::star::chart::XDiagram > xDiagram, css::uno::Reference< css::chart::XDiagram > xDiagram,
std::vector< SchXMLAxis >& aAxes, std::vector< SchXMLAxis >& aAxes,
OUString& rCategoriesAddress, OUString& rCategoriesAddress,
bool bAddMissingXAxisForNetCharts, bool bAddMissingXAxisForNetCharts,
@ -36,27 +36,27 @@ public:
bool& rbAxisPositionAttributeImported ); bool& rbAxisPositionAttributeImported );
virtual ~SchXMLAxisContext(); virtual ~SchXMLAxisContext();
virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
virtual void EndElement() override; virtual void EndElement() override;
virtual SvXMLImportContext* CreateChildContext( virtual SvXMLImportContext* CreateChildContext(
sal_uInt16 nPrefix, sal_uInt16 nPrefix,
const OUString& rLocalName, const OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
static void CorrectAxisPositions( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xNewDoc, static void CorrectAxisPositions( const css::uno::Reference< css::chart2::XChartDocument >& xNewDoc,
const OUString& rChartTypeServiceName, const OUString& rChartTypeServiceName,
const OUString& rODFVersionOfFile, const OUString& rODFVersionOfFile,
bool bAxisPositionAttributeImported ); bool bAxisPositionAttributeImported );
private: private:
SchXMLImportHelper& m_rImportHelper; SchXMLImportHelper& m_rImportHelper;
::com::sun::star::uno::Reference< ::com::sun::star::chart::XDiagram > m_xDiagram; css::uno::Reference< css::chart::XDiagram > m_xDiagram;
SchXMLAxis m_aCurrentAxis; SchXMLAxis m_aCurrentAxis;
std::vector< SchXMLAxis >& m_rAxes; std::vector< SchXMLAxis >& m_rAxes;
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xAxisProps; css::uno::Reference< css::beans::XPropertySet > m_xAxisProps;
OUString m_aAutoStyleName; OUString m_aAutoStyleName;
OUString& m_rCategoriesAddress; OUString& m_rCategoriesAddress;
sal_Int32 m_nAxisType;//::com::sun::star::chart::ChartAxisType sal_Int32 m_nAxisType;//css::chart::ChartAxisType
bool m_bAxisTypeImported; bool m_bAxisTypeImported;
bool m_bDateScaleImported; bool m_bDateScaleImported;
bool m_bAddMissingXAxisForNetCharts; //to correct errors from older versions bool m_bAddMissingXAxisForNetCharts; //to correct errors from older versions
@ -64,7 +64,7 @@ private:
bool m_bAdaptXAxisOrientationForOld2DBarCharts; //to correct different behaviour from older versions bool m_bAdaptXAxisOrientationForOld2DBarCharts; //to correct different behaviour from older versions
bool& m_rbAxisPositionAttributeImported; bool& m_rbAxisPositionAttributeImported;
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > getTitleShape(); css::uno::Reference< css::drawing::XShape > getTitleShape();
void CreateGrid( const OUString& sAutoStyleName, bool bIsMajor ); void CreateGrid( const OUString& sAutoStyleName, bool bIsMajor );
void CreateAxis(); void CreateAxis();
void SetAxisTitle(); void SetAxisTitle();

5
xmloff/source/chart/SchXMLCalculationSettingsContext.cxx
View File

@ -38,8 +38,7 @@ using namespace ::xmloff::token;
SchXMLCalculationSettingsContext::SchXMLCalculationSettingsContext( SvXMLImport& rImport, SchXMLCalculationSettingsContext::SchXMLCalculationSettingsContext( SvXMLImport& rImport,
sal_uInt16 p_nPrefix, sal_uInt16 p_nPrefix,
const OUString& rLocalName, const OUString& rLocalName,
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList )
::com::sun::star::xml::sax::XAttributeList >& xAttrList )
: SvXMLImportContext ( rImport, p_nPrefix, rLocalName ) : SvXMLImportContext ( rImport, p_nPrefix, rLocalName )
{ {
const SvXMLNamespaceMap& rMap = GetImport().GetNamespaceMap(); const SvXMLNamespaceMap& rMap = GetImport().GetNamespaceMap();
@ -60,7 +59,7 @@ SchXMLCalculationSettingsContext::SchXMLCalculationSettingsContext( SvXMLImport&
} }
SvXMLImportContext* SchXMLCalculationSettingsContext::CreateChildContext( sal_uInt16 nPrefix, SvXMLImportContext* SchXMLCalculationSettingsContext::CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName, const OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList )
{ {
return new SchXMLCalculationSettingsContext(GetImport(),nPrefix,rLocalName,xAttrList); return new SchXMLCalculationSettingsContext(GetImport(),nPrefix,rLocalName,xAttrList);
} }

7
xmloff/source/chart/SchXMLCalculationSettingsContext.hxx
View File

@ -24,17 +24,16 @@
class SchXMLCalculationSettingsContext : public SvXMLImportContext class SchXMLCalculationSettingsContext : public SvXMLImportContext
{ {
com::sun::star::uno::Any m_aNullDate; css::uno::Any m_aNullDate;
public: public:
SchXMLCalculationSettingsContext( SvXMLImport& rImport, SchXMLCalculationSettingsContext( SvXMLImport& rImport,
sal_uInt16 nPrefix, sal_uInt16 nPrefix,
const OUString& rLocalName, const OUString& rLocalName,
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList );
::com::sun::star::xml::sax::XAttributeList >& xAttrList );
virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName, const OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
virtual void EndElement() override; virtual void EndElement() override;
}; };

17
xmloff/source/chart/SchXMLChartContext.cxx
View File

@ -384,16 +384,14 @@ namespace
struct NewDonutSeries struct NewDonutSeries
{ {
::com::sun::star::uno::Reference< css::uno::Reference< css::chart2::XDataSeries > m_xSeries;
::com::sun::star::chart2::XDataSeries > m_xSeries;
OUString msStyleName; OUString msStyleName;
sal_Int32 mnAttachedAxis; sal_Int32 mnAttachedAxis;
::std::vector< OUString > m_aSeriesStyles; ::std::vector< OUString > m_aSeriesStyles;
::std::vector< OUString > m_aPointStyles; ::std::vector< OUString > m_aPointStyles;
NewDonutSeries( const ::com::sun::star::uno::Reference< NewDonutSeries( const css::uno::Reference< css::chart2::XDataSeries >& xSeries, sal_Int32 nPointCount )
::com::sun::star::chart2::XDataSeries >& xSeries, sal_Int32 nPointCount )
: m_xSeries( xSeries ) : m_xSeries( xSeries )
, mnAttachedAxis( 1 ) , mnAttachedAxis( 1 )
{ {
@ -446,16 +444,15 @@ struct NewDonutSeries
}; };
void lcl_swapPointAndSeriesStylesForDonutCharts( ::std::list< DataRowPointStyle >& rStyleList void lcl_swapPointAndSeriesStylesForDonutCharts( ::std::list< DataRowPointStyle >& rStyleList
, const ::std::map< ::com::sun::star::uno::Reference< , const ::std::map< css::uno::Reference< css::chart2::XDataSeries> , sal_Int32 >& rSeriesMap )
::com::sun::star::chart2::XDataSeries> , sal_Int32 >& rSeriesMap )
{ {
::std::list< DataRowPointStyle >::iterator aIt(rStyleList.begin()); ::std::list< DataRowPointStyle >::iterator aIt(rStyleList.begin());
::std::list< DataRowPointStyle >::iterator aEnd(rStyleList.end()); ::std::list< DataRowPointStyle >::iterator aEnd(rStyleList.end());
//detect old series count //detect old series count
//and add old series to aSeriesMap //and add old series to aSeriesMap
::std::map< ::com::sun::star::uno::Reference< ::std::map< css::uno::Reference<
::com::sun::star::chart2::XDataSeries >, sal_Int32 > aSeriesMap(rSeriesMap); css::chart2::XDataSeries >, sal_Int32 > aSeriesMap(rSeriesMap);
sal_Int32 nOldSeriesCount = 0; sal_Int32 nOldSeriesCount = 0;
{ {
sal_Int32 nMaxOldSeriesIndex = 0; sal_Int32 nMaxOldSeriesIndex = 0;
@ -581,7 +578,7 @@ bool lcl_SpecialHandlingForDonutChartNeeded(
static void lcl_ApplyDataFromRectangularRangeToDiagram( static void lcl_ApplyDataFromRectangularRangeToDiagram(
const uno::Reference< chart2::XChartDocument >& xNewDoc const uno::Reference< chart2::XChartDocument >& xNewDoc
, const OUString& rRectangularRange , const OUString& rRectangularRange
, ::com::sun::star::chart::ChartDataRowSource eDataRowSource , css::chart::ChartDataRowSource eDataRowSource
, bool bRowHasLabels, bool bColHasLabels , bool bRowHasLabels, bool bColHasLabels
, bool bSwitchOnLabelsAndCategoriesForOwnData , bool bSwitchOnLabelsAndCategoriesForOwnData
, const OUString& sColTrans , const OUString& sColTrans
@ -1152,7 +1149,7 @@ void SchXMLTitleContext::StartElement( const uno::Reference< xml::sax::XAttribut
{ {
sal_Int16 nAttrCount = xAttrList.is()? xAttrList->getLength(): 0; sal_Int16 nAttrCount = xAttrList.is()? xAttrList->getLength(): 0;
com::sun::star::awt::Point maPosition; css::awt::Point maPosition;
bool bHasXPosition=false; bool bHasXPosition=false;
bool bHasYPosition=false; bool bHasYPosition=false;

53
xmloff/source/chart/SchXMLChartContext.hxx
View File

@ -48,26 +48,26 @@ namespace com { namespace sun { namespace star {
struct SeriesDefaultsAndStyles struct SeriesDefaultsAndStyles
{ {
//default values for series: //default values for series:
::com::sun::star::uno::Any maSymbolTypeDefault; css::uno::Any maSymbolTypeDefault;
::com::sun::star::uno::Any maDataCaptionDefault; css::uno::Any maDataCaptionDefault;
::com::sun::star::uno::Any maErrorIndicatorDefault; css::uno::Any maErrorIndicatorDefault;
::com::sun::star::uno::Any maErrorCategoryDefault; css::uno::Any maErrorCategoryDefault;
::com::sun::star::uno::Any maConstantErrorLowDefault; css::uno::Any maConstantErrorLowDefault;
::com::sun::star::uno::Any maConstantErrorHighDefault; css::uno::Any maConstantErrorHighDefault;
::com::sun::star::uno::Any maPercentageErrorDefault; css::uno::Any maPercentageErrorDefault;
::com::sun::star::uno::Any maErrorMarginDefault; css::uno::Any maErrorMarginDefault;
::com::sun::star::uno::Any maMeanValueDefault; css::uno::Any maMeanValueDefault;
::com::sun::star::uno::Any maRegressionCurvesDefault; css::uno::Any maRegressionCurvesDefault;
::com::sun::star::uno::Any maStackedDefault; css::uno::Any maStackedDefault;
::com::sun::star::uno::Any maPercentDefault; css::uno::Any maPercentDefault;
::com::sun::star::uno::Any maDeepDefault; css::uno::Any maDeepDefault;
::com::sun::star::uno::Any maStackedBarsConnectedDefault; css::uno::Any maStackedBarsConnectedDefault;
//additional information //additional information
::com::sun::star::uno::Any maLinesOnProperty; css::uno::Any maLinesOnProperty;
//styles for series and datapoints //styles for series and datapoints
::std::list< DataRowPointStyle > maSeriesStyleList; ::std::list< DataRowPointStyle > maSeriesStyleList;
@ -81,28 +81,26 @@ public:
SvXMLImport& rImport, const OUString& rLocalName ); SvXMLImport& rImport, const OUString& rLocalName );
virtual ~SchXMLChartContext(); virtual ~SchXMLChartContext();
virtual void StartElement( const com::sun::star::uno::Reference< virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
com::sun::star::xml::sax::XAttributeList >& xAttrList ) override;
virtual void EndElement() override; virtual void EndElement() override;
virtual SvXMLImportContext *CreateChildContext( virtual SvXMLImportContext *CreateChildContext(
sal_uInt16 nPrefix, sal_uInt16 nPrefix,
const OUString& rLocalName, const OUString& rLocalName,
const com::sun::star::uno::Reference< const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
com::sun::star::xml::sax::XAttributeList >& xAttrList ) override;
private: private:
SchXMLTable maTable; SchXMLTable maTable;
SchXMLImportHelper& mrImportHelper; SchXMLImportHelper& mrImportHelper;
OUString maMainTitle, maSubTitle; OUString maMainTitle, maSubTitle;
com::sun::star::awt::Point maMainTitlePos, maSubTitlePos, maLegendPos; css::awt::Point maMainTitlePos, maSubTitlePos, maLegendPos;
OUString m_aXLinkHRefAttributeToIndicateDataProvider; OUString m_aXLinkHRefAttributeToIndicateDataProvider;
bool m_bHasRangeAtPlotArea; bool m_bHasRangeAtPlotArea;
bool m_bHasTableElement; bool m_bHasTableElement;
bool mbAllRangeAddressesAvailable; bool mbAllRangeAddressesAvailable;
bool mbColHasLabels; bool mbColHasLabels;
bool mbRowHasLabels; bool mbRowHasLabels;
::com::sun::star::chart::ChartDataRowSource meDataRowSource; css::chart::ChartDataRowSource meDataRowSource;
bool mbIsStockChart; bool mbIsStockChart;
OUString msCategoriesAddress; OUString msCategoriesAddress;
@ -111,12 +109,12 @@ private:
SeriesDefaultsAndStyles maSeriesDefaultsAndStyles; SeriesDefaultsAndStyles maSeriesDefaultsAndStyles;
tSchXMLLSequencesPerIndex maLSequencesPerIndex; tSchXMLLSequencesPerIndex maLSequencesPerIndex;
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > mxDrawPage; css::uno::Reference< css::drawing::XShapes > mxDrawPage;
OUString msColTrans; OUString msColTrans;
OUString msRowTrans; OUString msRowTrans;
OUString maChartTypeServiceName; OUString maChartTypeServiceName;
::com::sun::star::awt::Size maChartSize; css::awt::Size maChartSize;
/** @descr This method bundles some settings to the chart model and executes them with /** @descr This method bundles some settings to the chart model and executes them with
a locked controller. This includes setting the chart type. a locked controller. This includes setting the chart type.
@ -135,22 +133,21 @@ class SchXMLTitleContext : public SvXMLImportContext
private: private:
SchXMLImportHelper& mrImportHelper; SchXMLImportHelper& mrImportHelper;
OUString& mrTitle; OUString& mrTitle;
com::sun::star::uno::Reference< com::sun::star::drawing::XShape > mxTitleShape; css::uno::Reference< css::drawing::XShape > mxTitleShape;
OUString msAutoStyleName; OUString msAutoStyleName;
public: public:
SchXMLTitleContext( SchXMLImportHelper& rImpHelper, SchXMLTitleContext( SchXMLImportHelper& rImpHelper,
SvXMLImport& rImport, const OUString& rLocalName, SvXMLImport& rImport, const OUString& rLocalName,
OUString& rTitle, OUString& rTitle,
com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xTitleShape ); css::uno::Reference< css::drawing::XShape >& xTitleShape );
virtual ~SchXMLTitleContext(); virtual ~SchXMLTitleContext();
virtual void StartElement( const com::sun::star::uno::Reference< virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
com::sun::star::xml::sax::XAttributeList >& xAttrList ) override;
virtual SvXMLImportContext *CreateChildContext( virtual SvXMLImportContext *CreateChildContext(
sal_uInt16 nPrefix, sal_uInt16 nPrefix,
const OUString& rLocalName, const OUString& rLocalName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
}; };
#endif // INCLUDED_XMLOFF_SOURCE_CHART_SCHXMLCHARTCONTEXT_HXX #endif // INCLUDED_XMLOFF_SOURCE_CHART_SCHXMLCHARTCONTEXT_HXX

81
xmloff/source/chart/SchXMLExport.cxx
View File

@ -122,8 +122,8 @@ class SchXMLExportHelper_Impl: private boost::noncopyable
{ {
public: public:
// first: data sequence for label, second: data sequence for values. // first: data sequence for label, second: data sequence for values.
typedef ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence >, typedef ::std::pair< css::uno::Reference< css::chart2::data::XDataSequence >,
::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > > tLabelValuesDataPair; css::uno::Reference< css::chart2::data::XDataSequence > > tLabelValuesDataPair;
typedef ::std::vector< tLabelValuesDataPair > tDataSequenceCont; typedef ::std::vector< tLabelValuesDataPair > tDataSequenceCont;
public: public:
@ -134,8 +134,7 @@ public:
// auto-styles // auto-styles
/// parse chart and collect all auto-styles used in current pool /// parse chart and collect all auto-styles used in current pool
void collectAutoStyles( com::sun::star::uno::Reference< void collectAutoStyles( css::uno::Reference< css::chart::XChartDocument > rChartDoc );
com::sun::star::chart::XChartDocument > rChartDoc );
/// write the styles collected into the current pool as <style:style> elements /// write the styles collected into the current pool as <style:style> elements
void exportAutoStyles(); void exportAutoStyles();
@ -151,8 +150,7 @@ public:
which is the outer element of a chart. So these attributes can easily which is the outer element of a chart. So these attributes can easily
be parsed again by the container be parsed again by the container
*/ */
void exportChart( com::sun::star::uno::Reference< void exportChart( css::uno::Reference< css::chart::XChartDocument > rChartDoc,
com::sun::star::chart::XChartDocument > rChartDoc,
bool bIncludeTable ); bool bIncludeTable );
rtl::Reference<XMLPropertySetMapper> GetPropertySetMapper() const; rtl::Reference<XMLPropertySetMapper> GetPropertySetMapper() const;
@ -163,12 +161,10 @@ public:
{ msTableNumberList = rList; } { msTableNumberList = rList; }
void InitRangeSegmentationProperties( void InitRangeSegmentationProperties(
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::chart2::XChartDocument > & xChartDoc );
::com::sun::star::chart2::XChartDocument > & xChartDoc );
static ::com::sun::star::awt::Size getPageSize( static css::awt::Size getPageSize(
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::chart2::XChartDocument > & xChartDoc );
::com::sun::star::chart2::XChartDocument > & xChartDoc );
/** first parseDocument: collect autostyles and store names in this queue /** first parseDocument: collect autostyles and store names in this queue
second parseDocument: export content and use names from this queue second parseDocument: export content and use names from this queue
@ -183,20 +179,19 @@ public:
{ return mrAutoStylePool; } { return mrAutoStylePool; }
/// if bExportContent is false the auto-styles are collected /// if bExportContent is false the auto-styles are collected
void parseDocument( com::sun::star::uno::Reference< void parseDocument( css::uno::Reference< css::chart::XChartDocument >& rChartDoc,
com::sun::star::chart::XChartDocument >& rChartDoc,
bool bExportContent, bool bExportContent,
bool bIncludeTable = false ); bool bIncludeTable = false );
void exportTable(); void exportTable();
void exportPlotArea( void exportPlotArea(
com::sun::star::uno::Reference< com::sun::star::chart::XDiagram > xDiagram, css::uno::Reference< css::chart::XDiagram > xDiagram,
com::sun::star::uno::Reference< com::sun::star::chart2::XDiagram > xNewDiagram, css::uno::Reference< css::chart2::XDiagram > xNewDiagram,
const ::com::sun::star::awt::Size & rPageSize, const css::awt::Size & rPageSize,
bool bExportContent, bool bExportContent,
bool bIncludeTable ); bool bIncludeTable );
void exportCoordinateRegion( const com::sun::star::uno::Reference< com::sun::star::chart::XDiagram >& xDiagram ); void exportCoordinateRegion( const css::uno::Reference< css::chart::XDiagram >& xDiagram );
void exportAxes( const com::sun::star::uno::Reference< com::sun::star::chart::XDiagram > & xDiagram, void exportAxes( const css::uno::Reference< css::chart::XDiagram > & xDiagram,
const com::sun::star::uno::Reference< com::sun::star::chart2::XDiagram > & xNewDiagram, const css::uno::Reference< css::chart2::XDiagram > & xNewDiagram,
bool bExportContent ); bool bExportContent );
void exportAxis( enum XMLTokenEnum eDimension, enum XMLTokenEnum eAxisName, void exportAxis( enum XMLTokenEnum eDimension, enum XMLTokenEnum eAxisName,
const Reference< beans::XPropertySet >& rAxisProps, const Reference< chart2::XAxis >& rChart2Axis, const Reference< beans::XPropertySet >& rAxisProps, const Reference< chart2::XAxis >& rChart2Axis,
@ -207,46 +202,42 @@ public:
void exportAxisTitle( const Reference< beans::XPropertySet >& rTitleProps, bool bExportContent ); void exportAxisTitle( const Reference< beans::XPropertySet >& rTitleProps, bool bExportContent );
void exportSeries( void exportSeries(
const com::sun::star::uno::Reference< com::sun::star::chart2::XDiagram > & xNewDiagram, const css::uno::Reference< css::chart2::XDiagram > & xNewDiagram,
const ::com::sun::star::awt::Size & rPageSize, const css::awt::Size & rPageSize,
bool bExportContent, bool bExportContent,
bool bHasTwoYAxes ); bool bHasTwoYAxes );
void exportPropertyMapping( void exportPropertyMapping(
const com::sun::star::uno::Reference< com::sun::star::chart2::data::XDataSource > & xSource, const css::uno::Reference< css::chart2::data::XDataSource > & xSource,
Sequence< OUString >& rSupportedMappings ); Sequence< OUString >& rSupportedMappings );
void exportCandleStickSeries( void exportCandleStickSeries(
const ::com::sun::star::uno::Sequence< const css::uno::Sequence<
::com::sun::star::uno::Reference< css::uno::Reference< css::chart2::XDataSeries > > & aSeriesSeq,
::com::sun::star::chart2::XDataSeries > > & aSeriesSeq, const css::uno::Reference< css::chart2::XDiagram > & xDiagram,
const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XDiagram > & xDiagram,
bool bJapaneseCandleSticks, bool bJapaneseCandleSticks,
bool bExportContent ); bool bExportContent );
void exportDataPoints( void exportDataPoints(
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::beans::XPropertySet > & xSeriesProperties,
::com::sun::star::beans::XPropertySet > & xSeriesProperties,
sal_Int32 nSeriesLength, sal_Int32 nSeriesLength,
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::chart2::XDiagram > & xDiagram,
::com::sun::star::chart2::XDiagram > & xDiagram,
bool bExportContent ); bool bExportContent );
void exportRegressionCurve( void exportRegressionCurve(
const com::sun::star::uno::Reference<com::sun::star::chart2::XDataSeries>& xSeries, const css::uno::Reference<css::chart2::XDataSeries>& xSeries,
const com::sun::star::awt::Size& rPageSize, const css::awt::Size& rPageSize,
bool bExportContent ); bool bExportContent );
void exportErrorBar ( void exportErrorBar (
const ::com::sun::star::uno::Reference<beans::XPropertySet> &xSeriesProp, bool bYError, const css::uno::Reference<beans::XPropertySet> &xSeriesProp, bool bYError,
bool bExportContent ); bool bExportContent );
/// add svg position as attribute for current element /// add svg position as attribute for current element
void addPosition( const ::com::sun::star::awt::Point & rPosition ); void addPosition( const css::awt::Point & rPosition );
void addPosition( com::sun::star::uno::Reference< com::sun::star::drawing::XShape > xShape ); void addPosition( css::uno::Reference< css::drawing::XShape > xShape );
/// add svg size as attribute for current element /// add svg size as attribute for current element
void addSize( const ::com::sun::star::awt::Size & rSize, bool bIsOOoNamespace = false ); void addSize( const css::awt::Size & rSize, bool bIsOOoNamespace = false );
void addSize( com::sun::star::uno::Reference< com::sun::star::drawing::XShape > xShape, bool bIsOOoNamespace = false ); void addSize( css::uno::Reference< css::drawing::XShape > xShape, bool bIsOOoNamespace = false );
/// exports a string as a paragraph element /// exports a string as a paragraph element
void exportText( const OUString& rText, bool bConvertTabsLFs = false ); void exportText( const OUString& rText, bool bConvertTabsLFs = false );
@ -266,14 +257,14 @@ public:
bool mbRowSourceColumns; bool mbRowSourceColumns;
OUString msChartAddress; OUString msChartAddress;
OUString msTableNumberList; OUString msTableNumberList;
::com::sun::star::uno::Sequence< sal_Int32 > maSequenceMapping; css::uno::Sequence< sal_Int32 > maSequenceMapping;
OUString msCLSID; OUString msCLSID;
OUString maSrcShellID; OUString maSrcShellID;
OUString maDestShellID; OUString maDestShellID;
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > mxAdditionalShapes; css::uno::Reference< css::drawing::XShapes > mxAdditionalShapes;
tDataSequenceCont m_aDataSequencesToExport; tDataSequenceCont m_aDataSequencesToExport;
OUString maCategoriesRange; OUString maCategoriesRange;
@ -1089,7 +1080,7 @@ void SchXMLExportHelper_Impl::exportChart( Reference< chart::XChartDocument > rC
SAL_WARN_IF( !maAutoStyleNameQueue.empty(), "xmloff.chart", "There are still remaining autostyle names in the queue" ); SAL_WARN_IF( !maAutoStyleNameQueue.empty(), "xmloff.chart", "There are still remaining autostyle names in the queue" );
} }
static OUString lcl_GetStringFromNumberSequence( const ::com::sun::star::uno::Sequence< sal_Int32 >& rSequenceMapping, bool bRemoveOneFromEachIndex /*should be true if having categories*/ ) static OUString lcl_GetStringFromNumberSequence( const css::uno::Sequence< sal_Int32 >& rSequenceMapping, bool bRemoveOneFromEachIndex /*should be true if having categories*/ )
{ {
const sal_Int32* pArray = rSequenceMapping.getConstArray(); const sal_Int32* pArray = rSequenceMapping.getConstArray();
const sal_Int32 nSize = rSequenceMapping.getLength(); const sal_Int32 nSize = rSequenceMapping.getLength();
@ -2119,10 +2110,10 @@ namespace
XMLTokenEnum eToken = XML_DAYS; XMLTokenEnum eToken = XML_DAYS;
switch( nTimeUnit ) switch( nTimeUnit )
{ {
case ::com::sun::star::chart::TimeUnit::YEAR: case css::chart::TimeUnit::YEAR:
eToken = XML_YEARS; eToken = XML_YEARS;
break; break;
case ::com::sun::star::chart::TimeUnit::MONTH: case css::chart::TimeUnit::MONTH:
eToken = XML_MONTHS; eToken = XML_MONTHS;
break; break;
default://days default://days
@ -2140,7 +2131,7 @@ void SchXMLExportHelper_Impl::exportDateScale( const Reference< beans::XProperty
chart::TimeIncrement aIncrement; chart::TimeIncrement aIncrement;
if( (rAxisProps->getPropertyValue("TimeIncrement") >>= aIncrement) ) if( (rAxisProps->getPropertyValue("TimeIncrement") >>= aIncrement) )
{ {
sal_Int32 nTimeResolution = ::com::sun::star::chart::TimeUnit::DAY; sal_Int32 nTimeResolution = css::chart::TimeUnit::DAY;
if( aIncrement.TimeResolution >>= nTimeResolution ) if( aIncrement.TimeResolution >>= nTimeResolution )
mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_BASE_TIME_UNIT, lcl_getTimeUnitToken( nTimeResolution ) ); mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_BASE_TIME_UNIT, lcl_getTimeUnitToken( nTimeResolution ) );
@ -2424,7 +2415,7 @@ void SchXMLExportHelper_Impl::exportAxes(
// x axis // x axis
Reference< ::com::sun::star::chart2::XAxis > xNewAxis = lcl_getAxis( xCooSys, XML_X ); Reference< css::chart2::XAxis > xNewAxis = lcl_getAxis( xCooSys, XML_X );
if( xNewAxis.is() ) if( xNewAxis.is() )
{ {
Reference< beans::XPropertySet > xAxisProps( xAxisSupp.is() ? xAxisSupp->getAxis(0) : nullptr, uno::UNO_QUERY ); Reference< beans::XPropertySet > xAxisProps( xAxisSupp.is() ? xAxisSupp->getAxis(0) : nullptr, uno::UNO_QUERY );

2
xmloff/source/chart/SchXMLLegendContext.hxx
View File

@ -27,7 +27,7 @@ public:
SchXMLLegendContext( SchXMLImportHelper& rImpHelper, SvXMLImport& rImport, const OUString& rLocalName ); SchXMLLegendContext( SchXMLImportHelper& rImpHelper, SvXMLImport& rImport, const OUString& rLocalName );
virtual ~SchXMLLegendContext(); virtual ~SchXMLLegendContext();
virtual void StartElement( const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
private: private:
SchXMLImportHelper& mrImportHelper; SchXMLImportHelper& mrImportHelper;

4
xmloff/source/chart/SchXMLParagraphContext.hxx
View File

@ -40,13 +40,13 @@ public:
OUString& rText, OUString& rText,
OUString * pOutId = nullptr ); OUString * pOutId = nullptr );
virtual ~SchXMLParagraphContext(); virtual ~SchXMLParagraphContext();
virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
virtual void EndElement() override; virtual void EndElement() override;
virtual SvXMLImportContext* CreateChildContext( virtual SvXMLImportContext* CreateChildContext(
sal_uInt16 nPrefix, sal_uInt16 nPrefix,
const OUString& rLocalName, const OUString& rLocalName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
virtual void Characters( const OUString& rChars ) override; virtual void Characters( const OUString& rChars ) override;
}; };

20
xmloff/source/chart/SchXMLPlotAreaContext.cxx
View File

@ -608,8 +608,7 @@ void SchXMLPlotAreaContext::EndElement()
SchXMLDataPointContext::SchXMLDataPointContext( SvXMLImport& rImport, const OUString& rLocalName, SchXMLDataPointContext::SchXMLDataPointContext( SvXMLImport& rImport, const OUString& rLocalName,
::std::list< DataRowPointStyle >& rStyleList, ::std::list< DataRowPointStyle >& rStyleList,
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::chart2::XDataSeries >& xSeries,
::com::sun::star::chart2::XDataSeries >& xSeries,
sal_Int32& rIndex, sal_Int32& rIndex,
bool bSymbolSizeForSeriesIsMissingInFile ) : bool bSymbolSizeForSeriesIsMissingInFile ) :
SvXMLImportContext( rImport, XML_NAMESPACE_CHART, rLocalName ), SvXMLImportContext( rImport, XML_NAMESPACE_CHART, rLocalName ),
@ -908,9 +907,9 @@ static void lcl_setErrorBarSequence ( const uno::Reference< chart2::XChartDocume
bool bPositiveValue, bool bYError, bool bPositiveValue, bool bYError,
tSchXMLLSequencesPerIndex& rSequences) tSchXMLLSequencesPerIndex& rSequences)
{ {
uno::Reference< com::sun::star::chart2::data::XDataProvider > xDataProvider(xDoc->getDataProvider()); uno::Reference< css::chart2::data::XDataProvider > xDataProvider(xDoc->getDataProvider());
uno::Reference< com::sun::star::chart2::data::XDataSource > xDataSource( xBarProp, uno::UNO_QUERY ); uno::Reference< css::chart2::data::XDataSource > xDataSource( xBarProp, uno::UNO_QUERY );
uno::Reference< com::sun::star::chart2::data::XDataSink > xDataSink( xDataSource, uno::UNO_QUERY ); uno::Reference< css::chart2::data::XDataSink > xDataSink( xDataSource, uno::UNO_QUERY );
assert( xDataSink.is() && xDataSource.is() && xDataProvider.is() ); assert( xDataSink.is() && xDataSource.is() && xDataProvider.is() );
@ -968,8 +967,7 @@ SchXMLStatisticsObjectContext::SchXMLStatisticsObjectContext(
const OUString& rLocalName, const OUString& rLocalName,
const OUString &rSeriesStyleName, const OUString &rSeriesStyleName,
::std::list< DataRowPointStyle >& rStyleList, ::std::list< DataRowPointStyle >& rStyleList,
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::chart2::XDataSeries >& xSeries,
::com::sun::star::chart2::XDataSeries >& xSeries,
ContextType eContextType, ContextType eContextType,
const awt::Size & rChartSize, const awt::Size & rChartSize,
tSchXMLLSequencesPerIndex & rLSequencesPerIndex) : tSchXMLLSequencesPerIndex & rLSequencesPerIndex) :
@ -1018,7 +1016,7 @@ void SetErrorBarPropertiesFromStyleName( const OUString& aStyleName, uno::Refere
if ( aAny.hasValue() ) if ( aAny.hasValue() )
{ {
sal_Int32 aBarStyle = com::sun::star::chart::ErrorBarStyle::NONE; sal_Int32 aBarStyle = css::chart::ErrorBarStyle::NONE;
aAny >>= aBarStyle; aAny >>= aBarStyle;
xBarProp->setPropertyValue("ErrorBarStyle", aAny); xBarProp->setPropertyValue("ErrorBarStyle", aAny);
@ -1085,7 +1083,7 @@ void SetErrorBarPropertiesFromStyleName( const OUString& aStyleName, uno::Refere
aAny = SchXMLTools::getPropertyFromContext("PercentageError", aAny = SchXMLTools::getPropertyFromContext("PercentageError",
pSeriesStyleContext, pStylesCtxt); pSeriesStyleContext, pStylesCtxt);
if( aAny.hasValue() && aBarStyle == com::sun::star::chart::ErrorBarStyle::RELATIVE ) if( aAny.hasValue() && aBarStyle == css::chart::ErrorBarStyle::RELATIVE )
{ {
xBarProp->setPropertyValue("PositiveError", aAny); xBarProp->setPropertyValue("PositiveError", aAny);
xBarProp->setPropertyValue("NegativeError", aAny); xBarProp->setPropertyValue("NegativeError", aAny);
@ -1093,7 +1091,7 @@ void SetErrorBarPropertiesFromStyleName( const OUString& aStyleName, uno::Refere
switch(aBarStyle) switch(aBarStyle)
{ {
case com::sun::star::chart::ErrorBarStyle::ERROR_MARGIN: case css::chart::ErrorBarStyle::ERROR_MARGIN:
{ {
aAny = SchXMLTools::getPropertyFromContext("NegativeError", aAny = SchXMLTools::getPropertyFromContext("NegativeError",
pSeriesStyleContext,pStylesCtxt); pSeriesStyleContext,pStylesCtxt);
@ -1161,7 +1159,7 @@ void SchXMLStatisticsObjectContext::StartElement( const uno::Reference< xml::sax
uno::Reference< beans::XPropertySet > xBarProp( xFact->createInstance("com.sun.star.chart2.ErrorBar" ), uno::Reference< beans::XPropertySet > xBarProp( xFact->createInstance("com.sun.star.chart2.ErrorBar" ),
uno::UNO_QUERY ); uno::UNO_QUERY );
xBarProp->setPropertyValue("ErrorBarStyle",uno::makeAny(com::sun::star::chart::ErrorBarStyle::NONE)); xBarProp->setPropertyValue("ErrorBarStyle",uno::makeAny(css::chart::ErrorBarStyle::NONE));
xBarProp->setPropertyValue("PositiveError",uno::makeAny(static_cast<double>(0.0))); xBarProp->setPropertyValue("PositiveError",uno::makeAny(static_cast<double>(0.0)));
xBarProp->setPropertyValue("NegativeError",uno::makeAny(static_cast<double>(0.0))); xBarProp->setPropertyValue("NegativeError",uno::makeAny(static_cast<double>(0.0)));
xBarProp->setPropertyValue("Weight",uno::makeAny(static_cast<double>(1.0))); xBarProp->setPropertyValue("Weight",uno::makeAny(static_cast<double>(1.0)));

63
xmloff/source/chart/SchXMLPlotAreaContext.hxx
View File

@ -48,7 +48,7 @@ public:
explicit SchXML3DSceneAttributesHelper( SvXMLImport& rImporter ); explicit SchXML3DSceneAttributesHelper( SvXMLImport& rImporter );
virtual ~SchXML3DSceneAttributesHelper(); virtual ~SchXML3DSceneAttributesHelper();
void getCameraDefaultFromDiagram( const ::com::sun::star::uno::Reference< com::sun::star::chart::XDiagram >& xDiagram ); void getCameraDefaultFromDiagram( const css::uno::Reference< css::chart::XDiagram >& xDiagram );
private: private:
SchXML3DSceneAttributesHelper(); SchXML3DSceneAttributesHelper();
@ -65,7 +65,7 @@ public:
bool hasPosSize() const; bool hasPosSize() const;
bool isAutomatic() const; bool isAutomatic() const;
::com::sun::star::awt::Rectangle getRectangle() const { return css::awt::Rectangle( m_aPosition.X, m_aPosition.Y, m_aSize.Width, m_aSize.Height );} css::awt::Rectangle getRectangle() const { return css::awt::Rectangle( m_aPosition.X, m_aPosition.Y, m_aSize.Width, m_aSize.Height );}
private: private:
bool hasSize() const; bool hasSize() const;
@ -73,8 +73,8 @@ private:
SvXMLImport& m_rImport; SvXMLImport& m_rImport;
::com::sun::star::awt::Point m_aPosition; css::awt::Point m_aPosition;
::com::sun::star::awt::Size m_aSize; css::awt::Size m_aSize;
bool m_bHasSizeWidth; bool m_bHasSizeWidth;
bool m_bHasSizeHeight; bool m_bHasSizeHeight;
@ -96,24 +96,24 @@ public:
bool & rAllRangeAddressesAvailable, bool & rAllRangeAddressesAvailable,
bool & rColHasLabels, bool & rColHasLabels,
bool & rRowHasLabels, bool & rRowHasLabels,
::com::sun::star::chart::ChartDataRowSource & rDataRowSource, css::chart::ChartDataRowSource & rDataRowSource,
SeriesDefaultsAndStyles& rSeriesDefaultsAndStyles, SeriesDefaultsAndStyles& rSeriesDefaultsAndStyles,
const OUString& aChartTypeServiceName, const OUString& aChartTypeServiceName,
tSchXMLLSequencesPerIndex & rLSequencesPerIndex, tSchXMLLSequencesPerIndex & rLSequencesPerIndex,
const ::com::sun::star::awt::Size & rChartSize ); const css::awt::Size & rChartSize );
virtual ~SchXMLPlotAreaContext(); virtual ~SchXMLPlotAreaContext();
virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
virtual SvXMLImportContext* CreateChildContext( virtual SvXMLImportContext* CreateChildContext(
sal_uInt16 nPrefix, sal_uInt16 nPrefix,
const OUString& rLocalName, const OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
virtual void EndElement() override; virtual void EndElement() override;
private: private:
SchXMLImportHelper& mrImportHelper; SchXMLImportHelper& mrImportHelper;
::com::sun::star::uno::Reference< com::sun::star::chart::XDiagram > mxDiagram; css::uno::Reference< css::chart::XDiagram > mxDiagram;
::com::sun::star::uno::Reference< com::sun::star::chart2::XChartDocument > mxNewDoc; css::uno::Reference< css::chart2::XChartDocument > mxNewDoc;
::std::vector< SchXMLAxis > maAxes; ::std::vector< SchXMLAxis > maAxes;
OUString& mrCategoriesAddress; OUString& mrCategoriesAddress;
SeriesDefaultsAndStyles& mrSeriesDefaultsAndStyles; SeriesDefaultsAndStyles& mrSeriesDefaultsAndStyles;
@ -133,33 +133,32 @@ private:
bool& m_rbHasRangeAtPlotArea; bool& m_rbHasRangeAtPlotArea;
bool & mrColHasLabels; bool & mrColHasLabels;
bool & mrRowHasLabels; bool & mrRowHasLabels;
::com::sun::star::chart::ChartDataRowSource & mrDataRowSource; css::chart::ChartDataRowSource & mrDataRowSource;
OUString maChartTypeServiceName; OUString maChartTypeServiceName;
tSchXMLLSequencesPerIndex & mrLSequencesPerIndex; tSchXMLLSequencesPerIndex & mrLSequencesPerIndex;
bool mbGlobalChartTypeUsedBySeries; bool mbGlobalChartTypeUsedBySeries;
::com::sun::star::awt::Size maChartSize; css::awt::Size maChartSize;
}; };
class SchXMLDataPointContext : public SvXMLImportContext class SchXMLDataPointContext : public SvXMLImportContext
{ {
private: private:
::std::list< DataRowPointStyle >& mrStyleList; ::std::list< DataRowPointStyle >& mrStyleList;
::com::sun::star::uno::Reference< css::uno::Reference< css::chart2::XDataSeries > m_xSeries;
::com::sun::star::chart2::XDataSeries > m_xSeries;
sal_Int32& mrIndex; sal_Int32& mrIndex;
bool mbSymbolSizeForSeriesIsMissingInFile; bool mbSymbolSizeForSeriesIsMissingInFile;
public: public:
SchXMLDataPointContext( SvXMLImport& rImport, const OUString& rLocalName, SchXMLDataPointContext( SvXMLImport& rImport, const OUString& rLocalName,
::std::list< DataRowPointStyle >& rStyleList, ::std::list< DataRowPointStyle >& rStyleList,
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::chart2::XDataSeries >& xSeries,
::com::sun::star::chart2::XDataSeries >& xSeries, sal_Int32& rIndex, sal_Int32& rIndex,
bool bSymbolSizeForSeriesIsMissingInFile ); bool bSymbolSizeForSeriesIsMissingInFile );
virtual ~SchXMLDataPointContext(); virtual ~SchXMLDataPointContext();
virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
}; };
class SchXMLCoordinateRegionContext : public SvXMLImportContext class SchXMLCoordinateRegionContext : public SvXMLImportContext
@ -171,7 +170,7 @@ public:
, const OUString& rLocalName , const OUString& rLocalName
, SchXMLPositonAttributesHelper& rPositioning ); , SchXMLPositonAttributesHelper& rPositioning );
virtual ~SchXMLCoordinateRegionContext(); virtual ~SchXMLCoordinateRegionContext();
virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
private: private:
SchXMLPositonAttributesHelper& m_rPositioning; SchXMLPositonAttributesHelper& m_rPositioning;
@ -188,7 +187,7 @@ public:
private: private:
SchXMLImportHelper& mrImportHelper; SchXMLImportHelper& mrImportHelper;
::com::sun::star::uno::Reference< ::com::sun::star::chart::X3DDisplay > mxWallFloorSupplier; css::uno::Reference< css::chart::X3DDisplay > mxWallFloorSupplier;
ContextType meContextType; ContextType meContextType;
public: public:
@ -196,10 +195,10 @@ public:
SvXMLImport& rImport, SvXMLImport& rImport,
sal_uInt16 nPrefix, sal_uInt16 nPrefix,
const OUString& rLocalName, const OUString& rLocalName,
::com::sun::star::uno::Reference< ::com::sun::star::chart::XDiagram >& xDiagram, css::uno::Reference< css::chart::XDiagram >& xDiagram,
ContextType eContextType ); ContextType eContextType );
virtual ~SchXMLWallFloorContext(); virtual ~SchXMLWallFloorContext();
virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
}; };
class SchXMLStockContext : public SvXMLImportContext class SchXMLStockContext : public SvXMLImportContext
@ -214,7 +213,7 @@ public:
private: private:
SchXMLImportHelper& mrImportHelper; SchXMLImportHelper& mrImportHelper;
::com::sun::star::uno::Reference< ::com::sun::star::chart::XStatisticDisplay > mxStockPropProvider; css::uno::Reference< css::chart::XStatisticDisplay > mxStockPropProvider;
ContextType meContextType; ContextType meContextType;
public: public:
@ -222,10 +221,10 @@ public:
SvXMLImport& rImport, SvXMLImport& rImport,
sal_uInt16 nPrefix, sal_uInt16 nPrefix,
const OUString& rLocalName, const OUString& rLocalName,
::com::sun::star::uno::Reference< ::com::sun::star::chart::XDiagram >& xDiagram, css::uno::Reference< css::chart::XDiagram >& xDiagram,
ContextType eContextType ); ContextType eContextType );
virtual ~SchXMLStockContext(); virtual ~SchXMLStockContext();
virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
}; };
class SchXMLStatisticsObjectContext : public SvXMLImportContext class SchXMLStatisticsObjectContext : public SvXMLImportContext
@ -244,27 +243,25 @@ public:
const OUString& rLocalName, const OUString& rLocalName,
const OUString &rSeriesStyleName, const OUString &rSeriesStyleName,
::std::list< DataRowPointStyle >& rStyleList, ::std::list< DataRowPointStyle >& rStyleList,
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::chart2::XDataSeries >& xSeries,
::com::sun::star::chart2::XDataSeries >& xSeries,
ContextType eContextType, ContextType eContextType,
const ::com::sun::star::awt::Size & rChartSize, const css::awt::Size & rChartSize,
tSchXMLLSequencesPerIndex & rLSequencesPerIndex ); tSchXMLLSequencesPerIndex & rLSequencesPerIndex );
virtual ~SchXMLStatisticsObjectContext(); virtual ~SchXMLStatisticsObjectContext();
virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
virtual SvXMLImportContext* CreateChildContext( virtual SvXMLImportContext* CreateChildContext(
sal_uInt16 nPrefix, sal_uInt16 nPrefix,
const OUString& rLocalName, const OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
private: private:
SchXMLImportHelper & mrImportHelper; SchXMLImportHelper & mrImportHelper;
::std::list< DataRowPointStyle > & mrStyleList; ::std::list< DataRowPointStyle > & mrStyleList;
::com::sun::star::uno::Reference< css::uno::Reference< css::chart2::XDataSeries > m_xSeries;
::com::sun::star::chart2::XDataSeries > m_xSeries;
ContextType meContextType; ContextType meContextType;
::com::sun::star::awt::Size maChartSize; css::awt::Size maChartSize;
OUString maSeriesStyleName; OUString maSeriesStyleName;
tSchXMLLSequencesPerIndex& mrLSequencesPerIndex; tSchXMLLSequencesPerIndex& mrLSequencesPerIndex;
}; };

10
xmloff/source/chart/SchXMLPropertyMappingContext.hxx
View File

@ -29,17 +29,17 @@ public:
SchXMLPropertyMappingContext( SchXMLImportHelper& rImpHelper, SchXMLPropertyMappingContext( SchXMLImportHelper& rImpHelper,
SvXMLImport& rImport, const OUString& rLocalName, SvXMLImport& rImport, const OUString& rLocalName,
tSchXMLLSequencesPerIndex& rLSequencesPerIndex, tSchXMLLSequencesPerIndex& rLSequencesPerIndex,
com::sun::star::uno::Reference< css::uno::Reference<
com::sun::star::chart2::XDataSeries > xSeries ); css::chart2::XDataSeries > xSeries );
virtual ~SchXMLPropertyMappingContext(); virtual ~SchXMLPropertyMappingContext();
virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
private: private:
com::sun::star::uno::Reference< com::sun::star::chart2::XChartDocument > mxChartDocument; css::uno::Reference< css::chart2::XChartDocument > mxChartDocument;
SchXMLImportHelper& mrImportHelper; SchXMLImportHelper& mrImportHelper;
com::sun::star::uno::Reference< com::sun::star::chart2::XDataSeries > mxDataSeries; css::uno::Reference< css::chart2::XDataSeries > mxDataSeries;
tSchXMLLSequencesPerIndex& mrLSequencesPerIndex; tSchXMLLSequencesPerIndex& mrLSequencesPerIndex;

25
xmloff/source/chart/SchXMLRegressionCurveObjectContext.hxx
View File

@ -36,23 +36,22 @@ public:
sal_uInt16 nPrefix, sal_uInt16 nPrefix,
const OUString& rLocalName, const OUString& rLocalName,
std::list< RegressionStyle >& rRegressionStyleList, std::list< RegressionStyle >& rRegressionStyleList,
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::chart2::XDataSeries >& xSeries,
::com::sun::star::chart2::XDataSeries >& xSeries, const css::awt::Size & rChartSize );
const ::com::sun::star::awt::Size & rChartSize );
virtual ~SchXMLRegressionCurveObjectContext(); virtual ~SchXMLRegressionCurveObjectContext();
virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
virtual SvXMLImportContext* CreateChildContext( virtual SvXMLImportContext* CreateChildContext(
sal_uInt16 nPrefix, sal_uInt16 nPrefix,
const OUString& rLocalName, const OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
private: private:
SchXMLImportHelper& mrImportHelper; SchXMLImportHelper& mrImportHelper;
com::sun::star::uno::Reference<com::sun::star::chart2::XDataSeries > mxSeries; css::uno::Reference<css::chart2::XDataSeries > mxSeries;
com::sun::star::awt::Size maChartSize; css::awt::Size maChartSize;
std::list< RegressionStyle >& mrRegressionStyleList; std::list< RegressionStyle >& mrRegressionStyleList;
}; };
@ -64,21 +63,19 @@ public:
SvXMLImport& rImport, SvXMLImport& rImport,
sal_uInt16 nPrefix, sal_uInt16 nPrefix,
const OUString& rLocalName, const OUString& rLocalName,
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::chart2::XDataSeries >& xSeries,
::com::sun::star::chart2::XDataSeries >& xSeries, const css::awt::Size & rChartSize,
const ::com::sun::star::awt::Size & rChartSize,
RegressionStyle & rRegressionStyle ); RegressionStyle & rRegressionStyle );
virtual ~SchXMLEquationContext(); virtual ~SchXMLEquationContext();
virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
private: private:
SchXMLImportHelper& mrImportHelper; SchXMLImportHelper& mrImportHelper;
RegressionStyle& mrRegressionStyle; RegressionStyle& mrRegressionStyle;
::com::sun::star::uno::Reference< css::uno::Reference< css::chart2::XDataSeries > mxSeries;
::com::sun::star::chart2::XDataSeries > mxSeries; css::awt::Size maChartSize;
::com::sun::star::awt::Size maChartSize;
}; };
#endif // INCLUDED_XMLOFF_SOURCE_CHART_SCHXMLREGRESSIONCURVEOBJECTCONTEXT_HXX #endif // INCLUDED_XMLOFF_SOURCE_CHART_SCHXMLREGRESSIONCURVEOBJECTCONTEXT_HXX

18
xmloff/source/chart/SchXMLSeries2Context.hxx
View File

@ -43,13 +43,12 @@ class SchXMLSeries2Context : public SvXMLImportContext
{ {
private: private:
SchXMLImportHelper& mrImportHelper; SchXMLImportHelper& mrImportHelper;
::com::sun::star::uno::Reference< css::uno::Reference< css::chart2::XChartDocument > mxNewDoc;
::com::sun::star::chart2::XChartDocument > mxNewDoc;
::std::vector< SchXMLAxis >& mrAxes; ::std::vector< SchXMLAxis >& mrAxes;
::std::list< DataRowPointStyle >& mrStyleList; ::std::list< DataRowPointStyle >& mrStyleList;
::std::list< RegressionStyle >& mrRegressionStyleList; ::std::list< RegressionStyle >& mrRegressionStyleList;
::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > m_xSeries; css::uno::Reference< css::chart2::XDataSeries > m_xSeries;
sal_Int32 mnSeriesIndex; sal_Int32 mnSeriesIndex;
sal_Int32 mnDataPointIndex; sal_Int32 mnDataPointIndex;
bool m_bStockHasVolume; bool m_bStockHasVolume;
@ -68,13 +67,12 @@ private:
tSchXMLLSequencesPerIndex maPostponedSequences; tSchXMLLSequencesPerIndex maPostponedSequences;
bool& mrGlobalChartTypeUsedBySeries; bool& mrGlobalChartTypeUsedBySeries;
bool mbSymbolSizeIsMissingInFile; bool mbSymbolSizeIsMissingInFile;
::com::sun::star::awt::Size maChartSize; css::awt::Size maChartSize;
public: public:
SchXMLSeries2Context( SchXMLImportHelper& rImpHelper, SchXMLSeries2Context( SchXMLImportHelper& rImpHelper,
SvXMLImport& rImport, const OUString& rLocalName, SvXMLImport& rImport, const OUString& rLocalName,
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::chart2::XChartDocument > & xNewDoc,
::com::sun::star::chart2::XChartDocument > & xNewDoc,
std::vector< SchXMLAxis >& rAxes, std::vector< SchXMLAxis >& rAxes,
::std::list< DataRowPointStyle >& rStyleList, ::std::list< DataRowPointStyle >& rStyleList,
::std::list< RegressionStyle >& rRegressionStyleList, ::std::list< RegressionStyle >& rRegressionStyleList,
@ -84,18 +82,18 @@ public:
const OUString & aGlobalChartTypeName, const OUString & aGlobalChartTypeName,
tSchXMLLSequencesPerIndex & rLSequencesPerIndex, tSchXMLLSequencesPerIndex & rLSequencesPerIndex,
bool& rGlobalChartTypeUsedBySeries, bool& rGlobalChartTypeUsedBySeries,
const ::com::sun::star::awt::Size & rChartSize ); const css::awt::Size & rChartSize );
virtual ~SchXMLSeries2Context(); virtual ~SchXMLSeries2Context();
virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
virtual SvXMLImportContext* CreateChildContext( virtual SvXMLImportContext* CreateChildContext(
sal_uInt16 nPrefix, sal_uInt16 nPrefix,
const OUString& rLocalName, const OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
virtual void EndElement() override; virtual void EndElement() override;
static void initSeriesPropertySets( SeriesDefaultsAndStyles& rSeriesDefaultsAndStyles static void initSeriesPropertySets( SeriesDefaultsAndStyles& rSeriesDefaultsAndStyles
, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel ); , const css::uno::Reference< css::frame::XModel >& xChartModel );
static void setDefaultsToSeries( SeriesDefaultsAndStyles& rSeriesDefaultsAndStyles ); static void setDefaultsToSeries( SeriesDefaultsAndStyles& rSeriesDefaultsAndStyles );

2
xmloff/source/chart/SchXMLTableContext.cxx
View File

@ -601,7 +601,7 @@ public:
virtual SvXMLImportContext* CreateChildContext( virtual SvXMLImportContext* CreateChildContext(
sal_uInt16 nPrefix, sal_uInt16 nPrefix,
const OUString& rLocalName, const OUString& rLocalName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
virtual void EndElement() override; virtual void EndElement() override;
}; };

30
xmloff/source/chart/SchXMLTableContext.hxx
View File

@ -43,8 +43,8 @@ private:
bool mbHasRowPermutation; bool mbHasRowPermutation;
bool mbHasColumnPermutation; bool mbHasColumnPermutation;
::com::sun::star::uno::Sequence< sal_Int32 > maRowPermutation; css::uno::Sequence< sal_Int32 > maRowPermutation;
::com::sun::star::uno::Sequence< sal_Int32 > maColumnPermutation; css::uno::Sequence< sal_Int32 > maColumnPermutation;
public: public:
SchXMLTableContext( SchXMLImportHelper& rImpHelper, SchXMLTableContext( SchXMLImportHelper& rImpHelper,
@ -56,27 +56,27 @@ public:
virtual SvXMLImportContext* CreateChildContext( virtual SvXMLImportContext* CreateChildContext(
sal_uInt16 nPrefix, sal_uInt16 nPrefix,
const OUString& rLocalName, const OUString& rLocalName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
virtual void EndElement() override; virtual void EndElement() override;
void setRowPermutation( const ::com::sun::star::uno::Sequence< sal_Int32 > & rPermutation ); void setRowPermutation( const css::uno::Sequence< sal_Int32 > & rPermutation );
void setColumnPermutation( const ::com::sun::star::uno::Sequence< sal_Int32 > & rPermutation ); void setColumnPermutation( const css::uno::Sequence< sal_Int32 > & rPermutation );
}; };
class SchXMLTableHelper class SchXMLTableHelper
{ {
public: public:
static void applyTableToInternalDataProvider( const SchXMLTable& rTable, static void applyTableToInternalDataProvider( const SchXMLTable& rTable,
com::sun::star::uno::Reference< com::sun::star::chart2::XChartDocument > xChartDoc ); css::uno::Reference< css::chart2::XChartDocument > xChartDoc );
/** This function reorders local data to fit the correct data structure. /** This function reorders local data to fit the correct data structure.
Call it after the data series got their styles set. Call it after the data series got their styles set.
*/ */
static void switchRangesFromOuterToInternalIfNecessary( const SchXMLTable& rTable, static void switchRangesFromOuterToInternalIfNecessary( const SchXMLTable& rTable,
const tSchXMLLSequencesPerIndex & rLSequencesPerIndex, const tSchXMLLSequencesPerIndex & rLSequencesPerIndex,
com::sun::star::uno::Reference< com::sun::star::chart2::XChartDocument > xChartDoc, css::uno::Reference< css::chart2::XChartDocument > xChartDoc,
::com::sun::star::chart::ChartDataRowSource eDataRowSource ); css::chart::ChartDataRowSource eDataRowSource );
}; };
// classes for columns // classes for columns
@ -100,7 +100,7 @@ public:
virtual SvXMLImportContext* CreateChildContext( virtual SvXMLImportContext* CreateChildContext(
sal_uInt16 nPrefix, sal_uInt16 nPrefix,
const OUString& rLocalName, const OUString& rLocalName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
}; };
class SchXMLTableColumnContext : public SvXMLImportContext class SchXMLTableColumnContext : public SvXMLImportContext
@ -113,7 +113,7 @@ public:
const OUString& rLocalName, const OUString& rLocalName,
SchXMLTable& aTable ); SchXMLTable& aTable );
virtual ~SchXMLTableColumnContext(); virtual ~SchXMLTableColumnContext();
virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
}; };
// classes for rows // classes for rows
@ -134,7 +134,7 @@ public:
virtual SvXMLImportContext* CreateChildContext( virtual SvXMLImportContext* CreateChildContext(
sal_uInt16 nPrefix, sal_uInt16 nPrefix,
const OUString& rLocalName, const OUString& rLocalName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
}; };
class SchXMLTableRowContext : public SvXMLImportContext class SchXMLTableRowContext : public SvXMLImportContext
@ -153,7 +153,7 @@ public:
virtual SvXMLImportContext* CreateChildContext( virtual SvXMLImportContext* CreateChildContext(
sal_uInt16 nPrefix, sal_uInt16 nPrefix,
const OUString& rLocalName, const OUString& rLocalName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
}; };
// classes for cells and their content // classes for cells and their content
@ -177,8 +177,8 @@ public:
virtual SvXMLImportContext* CreateChildContext( virtual SvXMLImportContext* CreateChildContext(
sal_uInt16 nPrefix, sal_uInt16 nPrefix,
const OUString& rLocalName, const OUString& rLocalName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
virtual void EndElement() override; virtual void EndElement() override;
}; };

2
xmloff/source/chart/SchXMLTextListContext.cxx
View File

@ -41,7 +41,7 @@ public:
virtual SvXMLImportContext* CreateChildContext( virtual SvXMLImportContext* CreateChildContext(
sal_uInt16 nPrefix, sal_uInt16 nPrefix,
const OUString& rLocalName, const OUString& rLocalName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
private: private:
OUString& m_rText; OUString& m_rText;

8
xmloff/source/chart/SchXMLTextListContext.hxx
View File

@ -32,18 +32,18 @@ class SchXMLTextListContext : public SvXMLImportContext
public: public:
SchXMLTextListContext( SvXMLImport& rImport, SchXMLTextListContext( SvXMLImport& rImport,
const OUString& rLocalName, const OUString& rLocalName,
::com::sun::star::uno::Sequence< OUString>& rTextList ); css::uno::Sequence< OUString>& rTextList );
virtual ~SchXMLTextListContext(); virtual ~SchXMLTextListContext();
virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
virtual void EndElement() override; virtual void EndElement() override;
virtual SvXMLImportContext* CreateChildContext( virtual SvXMLImportContext* CreateChildContext(
sal_uInt16 nPrefix, sal_uInt16 nPrefix,
const OUString& rLocalName, const OUString& rLocalName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
private: private:
::com::sun::star::uno::Sequence< OUString>& m_rTextList; css::uno::Sequence< OUString>& m_rTextList;
std::vector< OUString> m_aTextVector; std::vector< OUString> m_aTextVector;
}; };

2
xmloff/source/chart/SchXMLTools.cxx
View File

@ -830,7 +830,7 @@ bool isDocumentGeneratedWithOpenOfficeOlderThan2_3( const uno::Reference< frame:
return bResult; return bResult;
} }
bool isDocumentGeneratedWithOpenOfficeOlderThan2_0( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel) bool isDocumentGeneratedWithOpenOfficeOlderThan2_0( const css::uno::Reference< css::frame::XModel >& xChartModel)
{ {
bool bResult = false; bool bResult = false;
OUString aGenerator( lcl_getGeneratorFromModelOrItsParent(xChartModel) ); OUString aGenerator( lcl_getGeneratorFromModelOrItsParent(xChartModel) );

49
xmloff/source/chart/SchXMLTools.hxx
View File

@ -42,14 +42,14 @@ class SvXMLExport;
namespace SchXMLTools namespace SchXMLTools
{ {
bool isDocumentGeneratedWithOpenOfficeOlderThan2_0( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel); bool isDocumentGeneratedWithOpenOfficeOlderThan2_0( const css::uno::Reference< css::frame::XModel >& xChartModel);
bool isDocumentGeneratedWithOpenOfficeOlderThan2_3( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel); bool isDocumentGeneratedWithOpenOfficeOlderThan2_3( const css::uno::Reference< css::frame::XModel >& xChartModel);
bool isDocumentGeneratedWithOpenOfficeOlderThan2_4( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel); bool isDocumentGeneratedWithOpenOfficeOlderThan2_4( const css::uno::Reference< css::frame::XModel >& xChartModel);
bool isDocumentGeneratedWithOpenOfficeOlderThan3_0( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel); bool isDocumentGeneratedWithOpenOfficeOlderThan3_0( const css::uno::Reference< css::frame::XModel >& xChartModel);
bool isDocumentGeneratedWithOpenOfficeOlderThan3_3( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel); bool isDocumentGeneratedWithOpenOfficeOlderThan3_3( const css::uno::Reference< css::frame::XModel >& xChartModel);
void setBuildIDAtImportInfo( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > xModel void setBuildIDAtImportInfo( css::uno::Reference< css::frame::XModel > xModel
, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xImportInfo ); , css::uno::Reference< css::beans::XPropertySet > xImportInfo );
enum SchXMLChartTypeEnum enum SchXMLChartTypeEnum
{ {
@ -78,28 +78,26 @@ namespace SchXMLTools
OUString GetNewChartTypeName( const OUString & rOldChartTypeName ); OUString GetNewChartTypeName( const OUString & rOldChartTypeName );
::com::sun::star::uno::Reference< css::uno::Reference<
::com::sun::star::chart2::data::XLabeledDataSequence2 > GetNewLabeledDataSequence(); css::chart2::data::XLabeledDataSequence2 > GetNewLabeledDataSequence();
::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > CreateDataSequence( css::uno::Reference< css::chart2::data::XDataSequence > CreateDataSequence(
const OUString& rRange, const OUString& rRange,
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::chart2::XChartDocument >& xChartDoc );
::com::sun::star::chart2::XChartDocument >& xChartDoc );
::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > CreateDataSequenceWithoutConvert( css::uno::Reference< css::chart2::data::XDataSequence > CreateDataSequenceWithoutConvert(
const OUString& rRange, const OUString& rRange,
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::chart2::XChartDocument >& xChartDoc );
::com::sun::star::chart2::XChartDocument >& xChartDoc );
void CreateCategories( void CreateCategories(
const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataProvider > & xDataProvider, const css::uno::Reference< css::chart2::data::XDataProvider > & xDataProvider,
const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > & xNewDoc, const css::uno::Reference< css::chart2::XChartDocument > & xNewDoc,
const OUString & rRangeAddress, const OUString & rRangeAddress,
sal_Int32 nCooSysIndex, sal_Int32 nCooSysIndex,
sal_Int32 nDimensionIndex, sal_Int32 nDimensionIndex,
tSchXMLLSequencesPerIndex * pLSequencesPerIndex = nullptr ); tSchXMLLSequencesPerIndex * pLSequencesPerIndex = nullptr );
::com::sun::star::uno::Any getPropertyFromContext( const OUString& rPropertyName, const XMLPropStyleContext * pPropStyleContext, const SvXMLStylesContext* pStylesCtxt ); css::uno::Any getPropertyFromContext( const OUString& rPropertyName, const XMLPropStyleContext * pPropStyleContext, const SvXMLStylesContext* pStylesCtxt );
void exportText( SvXMLExport& rExport, const OUString& rText, bool bConvertTabsLFs ); void exportText( SvXMLExport& rExport, const OUString& rText, bool bConvertTabsLFs );
@ -110,8 +108,7 @@ namespace SchXMLTools
given in rXMLRange given in rXMLRange
*/ */
void setXMLRangePropertyAtDataSequence( void setXMLRangePropertyAtDataSequence(
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::chart2::data::XDataSequence > & xDataSequence,
::com::sun::star::chart2::data::XDataSequence > & xDataSequence,
const OUString & rXMLRange ); const OUString & rXMLRange );
/** checks if the data sequence has the property "CachedXMLRange" (true for /** checks if the data sequence has the property "CachedXMLRange" (true for
@ -124,20 +121,18 @@ namespace SchXMLTools
@return true, if the property was found, assigned and is non-empty @return true, if the property was found, assigned and is non-empty
*/ */
bool getXMLRangePropertyFromDataSequence( bool getXMLRangePropertyFromDataSequence(
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::chart2::data::XDataSequence > & xDataSequence,
::com::sun::star::chart2::data::XDataSequence > & xDataSequence,
OUString & rOutXMLRange, OUString & rOutXMLRange,
bool bClearProp = false ); bool bClearProp = false );
::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataProvider > getDataProviderFromParent( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartDoc ); css::uno::Reference< css::chart2::data::XDataProvider > getDataProviderFromParent( const css::uno::Reference< css::chart2::XChartDocument >& xChartDoc );
bool switchBackToDataProviderFromParent( const ::com::sun::star::uno::Reference< bool switchBackToDataProviderFromParent( const css::uno::Reference< css::chart2::XChartDocument >& xChartDoc
::com::sun::star::chart2::XChartDocument >& xChartDoc
, const tSchXMLLSequencesPerIndex & rLSequencesPerIndex ); , const tSchXMLLSequencesPerIndex & rLSequencesPerIndex );
void copyProperties( void copyProperties(
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & xSource, const css::uno::Reference< css::beans::XPropertySet > & xSource,
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & xDestination ); const css::uno::Reference< css::beans::XPropertySet > & xDestination );
} }
#endif // INCLUDED_XMLOFF_SOURCE_CHART_SCHXMLTOOLS_HXX #endif // INCLUDED_XMLOFF_SOURCE_CHART_SCHXMLTOOLS_HXX

16
xmloff/source/chart/XMLAxisPositionPropertyHdl.cxx
View File

@ -50,7 +50,7 @@ bool XMLAxisPositionPropertyHdl::importXML( const OUString& rStrImpValue,
{ {
if( !m_bCrossingValue ) if( !m_bCrossingValue )
{ {
rValue <<= ::com::sun::star::chart::ChartAxisPosition_START; rValue <<= css::chart::ChartAxisPosition_START;
bResult = true; bResult = true;
} }
} }
@ -58,7 +58,7 @@ bool XMLAxisPositionPropertyHdl::importXML( const OUString& rStrImpValue,
{ {
if( !m_bCrossingValue ) if( !m_bCrossingValue )
{ {
rValue <<= ::com::sun::star::chart::ChartAxisPosition_END; rValue <<= css::chart::ChartAxisPosition_END;
bResult = true; bResult = true;
} }
} }
@ -66,7 +66,7 @@ bool XMLAxisPositionPropertyHdl::importXML( const OUString& rStrImpValue,
{ {
if( !m_bCrossingValue ) if( !m_bCrossingValue )
{ {
rValue <<= ::com::sun::star::chart::ChartAxisPosition_ZERO; rValue <<= css::chart::ChartAxisPosition_ZERO;
bResult = true; bResult = true;
} }
} }
@ -74,7 +74,7 @@ bool XMLAxisPositionPropertyHdl::importXML( const OUString& rStrImpValue,
{ {
if( !m_bCrossingValue ) if( !m_bCrossingValue )
{ {
rValue <<= ::com::sun::star::chart::ChartAxisPosition_VALUE; rValue <<= css::chart::ChartAxisPosition_VALUE;
bResult = true; bResult = true;
} }
else else
@ -107,19 +107,19 @@ bool XMLAxisPositionPropertyHdl::exportXML( OUString& rStrExpValue,
} }
else else
{ {
::com::sun::star::chart::ChartAxisPosition ePosition( ::com::sun::star::chart::ChartAxisPosition_ZERO ); css::chart::ChartAxisPosition ePosition( css::chart::ChartAxisPosition_ZERO );
rValue >>= ePosition; rValue >>= ePosition;
switch(ePosition) switch(ePosition)
{ {
case ::com::sun::star::chart::ChartAxisPosition_START: case css::chart::ChartAxisPosition_START:
rStrExpValue = GetXMLToken( XML_START ); rStrExpValue = GetXMLToken( XML_START );
bResult = true; bResult = true;
break; break;
case ::com::sun::star::chart::ChartAxisPosition_END: case css::chart::ChartAxisPosition_END:
rStrExpValue = GetXMLToken( XML_END ); rStrExpValue = GetXMLToken( XML_END );
bResult = true; bResult = true;
break; break;
case ::com::sun::star::chart::ChartAxisPosition_ZERO: case css::chart::ChartAxisPosition_ZERO:
::sax::Converter::convertDouble( sValueBuffer, 0.0 ); ::sax::Converter::convertDouble( sValueBuffer, 0.0 );
rStrExpValue = sValueBuffer.makeStringAndClear(); rStrExpValue = sValueBuffer.makeStringAndClear();
bResult = true; bResult = true;

4
xmloff/source/chart/XMLAxisPositionPropertyHdl.hxx
View File

@ -27,8 +27,8 @@ public:
explicit XMLAxisPositionPropertyHdl( bool bCrossingValue ); explicit XMLAxisPositionPropertyHdl( bool bCrossingValue );
virtual ~XMLAxisPositionPropertyHdl(); virtual ~XMLAxisPositionPropertyHdl();
virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override;
virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override;
private: private:
bool m_bCrossingValue; bool m_bCrossingValue;

6
xmloff/source/chart/XMLChartPropertyContext.hxx
View File

@ -27,8 +27,7 @@ public:
XMLChartPropertyContext( SvXMLImport& rImport, sal_uInt16 nPrfx, XMLChartPropertyContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName, const OUString& rLName,
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList,
::com::sun::star::xml::sax::XAttributeList > & xAttrList,
sal_uInt32 nFamily, sal_uInt32 nFamily,
::std::vector< XMLPropertyState >& rProps, ::std::vector< XMLPropertyState >& rProps,
const rtl::Reference< SvXMLImportPropertyMapper >& rMapper ); const rtl::Reference< SvXMLImportPropertyMapper >& rMapper );
@ -38,8 +37,7 @@ public:
virtual SvXMLImportContext* CreateChildContext( virtual SvXMLImportContext* CreateChildContext(
sal_uInt16 nPrefix, sal_uInt16 nPrefix,
const OUString& rLocalName, const OUString& rLocalName,
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList,
::com::sun::star::xml::sax::XAttributeList > & xAttrList,
::std::vector< XMLPropertyState > &rProperties, ::std::vector< XMLPropertyState > &rProperties,
const XMLPropertyState& rProp ) override; const XMLPropertyState& rProp ) override;

8
xmloff/source/chart/XMLErrorBarStylePropertyHdl.cxx
View File

@ -25,7 +25,7 @@
using namespace com::sun::star; using namespace com::sun::star;
XMLErrorBarStylePropertyHdl::XMLErrorBarStylePropertyHdl( const SvXMLEnumMapEntry* pEnumMap, const ::com::sun::star::uno::Type & rType ) XMLErrorBarStylePropertyHdl::XMLErrorBarStylePropertyHdl( const SvXMLEnumMapEntry* pEnumMap, const css::uno::Type & rType )
: XMLEnumPropertyHdl( pEnumMap, rType ) : XMLEnumPropertyHdl( pEnumMap, rType )
{ {
} }
@ -44,10 +44,10 @@ bool XMLErrorBarStylePropertyHdl::exportXML( OUString& rStrExpValue,
sal_Int32 nValue = 0; sal_Int32 nValue = 0;
if(rValue >>= nValue ) if(rValue >>= nValue )
{ {
if( nValue == ::com::sun::star::chart::ErrorBarStyle::STANDARD_ERROR if( nValue == css::chart::ErrorBarStyle::STANDARD_ERROR
|| nValue == ::com::sun::star::chart::ErrorBarStyle::FROM_DATA ) || nValue == css::chart::ErrorBarStyle::FROM_DATA )
{ {
nValue = ::com::sun::star::chart::ErrorBarStyle::NONE; nValue = css::chart::ErrorBarStyle::NONE;
aValue = uno::makeAny(nValue); aValue = uno::makeAny(nValue);
} }
} }

4
xmloff/source/chart/XMLErrorBarStylePropertyHdl.hxx
View File

@ -24,10 +24,10 @@
class XMLErrorBarStylePropertyHdl : public XMLEnumPropertyHdl class XMLErrorBarStylePropertyHdl : public XMLEnumPropertyHdl
{ {
public: public:
XMLErrorBarStylePropertyHdl( const SvXMLEnumMapEntry* pEnumMap, const ::com::sun::star::uno::Type & rType ); XMLErrorBarStylePropertyHdl( const SvXMLEnumMapEntry* pEnumMap, const css::uno::Type & rType );
virtual ~XMLErrorBarStylePropertyHdl(); virtual ~XMLErrorBarStylePropertyHdl();
virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override;
}; };
#endif // INCLUDED_XMLOFF_SOURCE_CHART_XMLERRORBARSTYLEPROPERTYHDL_HXX #endif // INCLUDED_XMLOFF_SOURCE_CHART_XMLERRORBARSTYLEPROPERTYHDL_HXX

4
xmloff/source/chart/XMLErrorIndicatorPropertyHdl.hxx
View File

@ -31,8 +31,8 @@ public:
{} {}
virtual ~XMLErrorIndicatorPropertyHdl(); virtual ~XMLErrorIndicatorPropertyHdl();
virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override;
virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override;
}; };
#endif // INCLUDED_XMLOFF_SOURCE_CHART_XMLERRORINDICATORPROPERTYHDL_HXX #endif // INCLUDED_XMLOFF_SOURCE_CHART_XMLERRORINDICATORPROPERTYHDL_HXX

4
xmloff/source/chart/XMLLabelSeparatorContext.hxx
View File

@ -31,11 +31,11 @@ public:
::std::vector< XMLPropertyState > &rProps ); ::std::vector< XMLPropertyState > &rProps );
virtual ~XMLLabelSeparatorContext(); virtual ~XMLLabelSeparatorContext();
virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
virtual SvXMLImportContext *CreateChildContext( virtual SvXMLImportContext *CreateChildContext(
sal_uInt16 nPrefix, sal_uInt16 nPrefix,
const OUString& rLocalName, const OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
virtual void EndElement() override; virtual void EndElement() override;
private: private:

6
xmloff/source/chart/XMLSymbolImageContext.hxx
View File

@ -35,16 +35,16 @@ public:
::std::vector< XMLPropertyState > &rProps ); ::std::vector< XMLPropertyState > &rProps );
virtual ~XMLSymbolImageContext(); virtual ~XMLSymbolImageContext();
virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
virtual SvXMLImportContext *CreateChildContext( virtual SvXMLImportContext *CreateChildContext(
sal_uInt16 nPrefix, sal_uInt16 nPrefix,
const OUString& rLocalName, const OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
virtual void EndElement() override; virtual void EndElement() override;
private: private:
OUString msURL; OUString msURL;
::com::sun::star::uno::Reference < ::com::sun::star::io::XOutputStream > mxBase64Stream; css::uno::Reference < css::io::XOutputStream > mxBase64Stream;
}; };
#endif // INCLUDED_XMLOFF_SOURCE_CHART_XMLSYMBOLIMAGECONTEXT_HXX #endif // INCLUDED_XMLOFF_SOURCE_CHART_XMLSYMBOLIMAGECONTEXT_HXX

4
xmloff/source/chart/XMLSymbolTypePropertyHdl.hxx
View File

@ -27,8 +27,8 @@ public:
explicit XMLSymbolTypePropertyHdl( bool bIsNamedSymbol ); explicit XMLSymbolTypePropertyHdl( bool bIsNamedSymbol );
virtual ~XMLSymbolTypePropertyHdl(); virtual ~XMLSymbolTypePropertyHdl();
virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override;
virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override;
private: private:
bool m_bIsNamedSymbol; bool m_bIsNamedSymbol;

4
xmloff/source/chart/XMLTextOrientationHdl.cxx
View File

@ -30,7 +30,7 @@ XMLTextOrientationHdl::~XMLTextOrientationHdl()
bool XMLTextOrientationHdl::importXML( bool XMLTextOrientationHdl::importXML(
const OUString& rStrImpValue, const OUString& rStrImpValue,
::com::sun::star::uno::Any& rValue, css::uno::Any& rValue,
const SvXMLUnitConverter& /*rUnitConverter*/ ) const const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{ {
bool bRetval( false ); bool bRetval( false );
@ -51,7 +51,7 @@ bool XMLTextOrientationHdl::importXML(
bool XMLTextOrientationHdl::exportXML( bool XMLTextOrientationHdl::exportXML(
OUString& rStrExpValue, OUString& rStrExpValue,
const ::com::sun::star::uno::Any& rValue, const css::uno::Any& rValue,
const SvXMLUnitConverter& /*rUnitConverter*/ ) const const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{ {
bool bVal (false ); bool bVal (false );

4
xmloff/source/chart/XMLTextOrientationHdl.hxx
View File

@ -28,10 +28,10 @@ public:
virtual ~XMLTextOrientationHdl(); virtual ~XMLTextOrientationHdl();
virtual bool importXML( const OUString& rStrImpValue, virtual bool importXML( const OUString& rStrImpValue,
::com::sun::star::uno::Any& rValue, css::uno::Any& rValue,
const SvXMLUnitConverter& rUnitConverter ) const override; const SvXMLUnitConverter& rUnitConverter ) const override;
virtual bool exportXML( OUString& rStrExpValue, virtual bool exportXML( OUString& rStrExpValue,
const ::com::sun::star::uno::Any& rValue, const css::uno::Any& rValue,
const SvXMLUnitConverter& rUnitConverter ) const override; const SvXMLUnitConverter& rUnitConverter ) const override;
}; };

8
xmloff/source/chart/contexts.hxx
View File

@ -53,7 +53,7 @@ public:
virtual SvXMLImportContext* CreateChildContext( virtual SvXMLImportContext* CreateChildContext(
sal_uInt16 nPrefix, sal_uInt16 nPrefix,
const OUString& rLocalName, const OUString& rLocalName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
}; };
// context for flat file xml format // context for flat file xml format
@ -65,13 +65,13 @@ public:
SchXMLImportHelper& i_rImpHelper, SchXMLImportHelper& i_rImpHelper,
SchXMLImport& i_rImport, SchXMLImport& i_rImport,
sal_uInt16 i_nPrefix, const OUString & i_rLName, sal_uInt16 i_nPrefix, const OUString & i_rLName,
const com::sun::star::uno::Reference<com::sun::star::document::XDocumentProperties>& i_xDocProps); const css::uno::Reference<css::document::XDocumentProperties>& i_xDocProps);
virtual ~SchXMLFlatDocContext_Impl(); virtual ~SchXMLFlatDocContext_Impl();
virtual SvXMLImportContext *CreateChildContext( virtual SvXMLImportContext *CreateChildContext(
sal_uInt16 i_nPrefix, const OUString& i_rLocalName, sal_uInt16 i_nPrefix, const OUString& i_rLocalName,
const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& i_xAttrList) override; const css::uno::Reference<css::xml::sax::XAttributeList>& i_xAttrList) override;
}; };
class SchXMLBodyContext : public SvXMLImportContext class SchXMLBodyContext : public SvXMLImportContext
@ -91,7 +91,7 @@ public:
virtual SvXMLImportContext* CreateChildContext( virtual SvXMLImportContext* CreateChildContext(
sal_uInt16 nPrefix, sal_uInt16 nPrefix,
const OUString& rLocalName, const OUString& rLocalName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
}; };
#endif // INCLUDED_XMLOFF_SOURCE_CHART_CONTEXTS_HXX #endif // INCLUDED_XMLOFF_SOURCE_CHART_CONTEXTS_HXX

35
xmloff/source/chart/transporttypes.hxx
View File

@ -36,7 +36,7 @@ enum SchXMLCellType
struct SchXMLCell struct SchXMLCell
{ {
OUString aString; OUString aString;
::com::sun::star::uno::Sequence< OUString > aComplexString; css::uno::Sequence< OUString > aComplexString;
double fValue; double fValue;
SchXMLCellType eType; SchXMLCellType eType;
OUString aRangeId; OUString aRangeId;
@ -84,7 +84,7 @@ enum SchXMLLabeledSequencePart
}; };
typedef ::std::pair< tSchXMLIndex, SchXMLLabeledSequencePart > tSchXMLIndexWithPart; typedef ::std::pair< tSchXMLIndex, SchXMLLabeledSequencePart > tSchXMLIndexWithPart;
typedef ::std::multimap< tSchXMLIndexWithPart, typedef ::std::multimap< tSchXMLIndexWithPart,
::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > > css::uno::Reference< css::chart2::data::XLabeledDataSequence > >
tSchXMLLSequencesPerIndex; tSchXMLLSequencesPerIndex;
bool operator < ( const tSchXMLIndexWithPart & rFirst, const tSchXMLIndexWithPart & rSecond ); bool operator < ( const tSchXMLIndexWithPart & rFirst, const tSchXMLIndexWithPart & rSecond );
@ -147,15 +147,15 @@ struct GlobalSeriesImportInfo
struct RegressionStyle struct RegressionStyle
{ {
com::sun::star::uno::Reference< css::uno::Reference<
com::sun::star::chart2::XDataSeries > m_xSeries; css::chart2::XDataSeries > m_xSeries;
com::sun::star::uno::Reference< css::uno::Reference<
com::sun::star::beans::XPropertySet > m_xEquationProperties; css::beans::XPropertySet > m_xEquationProperties;
OUString msStyleName; OUString msStyleName;
RegressionStyle(const com::sun::star::uno::Reference< RegressionStyle(const css::uno::Reference<
com::sun::star::chart2::XDataSeries >& xSeries, css::chart2::XDataSeries >& xSeries,
const OUString& sStyleName) : const OUString& sStyleName) :
m_xSeries ( xSeries ), m_xSeries ( xSeries ),
msStyleName ( sStyleName ) msStyleName ( sStyleName )
@ -173,17 +173,13 @@ struct DataRowPointStyle
}; };
StyleType meType; StyleType meType;
com::sun::star::uno::Reference< css::uno::Reference< css::chart2::XDataSeries > m_xSeries;
com::sun::star::chart2::XDataSeries > m_xSeries;
com::sun::star::uno::Reference< css::uno::Reference< css::beans::XPropertySet > m_xOldAPISeries;
com::sun::star::beans::XPropertySet > m_xOldAPISeries;
com::sun::star::uno::Reference< css::uno::Reference< css::beans::XPropertySet > m_xErrorXProperties;
com::sun::star::beans::XPropertySet > m_xErrorXProperties;
com::sun::star::uno::Reference< css::uno::Reference< css::beans::XPropertySet > m_xErrorYProperties;
com::sun::star::beans::XPropertySet > m_xErrorYProperties;
sal_Int32 m_nPointIndex; sal_Int32 m_nPointIndex;
sal_Int32 m_nPointRepeat; sal_Int32 m_nPointRepeat;
@ -193,8 +189,7 @@ struct DataRowPointStyle
bool mbSymbolSizeForSeriesIsMissingInFile; bool mbSymbolSizeForSeriesIsMissingInFile;
DataRowPointStyle( StyleType eType DataRowPointStyle( StyleType eType
, const com::sun::star::uno::Reference< , const css::uno::Reference< css::chart2::XDataSeries >& xSeries
com::sun::star::chart2::XDataSeries >& xSeries
, sal_Int32 nPointIndex , sal_Int32 nPointIndex
, sal_Int32 nPointRepeat , sal_Int32 nPointRepeat
, const OUString& sStyleName , const OUString& sStyleName
@ -210,8 +205,8 @@ struct DataRowPointStyle
{} {}
}; };
typedef ::std::multimap< OUString, ::com::sun::star::uno::Reference< typedef ::std::multimap< OUString, css::uno::Reference<
::com::sun::star::chart2::data::XDataSequence > > tSchXMLRangeSequenceMap; css::chart2::data::XDataSequence > > tSchXMLRangeSequenceMap;
#endif // INCLUDED_XMLOFF_SOURCE_CHART_TRANSPORTTYPES_HXX #endif // INCLUDED_XMLOFF_SOURCE_CHART_TRANSPORTTYPES_HXX

83
xmloff/source/core/DocumentSettingsContext.cxx
View File

@ -54,7 +54,7 @@ class XMLMyList
std::list<beans::PropertyValue> aProps; std::list<beans::PropertyValue> aProps;
sal_uInt32 nCount; sal_uInt32 nCount;
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; css::uno::Reference< css::uno::XComponentContext > m_xContext;
public: public:
explicit XMLMyList(const uno::Reference<uno::XComponentContext>& rxContext); explicit XMLMyList(const uno::Reference<uno::XComponentContext>& rxContext);
@ -124,11 +124,11 @@ class XMLConfigBaseContext : public SvXMLImportContext
protected: protected:
XMLMyList maProps; XMLMyList maProps;
beans::PropertyValue maProp; beans::PropertyValue maProp;
com::sun::star::uno::Any& mrAny; css::uno::Any& mrAny;
XMLConfigBaseContext* mpBaseContext; XMLConfigBaseContext* mpBaseContext;
public: public:
XMLConfigBaseContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, XMLConfigBaseContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName,
com::sun::star::uno::Any& rAny, css::uno::Any& rAny,
XMLConfigBaseContext* pBaseContext); XMLConfigBaseContext* pBaseContext);
virtual ~XMLConfigBaseContext(); virtual ~XMLConfigBaseContext();
@ -140,23 +140,21 @@ class XMLConfigItemContext : public SvXMLImportContext
OUString msType; OUString msType;
OUString msValue; OUString msValue;
uno::Sequence<sal_Int8> maDecoded; uno::Sequence<sal_Int8> maDecoded;
com::sun::star::uno::Any& mrAny; css::uno::Any& mrAny;
const OUString mrItemName; const OUString mrItemName;
XMLConfigBaseContext* mpBaseContext; XMLConfigBaseContext* mpBaseContext;
public: public:
XMLConfigItemContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, XMLConfigItemContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName,
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
::com::sun::star::xml::sax::XAttributeList>& xAttrList, css::uno::Any& rAny,
com::sun::star::uno::Any& rAny,
const OUString& rItemName, const OUString& rItemName,
XMLConfigBaseContext* pBaseContext); XMLConfigBaseContext* pBaseContext);
virtual ~XMLConfigItemContext(); virtual ~XMLConfigItemContext();
virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName, const OUString& rLocalName,
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override;
::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override;
virtual void Characters( const OUString& rChars ) override; virtual void Characters( const OUString& rChars ) override;
virtual void EndElement() override; virtual void EndElement() override;
@ -168,16 +166,14 @@ class XMLConfigItemSetContext : public XMLConfigBaseContext
{ {
public: public:
XMLConfigItemSetContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, XMLConfigItemSetContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName,
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
::com::sun::star::xml::sax::XAttributeList>& xAttrList, css::uno::Any& rAny,
com::sun::star::uno::Any& rAny,
XMLConfigBaseContext* pBaseContext); XMLConfigBaseContext* pBaseContext);
virtual ~XMLConfigItemSetContext(); virtual ~XMLConfigItemSetContext();
virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName, const OUString& rLocalName,
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override;
::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override;
virtual void EndElement() override; virtual void EndElement() override;
}; };
@ -186,16 +182,14 @@ class XMLConfigItemMapNamedContext : public XMLConfigBaseContext
{ {
public: public:
XMLConfigItemMapNamedContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, XMLConfigItemMapNamedContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName,
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
::com::sun::star::xml::sax::XAttributeList>& xAttrList, css::uno::Any& rAny,
com::sun::star::uno::Any& rAny,
XMLConfigBaseContext* pBaseContext); XMLConfigBaseContext* pBaseContext);
virtual ~XMLConfigItemMapNamedContext(); virtual ~XMLConfigItemMapNamedContext();
virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName, const OUString& rLocalName,
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override;
::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override;
virtual void EndElement() override; virtual void EndElement() override;
}; };
@ -208,17 +202,15 @@ private:
public: public:
XMLConfigItemMapIndexedContext(SvXMLImport& rImport, sal_uInt16 nPrfx, XMLConfigItemMapIndexedContext(SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName, const OUString& rLName,
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
::com::sun::star::xml::sax::XAttributeList>& xAttrList, css::uno::Any& rAny,
com::sun::star::uno::Any& rAny,
const OUString& rConfigItemName, const OUString& rConfigItemName,
XMLConfigBaseContext* pBaseContext); XMLConfigBaseContext* pBaseContext);
virtual ~XMLConfigItemMapIndexedContext(); virtual ~XMLConfigItemMapIndexedContext();
virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName, const OUString& rLocalName,
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override;
::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override;
virtual void EndElement() override; virtual void EndElement() override;
}; };
@ -283,8 +275,8 @@ namespace
struct XMLDocumentSettingsContext_Data struct XMLDocumentSettingsContext_Data
{ {
com::sun::star::uno::Any aViewProps; css::uno::Any aViewProps;
com::sun::star::uno::Any aConfigProps; css::uno::Any aConfigProps;
::std::list< SettingsGroup > aDocSpecificSettings; ::std::list< SettingsGroup > aDocSpecificSettings;
}; };
@ -302,8 +294,7 @@ XMLDocumentSettingsContext::~XMLDocumentSettingsContext()
SvXMLImportContext *XMLDocumentSettingsContext::CreateChildContext( sal_uInt16 p_nPrefix, SvXMLImportContext *XMLDocumentSettingsContext::CreateChildContext( sal_uInt16 p_nPrefix,
const OUString& rLocalName, const OUString& rLocalName,
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList )
::com::sun::star::xml::sax::XAttributeList>& xAttrList )
{ {
SvXMLImportContext *pContext = nullptr; SvXMLImportContext *pContext = nullptr;
OUString sName; OUString sName;
@ -434,7 +425,7 @@ void XMLDocumentSettingsContext::EndElement()
} }
XMLConfigBaseContext::XMLConfigBaseContext(SvXMLImport& rImport, sal_uInt16 nPrfx, XMLConfigBaseContext::XMLConfigBaseContext(SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName, com::sun::star::uno::Any& rTempAny, const OUString& rLName, css::uno::Any& rTempAny,
XMLConfigBaseContext* pTempBaseContext) XMLConfigBaseContext* pTempBaseContext)
: SvXMLImportContext( rImport, nPrfx, rLName ), : SvXMLImportContext( rImport, nPrfx, rLName ),
maProps( rImport.GetComponentContext() ), maProps( rImport.GetComponentContext() ),
@ -450,9 +441,8 @@ XMLConfigBaseContext::~XMLConfigBaseContext()
XMLConfigItemSetContext::XMLConfigItemSetContext(SvXMLImport& rImport, sal_uInt16 nPrfx, XMLConfigItemSetContext::XMLConfigItemSetContext(SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName, const OUString& rLName,
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::xml::sax::XAttributeList>&,
::com::sun::star::xml::sax::XAttributeList>&, css::uno::Any& rAny,
com::sun::star::uno::Any& rAny,
XMLConfigBaseContext* pBaseContext) XMLConfigBaseContext* pBaseContext)
: XMLConfigBaseContext( rImport, nPrfx, rLName, rAny, pBaseContext ) : XMLConfigBaseContext( rImport, nPrfx, rLName, rAny, pBaseContext )
{ {
@ -465,8 +455,7 @@ XMLConfigItemSetContext::~XMLConfigItemSetContext()
SvXMLImportContext *XMLConfigItemSetContext::CreateChildContext( sal_uInt16 nPrefix, SvXMLImportContext *XMLConfigItemSetContext::CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName, const OUString& rLocalName,
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList )
::com::sun::star::xml::sax::XAttributeList>& xAttrList )
{ {
return CreateSettingsContext(GetImport(), nPrefix, rLocalName, xAttrList, maProp, this); return CreateSettingsContext(GetImport(), nPrefix, rLocalName, xAttrList, maProp, this);
} }
@ -479,9 +468,8 @@ void XMLConfigItemSetContext::EndElement()
} }
XMLConfigItemContext::XMLConfigItemContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, XMLConfigItemContext::XMLConfigItemContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName,
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
::com::sun::star::xml::sax::XAttributeList>& xAttrList, css::uno::Any& rTempAny,
com::sun::star::uno::Any& rTempAny,
const OUString& rTempItemName, const OUString& rTempItemName,
XMLConfigBaseContext* pTempBaseContext) XMLConfigBaseContext* pTempBaseContext)
: SvXMLImportContext(rImport, nPrfx, rLName), : SvXMLImportContext(rImport, nPrfx, rLName),
@ -512,8 +500,7 @@ XMLConfigItemContext::~XMLConfigItemContext()
SvXMLImportContext *XMLConfigItemContext::CreateChildContext( sal_uInt16 nPrefix, SvXMLImportContext *XMLConfigItemContext::CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName, const OUString& rLocalName,
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::xml::sax::XAttributeList>& )
::com::sun::star::xml::sax::XAttributeList>& )
{ {
SvXMLImportContext* pContext = new SvXMLImportContext(GetImport(), nPrefix, rLocalName); SvXMLImportContext* pContext = new SvXMLImportContext(GetImport(), nPrefix, rLocalName);
return pContext; return pContext;
@ -667,9 +654,8 @@ void XMLConfigItemContext::ManipulateConfigItem()
} }
XMLConfigItemMapNamedContext::XMLConfigItemMapNamedContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, XMLConfigItemMapNamedContext::XMLConfigItemMapNamedContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName,
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::xml::sax::XAttributeList>&,
::com::sun::star::xml::sax::XAttributeList>&, css::uno::Any& rAny,
com::sun::star::uno::Any& rAny,
XMLConfigBaseContext* pBaseContext) XMLConfigBaseContext* pBaseContext)
: XMLConfigBaseContext(rImport, nPrfx, rLName, rAny, pBaseContext) : XMLConfigBaseContext(rImport, nPrfx, rLName, rAny, pBaseContext)
{ {
@ -681,8 +667,7 @@ XMLConfigItemMapNamedContext::~XMLConfigItemMapNamedContext()
SvXMLImportContext *XMLConfigItemMapNamedContext::CreateChildContext( sal_uInt16 nPrefix, SvXMLImportContext *XMLConfigItemMapNamedContext::CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName, const OUString& rLocalName,
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList )
::com::sun::star::xml::sax::XAttributeList>& xAttrList )
{ {
return CreateSettingsContext(GetImport(), nPrefix, rLocalName, xAttrList, maProp, this); return CreateSettingsContext(GetImport(), nPrefix, rLocalName, xAttrList, maProp, this);
} }
@ -701,9 +686,8 @@ void XMLConfigItemMapNamedContext::EndElement()
XMLConfigItemMapIndexedContext::XMLConfigItemMapIndexedContext(SvXMLImport& rImport, sal_uInt16 nPrfx, XMLConfigItemMapIndexedContext::XMLConfigItemMapIndexedContext(SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName, const OUString& rLName,
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::xml::sax::XAttributeList>&,
::com::sun::star::xml::sax::XAttributeList>&, css::uno::Any& rAny,
com::sun::star::uno::Any& rAny,
const OUString& rConfigItemName, const OUString& rConfigItemName,
XMLConfigBaseContext* pBaseContext) XMLConfigBaseContext* pBaseContext)
: XMLConfigBaseContext(rImport, nPrfx, rLName, rAny, pBaseContext), : XMLConfigBaseContext(rImport, nPrfx, rLName, rAny, pBaseContext),
@ -717,8 +701,7 @@ XMLConfigItemMapIndexedContext::~XMLConfigItemMapIndexedContext()
SvXMLImportContext *XMLConfigItemMapIndexedContext::CreateChildContext( sal_uInt16 nPrefix, SvXMLImportContext *XMLConfigItemMapIndexedContext::CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName, const OUString& rLocalName,
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList )
::com::sun::star::xml::sax::XAttributeList>& xAttrList )
{ {
return CreateSettingsContext(GetImport(), nPrefix, rLocalName, xAttrList, maProp, this); return CreateSettingsContext(GetImport(), nPrefix, rLocalName, xAttrList, maProp, this);
} }

2
xmloff/source/core/ProgressBarHelper.cxx
View File

@ -26,7 +26,7 @@ using namespace ::com::sun::star;
static const sal_Int32 nDefaultProgressBarRange = 1000000; static const sal_Int32 nDefaultProgressBarRange = 1000000;
ProgressBarHelper::ProgressBarHelper(const ::com::sun::star::uno::Reference < ::com::sun::star::task::XStatusIndicator>& xTempStatusIndicator, ProgressBarHelper::ProgressBarHelper(const css::uno::Reference < css::task::XStatusIndicator>& xTempStatusIndicator,
const bool bTempStrict) const bool bTempStrict)
: xStatusIndicator(xTempStatusIndicator) : xStatusIndicator(xTempStatusIndicator)
, nRange(nDefaultProgressBarRange) , nRange(nDefaultProgressBarRange)

10
xmloff/source/core/XMLEmbeddedObjectImportContext.cxx
View File

@ -70,23 +70,21 @@ const XMLServiceMapEntry_Impl aServiceMap[] =
class XMLEmbeddedObjectImportContext_Impl : public SvXMLImportContext class XMLEmbeddedObjectImportContext_Impl : public SvXMLImportContext
{ {
::com::sun::star::uno::Reference< css::uno::Reference< css::xml::sax::XDocumentHandler > xHandler;
::com::sun::star::xml::sax::XDocumentHandler > xHandler;
public: public:
XMLEmbeddedObjectImportContext_Impl( SvXMLImport& rImport, sal_uInt16 nPrfx, XMLEmbeddedObjectImportContext_Impl( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName, const OUString& rLName,
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::xml::sax::XDocumentHandler >& rHandler );
::com::sun::star::xml::sax::XDocumentHandler >& rHandler );
virtual ~XMLEmbeddedObjectImportContext_Impl(); virtual ~XMLEmbeddedObjectImportContext_Impl();
virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName, const OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
virtual void EndElement() override; virtual void EndElement() override;

20
xmloff/source/core/attrlist.cxx
View File

@ -70,14 +70,14 @@ struct SvXMLAttributeList_Impl
sal_Int16 SAL_CALL SvXMLAttributeList::getLength() throw( ::com::sun::star::uno::RuntimeException, std::exception ) sal_Int16 SAL_CALL SvXMLAttributeList::getLength() throw( css::uno::RuntimeException, std::exception )
{ {
return sal::static_int_cast< sal_Int16 >(m_pImpl->vecAttribute.size()); return sal::static_int_cast< sal_Int16 >(m_pImpl->vecAttribute.size());
} }
SvXMLAttributeList::SvXMLAttributeList( const SvXMLAttributeList &r ) : SvXMLAttributeList::SvXMLAttributeList( const SvXMLAttributeList &r ) :
cppu::WeakImplHelper3<com::sun::star::xml::sax::XAttributeList, com::sun::star::util::XCloneable, com::sun::star::lang::XUnoTunnel>(r), cppu::WeakImplHelper3<css::xml::sax::XAttributeList, css::util::XCloneable, css::lang::XUnoTunnel>(r),
m_pImpl( new SvXMLAttributeList_Impl( *r.m_pImpl ) ) m_pImpl( new SvXMLAttributeList_Impl( *r.m_pImpl ) )
{ {
} }
@ -97,28 +97,28 @@ SvXMLAttributeList::SvXMLAttributeList( const uno::Reference<
AppendAttributeList( rAttrList ); AppendAttributeList( rAttrList );
} }
OUString SAL_CALL SvXMLAttributeList::getNameByIndex(sal_Int16 i) throw( ::com::sun::star::uno::RuntimeException, std::exception ) OUString SAL_CALL SvXMLAttributeList::getNameByIndex(sal_Int16 i) throw( css::uno::RuntimeException, std::exception )
{ {
return ( static_cast< SvXMLAttributeList_Impl::size_type >( i ) < m_pImpl->vecAttribute.size() ) ? m_pImpl->vecAttribute[i].sName : OUString(); return ( static_cast< SvXMLAttributeList_Impl::size_type >( i ) < m_pImpl->vecAttribute.size() ) ? m_pImpl->vecAttribute[i].sName : OUString();
} }
OUString SAL_CALL SvXMLAttributeList::getTypeByIndex(sal_Int16) throw( ::com::sun::star::uno::RuntimeException, std::exception ) OUString SAL_CALL SvXMLAttributeList::getTypeByIndex(sal_Int16) throw( css::uno::RuntimeException, std::exception )
{ {
return sType; return sType;
} }
OUString SAL_CALL SvXMLAttributeList::getValueByIndex(sal_Int16 i) throw( ::com::sun::star::uno::RuntimeException, std::exception ) OUString SAL_CALL SvXMLAttributeList::getValueByIndex(sal_Int16 i) throw( css::uno::RuntimeException, std::exception )
{ {
return ( static_cast< SvXMLAttributeList_Impl::size_type >( i ) < m_pImpl->vecAttribute.size() ) ? m_pImpl->vecAttribute[i].sValue : OUString(); return ( static_cast< SvXMLAttributeList_Impl::size_type >( i ) < m_pImpl->vecAttribute.size() ) ? m_pImpl->vecAttribute[i].sValue : OUString();
} }
OUString SAL_CALL SvXMLAttributeList::getTypeByName( const OUString& ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) OUString SAL_CALL SvXMLAttributeList::getTypeByName( const OUString& ) throw( css::uno::RuntimeException, std::exception )
{ {
return sType; return sType;
} }
OUString SAL_CALL SvXMLAttributeList::getValueByName(const OUString& sName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) OUString SAL_CALL SvXMLAttributeList::getValueByName(const OUString& sName) throw( css::uno::RuntimeException, std::exception )
{ {
::std::vector<struct SvXMLTagAttribute_Impl>::iterator ii = m_pImpl->vecAttribute.begin(); ::std::vector<struct SvXMLTagAttribute_Impl>::iterator ii = m_pImpl->vecAttribute.begin();
@ -131,9 +131,9 @@ OUString SAL_CALL SvXMLAttributeList::getValueByName(const OUString& sName) thro
} }
uno::Reference< ::com::sun::star::util::XCloneable > SvXMLAttributeList::createClone() throw( ::com::sun::star::uno::RuntimeException, std::exception ) uno::Reference< css::util::XCloneable > SvXMLAttributeList::createClone() throw( css::uno::RuntimeException, std::exception )
{ {
uno::Reference< ::com::sun::star::util::XCloneable > r = new SvXMLAttributeList( *this ); uno::Reference< css::util::XCloneable > r = new SvXMLAttributeList( *this );
return r; return r;
} }
@ -176,7 +176,7 @@ void SvXMLAttributeList::RemoveAttribute( const OUString& sName )
} }
} }
void SvXMLAttributeList::AppendAttributeList( const uno::Reference< ::com::sun::star::xml::sax::XAttributeList > &r ) void SvXMLAttributeList::AppendAttributeList( const uno::Reference< css::xml::sax::XAttributeList > &r )
{ {
OSL_ASSERT( r.is() ); OSL_ASSERT( r.is() );

4
xmloff/source/core/unoatrcn.cxx
View File

@ -97,12 +97,12 @@ namespace
class theSvUnoAttributeContainerUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theSvUnoAttributeContainerUnoTunnelId> {}; class theSvUnoAttributeContainerUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theSvUnoAttributeContainerUnoTunnelId> {};
} }
const ::com::sun::star::uno::Sequence< sal_Int8 > & SvUnoAttributeContainer::getUnoTunnelId() throw() const css::uno::Sequence< sal_Int8 > & SvUnoAttributeContainer::getUnoTunnelId() throw()
{ {
return theSvUnoAttributeContainerUnoTunnelId::get().getSeq(); return theSvUnoAttributeContainerUnoTunnelId::get().getSeq();
} }
sal_Int64 SAL_CALL SvUnoAttributeContainer::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw(::com::sun::star::uno::RuntimeException, std::exception) sal_Int64 SAL_CALL SvUnoAttributeContainer::getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw(css::uno::RuntimeException, std::exception)
{ {
if( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), if( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(),
rId.getConstArray(), 16 ) ) rId.getConstArray(), 16 ) )

4
xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx
View File

@ -20,8 +20,8 @@
#include <xmloff/unointerfacetouniqueidentifiermapper.hxx> #include <xmloff/unointerfacetouniqueidentifiermapper.hxx>
using namespace ::com::sun::star; using namespace ::com::sun::star;
using ::com::sun::star::uno::Reference; using css::uno::Reference;
using ::com::sun::star::uno::XInterface; using css::uno::XInterface;
namespace comphelper namespace comphelper
{ {

24
xmloff/source/core/xmlexp.cxx
View File

@ -165,7 +165,7 @@ public:
virtual void Characters( const OUString& i_rCharacters ) override; virtual void Characters( const OUString& i_rCharacters ) override;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > virtual css::uno::Reference< css::uno::XComponentContext >
GetComponentContext() const override; GetComponentContext() const override;
private: private:
SvXMLExport& m_rExport; SvXMLExport& m_rExport;
@ -207,7 +207,7 @@ Reference< XComponentContext > SettingsExportFacade::GetComponentContext() const
} }
class SvXMLExportEventListener : public cppu::WeakImplHelper< class SvXMLExportEventListener : public cppu::WeakImplHelper<
com::sun::star::lang::XEventListener > css::lang::XEventListener >
{ {
private: private:
SvXMLExport* pExport; SvXMLExport* pExport;
@ -217,7 +217,7 @@ public:
virtual ~SvXMLExportEventListener(); virtual ~SvXMLExportEventListener();
// XEventListener // XEventListener
virtual void SAL_CALL disposing(const lang::EventObject& rEventObject) throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL disposing(const lang::EventObject& rEventObject) throw(css::uno::RuntimeException, std::exception) override;
}; };
SvXMLExportEventListener::SvXMLExportEventListener(SvXMLExport* pTempExport) SvXMLExportEventListener::SvXMLExportEventListener(SvXMLExport* pTempExport)
@ -462,7 +462,7 @@ SvXMLExport::SvXMLExport(
} }
SvXMLExport::SvXMLExport( SvXMLExport::SvXMLExport(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XComponentContext >& xContext,
OUString const & implementationName, OUString const & implementationName,
const OUString &rFileName, const OUString &rFileName,
sal_Int16 const eDefaultMeasureUnit /*css::util::MeasureUnit*/, sal_Int16 const eDefaultMeasureUnit /*css::util::MeasureUnit*/,
@ -497,7 +497,7 @@ SvXMLExport::SvXMLExport(
} }
SvXMLExport::SvXMLExport( SvXMLExport::SvXMLExport(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XComponentContext >& xContext,
OUString const & implementationName, OUString const & implementationName,
const OUString &rFileName, const OUString &rFileName,
const uno::Reference< xml::sax::XDocumentHandler > & rHandler, const uno::Reference< xml::sax::XDocumentHandler > & rHandler,
@ -671,7 +671,7 @@ void SAL_CALL SvXMLExport::setSourceDocument( const uno::Reference< lang::XCompo
} }
} }
} }
catch(const com::sun::star::uno::Exception&) catch(const css::uno::Exception&)
{ {
} }
} }
@ -682,7 +682,7 @@ void SAL_CALL SvXMLExport::setSourceDocument( const uno::Reference< lang::XCompo
// XInitialize // XInitialize
void SAL_CALL SvXMLExport::initialize( const uno::Sequence< uno::Any >& aArguments ) void SAL_CALL SvXMLExport::initialize( const uno::Sequence< uno::Any >& aArguments )
throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) throw(css::uno::Exception, css::uno::RuntimeException, std::exception)
{ {
// #93186# we need to queryInterface every single Any with any expected outcome. This variable hold the queryInterface results. // #93186# we need to queryInterface every single Any with any expected outcome. This variable hold the queryInterface results.
@ -871,13 +871,13 @@ void SAL_CALL SvXMLExport::cancel() throw(uno::RuntimeException, std::exception)
} }
OUString SAL_CALL SvXMLExport::getName( ) OUString SAL_CALL SvXMLExport::getName( )
throw (::com::sun::star::uno::RuntimeException, std::exception) throw (css::uno::RuntimeException, std::exception)
{ {
return msFilterName; return msFilterName;
} }
void SAL_CALL SvXMLExport::setName( const OUString& ) void SAL_CALL SvXMLExport::setName( const OUString& )
throw (::com::sun::star::uno::RuntimeException, std::exception) throw (css::uno::RuntimeException, std::exception)
{ {
// do nothing, because it is not possible to set the FilterName // do nothing, because it is not possible to set the FilterName
} }
@ -1010,7 +1010,7 @@ void SvXMLExport::AddAttribute( const OUString& rQName,
} }
void SvXMLExport::AddLanguageTagAttributes( sal_uInt16 nPrefix, sal_uInt16 nPrefixRfc, void SvXMLExport::AddLanguageTagAttributes( sal_uInt16 nPrefix, sal_uInt16 nPrefixRfc,
const ::com::sun::star::lang::Locale& rLocale, bool bWriteEmpty, const css::lang::Locale& rLocale, bool bWriteEmpty,
enum ::xmloff::token::XMLTokenEnum eClass ) enum ::xmloff::token::XMLTokenEnum eClass )
{ {
if (rLocale.Variant.isEmpty()) if (rLocale.Variant.isEmpty())
@ -1343,7 +1343,7 @@ sal_uInt32 SvXMLExport::exportDoc( enum ::xmloff::token::XMLTokenEnum eClass )
bOwnEmbeddedResolver = mxEmbeddedResolver.is(); bOwnEmbeddedResolver = mxEmbeddedResolver.is();
} }
} }
catch(const com::sun::star::uno::Exception&) catch(const css::uno::Exception&)
{ {
} }
} }
@ -1389,7 +1389,7 @@ sal_uInt32 SvXMLExport::exportDoc( enum ::xmloff::token::XMLTokenEnum eClass )
mxExtHandler.set( mxHandler, UNO_QUERY ); mxExtHandler.set( mxHandler, UNO_QUERY );
} }
} }
catch(const com::sun::star::uno::Exception&) catch(const css::uno::Exception&)
{ {
} }
} }

2
xmloff/source/core/xmlictxt.cxx
View File

@ -68,7 +68,7 @@ void SvXMLImportContext::Characters( const OUString& )
{ {
} }
// ::com::sun::star::xml::sax::XFastContextHandler: // css::xml::sax::XFastContextHandler:
void SAL_CALL SvXMLImportContext::startFastElement(sal_Int32, const uno::Reference< xml::sax::XFastAttributeList > &) void SAL_CALL SvXMLImportContext::startFastElement(sal_Int32, const uno::Reference< xml::sax::XFastAttributeList > &)
throw (uno::RuntimeException, xml::sax::SAXException, std::exception) throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{ {

Some files were not shown because too many files have changed in this diff Show More