diff options
Diffstat (limited to 'xmloff/source/forms')
23 files changed, 267 insertions, 267 deletions
diff --git a/xmloff/source/forms/attriblistmerge.hxx b/xmloff/source/forms/attriblistmerge.hxx index fbe3fb80915c..03f6d0f00860 100644 --- a/xmloff/source/forms/attriblistmerge.hxx +++ b/xmloff/source/forms/attriblistmerge.hxx @@ -32,7 +32,7 @@ namespace xmloff { //= OAttribListMerger - typedef ::cppu::WeakImplHelper < ::com::sun::star::xml::sax::XAttributeList + typedef ::cppu::WeakImplHelper < css::xml::sax::XAttributeList > OAttribListMerger_Base; /** implements the XAttributeList list by merging different source attribute lists @@ -42,7 +42,7 @@ namespace xmloff { protected: ::osl::Mutex m_aMutex; - typedef std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > > AttributeListArray; + typedef std::vector< css::uno::Reference< css::xml::sax::XAttributeList > > AttributeListArray; AttributeListArray m_aLists; virtual ~OAttribListMerger() { } @@ -52,19 +52,19 @@ namespace xmloff // attribute list handling // (very thin at the moment... only adding lists is allowed... add more if you need it :) - void addList(const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rList); + void addList(const css::uno::Reference< css::xml::sax::XAttributeList >& _rList); // XAttributeList - virtual sal_Int16 SAL_CALL getLength( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getNameByIndex( sal_Int16 i ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getTypeByIndex( sal_Int16 i ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getTypeByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getValueByIndex( sal_Int16 i ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getValueByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL getLength( ) throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getNameByIndex( sal_Int16 i ) throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getTypeByIndex( sal_Int16 i ) throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getTypeByName( const OUString& aName ) throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getValueByIndex( sal_Int16 i ) throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getValueByName( const OUString& aName ) throw(css::uno::RuntimeException, std::exception) override; protected: - bool seekToIndex(sal_Int16 _nGlobalIndex, ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rSubList, sal_Int16& _rLocalIndex); - bool seekToName(const OUString& _rName, ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rSubList, sal_Int16& _rLocalIndex); + bool seekToIndex(sal_Int16 _nGlobalIndex, css::uno::Reference< css::xml::sax::XAttributeList >& _rSubList, sal_Int16& _rLocalIndex); + bool seekToName(const OUString& _rName, css::uno::Reference< css::xml::sax::XAttributeList >& _rSubList, sal_Int16& _rLocalIndex); }; } // namespace xmloff diff --git a/xmloff/source/forms/callbacks.hxx b/xmloff/source/forms/callbacks.hxx index 21b9224bed16..afd36ba9b632 100644 --- a/xmloff/source/forms/callbacks.hxx +++ b/xmloff/source/forms/callbacks.hxx @@ -42,10 +42,10 @@ namespace xmloff /** steps through a collection and exports all children of this collection */ virtual void exportCollectionElements( - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& _rxCollection) = 0; + const css::uno::Reference< css::container::XIndexAccess >& _rxCollection) = 0; virtual OUString getObjectStyleName( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxObject ) = 0; + const css::uno::Reference< css::beans::XPropertySet >& _rxObject ) = 0; protected: ~IFormsExportContext() {} @@ -56,8 +56,8 @@ namespace xmloff { public: virtual void registerEvents( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxElement, - const ::com::sun::star::uno::Sequence< ::com::sun::star::script::ScriptEventDescriptor >& _rEvents + const css::uno::Reference< css::beans::XPropertySet >& _rxElement, + const css::uno::Sequence< css::script::ScriptEventDescriptor >& _rEvents ) = 0; protected: @@ -69,7 +69,7 @@ namespace xmloff { public: virtual void registerEvents( - const ::com::sun::star::uno::Sequence< ::com::sun::star::script::ScriptEventDescriptor >& _rEvents + const css::uno::Sequence< css::script::ScriptEventDescriptor >& _rEvents ) = 0; protected: diff --git a/xmloff/source/forms/elementexport.hxx b/xmloff/source/forms/elementexport.hxx index 9be1cfd511aa..9f956e3558f0 100644 --- a/xmloff/source/forms/elementexport.hxx +++ b/xmloff/source/forms/elementexport.hxx @@ -40,15 +40,15 @@ namespace xmloff class OElementExport : public OPropertyExport { protected: - ::com::sun::star::uno::Sequence< ::com::sun::star::script::ScriptEventDescriptor > + css::uno::Sequence< css::script::ScriptEventDescriptor > m_aEvents; SvXMLElementExport* m_pXMLElement; // XML element doing the concrete startElement etc. public: OElementExport(IFormsExportContext& _rContext, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxProps, - const ::com::sun::star::uno::Sequence< ::com::sun::star::script::ScriptEventDescriptor >& _rEvents); + const css::uno::Reference< css::beans::XPropertySet >& _rxProps, + const css::uno::Sequence< css::script::ScriptEventDescriptor >& _rEvents); virtual ~OElementExport(); void doExport(); @@ -115,10 +115,10 @@ namespace xmloff the comma-separated list of control-ids of all the controls referring to this one as LabelControl */ OControlExport(IFormsExportContext& _rContext, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControl, + const css::uno::Reference< css::beans::XPropertySet >& _rxControl, const OUString& _rControlId, const OUString& _rReferringControls, - const ::com::sun::star::uno::Sequence< ::com::sun::star::script::ScriptEventDescriptor >& _rxEvents); + const css::uno::Sequence< css::script::ScriptEventDescriptor >& _rxEvents); virtual ~OControlExport(); protected: @@ -235,7 +235,7 @@ namespace xmloff Bindings which count here are: <ul><li>an established connection to a database field</li> - <li>a binding to an external value supplier (<type scope="com::sun::star::form::binding">XValueBinding</type>)</li> + <li>a binding to an external value supplier (<type scope="css::form::binding">XValueBinding</type>)</li> </ul> */ bool controlHasActiveDataBinding() const; @@ -248,7 +248,7 @@ namespace xmloff List entries may be <ul><li>specified by the user</li> - <li>specified by an external list source (<type scope="com::sun::star::form::binding">XListEntrySource</type>)</li> + <li>specified by an external list source (<type scope="css::form::binding">XListEntrySource</type>)</li> <li>obtained from a database query (in various ways)</li> </ul> @@ -267,9 +267,9 @@ namespace xmloff @see OColumnExport::OColumnExport */ OColumnExport(IFormsExportContext& _rContext, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControl, + const css::uno::Reference< css::beans::XPropertySet >& _rxControl, const OUString& _rControlId, - const ::com::sun::star::uno::Sequence< ::com::sun::star::script::ScriptEventDescriptor >& _rxEvents); + const css::uno::Sequence< css::script::ScriptEventDescriptor >& _rxEvents); virtual ~OColumnExport(); @@ -298,8 +298,8 @@ namespace xmloff /** constructs an object capable of exporting controls */ OFormExport(IFormsExportContext& _rContext, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxForm, - const ::com::sun::star::uno::Sequence< ::com::sun::star::script::ScriptEventDescriptor >& _rxEvents + const css::uno::Reference< css::beans::XPropertySet >& _rxForm, + const css::uno::Sequence< css::script::ScriptEventDescriptor >& _rxEvents ); protected: diff --git a/xmloff/source/forms/elementimport.cxx b/xmloff/source/forms/elementimport.cxx index 1ecf02e38706..e63739088f6a 100644 --- a/xmloff/source/forms/elementimport.cxx +++ b/xmloff/source/forms/elementimport.cxx @@ -800,7 +800,7 @@ namespace xmloff void OControlImport::StartElement(const Reference< XAttributeList >& _rxAttrList) { - ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > xAttributes; + css::uno::Reference< css::xml::sax::XAttributeList > xAttributes; if( m_xOuterAttributes.is() ) { // merge the attribute lists @@ -2036,8 +2036,8 @@ namespace xmloff SvXMLImport& _rImport ,sal_uInt16 nPrfx , const OUString& _sLocalName - ,const Reference< ::com::sun::star::xml::sax::XAttributeList > & _xAttrList - ,const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _xElement) : + ,const Reference< css::xml::sax::XAttributeList > & _xAttrList + ,const css::uno::Reference< css::beans::XPropertySet >& _xElement) : SvXMLImportContext( _rImport, nPrfx, _sLocalName ) { OSL_ENSURE(_xAttrList.is(),"Attribute list is NULL!"); diff --git a/xmloff/source/forms/elementimport.hxx b/xmloff/source/forms/elementimport.hxx index d8e11f1e2caa..86ed4ed9566a 100644 --- a/xmloff/source/forms/elementimport.hxx +++ b/xmloff/source/forms/elementimport.hxx @@ -79,13 +79,13 @@ namespace xmloff // while reading our element /// the parent container to insert the new element into - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > + css::uno::Reference< css::container::XNameContainer > m_xParentContainer; /// the element we're creating. Valid after StartElement - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > + css::uno::Reference< css::beans::XPropertySet > m_xElement; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > + css::uno::Reference< css::beans::XPropertySetInfo > m_xInfo; bool m_bImplicitGenericAttributeHandling; @@ -108,17 +108,17 @@ namespace xmloff OElementImport( OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer + const css::uno::Reference< css::container::XNameContainer >& _rxParentContainer ); virtual ~OElementImport(); protected: // SvXMLImportContext overridables virtual void StartElement( - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList) override; virtual SvXMLImportContext* CreateChildContext( sal_uInt16 _nPrefix, const OUString& _rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList) override; virtual void EndElement() override; // OPropertyImport overridables @@ -128,14 +128,14 @@ namespace xmloff // IEventAttacher virtual void registerEvents( - const ::com::sun::star::uno::Sequence< ::com::sun::star::script::ScriptEventDescriptor >& _rEvents + const css::uno::Sequence< css::script::ScriptEventDescriptor >& _rEvents ) override; /** create the (uninitialized) element which is to represent the read data <p>The default implementation uses <member>m_xORB</member> to create a object with <member>m_sServiceName</member>. */ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > + virtual css::uno::Reference< css::beans::XPropertySet > createElement(); protected: @@ -185,7 +185,7 @@ namespace xmloff // we fake the attributes our base class gets: we add the attributes of the outer wrapper // element which encloses us - ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > + css::uno::Reference< css::xml::sax::XAttributeList > m_xOuterAttributes; /** the address of the calc cell which the control model should be bound to, @@ -207,20 +207,20 @@ namespace xmloff OControlImport( OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer + const css::uno::Reference< css::container::XNameContainer >& _rxParentContainer ); public: OControlImport( OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer, + const css::uno::Reference< css::container::XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType ); // SvXMLImportContext overridables virtual void StartElement( - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList) override; virtual void EndElement() override; // OPropertyImport overridables @@ -228,15 +228,15 @@ namespace xmloff const OUString& _rLocalName, const OUString& _rValue) override; - void addOuterAttributes(const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxOuterAttribs); + void addOuterAttributes(const css::uno::Reference< css::xml::sax::XAttributeList >& _rxOuterAttribs); protected: void setElementType(OControlElement::ElementType _eType) { m_eElementType = _eType; } protected: static void implTranslateValueProperty( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo >& _rxPropInfo, - ::com::sun::star::beans::PropertyValue& /* [in/out] */ _rPropValue); + const css::uno::Reference< css::beans::XPropertySetInfo >& _rxPropInfo, + css::beans::PropertyValue& /* [in/out] */ _rPropValue); virtual OUString determineDefaultServiceName() const override; @@ -264,7 +264,7 @@ namespace xmloff protected: // OElementImport overridables - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > + virtual css::uno::Reference< css::beans::XPropertySet > createElement() override; }; @@ -283,14 +283,14 @@ namespace xmloff public: OImagePositionImport( OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer, + const css::uno::Reference< css::container::XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType ); protected: // SvXMLImportContext overridables virtual void StartElement( - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList) override; // OPropertyImport overridables virtual bool handleAttribute( sal_uInt16 _nNamespaceKey, @@ -308,13 +308,13 @@ namespace xmloff public: OReferredControlImport( OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer, + const css::uno::Reference< css::container::XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType ); // SvXMLImportContext overridables virtual void StartElement( - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList) override; // OPropertyImport overridables virtual bool handleAttribute(sal_uInt16 _nNamespaceKey, @@ -328,7 +328,7 @@ namespace xmloff public: OPasswordImport( OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer, + const css::uno::Reference< css::container::XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType ); @@ -344,7 +344,7 @@ namespace xmloff public: ORadioImport( OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer, + const css::uno::Reference< css::container::XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType ); @@ -364,7 +364,7 @@ namespace xmloff public: OURLReferenceImport( OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer, + const css::uno::Reference< css::container::XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType ); @@ -384,14 +384,14 @@ namespace xmloff public: OButtonImport( OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer, + const css::uno::Reference< css::container::XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType ); protected: // SvXMLImportContext overridables virtual void StartElement( - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList) override; }; //= OValueRangeImport @@ -406,14 +406,14 @@ namespace xmloff public: OValueRangeImport( OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer, + const css::uno::Reference< css::container::XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType ); protected: // SvXMLImportContext overridables virtual void StartElement( - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList ) override; // OPropertyImport overridables virtual bool handleAttribute( sal_uInt16 _nNamespaceKey, @@ -428,23 +428,23 @@ namespace xmloff class OTextLikeImport : public OControlImport { private: - ::com::sun::star::uno::Reference< com::sun::star::text::XTextCursor > m_xCursor; - ::com::sun::star::uno::Reference< com::sun::star::text::XTextCursor > m_xOldCursor; + css::uno::Reference< css::text::XTextCursor > m_xCursor; + css::uno::Reference< css::text::XTextCursor > m_xOldCursor; bool m_bEncounteredTextPara; public: OTextLikeImport( OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer, + const css::uno::Reference< css::container::XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType ); // SvXMLImportContext overridables virtual void StartElement( - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList) override; virtual SvXMLImportContext* CreateChildContext( sal_uInt16 _nPrefix, const OUString& _rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList) override; virtual void EndElement() override; private: @@ -462,14 +462,14 @@ namespace xmloff friend class OComboItemImport; protected: - ::com::sun::star::uno::Sequence< OUString > + css::uno::Sequence< OUString > m_aListSource; - ::com::sun::star::uno::Sequence< OUString > + css::uno::Sequence< OUString > m_aValueList; - ::com::sun::star::uno::Sequence< sal_Int16 > + css::uno::Sequence< sal_Int16 > m_aSelectedSeq; - ::com::sun::star::uno::Sequence< sal_Int16 > + css::uno::Sequence< sal_Int16 > m_aDefaultSelectedSeq; OUString m_sCellListSource; /// the cell range which acts as list source for the control @@ -485,16 +485,16 @@ namespace xmloff public: OListAndComboImport( OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer, + const css::uno::Reference< css::container::XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType ); // SvXMLImportContext overridables virtual void StartElement( - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList) override; virtual SvXMLImportContext* CreateChildContext( sal_uInt16 _nPrefix, const OUString& _rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList) override; virtual void EndElement() override; // OPropertyImport overridables @@ -530,7 +530,7 @@ namespace xmloff const OListAndComboImportRef& _rListBox); virtual void StartElement( - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList) override; }; //= OComboItemImport @@ -548,7 +548,7 @@ namespace xmloff protected: // SvXMLImportContext overridables virtual void StartElement( - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList) override; }; //= OContainerImport @@ -559,13 +559,13 @@ namespace xmloff ,public ODefaultEventAttacherManager { protected: - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > + css::uno::Reference< css::container::XNameContainer > m_xMeAsContainer; OUString m_sWrapperElementName; protected: OContainerImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer, + const css::uno::Reference< css::container::XNameContainer >& _rxParentContainer, const sal_Char* _pWrapperElementName) :BASE(_rImport, _rEventManager, _nPrefix, _rName, _rxParentContainer) ,m_sWrapperElementName(OUString::createFromAscii(_pWrapperElementName)) @@ -575,12 +575,12 @@ namespace xmloff // SvXMLImportContext overridables virtual SvXMLImportContext* CreateChildContext( sal_uInt16 _nPrefix, const OUString& _rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList) SAL_OVERRIDE; + const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList) SAL_OVERRIDE; virtual void EndElement() SAL_OVERRIDE; protected: // OElementImport overridables - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > + virtual css::uno::Reference< css::beans::XPropertySet > createElement() SAL_OVERRIDE; // create the child context for the given control type @@ -598,17 +598,17 @@ namespace xmloff class OColumnImport : public BASE { protected: - ::com::sun::star::uno::Reference< ::com::sun::star::form::XGridColumnFactory > + css::uno::Reference< css::form::XGridColumnFactory > m_xColumnFactory; public: OColumnImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer, + const css::uno::Reference< css::container::XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType); protected: // OElementImport overridables - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > + virtual css::uno::Reference< css::beans::XPropertySet > createElement() SAL_OVERRIDE; }; @@ -616,23 +616,23 @@ namespace xmloff class OColumnWrapperImport : public SvXMLImportContext { protected: - ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > + css::uno::Reference< css::xml::sax::XAttributeList > m_xOwnAttributes; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > + css::uno::Reference< css::container::XNameContainer > m_xParentContainer; OFormLayerXMLImport_Impl& m_rFormImport; IEventAttacherManager& m_rEventManager; public: OColumnWrapperImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer); + const css::uno::Reference< css::container::XNameContainer >& _rxParentContainer); // SvXMLImportContext overridables virtual SvXMLImportContext* CreateChildContext( sal_uInt16 _nPrefix, const OUString& _rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList) override; virtual void StartElement( - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList) override; protected: OControlImport* implCreateChildContext( sal_uInt16 _nPrefix, const OUString& _rLocalName, @@ -648,7 +648,7 @@ namespace xmloff public: OGridImport( OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer, + const css::uno::Reference< css::container::XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType); protected: @@ -666,16 +666,16 @@ namespace xmloff public: OFormImport( OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer + const css::uno::Reference< css::container::XNameContainer >& _rxParentContainer ); protected: // SvXMLImportContext overridables virtual SvXMLImportContext* CreateChildContext( sal_uInt16 _nPrefix, const OUString& _rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList) override; virtual void StartElement( - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList) override; virtual void EndElement() override; // OContainerImport overridables @@ -702,8 +702,8 @@ namespace xmloff OXMLDataSourceImport( SvXMLImport& _rImport ,sal_uInt16 nPrfx ,const OUString& rLName - ,const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList - ,const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _xElement); + ,const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList + ,const css::uno::Reference< css::beans::XPropertySet >& _xElement); }; #define _INCLUDING_FROM_ELEMENTIMPORT_HXX_ diff --git a/xmloff/source/forms/elementimport_impl.hxx b/xmloff/source/forms/elementimport_impl.hxx index 3677f230a281..bd100642833e 100644 --- a/xmloff/source/forms/elementimport_impl.hxx +++ b/xmloff/source/forms/elementimport_impl.hxx @@ -32,7 +32,7 @@ template <class BASE> inline SvXMLImportContext* OContainerImport< BASE >::CreateChildContext( sal_uInt16 _nPrefix, const OUString& _rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList) + const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList) { // maybe it's a sub control if (_rLocalName == m_sWrapperElementName) @@ -50,16 +50,16 @@ inline SvXMLImportContext* OContainerImport< BASE >::CreateChildContext( } template <class BASE> -inline ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > +inline css::uno::Reference< css::beans::XPropertySet > OContainerImport< BASE >::createElement() { // let the base class create the object - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xReturn = BASE::createElement(); + css::uno::Reference< css::beans::XPropertySet > xReturn = BASE::createElement(); if (!xReturn.is()) return xReturn; // ensure that the object is a XNameContainer (we strongly need this for inserting child elements) - m_xMeAsContainer.set(xReturn, ::com::sun::star::uno::UNO_QUERY); + m_xMeAsContainer.set(xReturn, css::uno::UNO_QUERY); if (!m_xMeAsContainer.is()) { OSL_FAIL("OContainerImport::createElement: invalid element (no XNameContainer) created!"); @@ -75,7 +75,7 @@ inline void OContainerImport< BASE >::EndElement() BASE::EndElement(); // now that we have all children, attach the events - ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > xIndexContainer(m_xMeAsContainer, ::com::sun::star::uno::UNO_QUERY); + css::uno::Reference< css::container::XIndexAccess > xIndexContainer(m_xMeAsContainer, css::uno::UNO_QUERY); if (xIndexContainer.is()) ODefaultEventAttacherManager::setEvents(xIndexContainer); } @@ -83,19 +83,19 @@ inline void OContainerImport< BASE >::EndElement() //= OColumnImport template <class BASE> OColumnImport< BASE >::OColumnImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer, + const css::uno::Reference< css::container::XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType) :BASE(_rImport, _rEventManager, _nPrefix, _rName, _rxParentContainer, _eType) - ,m_xColumnFactory(_rxParentContainer, ::com::sun::star::uno::UNO_QUERY) + ,m_xColumnFactory(_rxParentContainer, css::uno::UNO_QUERY) { OSL_ENSURE(m_xColumnFactory.is(), "OColumnImport::OColumnImport: invalid parent container (no factory)!"); } // OElementImport overridables template <class BASE> -::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > OColumnImport< BASE >::createElement() +css::uno::Reference< css::beans::XPropertySet > OColumnImport< BASE >::createElement() { - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xReturn; + css::uno::Reference< css::beans::XPropertySet > xReturn; // no call to the base class' method. We have to use the grid column factory if (m_xColumnFactory.is()) { diff --git a/xmloff/source/forms/eventexport.hxx b/xmloff/source/forms/eventexport.hxx index 0f15371bb29b..40d239358542 100644 --- a/xmloff/source/forms/eventexport.hxx +++ b/xmloff/source/forms/eventexport.hxx @@ -34,7 +34,7 @@ namespace xmloff { //= OEventDescriptorMapper - typedef ::cppu::WeakImplHelper < ::com::sun::star::container::XNameReplace + typedef ::cppu::WeakImplHelper < css::container::XNameReplace > OEventDescriptorMapper_Base; /** helper class wrapping different script event representations @@ -48,24 +48,24 @@ namespace xmloff class OEventDescriptorMapper : public OEventDescriptorMapper_Base { protected: - typedef std::map< OUString, ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue > > MapString2PropertyValueSequence; + typedef std::map< OUString, css::uno::Sequence < css::beans::PropertyValue > > MapString2PropertyValueSequence; MapString2PropertyValueSequence m_aMappedEvents; public: explicit OEventDescriptorMapper( - const ::com::sun::star::uno::Sequence< ::com::sun::star::script::ScriptEventDescriptor >& _rEvents); + const css::uno::Sequence< css::script::ScriptEventDescriptor >& _rEvents); // XNameReplace - virtual void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) throw(css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(css::uno::RuntimeException, std::exception) override; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType( ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements( ) throw(css::uno::RuntimeException, std::exception) override; }; } // namespace xmloff diff --git a/xmloff/source/forms/eventimport.hxx b/xmloff/source/forms/eventimport.hxx index d75b68bf1e6f..cf1f2fbcb6c1 100644 --- a/xmloff/source/forms/eventimport.hxx +++ b/xmloff/source/forms/eventimport.hxx @@ -52,8 +52,8 @@ namespace xmloff { protected: typedef std::map< - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >, - ::com::sun::star::uno::Sequence< ::com::sun::star::script::ScriptEventDescriptor >, + css::uno::Reference< css::beans::XPropertySet >, + css::uno::Sequence< css::script::ScriptEventDescriptor >, OPropertySetCompare> MapPropertySet2ScriptSequence; // usually an event attacher manager will need to collect all script events registered, 'cause @@ -65,13 +65,13 @@ namespace xmloff public: // IEventAttacherManager virtual void registerEvents( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxElement, - const ::com::sun::star::uno::Sequence< ::com::sun::star::script::ScriptEventDescriptor >& _rEvents + const css::uno::Reference< css::beans::XPropertySet >& _rxElement, + const css::uno::Sequence< css::script::ScriptEventDescriptor >& _rEvents ) override; protected: void setEvents( - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& _rxContainer + const css::uno::Reference< css::container::XIndexAccess >& _rxContainer ); virtual ~ODefaultEventAttacherManager(); diff --git a/xmloff/source/forms/formattributes.cxx b/xmloff/source/forms/formattributes.cxx index 98a1c595c80a..14b22232b151 100644 --- a/xmloff/source/forms/formattributes.cxx +++ b/xmloff/source/forms/formattributes.cxx @@ -259,7 +259,7 @@ namespace xmloff void OAttribute2Property::addEnumProperty( const sal_Char* _pAttributeName, const OUString& _rPropertyName, const sal_uInt16 _nAttributeDefault, const SvXMLEnumMapEntry* _pValueMap, - const ::com::sun::star::uno::Type* _pType) + const css::uno::Type* _pType) { OUStringBuffer aDefault; SvXMLUnitConverter::convertEnum(aDefault, _nAttributeDefault, _pValueMap); @@ -272,7 +272,7 @@ namespace xmloff OAttribute2Property::AttributeAssignment& OAttribute2Property::implAdd( const sal_Char* _pAttributeName, const OUString& _rPropertyName, - const ::com::sun::star::uno::Type& _rType, const OUString& /*_rDefaultString*/) + const css::uno::Type& _rType, const OUString& /*_rDefaultString*/) { OSL_ENSURE(m_aKnownProperties.end() == m_aKnownProperties.find(OUString::createFromAscii(_pAttributeName)), "OAttribute2Property::implAdd: already have this attribute!"); diff --git a/xmloff/source/forms/formattributes.hxx b/xmloff/source/forms/formattributes.hxx index 4897f7d103a0..10b80b788df5 100644 --- a/xmloff/source/forms/formattributes.hxx +++ b/xmloff/source/forms/formattributes.hxx @@ -248,7 +248,7 @@ namespace xmloff { OUString sAttributeName; // the attribute name OUString sPropertyName; // the property name - ::com::sun::star::uno::Type aPropertyType; // the property type + css::uno::Type aPropertyType; // the property type OUString sAttributeDefault; // the default if the attribute is not present // entries which are special to some value types @@ -348,13 +348,13 @@ namespace xmloff void addEnumProperty( const sal_Char* _pAttributeName, const OUString& _rPropertyName, const sal_uInt16 _nAttributeDefault, const SvXMLEnumMapEntry* _pValueMap, - const ::com::sun::star::uno::Type* _pType = nullptr); + const css::uno::Type* _pType = nullptr); protected: /// some common code for the various add*Property methods AttributeAssignment& implAdd( const sal_Char* _pAttributeName, const OUString& _rPropertyName, - const ::com::sun::star::uno::Type& _rType, const OUString& _rDefaultString); + const css::uno::Type& _rType, const OUString& _rDefaultString); }; } // namespace xmloff diff --git a/xmloff/source/forms/formcellbinding.hxx b/xmloff/source/forms/formcellbinding.hxx index e58205e98a41..98cfd206b0bc 100644 --- a/xmloff/source/forms/formcellbinding.hxx +++ b/xmloff/source/forms/formcellbinding.hxx @@ -38,9 +38,9 @@ namespace xmloff class FormCellBindingHelper { protected: - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > + css::uno::Reference< css::beans::XPropertySet > m_xControlModel; // the model we work for - ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheetDocument > + css::uno::Reference< css::sheet::XSpreadsheetDocument > m_xDocument; // the document where the model lives public: @@ -49,7 +49,7 @@ namespace xmloff this model, since then no of it's functionality will be available.</p> */ static bool livesInSpreadsheetDocument( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControlModel + const css::uno::Reference< css::beans::XPropertySet >& _rxControlModel ); /** ctor @@ -62,8 +62,8 @@ namespace xmloff model. */ FormCellBindingHelper( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControlModel, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& _rxDocument + const css::uno::Reference< css::beans::XPropertySet >& _rxControlModel, + const css::uno::Reference< css::frame::XModel >& _rxDocument ); public: @@ -71,7 +71,7 @@ namespace xmloff @precond isCellBindingAllowed returns <TRUE/> */ - ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XValueBinding > + css::uno::Reference< css::form::binding::XValueBinding > createCellBindingFromStringAddress( const OUString& _rAddress, bool _bUseIntegerBinding @@ -79,7 +79,7 @@ namespace xmloff /** gets a cell range list source binding for the given address */ - ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XListEntrySource > + css::uno::Reference< css::form::binding::XListEntrySource > createCellListSourceFromStringAddress( const OUString& _rAddress ) const; /** creates a string representation for the given value binding's address @@ -92,7 +92,7 @@ namespace xmloff @see isCellBinding */ OUString getStringAddressFromCellBinding( - const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XValueBinding >& _rxBinding + const css::uno::Reference< css::form::binding::XValueBinding >& _rxBinding ) const; /** creates a string representation for the given list source's range address @@ -106,17 +106,17 @@ namespace xmloff @see isCellRangeListSource */ OUString getStringAddressFromCellListSource( - const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XListEntrySource >& _rxSource + const css::uno::Reference< css::form::binding::XListEntrySource >& _rxSource ) const; /** returns the current binding of our control model, if any. */ - ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XValueBinding > + css::uno::Reference< css::form::binding::XValueBinding > getCurrentBinding( ) const; /** returns the current external list source of the control model, if any */ - ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XListEntrySource > + css::uno::Reference< css::form::binding::XListEntrySource > getCurrentListSource( ) const; /** sets a new binding for our control model @@ -125,7 +125,7 @@ namespace xmloff returning <TRUE/>) */ void setBinding( - const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XValueBinding >& _rxBinding + const css::uno::Reference< css::form::binding::XValueBinding >& _rxBinding ); /** sets a list source for our control model @@ -134,7 +134,7 @@ namespace xmloff returning <TRUE/>) */ void setListSource( - const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XListEntrySource >& _rxSource + const css::uno::Reference< css::form::binding::XListEntrySource >& _rxSource ); /** checks whether it's possible to bind the control model to a spreadsheet cell @@ -144,7 +144,7 @@ namespace xmloff /** checks whether within the given document, it's possible to bind control models to spreadsheet cells */ static bool isCellBindingAllowed( - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& _rxDocument + const css::uno::Reference< css::frame::XModel >& _rxDocument ); /** checks whether it's possible to bind the control model to a range of spreadsheet cells @@ -156,26 +156,26 @@ namespace xmloff spreadsheet cells supplying the list entries */ static bool isListCellRangeAllowed( - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& _rxDocument + const css::uno::Reference< css::frame::XModel >& _rxDocument ); /** checks whether a given binding is a spreadsheet cell binding */ static bool isCellBinding( - const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XValueBinding >& _rxBinding + const css::uno::Reference< css::form::binding::XValueBinding >& _rxBinding ); /** checks whether a given binding is a spreadsheet cell binding, exchanging integer values */ static bool isCellIntegerBinding( - const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XValueBinding >& _rxBinding + const css::uno::Reference< css::form::binding::XValueBinding >& _rxBinding ); /** checks whether a given list source is a spreadsheet cell list source */ static bool isCellRangeListSource( - const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XListEntrySource >& _rxSource + const css::uno::Reference< css::form::binding::XListEntrySource >& _rxSource ); protected: @@ -183,7 +183,7 @@ namespace xmloff */ bool convertStringAddress( const OUString& _rAddressDescription, - ::com::sun::star::table::CellAddress& /* [out] */ _rAddress, + css::table::CellAddress& /* [out] */ _rAddress, sal_Int16 _nAssumeSheet = -1 ) const; @@ -191,7 +191,7 @@ namespace xmloff */ bool convertStringAddress( const OUString& _rAddressDescription, - ::com::sun::star::table::CellRangeAddress& /* [out] */ _rAddress + css::table::CellRangeAddress& /* [out] */ _rAddress ) const; /** determines if our document is a spreadsheet document, *and* can supply @@ -203,14 +203,14 @@ namespace xmloff the given service */ static bool isSpreadsheetDocumentWhichSupplies( - const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheetDocument >& _rxDocument, + const css::uno::Reference< css::sheet::XSpreadsheetDocument >& _rxDocument, const OUString& _rService ); /** checkes whether a given component supports a given servive */ static bool doesComponentSupport( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxComponent, + const css::uno::Reference< css::uno::XInterface >& _rxComponent, const OUString& _rService ); @@ -224,11 +224,11 @@ namespace xmloff the value of the instantiation argument. Not evaluated if <arg>_rArgumentName</arg> is empty. */ - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > + css::uno::Reference< css::uno::XInterface > createDocumentDependentInstance( const OUString& _rService, const OUString& _rArgumentName, - const ::com::sun::star::uno::Any& _rArgumentValue + const css::uno::Any& _rArgumentValue ) const; /** converts an address representation into another one @@ -248,14 +248,14 @@ namespace xmloff @return <TRUE/> if any only if the conversion was successful - @see com::sun::star::table::CellAddressConversion - @see com::sun::star::table::CellRangeAddressConversion + @see css::table::CellAddressConversion + @see css::table::CellRangeAddressConversion */ bool doConvertAddressRepresentations( const OUString& _rInputProperty, - const ::com::sun::star::uno::Any& _rInputValue, + const css::uno::Any& _rInputValue, const OUString& _rOutputProperty, - ::com::sun::star::uno::Any& _rOutputValue, + css::uno::Any& _rOutputValue, bool _bIsRange ) const; }; diff --git a/xmloff/source/forms/gridcolumnproptranslator.cxx b/xmloff/source/forms/gridcolumnproptranslator.cxx index 3110e21b9a6e..c5b1c7d8c5d9 100644 --- a/xmloff/source/forms/gridcolumnproptranslator.cxx +++ b/xmloff/source/forms/gridcolumnproptranslator.cxx @@ -127,9 +127,9 @@ namespace xmloff virtual ~OMergedPropertySetInfo(); // XPropertySetInfo - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getProperties( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::beans::Property SAL_CALL getPropertyByName( const OUString& aName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::beans::Property > SAL_CALL getProperties( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::beans::Property SAL_CALL getPropertyByName( const OUString& aName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) throw (css::uno::RuntimeException, std::exception) override; }; OMergedPropertySetInfo::OMergedPropertySetInfo( const Reference< XPropertySetInfo >& _rxMasterInfo ) diff --git a/xmloff/source/forms/gridcolumnproptranslator.hxx b/xmloff/source/forms/gridcolumnproptranslator.hxx index 6d79377f1374..b0aad99af99a 100644 --- a/xmloff/source/forms/gridcolumnproptranslator.hxx +++ b/xmloff/source/forms/gridcolumnproptranslator.hxx @@ -28,38 +28,38 @@ namespace xmloff { //= OGridColumnPropertyTranslator - typedef ::cppu::WeakImplHelper < ::com::sun::star::beans::XPropertySet - , ::com::sun::star::beans::XMultiPropertySet + typedef ::cppu::WeakImplHelper < css::beans::XPropertySet + , css::beans::XMultiPropertySet > OGridColumnPropertyTranslator_Base; class OGridColumnPropertyTranslator : public OGridColumnPropertyTranslator_Base { private: - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XMultiPropertySet > + css::uno::Reference< css::beans::XMultiPropertySet > m_xGridColumn; public: explicit OGridColumnPropertyTranslator( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XMultiPropertySet >& _rxGridColumn + const css::uno::Reference< css::beans::XMultiPropertySet >& _rxGridColumn ); protected: virtual ~OGridColumnPropertyTranslator(); // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XMultiPropertySet - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) throw (css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; }; } // namespace xmloff diff --git a/xmloff/source/forms/handler/vcl_date_handler.hxx b/xmloff/source/forms/handler/vcl_date_handler.hxx index 300ef640539d..028e2c12f435 100644 --- a/xmloff/source/forms/handler/vcl_date_handler.hxx +++ b/xmloff/source/forms/handler/vcl_date_handler.hxx @@ -33,7 +33,7 @@ namespace xmloff // IPropertyHandler virtual OUString getAttributeValue( const PropertyValues& i_propertyValues ) const override; - virtual OUString getAttributeValue( const ::com::sun::star::uno::Any& i_propertyValue ) const override; + virtual OUString getAttributeValue( const css::uno::Any& i_propertyValue ) const override; virtual bool getPropertyValues( const OUString& i_attributeValue, PropertyValues& o_propertyValues ) const override; }; diff --git a/xmloff/source/forms/handler/vcl_time_handler.hxx b/xmloff/source/forms/handler/vcl_time_handler.hxx index 7c1a0cdd7fd3..262ed942db95 100644 --- a/xmloff/source/forms/handler/vcl_time_handler.hxx +++ b/xmloff/source/forms/handler/vcl_time_handler.hxx @@ -33,7 +33,7 @@ namespace xmloff // IPropertyHandler virtual OUString getAttributeValue( const PropertyValues& i_propertyValues ) const override; - virtual OUString getAttributeValue( const ::com::sun::star::uno::Any& i_propertyValue ) const override; + virtual OUString getAttributeValue( const css::uno::Any& i_propertyValue ) const override; virtual bool getPropertyValues( const OUString& i_attributeValue, PropertyValues& o_propertyValues ) const override; }; diff --git a/xmloff/source/forms/ifacecompare.hxx b/xmloff/source/forms/ifacecompare.hxx index 455c6219ec1c..9eab7abfb655 100644 --- a/xmloff/source/forms/ifacecompare.hxx +++ b/xmloff/source/forms/ifacecompare.hxx @@ -32,12 +32,12 @@ namespace xmloff */ template < class IAFCE > struct OInterfaceCompare - :public ::std::binary_function < ::com::sun::star::uno::Reference< IAFCE > - , ::com::sun::star::uno::Reference< IAFCE > + :public ::std::binary_function < css::uno::Reference< IAFCE > + , css::uno::Reference< IAFCE > , bool > { - bool operator() (const ::com::sun::star::uno::Reference< IAFCE >& lhs, const ::com::sun::star::uno::Reference< IAFCE >& rhs) const + bool operator() (const css::uno::Reference< IAFCE >& lhs, const css::uno::Reference< IAFCE >& rhs) const { return lhs.get() < rhs.get(); // this does not make any sense if you see the semantics of the pointer returned by get: @@ -47,8 +47,8 @@ namespace xmloff } }; - typedef OInterfaceCompare< ::com::sun::star::beans::XPropertySet > OPropertySetCompare; - typedef OInterfaceCompare< ::com::sun::star::drawing::XDrawPage > ODrawPageCompare; + typedef OInterfaceCompare< css::beans::XPropertySet > OPropertySetCompare; + typedef OInterfaceCompare< css::drawing::XDrawPage > ODrawPageCompare; } // namespace xmloff diff --git a/xmloff/source/forms/layerexport.hxx b/xmloff/source/forms/layerexport.hxx index fa2042623453..9aa4d881122c 100644 --- a/xmloff/source/forms/layerexport.hxx +++ b/xmloff/source/forms/layerexport.hxx @@ -41,18 +41,18 @@ class SvXMLExportPropertyMapper; namespace xmloff { - typedef ::std::set < ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > + typedef ::std::set < css::uno::Reference< css::beans::XPropertySet > , OPropertySetCompare > PropertySetBag; // maps objects (property sets) to strings, e.g. control ids. - typedef ::std::map < ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > + typedef ::std::map < css::uno::Reference< css::beans::XPropertySet > , OUString , OPropertySetCompare > MapPropertySet2String; // map pages to maps (of property sets to strings) - typedef ::std::map < ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > + typedef ::std::map < css::uno::Reference< css::drawing::XDrawPage > , MapPropertySet2String , ODrawPageCompare > MapPropertySet2Map; @@ -92,7 +92,7 @@ namespace xmloff // chance, as (if other user-defined formats exist in the document as well) we can't distinguish // between user-defined formats really needed for the doc (i.e. in a calc cell) and formats only added // to the supplier because the controls needed it. - ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormats > + css::uno::Reference< css::util::XNumberFormats > m_xControlNumberFormats; MapPropertySet2Map m_aControlIds; @@ -127,21 +127,21 @@ namespace xmloff /** exports one single grid column */ void exportGridColumn( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxColumn, - const ::com::sun::star::uno::Sequence< ::com::sun::star::script::ScriptEventDescriptor >& _rEvents + const css::uno::Reference< css::beans::XPropertySet >& _rxColumn, + const css::uno::Sequence< css::script::ScriptEventDescriptor >& _rEvents ); /** exports one single control */ void exportControl( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControl, - const ::com::sun::star::uno::Sequence< ::com::sun::star::script::ScriptEventDescriptor >& _rEvents + const css::uno::Reference< css::beans::XPropertySet >& _rxControl, + const css::uno::Sequence< css::script::ScriptEventDescriptor >& _rEvents ); /** exports one single form */ - void exportForm(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxProps, - const ::com::sun::star::uno::Sequence< ::com::sun::star::script::ScriptEventDescriptor >& _rEvents + void exportForm(const css::uno::Reference< css::beans::XPropertySet >& _rxProps, + const css::uno::Sequence< css::script::ScriptEventDescriptor >& _rEvents ); /** seek to the page given. @@ -152,14 +152,14 @@ namespace xmloff getControlId */ bool seekPage( - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& _rxDrawPage); + const css::uno::Reference< css::drawing::XDrawPage >& _rxDrawPage); /** get the id of the given control. <p>You must have sought to the page of the control before calling this.</p> */ OUString - getControlId(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControl); + getControlId(const css::uno::Reference< css::beans::XPropertySet >& _rxControl); /** retrieves the style name for the control's number style. @@ -167,13 +167,13 @@ namespace xmloff do not have a number style. In this case, an empty string is returned.</p> */ OUString - getControlNumberStyle( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControl ); + getControlNumberStyle( const css::uno::Reference< css::beans::XPropertySet >& _rxControl ); // IFormsExportContext - virtual void exportCollectionElements(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& _rxCollection) override; + virtual void exportCollectionElements(const css::uno::Reference< css::container::XIndexAccess >& _rxCollection) override; virtual SvXMLExport& getGlobalContext() override; virtual OUString getObjectStyleName( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxObject ) override; + const css::uno::Reference< css::beans::XPropertySet >& _rxObject ) override; virtual ::rtl::Reference< SvXMLExportPropertyMapper > getStylePropertyMapper() override; /** clear any structures which have been build in the recent <method>examine</method> calls. @@ -201,7 +201,7 @@ namespace xmloff @see exportForms */ void examineForms( - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& _rxDrawPage); + const css::uno::Reference< css::drawing::XDrawPage >& _rxDrawPage); /** export a forms collection of a draw page @@ -209,7 +209,7 @@ namespace xmloff <method>exportCollectionElements</method>.</p> */ void exportForms( - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& _rxDrawPage); + const css::uno::Reference< css::drawing::XDrawPage >& _rxDrawPage); /** exports the XForms model data */ @@ -217,7 +217,7 @@ namespace xmloff /** determines whether the given page contains logical forms */ - static bool pageContainsForms( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& _rxDrawPage ); + static bool pageContainsForms( const css::uno::Reference< css::drawing::XDrawPage >& _rxDrawPage ); /** determines whether the given page contains XForm instances */ @@ -233,37 +233,37 @@ namespace xmloff protected: static bool impl_isFormPageContainingForms( - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& _rxDrawPage, - ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& _rxForms); + const css::uno::Reference< css::drawing::XDrawPage >& _rxDrawPage, + css::uno::Reference< css::container::XIndexAccess >& _rxForms); /** moves the m_aCurrentPage* members to the positions specifying the given page. @return <TRUE/> if there already were structures for the given page */ bool implMoveIterators( - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& _rxDrawPage, + const css::uno::Reference< css::drawing::XDrawPage >& _rxDrawPage, bool _bClear); /** check the object given if it's a control, if so, examine it. @return <TRUE/> if the object has been handled */ - bool checkExamineControl(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxObject); + bool checkExamineControl(const css::uno::Reference< css::beans::XPropertySet >& _rxObject); /** examines the control's number format, so later the format style can be referred <p>remembers the format key for the control, so it can later be asked for in getControlNumberStyle</p> */ - void examineControlNumberFormat(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControl); + void examineControlNumberFormat(const css::uno::Reference< css::beans::XPropertySet >& _rxControl); /** examines the control's number format, so later the format style can be referred <p>does not remember the information returned in any way</p> */ - sal_Int32 implExamineControlNumberFormat( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxObject ); + sal_Int32 implExamineControlNumberFormat( const css::uno::Reference< css::beans::XPropertySet >& _rxObject ); /** collects AutoStyles for grid columns */ - void collectGridColumnStylesAndIds( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControl ); + void collectGridColumnStylesAndIds( const css::uno::Reference< css::beans::XPropertySet >& _rxControl ); /** ensures that the number format of the given control exist in our own formats supplier. @@ -274,7 +274,7 @@ namespace xmloff the format key of the control's format relative to our own formats supplier */ - sal_Int32 ensureTranslateFormat(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxFormattedControl); + sal_Int32 ensureTranslateFormat(const css::uno::Reference< css::beans::XPropertySet >& _rxFormattedControl); /// returns the instance exporting our control's number styles SvXMLNumFmtExport* getControlNumberStyleExport(); @@ -285,7 +285,7 @@ namespace xmloff /** determines the number format style for the given object without remembering it */ OUString - getImmediateNumberStyle( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxObject ); + getImmediateNumberStyle( const css::uno::Reference< css::beans::XPropertySet >& _rxObject ); /** returns the prefix to be used for control number styles */ @@ -298,7 +298,7 @@ namespace xmloff to the form layer exporter.<br/> Of course you have to do this before calling <member>exportForms</member></p> */ - void excludeFromExport( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& _rxControl ); + void excludeFromExport( const css::uno::Reference< css::awt::XControlModel >& _rxControl ); }; } // namespace xmloff diff --git a/xmloff/source/forms/layerimport.hxx b/xmloff/source/forms/layerimport.hxx index 641380cafe99..be8dddf8bdfd 100644 --- a/xmloff/source/forms/layerimport.hxx +++ b/xmloff/source/forms/layerimport.hxx @@ -56,18 +56,18 @@ namespace xmloff OAttribute2Property m_aAttributeMetaData; /// the supplier for the forms of the currently imported page - ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormsSupplier2 > + css::uno::Reference< css::form::XFormsSupplier2 > m_xCurrentPageFormsSupp; SvXMLStylesContext* m_pAutoStyles; protected: - typedef std::map< OUString, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > > MapString2PropertySet; + typedef std::map< OUString, css::uno::Reference< css::beans::XPropertySet > > MapString2PropertySet; typedef std::map<css::uno::Reference<css::drawing::XDrawPage>, MapString2PropertySet, ODrawPageCompare> MapDrawPage2Map; MapDrawPage2Map m_aControlIds; // ids of the controls on all known page MapDrawPage2Map::iterator m_aCurrentPageIds; // ifs of the controls on the current page - typedef ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >, OUString > + typedef ::std::pair< css::uno::Reference< css::beans::XPropertySet >, OUString > ModelStringPair; ::std::vector< ModelStringPair > m_aControlReferences; // control reference descriptions for current page @@ -88,10 +88,10 @@ namespace xmloff public: // IControlIdMap void registerControlId( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControl, + const css::uno::Reference< css::beans::XPropertySet >& _rxControl, const OUString& _rId); void registerControlReferences( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControl, + const css::uno::Reference< css::beans::XPropertySet >& _rxControl, const OUString& _rReferringControls); // OFormLayerXMLImport_Impl @@ -101,31 +101,31 @@ namespace xmloff void enterEventContext(); void leaveEventContext(); void applyControlNumberStyle( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControlModel, + const css::uno::Reference< css::beans::XPropertySet >& _rxControlModel, const OUString& _rControlNumerStyleName ); void registerCellValueBinding( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControlModel, + const css::uno::Reference< css::beans::XPropertySet >& _rxControlModel, const OUString& _rCellAddress ); void registerCellRangeListSource( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControlModel, + const css::uno::Reference< css::beans::XPropertySet >& _rxControlModel, const OUString& _rCellRangeAddress ); void registerXFormsValueBinding( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControlModel, + const css::uno::Reference< css::beans::XPropertySet >& _rxControlModel, const OUString& _rBindingID ); void registerXFormsListBinding( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControlModel, + const css::uno::Reference< css::beans::XPropertySet >& _rxControlModel, const OUString& _rBindingID ); void registerXFormsSubmission( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControlModel, + const css::uno::Reference< css::beans::XPropertySet >& _rxControlModel, const OUString& _rSubmissionID ); @@ -136,7 +136,7 @@ namespace xmloff /** start importing the forms of the given page */ void startPage( - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& _rxDrawPage); + const css::uno::Reference< css::drawing::XDrawPage >& _rxDrawPage); /** end importing the forms of the current page */ @@ -155,11 +155,11 @@ namespace xmloff SvXMLImportContext* createContext( const sal_uInt16 _nPrefix, const OUString& _rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttribs); + const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttribs); /** get the control with the given id */ - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > + css::uno::Reference< css::beans::XPropertySet > lookupControlId(const OUString& _rControlId); /** announces the auto-style context to the form importer diff --git a/xmloff/source/forms/officeforms.hxx b/xmloff/source/forms/officeforms.hxx index e672d71e905e..eccf2003e1d8 100644 --- a/xmloff/source/forms/officeforms.hxx +++ b/xmloff/source/forms/officeforms.hxx @@ -42,16 +42,16 @@ namespace xmloff // SvXMLImportContext overriabled virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList ) override; virtual void EndElement() override; protected: void implImportBool( - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttributes, + const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttributes, OfficeFormsAttributes _eAttribute, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxProps, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo >& _rxPropInfo, + const css::uno::Reference< css::beans::XPropertySet >& _rxProps, + const css::uno::Reference< css::beans::XPropertySetInfo >& _rxPropInfo, const OUString& _rPropName, bool _bDefault ); @@ -73,8 +73,8 @@ namespace xmloff static void implExportBool( SvXMLExport& _rExp, OfficeFormsAttributes _eAttribute, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxProps, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo >& _rxPropInfo, + const css::uno::Reference< css::beans::XPropertySet >& _rxProps, + const css::uno::Reference< css::beans::XPropertySetInfo >& _rxPropInfo, const OUString& _rPropName, bool _bDefault ); diff --git a/xmloff/source/forms/propertyexport.cxx b/xmloff/source/forms/propertyexport.cxx index a78c8c6bd97d..a06823d3b47f 100644 --- a/xmloff/source/forms/propertyexport.cxx +++ b/xmloff/source/forms/propertyexport.cxx @@ -146,7 +146,7 @@ namespace xmloff bool bIsEmptyValue = TypeClass_VOID == aValue.getValueType().getTypeClass(); if ( bIsEmptyValue ) { - com::sun::star::beans::Property aPropDesc; + css::beans::Property aPropDesc; aPropDesc = m_xPropertyInfo->getPropertyByName( *aProperty ); aExportType = aPropDesc.Type; } @@ -562,9 +562,9 @@ namespace xmloff default: { // hmmm .... what else do we know? double fValue = 0; - ::com::sun::star::util::Date aDate; - ::com::sun::star::util::Time aTime; - ::com::sun::star::util::DateTime aDateTime; + css::util::Date aDate; + css::util::Time aTime; + css::util::DateTime aDateTime; if (_rValue >>= aDate) { Date aToolsDate( Date::EMPTY ); @@ -607,7 +607,7 @@ namespace xmloff return aBuffer.makeStringAndClear(); } - token::XMLTokenEnum OPropertyExport::implGetPropertyXMLType(const ::com::sun::star::uno::Type& _rType) + token::XMLTokenEnum OPropertyExport::implGetPropertyXMLType(const css::uno::Type& _rType) { // handle the type description switch (_rType.getTypeClass()) diff --git a/xmloff/source/forms/propertyexport.hxx b/xmloff/source/forms/propertyexport.hxx index c8f545ef140e..4af543b5251d 100644 --- a/xmloff/source/forms/propertyexport.hxx +++ b/xmloff/source/forms/propertyexport.hxx @@ -65,11 +65,11 @@ namespace xmloff protected: IFormsExportContext& m_rContext; - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > + const css::uno::Reference< css::beans::XPropertySet > m_xProps; - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > + const css::uno::Reference< css::beans::XPropertySetInfo > m_xPropertyInfo; - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState > + const css::uno::Reference< css::beans::XPropertyState > m_xPropertyState; // caching @@ -84,7 +84,7 @@ namespace xmloff the property set to be exported */ OPropertyExport(IFormsExportContext& _rContext, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxProps); + const css::uno::Reference< css::beans::XPropertySet >& _rxProps); protected: /** examines a property set given for all properties which's value are to made persistent @@ -95,7 +95,7 @@ namespace xmloff void examinePersistence(); template< typename T > void exportRemainingPropertiesSequence( - com::sun::star::uno::Any const & value, + css::uno::Any const & value, token::XMLTokenEnum eValueAttName); void exportRemainingProperties(); @@ -325,7 +325,7 @@ namespace xmloff the value to convert */ OUString implConvertAny( - const ::com::sun::star::uno::Any& _rValue); + const css::uno::Any& _rValue); /** @return @@ -341,7 +341,7 @@ namespace xmloff </ul> If the type is not convertible, float is returned */ - static ::xmloff::token::XMLTokenEnum implGetPropertyXMLType(const ::com::sun::star::uno::Type& _rType); + static ::xmloff::token::XMLTokenEnum implGetPropertyXMLType(const css::uno::Type& _rType); #ifdef DBG_UTIL void AddAttribute(sal_uInt16 _nPrefix, const sal_Char* _pName, const OUString& _rValue); @@ -377,11 +377,11 @@ namespace xmloff */ void dbg_implCheckProperty( const OUString& _rPropertyName, - const ::com::sun::star::uno::Type* _pType); + const css::uno::Type* _pType); // void dbg_implCheckProperty( // const sal_Char* _rPropertyName, -// const ::com::sun::star::uno::Type* _pType) +// const css::uno::Type* _pType) // { // dbg_implCheckProperty(OUString::createFromAscii(_rPropertyName), _pType); // } diff --git a/xmloff/source/forms/propertyimport.cxx b/xmloff/source/forms/propertyimport.cxx index 7ea93ac919b2..b9fdc78f652e 100644 --- a/xmloff/source/forms/propertyimport.cxx +++ b/xmloff/source/forms/propertyimport.cxx @@ -58,9 +58,9 @@ namespace xmloff //= PropertyConversion namespace { - ::com::sun::star::util::Time lcl_getTime(double _nValue) + css::util::Time lcl_getTime(double _nValue) { - ::com::sun::star::util::Time aTime; + css::util::Time aTime; sal_uInt64 nIntValue = static_cast<sal_uInt64>(_nValue * ::tools::Time::nanoSecPerDay); aTime.NanoSeconds = nIntValue % ::tools::Time::nanoSecPerSec; nIntValue /= ::tools::Time::nanoSecPerSec; @@ -74,16 +74,16 @@ namespace return aTime; } - static ::com::sun::star::util::Date lcl_getDate( double _nValue ) + static css::util::Date lcl_getDate( double _nValue ) { Date aToolsDate((sal_uInt32)_nValue); - ::com::sun::star::util::Date aDate; + css::util::Date aDate; ::utl::typeConvert(aToolsDate, aDate); return aDate; } } -Any PropertyConversion::convertString( const ::com::sun::star::uno::Type& _rExpectedType, +Any PropertyConversion::convertString( const css::uno::Type& _rExpectedType, const OUString& _rReadCharacters, const SvXMLEnumMapEntry* _pEnumMap, const bool _bInvertBoolean ) { Any aReturn; @@ -160,11 +160,11 @@ Any PropertyConversion::convertString( const ::com::sun::star::uno::Type& _rExpe case TypeClass_STRUCT: { sal_Int32 nType = 0; - if ( _rExpectedType.equals( ::cppu::UnoType< ::com::sun::star::util::Date >::get() ) ) + if ( _rExpectedType.equals( ::cppu::UnoType< css::util::Date >::get() ) ) nType = TYPE_DATE; - else if ( _rExpectedType.equals( ::cppu::UnoType< ::com::sun::star::util::Time >::get() ) ) + else if ( _rExpectedType.equals( ::cppu::UnoType< css::util::Time >::get() ) ) nType = TYPE_TIME; - else if ( _rExpectedType.equals( ::cppu::UnoType< ::com::sun::star::util::DateTime >::get() ) ) + else if ( _rExpectedType.equals( ::cppu::UnoType< css::util::DateTime >::get() ) ) nType = TYPE_DATETIME; if ( nType ) @@ -197,10 +197,10 @@ Any PropertyConversion::convertString( const ::com::sun::star::uno::Type& _rExpe break; case TYPE_DATETIME: { - ::com::sun::star::util::Time aTime = lcl_getTime(nValue); - ::com::sun::star::util::Date aDate = lcl_getDate(nValue); + css::util::Time aTime = lcl_getTime(nValue); + css::util::Date aDate = lcl_getDate(nValue); - ::com::sun::star::util::DateTime aDateTime; + css::util::DateTime aDateTime; aDateTime.NanoSeconds = aTime.NanoSeconds; aDateTime.Seconds = aTime.Seconds; aDateTime.Minutes = aTime.Minutes; @@ -404,8 +404,8 @@ SvXMLImportContext* OSinglePropertyContext::CreateChildContext(sal_uInt16 _nPref void OSinglePropertyContext::StartElement(const Reference< XAttributeList >& _rxAttrList) { - ::com::sun::star::beans::PropertyValue aPropValue; // the property the instance imports currently - ::com::sun::star::uno::Type aPropType; // the type of the property the instance imports currently + css::beans::PropertyValue aPropValue; // the property the instance imports currently + css::uno::Type aPropType; // the type of the property the instance imports currently OUString sType, sValue; const SvXMLNamespaceMap& rMap = GetImport().GetNamespaceMap(); @@ -441,7 +441,7 @@ void OSinglePropertyContext::StartElement(const Reference< XAttributeList >& _rx // the name of the property OSL_ENSURE(!aPropValue.Name.isEmpty(), "OSinglePropertyContext::StartElement: invalid property name!"); - // needs to be translated into a ::com::sun::star::uno::Type + // needs to be translated into a css::uno::Type aPropType = PropertyConversion::xmlTypeToUnoType( sType ); if( TypeClass_VOID == aPropType.getTypeClass() ) { @@ -508,7 +508,7 @@ void OListPropertyContext::EndElement() Sequence< Any > aListElements( m_aListValues.size() ); Any* pListElement = aListElements.getArray(); - com::sun::star::uno::Type aType = PropertyConversion::xmlTypeToUnoType( m_sPropertyType ); + css::uno::Type aType = PropertyConversion::xmlTypeToUnoType( m_sPropertyType ); for ( ::std::vector< OUString >::const_iterator values = m_aListValues.begin(); values != m_aListValues.end(); ++values, ++pListElement diff --git a/xmloff/source/forms/propertyimport.hxx b/xmloff/source/forms/propertyimport.hxx index f31defc2bad9..23d2b4c64c77 100644 --- a/xmloff/source/forms/propertyimport.hxx +++ b/xmloff/source/forms/propertyimport.hxx @@ -42,14 +42,14 @@ namespace xmloff class PropertyConversion { public: - static ::com::sun::star::uno::Any convertString( - const ::com::sun::star::uno::Type& _rExpectedType, + static css::uno::Any convertString( + const css::uno::Type& _rExpectedType, const OUString& _rReadCharacters, const SvXMLEnumMapEntry* _pEnumMap = nullptr, const bool _bInvertBoolean = false ); - static ::com::sun::star::uno::Type xmlTypeToUnoType( const OUString& _rType ); + static css::uno::Type xmlTypeToUnoType( const OUString& _rType ); }; class OFormLayerXMLImport_Impl; @@ -65,7 +65,7 @@ namespace xmloff friend class OListPropertyContext; protected: - typedef ::std::vector< ::com::sun::star::beans::PropertyValue > PropertyValueArray; + typedef ::std::vector< css::beans::PropertyValue > PropertyValueArray; PropertyValueArray m_aValues; PropertyValueArray m_aGenericValues; // the values which the instance collects between StartElement and EndElement @@ -86,10 +86,10 @@ namespace xmloff virtual SvXMLImportContext* CreateChildContext( sal_uInt16 _nPrefix, const OUString& _rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList) override; virtual void StartElement( - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList) override; virtual void Characters(const OUString& _rChars) override; protected: @@ -123,18 +123,18 @@ namespace xmloff */ void enableTrackAttributes() { m_bTrackAttributes = true; } - inline void implPushBackPropertyValue(const ::com::sun::star::beans::PropertyValue& _rProp) + inline void implPushBackPropertyValue(const css::beans::PropertyValue& _rProp) { m_aValues.push_back(_rProp); } - inline void implPushBackPropertyValue( const OUString& _rName, const ::com::sun::star::uno::Any& _rValue ) + inline void implPushBackPropertyValue( const OUString& _rName, const css::uno::Any& _rValue ) { - m_aValues.push_back( ::com::sun::star::beans::PropertyValue( - _rName, -1, _rValue, ::com::sun::star::beans::PropertyState_DIRECT_VALUE ) ); + m_aValues.push_back( css::beans::PropertyValue( + _rName, -1, _rValue, css::beans::PropertyState_DIRECT_VALUE ) ); } - inline void implPushBackGenericPropertyValue(const ::com::sun::star::beans::PropertyValue& _rProp) + inline void implPushBackGenericPropertyValue(const css::beans::PropertyValue& _rProp) { m_aGenericValues.push_back(_rProp); } @@ -155,11 +155,11 @@ namespace xmloff virtual SvXMLImportContext* CreateChildContext( sal_uInt16 _nPrefix, const OUString& _rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList) override; #if OSL_DEBUG_LEVEL > 0 virtual void StartElement( - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList) override; virtual void Characters(const OUString& _rChars) override; #endif }; @@ -177,10 +177,10 @@ namespace xmloff virtual SvXMLImportContext* CreateChildContext( sal_uInt16 _nPrefix, const OUString& _rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList) override; virtual void StartElement( - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList) override; }; //= OListPropertyContext @@ -196,13 +196,13 @@ namespace xmloff const OPropertyImportRef& _rPropertyImporter ); virtual void StartElement( - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList ) override; virtual void EndElement() override; virtual SvXMLImportContext* CreateChildContext( sal_uInt16 _nPrefix, const OUString& _rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList) override; }; //= OListValueContext @@ -215,7 +215,7 @@ namespace xmloff OUString& _rListValueHolder ); virtual void StartElement( - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList ) override; }; } // namespace xmloff |