Kaydet (Commit) 80735fcb authored tarafından Noel Grandin's avatar Noel Grandin Kaydeden (comit) Noel Grandin

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

Change-Id: Iee6e21e093fb1383f19a0716dbc1c341f446b8c2
Reviewed-on: https://gerrit.libreoffice.org/20192Reviewed-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
Tested-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
üst 4112ecad
......@@ -30,10 +30,10 @@ class XMLAttributeContainerHandler : public XMLPropertyHandler
public:
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 exportXML( OUString& rStrExpValue, const ::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 css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override;
};
#endif // INCLUDED_XMLOFF_INC_ATTRIBUTECONTAINERHANDLER_HXX
......
......@@ -44,7 +44,7 @@ class SvXMLImportContext;
* XML data from a sequence of SAX events */
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:
......@@ -57,7 +57,7 @@ public:
DomBuilderContext( SvXMLImport& rImport,
sal_uInt16 nPrefix,
const OUString& rLocalName,
com::sun::star::uno::Reference<com::sun::star::xml::dom::XNode>& );
css::uno::Reference<css::xml::dom::XNode>& );
virtual ~DomBuilderContext();
......@@ -67,7 +67,7 @@ public:
/** 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(
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;
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;
......
......@@ -29,7 +29,7 @@ namespace com { namespace sun { namespace star {
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
......
......@@ -26,12 +26,11 @@
class XMLMetaExportComponent : public SvXMLExport
{
::com::sun::star::uno::Reference<
::com::sun::star::document::XDocumentProperties > mxDocProps;
css::uno::Reference< css::document::XDocumentProperties > mxDocProps;
public:
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
);
......@@ -43,7 +42,7 @@ protected:
enum ::xmloff::token::XMLTokenEnum eClass = xmloff::token::XML_TOKEN_INVALID ) override;
// 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
virtual void _ExportMeta() override;
......
......@@ -62,20 +62,20 @@ class MultiPropertySetHelper
/// the sequence of property names that the current (multi)
/// 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
/// aPropertySequence indices
sal_Int16* pSequenceIndex;
/// 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()
const ::com::sun::star::uno::Any* pValues;
const css::uno::Any* pValues;
/// an empty Any
::com::sun::star::uno::Any aEmptyAny;
css::uno::Any aEmptyAny;
public:
......@@ -88,8 +88,7 @@ public:
* Call hasPropertiesByName for the provided XPropertySetInfo and build
* list of allowed properties.
*/
void hasProperties( const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySetInfo> & );
void hasProperties( const css::uno::Reference<css::beans::XPropertySetInfo> & );
/**
......@@ -104,8 +103,7 @@ public:
* May only be called after hasProperties() was called for the
* appropriate XPropertySetInfo.
*/
void getValues( const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XMultiPropertySet> & );
void getValues( const css::uno::Reference<css::beans::XMultiPropertySet> & );
/**
* 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
* appropriate XPropertySetInfo.
*/
void getValues( const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet> & );
void getValues( const css::uno::Reference<css::beans::XPropertySet> & );
......@@ -125,7 +122,7 @@ public:
*
* 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.
......@@ -144,9 +141,8 @@ public:
* bTryMult is set, the XMultiPropertySet is used to get the values.
*
*/
const ::com::sun::star::uno::Any& getValue( sal_Int16 nIndex,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet> &,
const css::uno::Any& getValue( sal_Int16 nIndex,
const css::uno::Reference<css::beans::XPropertySet> &,
bool bTryMulti = false );
/**
......@@ -159,9 +155,8 @@ public:
* XMultiPropertySet is used to get the values.
*
*/
const ::com::sun::star::uno::Any& getValue( sal_Int16 nIndex,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XMultiPropertySet> & );
const css::uno::Any& getValue( sal_Int16 nIndex,
const css::uno::Reference<css::beans::XMultiPropertySet> & );
inline void resetValues() { pValues = nullptr; }
};
......@@ -169,7 +164,7 @@ public:
// 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 )
{
assert(pValues && "called getValue() without calling getValues()");
......
......@@ -42,7 +42,7 @@ public:
PageStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
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,
bool bDefaultStyle=false);
virtual ~PageStyleContext();
......@@ -50,11 +50,10 @@ public:
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;
virtual void FillPropertySet(
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > & rPropSet ) override;
const css::uno::Reference< css::beans::XPropertySet > & rPropSet ) override;
//text grid enhancement
virtual void SetDefaults() override;
......
......@@ -22,10 +22,10 @@
#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(
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rPropSet1,
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rPropSet2 ) throw();
css::uno::Reference< css::beans::XPropertySet > rPropSet1,
css::uno::Reference< css::beans::XPropertySet > rPropSet2 ) throw();
#endif
......
......@@ -42,8 +42,7 @@ class RDFaExportHelper
private:
SvXMLExport & m_rExport;
::com::sun::star::uno::Reference<
::com::sun::star::rdf::XDocumentRepository> m_xRepository;
css::uno::Reference<css::rdf::XDocumentRepository> m_xRepository;
typedef ::std::map< OUString, OUString >
BlankNodeMap_t;
......@@ -53,15 +52,13 @@ private:
long m_Counter;
OUString
LookupBlankNode( ::com::sun::star::uno::Reference<
::com::sun::star::rdf::XBlankNode> const & i_xBlankNode);
LookupBlankNode( css::uno::Reference<css::rdf::XBlankNode> const & i_xBlankNode);
public:
RDFaExportHelper(SvXMLExport & i_rExport);
void
AddRDFa(::com::sun::star::uno::Reference<
::com::sun::star::rdf::XMetadatable> const & i_xMetadatable);
AddRDFa(css::uno::Reference<css::rdf::XMetadatable> const & i_xMetadatable);
};
} // namespace xmloff
......
......@@ -66,14 +66,12 @@ public:
/** Add a RDFa statement; must have been parsed with ParseRDFa */
void AddRDFa(
::com::sun::star::uno::Reference< ::com::sun::star::rdf::XMetadatable>
const & i_xObject,
css::uno::Reference< css::rdf::XMetadatable> const & i_xObject,
std::shared_ptr<ParsedRDFaAttributes> & i_pRDFaAttributes);
/** Parse and add a RDFa statement; parameters are XML attribute values */
void ParseAndAddRDFa(
::com::sun::star::uno::Reference< ::com::sun::star::rdf::XMetadatable>
const & i_xObject,
css::uno::Reference< css::rdf::XMetadatable> const & i_xObject,
OUString const & i_rAbout,
OUString const & i_rProperty,
OUString const & i_rContent,
......@@ -83,8 +81,7 @@ public:
<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>
*/
void InsertRDFa( ::com::sun::star::uno::Reference<
::com::sun::star::rdf::XRepositorySupplier > const & i_xModel);
void InsertRDFa( css::uno::Reference< css::rdf::XRepositorySupplier > const & i_xModel);
};
} // namespace xmloff
......
......@@ -36,7 +36,7 @@ namespace com { namespace sun { namespace star {
class SchXMLExport : public SvXMLExport
{
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<SchXMLExportHelper> maExportHelper;
......@@ -51,7 +51,7 @@ protected:
public:
SchXMLExport(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext,
const css::uno::Reference< css::uno::XComponentContext >& xContext,
OUString const & implementationName,
SvXMLExportFlags nExportFlags = SvXMLExportFlags::ALL );
virtual ~SchXMLExport();
......
......@@ -158,7 +158,7 @@ enum SchXMLRegEquationAttrMap
class SchXMLImport : public SvXMLImport
{
private:
com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator > mxStatusIndicator;
css::uno::Reference< css::task::XStatusIndicator > mxStatusIndicator;
rtl::Reference<SchXMLImportHelper> maImportHelper;
......@@ -166,20 +166,20 @@ protected:
virtual SvXMLImportContext *CreateContext(
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;
public:
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 );
virtual ~SchXMLImport() throw ();
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
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
......
......@@ -63,7 +63,7 @@ inline bool StyleNameHash_Impl::operator()(
}
class StyleMap :
public ::cppu::WeakImplHelper< ::com::sun::star::lang::XUnoTunnel>,
public ::cppu::WeakImplHelper< css::lang::XUnoTunnel>,
public std::unordered_map< StyleNameKey_Impl, OUString,
StyleNameHash_Impl, StyleNameHash_Impl >
{
......@@ -73,14 +73,13 @@ public:
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(
::com::sun::star::uno::Reference<
::com::sun::star::uno::XInterface > ) throw();
css::uno::Reference< css::uno::XInterface > ) throw();
// XUnoTunnel
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
......
......@@ -42,9 +42,8 @@ public:
~XMLTransGradientStyleImport();
bool importXML(
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList >& xAttrList,
::com::sun::star::uno::Any& rValue,
const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList,
css::uno::Any& rValue,
OUString& rStrName );
};
......@@ -56,7 +55,7 @@ public:
XMLTransGradientStyleExport( SvXMLExport& rExport );
~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
......
......@@ -34,17 +34,16 @@ class XMLBackgroundImageContext : public XMLElementPropertyContext
XMLPropertyState aFilterProp;
XMLPropertyState aTransparencyProp;
::com::sun::star::style::GraphicLocation ePos;
css::style::GraphicLocation ePos;
OUString sURL;
OUString sFilter;
sal_Int8 nTransparency;
::com::sun::star::uno::Reference < ::com::sun::star::io::XOutputStream > xBase64Stream;
css::uno::Reference < css::io::XOutputStream > xBase64Stream;
private:
void ProcessAttrs(
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList > & xAttrList );
const css::uno::Reference<css::xml::sax::XAttributeList > & xAttrList );
public:
......@@ -52,8 +51,7 @@ public:
SvXMLImport& rImport,
sal_uInt16 nPrfx,
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,
const XMLPropertyState& rProp,
sal_Int32 nPosIdx,
sal_Int32 nFilterIdx,
......@@ -65,8 +63,7 @@ public:
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;
virtual void EndElement() override;
};
......
......@@ -41,10 +41,10 @@ public:
~XMLBackgroundImageExport();
void exportXML( const ::com::sun::star::uno::Any& rURL,
const ::com::sun::star::uno::Any *pPos,
const ::com::sun::star::uno::Any *pFilter,
const ::com::sun::star::uno::Any *pTransparency,
void exportXML( const css::uno::Any& rURL,
const css::uno::Any *pPos,
const css::uno::Any *pFilter,
const css::uno::Any *pTransparency,
sal_uInt16 nPrefix,
const OUString& rLocalName );
};
......
......@@ -37,15 +37,12 @@ public:
XMLBase64Export( SvXMLExport& rExport );
bool exportXML( const ::com::sun::star::uno::Reference <
::com::sun::star::io::XInputStream > & rIn );
bool exportElement( const ::com::sun::star::uno::Reference <
::com::sun::star::io::XInputStream > & rIn,
bool exportXML( const css::uno::Reference < css::io::XInputStream > & rIn );
bool exportElement( const css::uno::Reference < css::io::XInputStream > & rIn,
sal_uInt16 nNamespace,
enum ::xmloff::token::XMLTokenEnum eName );
bool exportOfficeBinaryDataElement(
const ::com::sun::star::uno::Reference <
::com::sun::star::io::XInputStream > & rIn );
const css::uno::Reference < css::io::XInputStream > & rIn );
};
......
......@@ -26,36 +26,36 @@
// class XMLBasicExportFilter
typedef ::cppu::WeakImplHelper<
::com::sun::star::xml::sax::XDocumentHandler > XMLBasicExportFilter_BASE;
css::xml::sax::XDocumentHandler > XMLBasicExportFilter_BASE;
class XMLBasicExportFilter : public XMLBasicExportFilter_BASE
{
private:
::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > m_xHandler;
css::uno::Reference< css::xml::sax::XDocumentHandler > m_xHandler;
public:
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();
// XDocumentHandler
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()
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,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttribs )
throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
const css::uno::Reference< css::xml::sax::XAttributeList >& xAttribs )
throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
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 )
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 )
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 )
throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setDocumentLocator( const ::com::sun::star::uno::Reference< ::com::sun::star::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;
virtual void SAL_CALL setDocumentLocator( const css::uno::Reference< css::xml::sax::XLocator >& xLocator )
throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
};
#endif // INCLUDED_XMLOFF_INC_XMLBASICEXPORTFILTER_HXX
......