diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2024-11-04 11:26:07 +0500 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2024-11-10 10:50:15 +0100 |
| commit | 1180b3473aed3251b5869256abc9c7774bab9ced (patch) | |
| tree | 72e169fd28db8da7b247290e2e53d530feae9d2b | |
| parent | 7713d916e06a8388f849a758f928cbcfded6c0ae (diff) | |
com::sun::star -> css
Change-Id: I890ec73e30d3cc6b210903ecee29431f3cb5f635
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175979
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
158 files changed, 627 insertions, 650 deletions
diff --git a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx index 9d10c78650e1..541b5ead7057 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx @@ -236,8 +236,8 @@ awt::Size SAL_CALL AccessibleBrowseBoxBase::getSize() void SAL_CALL AccessibleBrowseBoxBase::focusGained( const css::awt::FocusEvent& ) { - com::sun::star::uno::Any aFocused; - com::sun::star::uno::Any aEmpty; + css::uno::Any aFocused; + css::uno::Any aEmpty; aFocused <<= FOCUSED; commitEvent(AccessibleEventId::STATE_CHANGED,aFocused,aEmpty); @@ -246,8 +246,8 @@ void SAL_CALL AccessibleBrowseBoxBase::focusGained( const css::awt::FocusEvent& void SAL_CALL AccessibleBrowseBoxBase::focusLost( const css::awt::FocusEvent& ) { - com::sun::star::uno::Any aFocused; - com::sun::star::uno::Any aEmpty; + css::uno::Any aFocused; + css::uno::Any aEmpty; aFocused <<= FOCUSED; commitEvent(AccessibleEventId::STATE_CHANGED,aEmpty,aFocused); diff --git a/accessibility/source/standard/vclxaccessiblelist.cxx b/accessibility/source/standard/vclxaccessiblelist.cxx index 4895d929e1cf..335ffffe6624 100644 --- a/accessibility/source/standard/vclxaccessiblelist.cxx +++ b/accessibility/source/standard/vclxaccessiblelist.cxx @@ -440,7 +440,7 @@ void VCLXAccessibleList::ProcessWindowEvent (const VclWindowEvent& rVclWindowEve if (m_pListBoxHelper && (m_pListBoxHelper->GetStyle() & WB_DROPDOWN ) != WB_DROPDOWN) { uno::Sequence<uno::Reference<css::accessibility::XAccessible>> aSequence { pBox->GetAccessible() }; - rRelationSet.AddRelation( com::sun::star::accessibility::AccessibleRelation( com::sun::star::accessibility::AccessibleRelationType_MEMBER_OF, aSequence ) ); + rRelationSet.AddRelation( css::accessibility::AccessibleRelation( css::accessibility::AccessibleRelationType_MEMBER_OF, aSequence ) ); } } else diff --git a/basegfx/source/matrix/b3dhommatrixtools.cxx b/basegfx/source/matrix/b3dhommatrixtools.cxx index 9125aca4e0a6..70ca2dea50b7 100644 --- a/basegfx/source/matrix/b3dhommatrixtools.cxx +++ b/basegfx/source/matrix/b3dhommatrixtools.cxx @@ -22,7 +22,7 @@ namespace basegfx::utils { -B3DHomMatrix UnoHomogenMatrixToB3DHomMatrix(const com::sun::star::drawing::HomogenMatrix& rMatrixIn) +B3DHomMatrix UnoHomogenMatrixToB3DHomMatrix(const css::drawing::HomogenMatrix& rMatrixIn) { B3DHomMatrix aRetval; @@ -47,7 +47,7 @@ B3DHomMatrix UnoHomogenMatrixToB3DHomMatrix(const com::sun::star::drawing::Homog } void B3DHomMatrixToUnoHomogenMatrix(const B3DHomMatrix& rMatrixIn, - com::sun::star::drawing::HomogenMatrix& rMatrixOut) + css::drawing::HomogenMatrix& rMatrixOut) { rMatrixOut.Line1.Column1 = rMatrixIn.get(0, 0); rMatrixOut.Line1.Column2 = rMatrixIn.get(0, 1); diff --git a/binaryurp/source/binaryany.hxx b/binaryurp/source/binaryany.hxx index c04fe8f8624a..1504f92d9259 100644 --- a/binaryurp/source/binaryany.hxx +++ b/binaryurp/source/binaryany.hxx @@ -31,7 +31,7 @@ class BinaryAny { public: BinaryAny() noexcept; - BinaryAny(com::sun::star::uno::TypeDescription const & type, void * value) + BinaryAny(css::uno::TypeDescription const & type, void * value) noexcept; explicit BinaryAny(uno_Any const & raw) noexcept; @@ -50,9 +50,9 @@ public: uno_Any& get() noexcept { return data_; } - com::sun::star::uno::TypeDescription getType() const noexcept; + css::uno::TypeDescription getType() const noexcept; - void * getValue(com::sun::star::uno::TypeDescription const & type) const + void * getValue(css::uno::TypeDescription const & type) const noexcept; private: diff --git a/binaryurp/source/bridge.cxx b/binaryurp/source/bridge.cxx index 0f9832682648..9d086946aa81 100644 --- a/binaryurp/source/bridge.cxx +++ b/binaryurp/source/bridge.cxx @@ -165,7 +165,7 @@ void PopOutgoingRequest::clear() { } struct Bridge::SubStub { - com::sun::star::uno::UnoInterfaceReference object; + css::uno::UnoInterfaceReference object; sal_uInt32 references; }; diff --git a/binaryurp/source/bridge.hxx b/binaryurp/source/bridge.hxx index 9da6640fa126..1d7c4aad60ab 100644 --- a/binaryurp/source/bridge.hxx +++ b/binaryurp/source/bridge.hxx @@ -66,16 +66,14 @@ namespace binaryurp { class Bridge: public cppu::WeakImplHelper< - com::sun::star::bridge::XBridge, com::sun::star::lang::XComponent > + css::bridge::XBridge, com::sun::star::lang::XComponent > { public: Bridge( rtl::Reference< BridgeFactory > const & factory, OUString name, - com::sun::star::uno::Reference< - com::sun::star::connection::XConnection > const & connection, - com::sun::star::uno::Reference< - com::sun::star::bridge::XInstanceProvider > provider); + css::uno::Reference< css::connection::XConnection > const & connection, + css::uno::Reference< css::bridge::XInstanceProvider > provider); void start(); @@ -86,35 +84,35 @@ public: // thread: void terminate(bool final); - const com::sun::star::uno::Reference< com::sun::star::connection::XConnection >& + const css::uno::Reference< css::connection::XConnection >& getConnection() const { return connection_;} - const com::sun::star::uno::Reference< com::sun::star::bridge::XInstanceProvider >& + const css::uno::Reference< css::bridge::XInstanceProvider >& getProvider() const { return provider_;} - com::sun::star::uno::Mapping & getCppToBinaryMapping() { return cppToBinaryMapping_;} + css::uno::Mapping & getCppToBinaryMapping() { return cppToBinaryMapping_;} - BinaryAny mapCppToBinaryAny(com::sun::star::uno::Any const & cppAny); + BinaryAny mapCppToBinaryAny(css::uno::Any const & cppAny); uno_ThreadPool getThreadPool(); rtl::Reference< Writer > getWriter(); - com::sun::star::uno::UnoInterfaceReference registerIncomingInterface( + css::uno::UnoInterfaceReference registerIncomingInterface( OUString const & oid, - com::sun::star::uno::TypeDescription const & type); + css::uno::TypeDescription const & type); OUString registerOutgoingInterface( - com::sun::star::uno::UnoInterfaceReference const & object, - com::sun::star::uno::TypeDescription const & type); + css::uno::UnoInterfaceReference const & object, + css::uno::TypeDescription const & type); - com::sun::star::uno::UnoInterfaceReference findStub( + css::uno::UnoInterfaceReference findStub( OUString const & oid, - com::sun::star::uno::TypeDescription const & type); + css::uno::TypeDescription const & type); void releaseStub( OUString const & oid, - com::sun::star::uno::TypeDescription const & type); + css::uno::TypeDescription const & type); void resurrectProxy(Proxy & proxy); @@ -132,7 +130,7 @@ public: bool makeCall( OUString const & oid, - com::sun::star::uno::TypeDescription const & member, bool setter, + css::uno::TypeDescription const & member, bool setter, std::vector< BinaryAny >&& inArguments, BinaryAny * returnValue, std::vector< BinaryAny > * outArguments); @@ -160,7 +158,7 @@ public: bool isProtocolPropertiesRequest( std::u16string_view oid, - com::sun::star::uno::TypeDescription const & type) const; + css::uno::TypeDescription const & type) const; void setCurrentContextMode(); @@ -172,7 +170,7 @@ private: virtual ~Bridge() override; - virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getInstance(OUString const & sInstanceName) override; virtual OUString SAL_CALL getName() override; @@ -182,11 +180,11 @@ private: virtual void SAL_CALL dispose() override; virtual void SAL_CALL addEventListener( - com::sun::star::uno::Reference< com::sun::star::lang::XEventListener > + css::uno::Reference< css::lang::XEventListener > const & xListener) override; virtual void SAL_CALL removeEventListener( - com::sun::star::uno::Reference< com::sun::star::lang::XEventListener > + css::uno::Reference< css::lang::XEventListener > const & aListener) override; // Only called from reader_ thread: @@ -199,17 +197,17 @@ private: void makeReleaseCall( OUString const & oid, - com::sun::star::uno::TypeDescription const & type); + css::uno::TypeDescription const & type); void sendRequest( rtl::ByteSequence const & tid, OUString const & oid, - com::sun::star::uno::TypeDescription const & type, - com::sun::star::uno::TypeDescription const & member, + css::uno::TypeDescription const & type, + css::uno::TypeDescription const & member, std::vector< BinaryAny >&& inArguments); void throwException(bool exception, BinaryAny const & value); - com::sun::star::uno::Any mapBinaryToCppAny(BinaryAny const & binaryAny); + css::uno::Any mapBinaryToCppAny(BinaryAny const & binaryAny); bool becameUnused() const; @@ -220,13 +218,13 @@ private: typedef std::vector< - com::sun::star::uno::Reference< - com::sun::star::lang::XEventListener > > + css::uno::Reference< + css::lang::XEventListener > > Listeners; struct SubStub; - typedef std::map< com::sun::star::uno::TypeDescription, SubStub > Stub; + typedef std::map< css::uno::TypeDescription, SubStub > Stub; typedef std::map< OUString, Stub > Stubs; @@ -238,18 +236,18 @@ private: rtl::Reference< BridgeFactory > factory_; OUString name_; - com::sun::star::uno::Reference< com::sun::star::connection::XConnection > + css::uno::Reference< css::connection::XConnection > connection_; - com::sun::star::uno::Reference< com::sun::star::bridge::XInstanceProvider > + css::uno::Reference< css::bridge::XInstanceProvider > provider_; - com::sun::star::uno::Environment binaryUno_; - com::sun::star::uno::Mapping cppToBinaryMapping_; - com::sun::star::uno::Mapping binaryToCppMapping_; + css::uno::Environment binaryUno_; + css::uno::Mapping cppToBinaryMapping_; + css::uno::Mapping binaryToCppMapping_; rtl::ByteSequence protPropTid_; OUString protPropOid_; - com::sun::star::uno::TypeDescription protPropType_; - com::sun::star::uno::TypeDescription protPropRequest_; - com::sun::star::uno::TypeDescription protPropCommit_; + css::uno::TypeDescription protPropType_; + css::uno::TypeDescription protPropRequest_; + css::uno::TypeDescription protPropCommit_; OutgoingRequests outgoingRequests_; osl::Condition passive_; // to guarantee that passive_ is eventually set (to avoid deadlock, see diff --git a/binaryurp/source/bridgefactory.hxx b/binaryurp/source/bridgefactory.hxx index 59023896010b..a733ebb040af 100644 --- a/binaryurp/source/bridgefactory.hxx +++ b/binaryurp/source/bridgefactory.hxx @@ -46,15 +46,15 @@ namespace binaryurp { typedef cppu::WeakComponentImplHelper< - com::sun::star::lang::XServiceInfo, - com::sun::star::bridge::XBridgeFactory2 > + css::lang::XServiceInfo, + css::bridge::XBridgeFactory2 > BridgeFactoryBase; class BridgeFactory : private cppu::BaseMutex, public BridgeFactoryBase { public: void removeBridge( - com::sun::star::uno::Reference< com::sun::star::bridge::XBridge > + css::uno::Reference< css::bridge::XBridge > const & bridge); using BridgeFactoryBase::acquire; @@ -72,38 +72,34 @@ private: virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override; - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; - virtual com::sun::star::uno::Reference< com::sun::star::bridge::XBridge > + virtual css::uno::Reference< css::bridge::XBridge > SAL_CALL createBridge( OUString const & sName, OUString const & sProtocol, - com::sun::star::uno::Reference< - com::sun::star::connection::XConnection > const & aConnection, - com::sun::star::uno::Reference< - com::sun::star::bridge::XInstanceProvider > const & + css::uno::Reference< css::connection::XConnection > const & aConnection, + css::uno::Reference< css::bridge::XInstanceProvider > const & anInstanceProvider) override; - virtual com::sun::star::uno::Reference< com::sun::star::bridge::XBridge > + virtual css::uno::Reference< css::bridge::XBridge > SAL_CALL getBridge( OUString const & sName) override; virtual - com::sun::star::uno::Sequence< - com::sun::star::uno::Reference< com::sun::star::bridge::XBridge > > + css::uno::Sequence< css::uno::Reference< css::bridge::XBridge > > SAL_CALL getExistingBridges() override; void SAL_CALL disposing() override; typedef - std::vector< - com::sun::star::uno::Reference< com::sun::star::bridge::XBridge > > + std::vector< css::uno::Reference< css::bridge::XBridge > > BridgeVector; typedef std::map< OUString, - com::sun::star::uno::Reference< com::sun::star::bridge::XBridge > > + css::uno::Reference< css::bridge::XBridge > > BridgeMap; BridgeVector unnamed_; diff --git a/binaryurp/source/currentcontext.hxx b/binaryurp/source/currentcontext.hxx index b5f55a8244c9..41e621f2670a 100644 --- a/binaryurp/source/currentcontext.hxx +++ b/binaryurp/source/currentcontext.hxx @@ -28,9 +28,9 @@ class UnoInterfaceReference; namespace binaryurp::current_context { -com::sun::star::uno::UnoInterfaceReference get(); +css::uno::UnoInterfaceReference get(); -void set(com::sun::star::uno::UnoInterfaceReference const& value); +void set(css::uno::UnoInterfaceReference const& value); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/binaryurp/source/incomingrequest.hxx b/binaryurp/source/incomingrequest.hxx index faff4f5a5c0c..9c61041a2706 100644 --- a/binaryurp/source/incomingrequest.hxx +++ b/binaryurp/source/incomingrequest.hxx @@ -45,12 +45,12 @@ public: IncomingRequest( rtl::Reference< Bridge > const & bridge, rtl::ByteSequence tid, OUString oid, - com::sun::star::uno::UnoInterfaceReference object, - com::sun::star::uno::TypeDescription type, + css::uno::UnoInterfaceReference object, + css::uno::TypeDescription type, sal_uInt16 functionId, bool synchronous, - com::sun::star::uno::TypeDescription const & member, bool setter, + css::uno::TypeDescription const & member, bool setter, std::vector< BinaryAny >&& inArguments, bool currentContextMode, - com::sun::star::uno::UnoInterfaceReference currentContext); + css::uno::UnoInterfaceReference currentContext); ~IncomingRequest(); @@ -63,10 +63,10 @@ private: rtl::Reference< Bridge > bridge_; rtl::ByteSequence tid_; OUString oid_; // initial object queryInterface; release - com::sun::star::uno::UnoInterfaceReference object_; - com::sun::star::uno::TypeDescription type_; - com::sun::star::uno::TypeDescription member_; - com::sun::star::uno::UnoInterfaceReference currentContext_; + css::uno::UnoInterfaceReference object_; + css::uno::TypeDescription type_; + css::uno::TypeDescription member_; + css::uno::UnoInterfaceReference currentContext_; std::vector< BinaryAny > inArguments_; sal_uInt16 functionId_; bool synchronous_; diff --git a/binaryurp/source/marshal.hxx b/binaryurp/source/marshal.hxx index 93930e3566c1..3e456854a6db 100644 --- a/binaryurp/source/marshal.hxx +++ b/binaryurp/source/marshal.hxx @@ -53,12 +53,12 @@ public: void writeValue( std::vector< unsigned char > * buffer, - com::sun::star::uno::TypeDescription const & type, + css::uno::TypeDescription const & type, BinaryAny const & value); void writeType( std::vector< unsigned char > * buffer, - com::sun::star::uno::TypeDescription const & value); + css::uno::TypeDescription const & value); void writeOid( std::vector< unsigned char > * buffer, OUString const & oid); @@ -72,11 +72,11 @@ private: void writeValue( std::vector< unsigned char > * buffer, - com::sun::star::uno::TypeDescription const & type, void const * value); + css::uno::TypeDescription const & type, void const * value); void writeMemberValues( std::vector< unsigned char > * buffer, - com::sun::star::uno::TypeDescription const & type, + css::uno::TypeDescription const & type, void const * aggregateValue); rtl::Reference< Bridge > bridge_; diff --git a/binaryurp/source/outgoingrequest.hxx b/binaryurp/source/outgoingrequest.hxx index efa673eac781..31daf919387f 100644 --- a/binaryurp/source/outgoingrequest.hxx +++ b/binaryurp/source/outgoingrequest.hxx @@ -30,12 +30,12 @@ struct OutgoingRequest { enum Kind { KIND_NORMAL, KIND_REQUEST_CHANGE, KIND_COMMIT_CHANGE }; OutgoingRequest( - Kind theKind, com::sun::star::uno::TypeDescription theMember, + Kind theKind, css::uno::TypeDescription theMember, bool theSetter): member(std::move(theMember)), kind(theKind), setter(theSetter) {} - com::sun::star::uno::TypeDescription member; + css::uno::TypeDescription member; Kind kind; diff --git a/binaryurp/source/proxy.hxx b/binaryurp/source/proxy.hxx index 4e1fa3656ecc..e6c6de5c3d79 100644 --- a/binaryurp/source/proxy.hxx +++ b/binaryurp/source/proxy.hxx @@ -40,11 +40,11 @@ class Proxy: public uno_Interface { public: Proxy( rtl::Reference< Bridge > const & bridge, OUString oid, - com::sun::star::uno::TypeDescription type); + css::uno::TypeDescription type); const OUString& getOid() const { return oid_;} - const com::sun::star::uno::TypeDescription& getType() const { return type_;} + const css::uno::TypeDescription& getType() const { return type_;} void do_acquire(); @@ -58,7 +58,7 @@ public: static bool isProxy( rtl::Reference< Bridge > const & bridge, - com::sun::star::uno::UnoInterfaceReference const & object, + css::uno::UnoInterfaceReference const & object, OUString * oid); private: @@ -76,7 +76,7 @@ private: rtl::Reference< Bridge > bridge_; OUString oid_; - com::sun::star::uno::TypeDescription type_; + css::uno::TypeDescription type_; std::atomic<std::size_t> references_; }; diff --git a/binaryurp/source/reader.hxx b/binaryurp/source/reader.hxx index 2f3ec0dd9e2e..3ab4d2340d47 100644 --- a/binaryurp/source/reader.hxx +++ b/binaryurp/source/reader.hxx @@ -55,7 +55,7 @@ private: rtl::ByteSequence getTid(Unmarshal& unmarshal, bool newTid) const; rtl::Reference<Bridge> bridge_; - com::sun::star::uno::TypeDescription lastType_; + css::uno::TypeDescription lastType_; OUString lastOid_; rtl::ByteSequence lastTid_; ReaderState state_; diff --git a/binaryurp/source/readerstate.hxx b/binaryurp/source/readerstate.hxx index a93a45dfcc1d..05dbaa24bb49 100644 --- a/binaryurp/source/readerstate.hxx +++ b/binaryurp/source/readerstate.hxx @@ -38,7 +38,7 @@ private: public: ReaderState() {} - com::sun::star::uno::TypeDescription typeCache[cache::size]; + css::uno::TypeDescription typeCache[cache::size]; OUString oidCache[cache::size]; rtl::ByteSequence tidCache[cache::size]; }; diff --git a/binaryurp/source/unmarshal.hxx b/binaryurp/source/unmarshal.hxx index 1972c30d0e74..11f62ad334b7 100644 --- a/binaryurp/source/unmarshal.hxx +++ b/binaryurp/source/unmarshal.hxx @@ -41,7 +41,7 @@ class Unmarshal { public: Unmarshal( rtl::Reference< Bridge > bridge, ReaderState & state, - com::sun::star::uno::Sequence< sal_Int8 > const & buffer); + css::uno::Sequence< sal_Int8 > const & buffer); ~Unmarshal(); @@ -51,13 +51,13 @@ public: sal_uInt32 read32(); - com::sun::star::uno::TypeDescription readType(); + css::uno::TypeDescription readType(); OUString readOid(); rtl::ByteSequence readTid(); - BinaryAny readValue(com::sun::star::uno::TypeDescription const & type); + BinaryAny readValue(css::uno::TypeDescription const & type); void done() const; @@ -75,15 +75,15 @@ private: OUString readString(); - BinaryAny readSequence(com::sun::star::uno::TypeDescription const & type); + BinaryAny readSequence(css::uno::TypeDescription const & type); void readMemberValues( - com::sun::star::uno::TypeDescription const & type, + css::uno::TypeDescription const & type, std::vector< BinaryAny > * values); rtl::Reference< Bridge > bridge_; ReaderState & state_; - com::sun::star::uno::Sequence< sal_Int8 > buffer_; + css::uno::Sequence< sal_Int8 > buffer_; sal_uInt8 const * data_; sal_uInt8 const * end_; }; diff --git a/binaryurp/source/writer.cxx b/binaryurp/source/writer.cxx index 4331a419c751..9b8bf07ea6b4 100644 --- a/binaryurp/source/writer.cxx +++ b/binaryurp/source/writer.cxx @@ -115,7 +115,7 @@ void Writer::queueRequest( void Writer::queueReply( rtl::ByteSequence const & tid, - com::sun::star::uno::TypeDescription const & member, bool setter, + css::uno::TypeDescription const & member, bool setter, bool exception, BinaryAny const & returnValue, std::vector< BinaryAny >&& outArguments, bool setCurrentContextMode) { @@ -342,7 +342,7 @@ void Writer::sendRequest( void Writer::sendReply( rtl::ByteSequence const & tid, - com::sun::star::uno::TypeDescription const & member, bool setter, + css::uno::TypeDescription const & member, bool setter, bool exception, BinaryAny const & returnValue, std::vector< BinaryAny > const & outArguments) { diff --git a/binaryurp/source/writer.hxx b/binaryurp/source/writer.hxx index e2061502a015..2781014ed12a 100644 --- a/binaryurp/source/writer.hxx +++ b/binaryurp/source/writer.hxx @@ -50,27 +50,27 @@ public: // thread is unblocked: void sendDirectRequest( rtl::ByteSequence const & tid, OUString const & oid, - com::sun::star::uno::TypeDescription const & type, - com::sun::star::uno::TypeDescription const & member, + css::uno::TypeDescription const & type, + css::uno::TypeDescription const & member, std::vector< BinaryAny > const & inArguments); // Only called from Bridge::reader_ thread, and only before Bridge::writer_ // thread is unblocked: void sendDirectReply( rtl::ByteSequence const & tid, - com::sun::star::uno::TypeDescription const & member, + css::uno::TypeDescription const & member, bool exception, BinaryAny const & returnValue, std::vector< BinaryAny > const & outArguments); void queueRequest( rtl::ByteSequence const & tid, OUString const & oid, - com::sun::star::uno::TypeDescription const & type, - com::sun::star::uno::TypeDescription const & member, + css::uno::TypeDescription const & type, + css::uno::TypeDescription const & member, std::vector< BinaryAny >&& inArguments); void queueReply( rtl::ByteSequence const & tid, - com::sun::star::uno::TypeDescription const & member, bool setter, + css::uno::TypeDescription const & member, bool setter, bool exception, BinaryAny const & returnValue, std::vector< BinaryAny >&& outArguments, bool setCurrentContextMode); @@ -86,14 +86,14 @@ private: void sendRequest( rtl::ByteSequence const & tid, OUString const & oid, - com::sun::star::uno::TypeDescription const & type, - com::sun::star::uno::TypeDescription const & member, + css::uno::TypeDescription const & type, + css::uno::TypeDescription const & member, std::vector< BinaryAny > const & inArguments, bool currentContextMode, - com::sun::star::uno::UnoInterfaceReference const & currentContext); + css::uno::UnoInterfaceReference const & currentContext); void sendReply( rtl::ByteSequence const & tid, - com::sun::star::uno::TypeDescription const & member, bool setter, + css::uno::TypeDescription const & member, bool setter, bool exception, BinaryAny const & returnValue, std::vector< BinaryAny > const & outArguments); @@ -105,24 +105,24 @@ private: // Request: Item( rtl::ByteSequence theTid, OUString theOid, - com::sun::star::uno::TypeDescription theType, - com::sun::star::uno::TypeDescription theMember, + css::uno::TypeDescription theType, + css::uno::TypeDescription theMember, std::vector< BinaryAny >&& inArguments, - com::sun::star::uno::UnoInterfaceReference theCurrentContext); + css::uno::UnoInterfaceReference theCurrentContext); // Reply: Item( rtl::ByteSequence theTid, - com::sun::star::uno::TypeDescription theMember, + css::uno::TypeDescription theMember, bool theSetter, bool theException, BinaryAny theReturnValue, std::vector< BinaryAny >&& outArguments, bool theSetCurrentContextMode); rtl::ByteSequence tid; // request + reply OUString oid; // request - com::sun::star::uno::TypeDescription type; // request - com::sun::star::uno::TypeDescription member; // request + reply - com::sun::star::uno::UnoInterfaceReference currentContext; // request + css::uno::TypeDescription type; // request + css::uno::TypeDescription member; // request + reply + css::uno::UnoInterfaceReference currentContext; // request BinaryAny returnValue; // reply std::vector< BinaryAny > arguments; // request: inArguments; reply: outArguments bool request; @@ -134,7 +134,7 @@ private: rtl::Reference< Bridge > bridge_; WriterState state_; Marshal marshal_; - com::sun::star::uno::TypeDescription lastType_; + css::uno::TypeDescription lastType_; OUString lastOid_; rtl::ByteSequence lastTid_; osl::Condition unblocked_; diff --git a/binaryurp/source/writerstate.hxx b/binaryurp/source/writerstate.hxx index 72477ad17c07..a9bbf5e8e2fc 100644 --- a/binaryurp/source/writerstate.hxx +++ b/binaryurp/source/writerstate.hxx @@ -37,7 +37,7 @@ public: WriterState(): typeCache(cache::size), oidCache(cache::size), tidCache(cache::size) {} - Cache< com::sun::star::uno::TypeDescription > typeCache; + Cache< css::uno::TypeDescription > typeCache; Cache< OUString > oidCache; diff --git a/bridges/inc/cppinterfaceproxy.hxx b/bridges/inc/cppinterfaceproxy.hxx index 5b5c85dc7dd5..a9489787783a 100644 --- a/bridges/inc/cppinterfaceproxy.hxx +++ b/bridges/inc/cppinterfaceproxy.hxx @@ -47,7 +47,7 @@ class CppInterfaceProxy { public: // Interface for Bridge: - static com::sun::star::uno::XInterface * create( + static css::uno::XInterface * create( Bridge * pBridge, uno_Interface * pUnoI, typelib_InterfaceTypeDescription * pTypeDescr, OUString const & rOId); @@ -76,7 +76,7 @@ private: ~CppInterfaceProxy(); - static com::sun::star::uno::XInterface * castProxyToInterface( + static css::uno::XInterface * castProxyToInterface( CppInterfaceProxy * pProxy); std::atomic<std::size_t> nRef; diff --git a/bridges/inc/unointerfaceproxy.hxx b/bridges/inc/unointerfaceproxy.hxx index d20a7c3549fa..a0a8f6d4b01d 100644 --- a/bridges/inc/unointerfaceproxy.hxx +++ b/bridges/inc/unointerfaceproxy.hxx @@ -60,21 +60,21 @@ public: // Interface for Bridge: static UnoInterfaceProxy * create( - Bridge * pBridge, com::sun::star::uno::XInterface * pCppI, + Bridge * pBridge, css::uno::XInterface * pCppI, typelib_InterfaceTypeDescription * pTypeDescr, OUString const & rOId); // Interface for individual CPP--UNO bridges: Bridge * getBridge() { return pBridge; } - com::sun::star::uno::XInterface * getCppI() { return pCppI; } + css::uno::XInterface * getCppI() { return pCppI; } private: UnoInterfaceProxy(UnoInterfaceProxy const &) = delete; UnoInterfaceProxy& operator =(const UnoInterfaceProxy&) = delete; UnoInterfaceProxy( - Bridge * pBridge_, com::sun::star::uno::XInterface * pCppI_, + Bridge * pBridge_, css::uno::XInterface * pCppI_, typelib_InterfaceTypeDescription * pTypeDescr_, OUString aOId_); @@ -84,7 +84,7 @@ private: Bridge * pBridge; // mapping information - com::sun::star::uno::XInterface * pCppI; // wrapped interface + css::uno::XInterface * pCppI; // wrapped interface typelib_InterfaceTypeDescription * pTypeDescr; OUString oid; diff --git a/bridges/source/cpp_uno/shared/bridge.cxx b/bridges/source/cpp_uno/shared/bridge.cxx index ddd34e4ed380..f43ee12ea184 100644 --- a/bridges/source/cpp_uno/shared/bridge.cxx +++ b/bridges/source/cpp_uno/shared/bridge.cxx @@ -79,7 +79,7 @@ void cpp2unoMapping( uno_Interface * pSurrogate = bridges::cpp_uno::shared::UnoInterfaceProxy::create( pBridge, - static_cast< ::com::sun::star::uno::XInterface * >( pCppI ), + static_cast< css::uno::XInterface * >( pCppI ), pTypeDescr, pOId ); // proxy may be exchanged during registration @@ -100,7 +100,7 @@ void uno2cppMapping( assert(ppCppI && pTypeDescr); if (*ppCppI) { - static_cast< ::com::sun::star::uno::XInterface * >( *ppCppI )-> + static_cast< css::uno::XInterface * >( *ppCppI )-> release(); *ppCppI = nullptr; } @@ -122,7 +122,7 @@ void uno2cppMapping( if (! *ppCppI) // no existing interface, register new proxy interface { // try to publish a new proxy (ref count initially 1) - com::sun::star::uno::XInterface * pProxy + css::uno::XInterface * pProxy = bridges::cpp_uno::shared::CppInterfaceProxy::create( pBridge, static_cast< uno_Interface * >( pUnoI ), pTypeDescr, pOId ); diff --git a/bridges/source/cpp_uno/shared/component.cxx b/bridges/source/cpp_uno/shared/component.cxx index 9e7f5ae7a75a..ada8ae6e643c 100644 --- a/bridges/source/cpp_uno/shared/component.cxx +++ b/bridges/source/cpp_uno/shared/component.cxx @@ -78,7 +78,7 @@ static void s_stub_computeObjectIdentifier(va_list * pParam) { ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xHome( - static_cast< ::com::sun::star::uno::XInterface * >( + static_cast< css::uno::XInterface * >( pInterface ), ::com::sun::star::uno::UNO_QUERY ); assert(xHome.is() && "### query to XInterface failed!"); @@ -98,7 +98,7 @@ static void s_stub_computeObjectIdentifier(va_list * pParam) ::rtl_uString_acquire( *ppOId ); } } - catch (const ::com::sun::star::uno::RuntimeException & e) + catch (const css::uno::RuntimeException & e) { SAL_WARN("bridges", "### RuntimeException occurred during queryInterface(): " @@ -117,7 +117,7 @@ static void s_stub_acquireInterface(va_list * pParam) /*uno_ExtEnvironment * pExtEnv = */va_arg(*pParam, uno_ExtEnvironment *); void * pCppI = va_arg(*pParam, void *); - static_cast< ::com::sun::star::uno::XInterface * >( pCppI )->acquire(); + static_cast< css::uno::XInterface * >( pCppI )->acquire(); } static void acquireInterface( uno_ExtEnvironment * pExtEnv, void * pCppI ) @@ -130,7 +130,7 @@ static void s_stub_releaseInterface(va_list * pParam) /*uno_ExtEnvironment * pExtEnv = */va_arg(*pParam, uno_ExtEnvironment *); void * pCppI = va_arg(*pParam, void *); - static_cast< ::com::sun::star::uno::XInterface * >( pCppI )->release(); + static_cast< css::uno::XInterface * >( pCppI )->release(); } static void releaseInterface( uno_ExtEnvironment * pExtEnv, void * pCppI ) diff --git a/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx b/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx index 189b3c2a4ef9..324b328e8fc2 100644 --- a/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx +++ b/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx @@ -54,7 +54,7 @@ void freeCppInterfaceProxy(uno_ExtEnvironment * pEnv, void * pInterface) delete[] reinterpret_cast< char * >(pThis); } -com::sun::star::uno::XInterface * CppInterfaceProxy::create( +css::uno::XInterface * CppInterfaceProxy::create( bridges::cpp_uno::shared::Bridge * pBridge, uno_Interface * pUnoI, typelib_InterfaceTypeDescription * pTypeDescr, OUString const & rOId) { @@ -122,10 +122,10 @@ CppInterfaceProxy::CppInterfaceProxy( CppInterfaceProxy::~CppInterfaceProxy() {} -com::sun::star::uno::XInterface * CppInterfaceProxy::castProxyToInterface( +css::uno::XInterface * CppInterfaceProxy::castProxyToInterface( CppInterfaceProxy * pProxy) { - return reinterpret_cast< com::sun::star::uno::XInterface * >( + return reinterpret_cast< css::uno::XInterface * >( &pProxy->vtables); } diff --git a/bridges/source/cpp_uno/shared/unointerfaceproxy.cxx b/bridges/source/cpp_uno/shared/unointerfaceproxy.cxx index 3c03c1cffc0f..b93f78448c1e 100644 --- a/bridges/source/cpp_uno/shared/unointerfaceproxy.cxx +++ b/bridges/source/cpp_uno/shared/unointerfaceproxy.cxx @@ -84,7 +84,7 @@ void releaseProxy(uno_Interface * pUnoI) UnoInterfaceProxy * UnoInterfaceProxy::create( bridges::cpp_uno::shared::Bridge * pBridge, - com::sun::star::uno::XInterface * pCppI, + css::uno::XInterface * pCppI, typelib_InterfaceTypeDescription * pTypeDescr, OUString const & rOId) { @@ -93,7 +93,7 @@ UnoInterfaceProxy * UnoInterfaceProxy::create( UnoInterfaceProxy::UnoInterfaceProxy( bridges::cpp_uno::shared::Bridge * pBridge_, - com::sun::star::uno::XInterface * pCppI_, + css::uno::XInterface * pCppI_, typelib_InterfaceTypeDescription * pTypeDescr_, OUString aOId_) : nRef( 1 ) , pBridge( pBridge_ ) diff --git a/bridges/source/jni_uno/jni_uno2java.cxx b/bridges/source/jni_uno/jni_uno2java.cxx index 110ed8db14c2..5ca10fc30dd6 100644 --- a/bridges/source/jni_uno/jni_uno2java.cxx +++ b/bridges/source/jni_uno/jni_uno2java.cxx @@ -573,9 +573,9 @@ void UNO_proxy_dispatch( reinterpret_cast< typelib_InterfaceAttributeTypeDescription const * >( member_td ); - com::sun::star::uno::TypeDescription attrib_holder; + css::uno::TypeDescription attrib_holder; while ( attrib_td->pBaseRef != nullptr ) { - attrib_holder = com::sun::star::uno::TypeDescription( + attrib_holder = css::uno::TypeDescription( attrib_td->pBaseRef ); assert( attrib_holder.get()->eTypeClass @@ -616,9 +616,9 @@ void UNO_proxy_dispatch( reinterpret_cast< typelib_InterfaceMethodTypeDescription const * >( member_td ); - com::sun::star::uno::TypeDescription method_holder; + css::uno::TypeDescription method_holder; while ( method_td->pBaseRef != nullptr ) { - method_holder = com::sun::star::uno::TypeDescription( + method_holder = css::uno::TypeDescription( method_td->pBaseRef ); assert( method_holder.get()->eTypeClass diff --git a/canvas/source/opengl/ogl_canvastools.hxx b/canvas/source/opengl/ogl_canvastools.hxx index 8e7029fbe5f4..87136305c1b9 100644 --- a/canvas/source/opengl/ogl_canvastools.hxx +++ b/canvas/source/opengl/ogl_canvastools.hxx @@ -29,7 +29,7 @@ namespace oglcanvas void setupState( const ::basegfx::B2DHomMatrix& rTransform, GLenum eSrcBlend, GLenum eDstBlend, - const com::sun::star::rendering::ARGBColor& rColor ); + const css::rendering::ARGBColor& rColor ); void renderOSD( const std::vector<double>& rNumbers, double scale ); } diff --git a/chart2/inc/ChartModel.hxx b/chart2/inc/ChartModel.hxx index b2e9a6d87cb8..911fcc4e409f 100644 --- a/chart2/inc/ChartModel.hxx +++ b/chart2/inc/ChartModel.hxx @@ -181,7 +181,7 @@ private: OUString impl_g_getLocation(); bool - impl_isControllerConnected( const css::uno::Reference< com::sun::star::frame::XController >& xController ); + impl_isControllerConnected( const css::uno::Reference< css::frame::XController >& xController ); /// @throws css::uno::RuntimeException css::uno::Reference< css::frame::XController > @@ -204,7 +204,7 @@ private: const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescriptor, const css::uno::Reference< css::embed::XStorage >& xStorage ); void impl_loadGraphics( - const css::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ); + const css::uno::Reference< css::embed::XStorage >& xStorage ); css::uno::Reference< css::document::XFilter > impl_createFilter( const css::uno::Sequence< css::beans::PropertyValue > & rMediaDescriptor ); diff --git a/chart2/qa/extras/chart2import2.cxx b/chart2/qa/extras/chart2import2.cxx index 934414679a17..bb5f7ecb1947 100644 --- a/chart2/qa/extras/chart2import2.cxx +++ b/chart2/qa/extras/chart2import2.cxx @@ -37,9 +37,9 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testTdf114179) xDiagram.set(xChartDoc->getFirstDiagram()); CPPUNIT_ASSERT_MESSAGE("There is a Diagram.", xDiagram.is()); awt::Size aPage(0, 0); - uno::Reference<com::sun::star::embed::XVisualObject> xVisualObject(xChartDoc, uno::UNO_QUERY); + uno::Reference<css::embed::XVisualObject> xVisualObject(xChartDoc, uno::UNO_QUERY); CPPUNIT_ASSERT(xVisualObject.is()); - aPage = xVisualObject->getVisualAreaSize(com::sun::star::embed::Aspects::MSOLE_CONTENT); + aPage = xVisualObject->getVisualAreaSize(css::embed::Aspects::MSOLE_CONTENT); Reference<beans::XPropertySet> xProp(xDiagram, uno::UNO_QUERY); chart2::RelativeSize aRelativeSize; xProp->getPropertyValue(u"RelativeSize"_ustr) >>= aRelativeSize; diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx index e861b91c58c5..747b2319a1a8 100644 --- a/chart2/source/controller/main/ChartController.cxx +++ b/chart2/source/controller/main/ChartController.cxx @@ -1361,7 +1361,7 @@ void ChartController::executeDispatch_SourceData() if ( rModel.hasInternalDataProvider() ) { // Check if we will able to create data provider later - css::uno::Reference< com::sun::star::chart2::XDataProviderAccess > xCreatorDoc( + css::uno::Reference< css::chart2::XDataProviderAccess > xCreatorDoc( rModel.getParent(), uno::UNO_QUERY); if (!xCreatorDoc.is()) return; diff --git a/chart2/source/controller/main/ControllerCommandDispatch.cxx b/chart2/source/controller/main/ControllerCommandDispatch.cxx index ee9d7d480de3..2aa350e48aa3 100644 --- a/chart2/source/controller/main/ControllerCommandDispatch.cxx +++ b/chart2/source/controller/main/ControllerCommandDispatch.cxx @@ -555,7 +555,7 @@ void ControllerCommandDispatch::updateCommandAvailability() OSL_ENSURE(xChartModel.is(), "Invalid XChartDocument"); if ( xChartModel.is() ) { - css::uno::Reference< com::sun::star::chart2::XDataProviderAccess > xCreatorDoc(xChartModel->getParent(), uno::UNO_QUERY); + css::uno::Reference< css::chart2::XDataProviderAccess > xCreatorDoc(xChartModel->getParent(), uno::UNO_QUERY); bCanCreateDataProvider = xCreatorDoc.is(); } } diff --git a/chart2/source/inc/ModifyListenerCallBack.hxx b/chart2/source/inc/ModifyListenerCallBack.hxx index b1b704c86002..b9006bad5a13 100644 --- a/chart2/source/inc/ModifyListenerCallBack.hxx +++ b/chart2/source/inc/ModifyListenerCallBack.hxx @@ -40,9 +40,7 @@ public: ~ModifyListenerCallBack(); - void startListening( - const ::com::sun::star::uno::Reference<::com::sun::star::util::XModifyBroadcaster>& - xBroadcaster); + void startListening(const css::uno::Reference<css::util::XModifyBroadcaster>& xBroadcaster); SAL_DLLPRIVATE void stopListening(); private: //methods diff --git a/chart2/source/tools/ModifyListenerCallBack.cxx b/chart2/source/tools/ModifyListenerCallBack.cxx index 037ee7a7820d..758b25386f96 100644 --- a/chart2/source/tools/ModifyListenerCallBack.cxx +++ b/chart2/source/tools/ModifyListenerCallBack.cxx @@ -67,7 +67,7 @@ void SAL_CALL ModifyListenerCallBack_impl::disposing( const lang::EventObject& / m_xBroadcaster.clear(); } -void ModifyListenerCallBack_impl::startListening( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyBroadcaster >& xBroadcaster ) +void ModifyListenerCallBack_impl::startListening( const css::uno::Reference< css::util::XModifyBroadcaster >& xBroadcaster ) { if( m_xBroadcaster == xBroadcaster ) return; @@ -97,7 +97,7 @@ ModifyListenerCallBack::~ModifyListenerCallBack() stopListening(); } -void ModifyListenerCallBack::startListening( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyBroadcaster >& xBroadcaster ) +void ModifyListenerCallBack::startListening( const css::uno::Reference< css::util::XModifyBroadcaster >& xBroadcaster ) { pModifyListener_impl->startListening( xBroadcaster ); } diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index 4b085cde1325..b2d27a4e67e1 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -446,7 +446,7 @@ void lcl_setDefaultWritingMode( const std::shared_ptr< DrawModelWrapper >& pDraw else { //Calc is parent document - Reference< com::sun::star::beans::XPropertySetInfo > xInfo = xParentProps->getPropertySetInfo(); + Reference< css::beans::XPropertySetInfo > xInfo = xParentProps->getPropertySetInfo(); if (xInfo->hasPropertyByName(u"PageStyle"_ustr)) { xParentProps->getPropertyValue( u"PageStyle"_ustr ) >>= aPageStyle; @@ -457,7 +457,7 @@ void lcl_setDefaultWritingMode( const std::shared_ptr< DrawModelWrapper >& pDraw if( nWritingMode == -1 || nWritingMode == text::WritingMode2::PAGE ) { uno::Reference< beans::XPropertySet > xPageStyle( xPageStyles->getByName( aPageStyle ), uno::UNO_QUERY ); - Reference< com::sun::star::beans::XPropertySetInfo > xInfo = xPageStyle->getPropertySetInfo(); + Reference< css::beans::XPropertySetInfo > xInfo = xPageStyle->getPropertySetInfo(); if (xInfo->hasPropertyByName(u"WritingMode"_ustr)) { if( xPageStyle.is() ) diff --git a/chart2/source/view/main/VDataSeries.cxx b/chart2/source/view/main/VDataSeries.cxx index cdf5df751ddd..ebf2141d8bb9 100644 --- a/chart2/source/view/main/VDataSeries.cxx +++ b/chart2/source/view/main/VDataSeries.cxx @@ -836,7 +836,7 @@ Symbol* VDataSeries::getSymbolProperties( sal_Int32 index ) const m_oSymbolProperties_InvisibleSymbolForSelection.emplace(); m_oSymbolProperties_InvisibleSymbolForSelection->Style = SymbolStyle_STANDARD; m_oSymbolProperties_InvisibleSymbolForSelection->StandardSymbol = 0;//square - m_oSymbolProperties_InvisibleSymbolForSelection->Size = com::sun::star::awt::Size(0, 0);//tdf#126033 + m_oSymbolProperties_InvisibleSymbolForSelection->Size = css::awt::Size(0, 0);//tdf#126033 m_oSymbolProperties_InvisibleSymbolForSelection->BorderColor = 0xff000000;//invisible m_oSymbolProperties_InvisibleSymbolForSelection->FillColor = 0xff000000;//invisible } diff --git a/comphelper/qa/unit/variadictemplates.cxx b/comphelper/qa/unit/variadictemplates.cxx index 2865fbac9f1e..c460bdba70fa 100644 --- a/comphelper/qa/unit/variadictemplates.cxx +++ b/comphelper/qa/unit/variadictemplates.cxx @@ -45,12 +45,12 @@ void extract( const& xErrorContext ) { if (nArg >= seq.getLength()) { - throw ::com::sun::star::lang::IllegalArgumentException( + throw css::lang::IllegalArgumentException( u"No such argument available!"_ustr, xErrorContext, static_cast<sal_Int16>(nArg) ); } if (! fromAny(seq[nArg], &v)) { - throw ::com::sun::star::lang::IllegalArgumentException( + throw css::lang::IllegalArgumentException( "Cannot extract ANY { " + seq[nArg].getValueTypeName() + " } to " + ::cppu::UnoType<T>::get().getTypeName(), @@ -136,7 +136,7 @@ void VariadicTemplatesTest::testUnwrapArgs() { CPPUNIT_ASSERT_MESSAGE( "seq1 and seq2 are equal", bool(seq1 == seq2) ); } - catch( ::com::sun::star::lang::IllegalArgumentException& err ) { + catch( css::lang::IllegalArgumentException& err ) { std::stringstream ss; ss << "IllegalArgumentException when unwrapping arguments at: " << err.ArgumentPosition; @@ -149,7 +149,7 @@ void VariadicTemplatesTest::testUnwrapArgs() { static_cast< sal_uInt32 >( 4 ) ); ::comphelper::unwrapArgs( seq, tmp6, tmp7, tmp10, tmp11, tmp10, tmp6 ); } - catch( ::com::sun::star::lang::IllegalArgumentException& err ) { + catch( css::lang::IllegalArgumentException& err ) { CPPUNIT_ASSERT_EQUAL( static_cast< short >( 5 ), err.ArgumentPosition ); } @@ -164,14 +164,14 @@ void VariadicTemplatesTest::testUnwrapArgs() { static_cast< sal_uInt32 >( 4 ) ); ::comphelper::unwrapArgs( seq, test1, test2, test3, test4, test5 ); } - catch( ::com::sun::star::lang::IllegalArgumentException& err1 ) { + catch( css::lang::IllegalArgumentException& err1 ) { try { ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > seq( static_cast< sal_uInt32 >( 4 ) ); unwrapArgsBaseline( seq, test1, test2, test3, test4, test5 ); CPPUNIT_FAIL( "unwrapArgs failed while the baseline did not throw" ); } - catch( ::com::sun::star::lang::IllegalArgumentException& err2 ) { + catch( css::lang::IllegalArgumentException& err2 ) { CPPUNIT_ASSERT_EQUAL_MESSAGE( "err1.ArgumentPosition == err2.ArgumentPosition", err1.ArgumentPosition, err2.ArgumentPosition ); } diff --git a/comphelper/source/misc/types.cxx b/comphelper/source/misc/types.cxx index 8e5d42073bff..e93d96dee867 100644 --- a/comphelper/source/misc/types.cxx +++ b/comphelper/source/misc/types.cxx @@ -105,7 +105,7 @@ FontDescriptor getDefaultFont() FontDescriptor aReturn; aReturn.Slant = FontSlant_DONTKNOW; aReturn.Underline = FontUnderline::DONTKNOW; - aReturn.Strikeout = com::sun::star::awt::FontStrikeout::DONTKNOW; + aReturn.Strikeout = css::awt::FontStrikeout::DONTKNOW; return aReturn; } diff --git a/connectivity/source/drivers/firebird/Tables.hxx b/connectivity/source/drivers/firebird/Tables.hxx index ada1827097a5..9e59da0cf11d 100644 --- a/connectivity/source/drivers/firebird/Tables.hxx +++ b/connectivity/source/drivers/firebird/Tables.hxx @@ -28,7 +28,7 @@ namespace connectivity::firebird css::uno::Reference< css::sdbc::XDatabaseMetaData > m_xMetaData; - static OUString createStandardColumnPart(const css::uno::Reference< css::beans::XPropertySet >& xColProp,const css::uno::Reference< com::sun::star::sdbc::XConnection>& _xConnection); + static OUString createStandardColumnPart(const css::uno::Reference< css::beans::XPropertySet >& xColProp,const css::uno::Reference< css::sdbc::XConnection>& _xConnection); // OCollection virtual void impl_refresh() override; diff --git a/connectivity/source/drivers/mysqlc/mysqlc_types.cxx b/connectivity/source/drivers/mysqlc/mysqlc_types.cxx index ca473cebd84f..85d3df43dfe0 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_types.cxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_types.cxx @@ -29,14 +29,14 @@ TypeInfoDef const mysqlc_types[] = { // ------------- MySQL-Type: BIT. SDBC-Type: Bit ------------- { "BIT", // Typename - com::sun::star::sdbc::DataType::BIT, // sdbc-type + css::sdbc::DataType::BIT, // sdbc-type 1, // Precision "", // Literal prefix "", // Literal suffix "", // Create params - com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable + css::sdbc::ColumnValue::NULLABLE, // nullable true, // case sensitive - com::sun::star::sdbc::ColumnSearch::FULL, // searchable + css::sdbc::ColumnSearch::FULL, // searchable false, // unsignable false, // fixed_prec_scale false, // auto_increment @@ -48,14 +48,14 @@ TypeInfoDef const mysqlc_types[] = { // ------------ MySQL-Type: BOOL. SDBC-Type: Bit ------------- { "BOOL", // Typename - com::sun::star::sdbc::DataType::BIT, // sdbc-type + css::sdbc::DataType::BIT, // sdbc-type 1, // Precision "", // Literal prefix "", // Literal suffix "", // Create params - com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable + css::sdbc::ColumnValue::NULLABLE, // nullable true, // case sensitive - com::sun::star::sdbc::ColumnSearch::FULL, // searchable + css::sdbc::ColumnSearch::FULL, // searchable false, // unsignable false, // fixed_prec_scale false, // auto_increment @@ -67,14 +67,14 @@ TypeInfoDef const mysqlc_types[] = { // --------- MySQL-Type: TINYINT SDBC-Type: TINYINT ---------- { "TINYINT", // Typename - com::sun::star::sdbc::DataType::TINYINT, // sdbc-type + css::sdbc::DataType::TINYINT, // sdbc-type 3, // Precision "", // Literal prefix "", // Literal suffix "[(M)] [UNSIGNED] [ZEROFILL]", // Create params - com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable + css::sdbc::ColumnValue::NULLABLE, // nullable false, // case sensitive - com::sun::star::sdbc::ColumnSearch::FULL, // searchable + css::sdbc::ColumnSearch::FULL, // searchable true, // unsignable false, // fixed_prec_scale true, // auto_increment @@ -86,14 +86,14 @@ TypeInfoDef const mysqlc_types[] = { // ----------- MySQL-Type: BIGINT SDBC-Type: BIGINT ---------- { "BIGINT", // Typename - com::sun::star::sdbc::DataType::BIGINT, // sdbc-type + css::sdbc::DataType::BIGINT, // sdbc-type 19, // Precision "", // Literal prefix "", // Literal suffix "[(M)] [UNSIGNED] [ZEROFILL]", // Create params - com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable + css::sdbc::ColumnValue::NULLABLE, // nullable false, // case sensitive - com::sun::star::sdbc::ColumnSearch::FULL, // searchable + css::sdbc::ColumnSearch::FULL, // searchable true, // unsignable false, // fixed_prec_scale true, // auto_increment @@ -105,14 +105,14 @@ TypeInfoDef const mysqlc_types[] = { // ----------- MySQL-Type: LONG VARBINARY SDBC-Type: LONGVARBINARY ---------- { "LONG VARBINARY", // Typename - com::sun::star::sdbc::DataType::LONGVARBINARY, // sdbc-type + css::sdbc::DataType::LONGVARBINARY, // sdbc-type 16777215, // Precision "'", // Literal prefix "'", // Literal suffix "", // Create params - com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable + css::sdbc::ColumnValue::NULLABLE, // nullable true, // case sensitive - com::sun::star::sdbc::ColumnSearch::FULL, // searchable + css::sdbc::ColumnSearch::FULL, // searchable false, // unsignable false, // fixed_prec_scale false, // auto_increment @@ -124,14 +124,14 @@ TypeInfoDef const mysqlc_types[] = { // ----------- MySQL-Type: MEDIUMBLOB SDBC-Type: LONGVARBINARY ---------- { "MEDIUMBLOB", // Typename - com::sun::star::sdbc::DataType::LONGVARBINARY, // sdbc-type + css::sdbc::DataType::LONGVARBINARY, // sdbc-type 16777215, // Precision "'", // Literal prefix "'", // Literal suffix "", // Create params - com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable + css::sdbc::ColumnValue::NULLABLE, // nullable true, // case sensitive - com::sun::star::sdbc::ColumnSearch::FULL, // searchable + css::sdbc::ColumnSearch::FULL, // searchable false, // unsignable false, // fixed_prec_scale false, // auto_increment @@ -143,14 +143,14 @@ TypeInfoDef const mysqlc_types[] = { // ----------- MySQL-Type: LONGBLOB SDBC-Type: LONGVARBINARY ---------- { "LONGBLOB", // Typename - com::sun::star::sdbc::DataType::LONGVARBINARY, // sdbc-type + css::sdbc::DataType::LONGVARBINARY, // sdbc-type -1, // Precision "'", // Literal prefix "'", // Literal suffix "", // Create params - com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable + css::sdbc::ColumnValue::NULLABLE, // nullable true, // case sensitive - com::sun::star::sdbc::ColumnSearch::FULL, // searchable + css::sdbc::ColumnSearch::FULL, // searchable false, // unsignable false, // fixed_prec_scale false, // auto_increment @@ -162,14 +162,14 @@ TypeInfoDef const mysqlc_types[] = { // ----------- MySQL-Type: BLOB SDBC-Type: LONGVARBINARY ---------- { "BLOB", // Typename - com::sun::star::sdbc::DataType::LONGVARBINARY, // sdbc-type + css::sdbc::DataType::LONGVARBINARY, // sdbc-type 0xFFFF, // Precision "'", // Literal prefix "'", // Literal suffix "", // Create params - com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable + css::sdbc::ColumnValue::NULLABLE, // nullable true, // case sensitive - com::sun::star::sdbc::ColumnSearch::FULL, // searchable + css::sdbc::ColumnSearch::FULL, // searchable false, // unsignable false, // fixed_prec_scale false, // auto_increment @@ -181,14 +181,14 @@ TypeInfoDef const mysqlc_types[] = { // ----------- MySQL-Type: TINYBLOB SDBC-Type: LONGVARBINARY ---------- { "TINYBLOB", // Typename - com::sun::star::sdbc::DataType::LONGVARBINARY, // sdbc-type + css::sdbc::DataType::LONGVARBINARY, // sdbc-type 0xFF, // Precision "'", // Literal prefix "'", // Literal suffix "", // Create params - com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable + css::sdbc::ColumnValue::NULLABLE, // nullable true, // case sensitive - com::sun::star::sdbc::ColumnSearch::FULL, // searchable + css::sdbc::ColumnSearch::FULL, // searchable false, // unsignable false, // fixed_prec_scale false, // auto_increment @@ -200,14 +200,14 @@ TypeInfoDef const mysqlc_types[] = { // ----------- MySQL-Type: VARBINARY SDBC-Type: VARBINARY ---------- { "VARBINARY", // Typename - com::sun::star::sdbc::DataType::VARBINARY, // sdbc-type + css::sdbc::DataType::VARBINARY, // sdbc-type 0xFF, // Precision "'", // Literal prefix "'", // Literal suffix "(M)", // Create params - com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable + css::sdbc::ColumnValue::NULLABLE, // nullable true, // case sensitive - com::sun::star::sdbc::ColumnSearch::FULL, // searchable + css::sdbc::ColumnSearch::FULL, // searchable false, // unsignable false, // fixed_prec_scale false, // auto_increment @@ -219,14 +219,14 @@ TypeInfoDef const mysqlc_types[] = { // ----------- MySQL-Type: BINARY SDBC-Type: BINARY ---------- { "BINARY", // Typename - com::sun::star::sdbc::DataType::BINARY, // sdbc-type + css::sdbc::DataType::BINARY, // sdbc-type 0xFF, // Precision "'", // Literal prefix "'", // Literal suffix "(M)", // Create params - com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable + css::sdbc::ColumnValue::NULLABLE, // nullable true, // case sensitive - com::sun::star::sdbc::ColumnSearch::FULL, // searchable + css::sdbc::ColumnSearch::FULL, // searchable false, // unsignable false, // fixed_prec_scale false, // auto_increment @@ -238,14 +238,14 @@ TypeInfoDef const mysqlc_types[] = { // ----------- MySQL-Type: LONG VARCHAR SDBC-Type: LONG VARCHAR ---------- { "LONG VARCHAR", // Typename - com::sun::star::sdbc::DataType::LONGVARCHAR, // sdbc-type + css::sdbc::DataType::LONGVARCHAR, // sdbc-type 0xFFFFFF, // Precision "'", // Literal prefix "'", // Literal suffix "", // Create params - com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable + css::sdbc::ColumnValue::NULLABLE, // nullable false, // case sensitive - com::sun::star::sdbc::ColumnSearch::FULL, // searchable + css::sdbc::ColumnSearch::FULL, // searchable false, // unsignable false, // fixed_prec_scale false, // auto_increment @@ -257,14 +257,14 @@ TypeInfoDef const mysqlc_types[] = { // ----------- MySQL-Type: MEDIUMTEXT SDBC-Type: LONG VARCHAR ---------- { "MEDIUMTEXT", // Typename - com::sun::star::sdbc::DataType::LONGVARCHAR, // sdbc-type + css::sdbc::DataType::LONGVARCHAR, // sdbc-type 0xFFFFFF, // Precision "'", // Literal prefix "'", // Literal suffix "", // Create params - com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable + css::sdbc::ColumnValue::NULLABLE, // nullable false, // case sensitive - com::sun::star::sdbc::ColumnSearch::FULL, // searchable + css::sdbc::ColumnSearch::FULL, // searchable false, // unsignable false, // fixed_prec_scale false, // auto_increment @@ -276,14 +276,14 @@ TypeInfoDef const mysqlc_types[] = { // ----------- MySQL-Type: LONGTEXT SDBC-Type: LONG VARCHAR ---------- { "LONGTEXT", // Typename - com::sun::star::sdbc::DataType::LONGVARCHAR, // sdbc-type + css::sdbc::DataType::LONGVARCHAR, // sdbc-type 0xFFFFFF, // Precision "'", // Literal prefix "'", // Literal suffix "", // Create params - com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable + css::sdbc::ColumnValue::NULLABLE, // nullable false, // case sensitive - com::sun::star::sdbc::ColumnSearch::FULL, // searchable + css::sdbc::ColumnSearch::FULL, // searchable false, // unsignable false, // fixed_prec_scale false, // auto_increment @@ -295,14 +295,14 @@ TypeInfoDef const mysqlc_types[] = { // ----------- MySQL-Type: TEXT SDBC-Type: LONG VARCHAR ---------- { "TEXT", // Typename - com::sun::star::sdbc::DataType::LONGVARCHAR, // sdbc-type + css::sdbc::DataType::LONGVARCHAR, // sdbc-type 0xFFFF, // Precision "'", // Literal prefix "'", // Literal suffix "", // Create params - com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable + css::sdbc::ColumnValue::NULLABLE, // nullable false, // case sensitive - com::sun::star::sdbc::ColumnSearch::FULL, // searchable + css::sdbc::ColumnSearch::FULL, // searchable false, // unsignable false, // fixed_prec_scale false, // auto_increment @@ -314,14 +314,14 @@ TypeInfoDef const mysqlc_types[] = { // ----------- MySQL-Type: TINYTEXT SDBC-Type: LONG VARCHAR ---------- { "TINYTEXT", // Typename - com::sun::star::sdbc::DataType::LONGVARCHAR, // sdbc-type + css::sdbc::DataType::LONGVARCHAR, // sdbc-type 0xFF, // Precision "'", // Literal prefix "'", // Literal suffix "", // Create params - com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable + css::sdbc::ColumnValue::NULLABLE, // nullable false, // case sensitive - com::sun::star::sdbc::ColumnSearch::FULL, // searchable + css::sdbc::ColumnSearch::FULL, // searchable false, // unsignable false, // fixed_prec_scale false, // auto_increment @@ -333,14 +333,14 @@ TypeInfoDef const mysqlc_types[] = { // ----------- MySQL-Type: CHAR SDBC-Type: CHAR ---------- { "CHAR", // Typename - com::sun::star::sdbc::DataType::CHAR, // sdbc-type + css::sdbc::DataType::CHAR, // sdbc-type 0xFF, // Precision "'", // Literal prefix "'", // Literal suffix "(M)", // Create params - com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable + css::sdbc::ColumnValue::NULLABLE, // nullable false, // case sensitive - com::sun::star::sdbc::ColumnSearch::FULL, // searchable + css::sdbc::ColumnSearch::FULL, // searchable false, // unsignable false, // fixed_prec_scale false, // auto_increment @@ -352,14 +352,14 @@ TypeInfoDef const mysqlc_types[] = { // ----------- MySQL-Type: DECIMAL SDBC-Type: DECIMAL ---------- { "DECIMAL", // Typename - com::sun::star::sdbc::DataType::DECIMAL, // sdbc-type + css::sdbc::DataType::DECIMAL, // sdbc-type 17, // Precision "", // Literal prefix "", // Literal suffix "[(M[,D])] [ZEROFILL]", // Create params - com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable + css::sdbc::ColumnValue::NULLABLE, // nullable false, // case sensitive - com::sun::star::sdbc::ColumnSearch::FULL, // searchable + css::sdbc::ColumnSearch::FULL, // searchable false, // unsignable false, // fixed_prec_scale true, // auto_increment @@ -371,14 +371,14 @@ TypeInfoDef const mysqlc_types[] = { // ----------- MySQL-Type: NUMERIC SDBC-Type: NUMERIC ---------- { "NUMERIC", // Typename - com::sun::star::sdbc::DataType::NUMERIC, // sdbc-type + css::sdbc::DataType::NUMERIC, // sdbc-type 17, // Precision "", // Literal prefix "", // Literal suffix "[(M[,D])] [ZEROFILL]", // Create params - com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable + css::sdbc::ColumnValue::NULLABLE, // nullable false, // case sensitive - com::sun::star::sdbc::ColumnSearch::FULL, // searchable + css::sdbc::ColumnSearch::FULL, // searchable false, // unsignable false, // fixed_prec_scale true, // auto_increment @@ -390,14 +390,14 @@ TypeInfoDef const mysqlc_types[] = { // ----------- MySQL-Type: INTEGER SDBC-Type: INTEGER ---------- { "INTEGER", // Typename - com::sun::star::sdbc::DataType::INTEGER, // sdbc-type + css::sdbc::DataType::INTEGER, // sdbc-type 10, // Precision "", // Literal prefix "", // Literal suffix "[(M)] [UNSIGNED] [ZEROFILL]", // Create params - com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable + css::sdbc::ColumnValue::NULLABLE, // nullable false, // case sensitive - com::sun::star::sdbc::ColumnSearch::FULL, // searchable + css::sdbc::ColumnSearch::FULL, // searchable true, // unsignable false, // fixed_prec_scale true, // auto_increment @@ -409,14 +409,14 @@ TypeInfoDef const mysqlc_types[] = { // ----------- MySQL-Type: INT SDBC-Type: INTEGER ---------- { "INT", // Typename - com::sun::star::sdbc::DataType::INTEGER, // sdbc-type + css::sdbc::DataType::INTEGER, // sdbc-type 10, // Precision "", // Literal prefix "", // Literal suffix "[(M)] [UNSIGNED] [ZEROFILL]", // Create params - com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable + css::sdbc::ColumnValue::NULLABLE, // nullable false, // case sensitive - com::sun::star::sdbc::ColumnSearch::FULL, // searchable + css::sdbc::ColumnSearch::FULL, // searchable true, // unsignable false, // fixed_prec_scale true, // auto_increment @@ -428,14 +428,14 @@ TypeInfoDef const mysqlc_types[] = { // ----------- MySQL-Type: MEDIUMINT SDBC-Type: INTEGER ---------- { "MEDIUMINT", // Typename - com::sun::star::sdbc::DataType::INTEGER, // sdbc-type + css::sdbc::DataType::INTEGER, // sdbc-type 7, // Precision "", // Literal prefix "", // Literal suffix "[(M)] [UNSIGNED] [ZEROFILL]", // Create params - com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable + css::sdbc::ColumnValue::NULLABLE, // nullable false, // case sensitive - com::sun::star::sdbc::ColumnSearch::FULL, // searchable + css::sdbc::ColumnSearch::FULL, // searchable true, // unsignable false, // fixed_prec_scale true, // auto_increment @@ -447,14 +447,14 @@ TypeInfoDef const mysqlc_types[] = { // ----------- MySQL-Type: SMALLINT SDBC-Type: INTEGER ---------- { "SMALLINT", // Typename - com::sun::star::sdbc::DataType::SMALLINT, // sdbc-type + css::sdbc::DataType::SMALLINT, // sdbc-type 5, // Precision "", // Literal prefix "", // Literal suffix "[(M)] [UNSIGNED] [ZEROFILL]", // Create params - com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable + css::sdbc::ColumnValue::NULLABLE, // nullable false, // case sensitive - com::sun::star::sdbc::ColumnSearch::FULL, // searchable + css::sdbc::ColumnSearch::FULL, // searchable true, // unsignable false, // fixed_prec_scale true, // auto_increment @@ -466,14 +466,14 @@ TypeInfoDef const mysqlc_types[] = { // ----------- MySQL-Type: FLOAT SDBC-Type: REAL ---------- { "FLOAT", // Typename - com::sun::star::sdbc::DataType::REAL, // sdbc-type + css::sdbc::DataType::REAL, // sdbc-type 10, // Precision "", // Literal prefix "", // Literal suffix "[(M,D)] [ZEROFILL]", // Create params - com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable + css::sdbc::ColumnValue::NULLABLE, // nullable false, // case sensitive - com::sun::star::sdbc::ColumnSearch::FULL, // searchable + css::sdbc::ColumnSearch::FULL, // searchable false, // unsignable false, // fixed_prec_scale true, // auto_increment @@ -485,14 +485,14 @@ TypeInfoDef const mysqlc_types[] = { // ----------- MySQL-Type: DOUBLE SDBC-Type: DOUBLE ---------- { "DOUBLE", // Typename - com::sun::star::sdbc::DataType::DOUBLE, // sdbc-type + css::sdbc::DataType::DOUBLE, // sdbc-type 17, // Precision "", // Literal prefix "", // Literal suffix "[(M,D)] [ZEROFILL]", // Create params - com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable + css::sdbc::ColumnValue::NULLABLE, // nullable false, // case sensitive - com::sun::star::sdbc::ColumnSearch::FULL, // searchable + css::sdbc::ColumnSearch::FULL, // searchable false, // unsignable false, // fixed_prec_scale true, // auto_increment @@ -504,14 +504,14 @@ TypeInfoDef const mysqlc_types[] = { // ----------- MySQL-Type: DOUBLE PRECISION SDBC-Type: DOUBLE ---------- { "DOUBLE PRECISION", // Typename - com::sun::star::sdbc::DataType::DOUBLE, // sdbc-type + css::sdbc::DataType::DOUBLE, // sdbc-type 17, // Precision "", // Literal prefix "", // Literal suffix "[(M,D)] [ZEROFILL]", // Create params - com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable + css::sdbc::ColumnValue::NULLABLE, // nullable false, // case sensitive - com::sun::star::sdbc::ColumnSearch::FULL, // searchable + css::sdbc::ColumnSearch::FULL, // searchable false, // unsignable false, // fixed_prec_scale true, // auto_increment @@ -523,14 +523,14 @@ TypeInfoDef const mysqlc_types[] = { // ----------- MySQL-Type: REAL SDBC-Type: DOUBLE ---------- { "REAL", // Typename - com::sun::star::sdbc::DataType::DOUBLE, // sdbc-type + css::sdbc::DataType::DOUBLE, // sdbc-type 17, // Precision "", // Literal prefix "", // Literal suffix "[(M,D)] [ZEROFILL]", // Create params - com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable + css::sdbc::ColumnValue::NULLABLE, // nullable false, // case sensitive - com::sun::star::sdbc::ColumnSearch::FULL, // searchable + css::sdbc::ColumnSearch::FULL, // searchable false, // unsignable false, // fixed_prec_scale true, // auto_increment @@ -542,14 +542,14 @@ TypeInfoDef const mysqlc_types[] = { // ----------- MySQL-Type: VARCHAR SDBC-Type: VARCHAR ---------- { "VARCHAR", // Typename - com::sun::star::sdbc::DataType::VARCHAR, // sdbc-type + css::sdbc::DataType::VARCHAR, // sdbc-type 255, // Precision "'", // Literal prefix "'", // Literal suffix "(M)", // Create params - com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable + css::sdbc::ColumnValue::NULLABLE, // nullable false, // case sensitive - com::sun::star::sdbc::ColumnSearch::FULL, // searchable + css::sdbc::ColumnSearch::FULL, // searchable false, // unsignable false, // fixed_prec_scale false, // auto_increment @@ -561,14 +561,14 @@ TypeInfoDef const mysqlc_types[] = { // ----------- MySQL-Type: ENUM SDBC-Type: VARCHAR ---------- { "ENUM", // Typename - com::sun::star::sdbc::DataType::VARCHAR, // sdbc-type + css::sdbc::DataType::VARCHAR, // sdbc-type 0xFFFF, // Precision "'", // Literal prefix "'", // Literal suffix "", // Create params - com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable + css::sdbc::ColumnValue::NULLABLE, // nullable false, // case sensitive - com::sun::star::sdbc::ColumnSearch::FULL, // searchable + css::sdbc::ColumnSearch::FULL, // searchable false, // unsignable false, // fixed_prec_scale false, // auto_increment @@ -580,14 +580,14 @@ TypeInfoDef const mysqlc_types[] = { // ----------- MySQL-Type: SET SDBC-Type: VARCHAR ---------- { "SET", // Typename - com::sun::star::sdbc::DataType::VARCHAR, // sdbc-type + css::sdbc::DataType::VARCHAR, // sdbc-type 64, // Precision "'", // Literal prefix "'", // Literal suffix "", // Create params - com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable + css::sdbc::ColumnValue::NULLABLE, // nullable false, // case sensitive - com::sun::star::sdbc::ColumnSearch::FULL, // searchable + css::sdbc::ColumnSearch::FULL, // searchable false, // unsignable false, // fixed_prec_scale false, // auto_increment @@ -599,14 +599,14 @@ TypeInfoDef const mysqlc_types[] = { // ----------- MySQL-Type: DATE SDBC-Type: DATE ---------- { "DATE", // Typename - com::sun::star::sdbc::DataType::DATE, // sdbc-type + css::sdbc::DataType::DATE, // sdbc-type 0, // Precision "'", // Literal prefix "'", // Literal suffix "", // Create params - com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable + css::sdbc::ColumnValue::NULLABLE, // nullable false, // case sensitive - com::sun::star::sdbc::ColumnSearch::FULL, // searchable + css::sdbc::ColumnSearch::FULL, // searchable false, // unsignable false, // fixed_prec_scale false, // auto_increment @@ -618,14 +618,14 @@ TypeInfoDef const mysqlc_types[] = { // ----------- MySQL-Type: TIME SDBC-Type: TIME ---------- { "TIME", // Typename - com::sun::star::sdbc::DataType::TIME, // sdbc-type + css::sdbc::DataType::TIME, // sdbc-type 0, // Precision "'", // Literal prefix "'", // Literal suffix "", // Create params - com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable + css::sdbc::ColumnValue::NULLABLE, // nullable false, // case sensitive - com::sun::star::sdbc::ColumnSearch::FULL, // searchable + css::sdbc::ColumnSearch::FULL, // searchable false, // unsignable false, // fixed_prec_scale false, // auto_increment @@ -637,14 +637,14 @@ TypeInfoDef const mysqlc_types[] = { // ----------- MySQL-Type: DATETIME SDBC-Type: TIMESTAMP ---------- { "DATETIME", // Typename - com::sun::star::sdbc::DataType::TIMESTAMP, // sdbc-type + css::sdbc::DataType::TIMESTAMP, // sdbc-type 0, // Precision "'", // Literal prefix "'", // Literal suffix "", // Create params - com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable + css::sdbc::ColumnValue::NULLABLE, // nullable false, // case sensitive - com::sun::star::sdbc::ColumnSearch::FULL, // searchable + css::sdbc::ColumnSearch::FULL, // searchable false, // unsignable false, // fixed_prec_scale false, // auto_increment @@ -656,14 +656,14 @@ TypeInfoDef const mysqlc_types[] = { // ----------- MySQL-Type: TIMESTAMP SDBC-Type: TIMESTAMP ---------- { "TIMESTAMP", // Typename - com::sun::star::sdbc::DataType::TIMESTAMP, // sdbc-type + css::sdbc::DataType::TIMESTAMP, // sdbc-type 0, // Precision "'", // Literal prefix "'", // Literal suffix "[(M)]", // Create params - com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable + css::sdbc::ColumnValue::NULLABLE, // nullable false, // case sensitive - com::sun::star::sdbc::ColumnSearch::FULL, // searchable + css::sdbc::ColumnSearch::FULL, // searchable false, // unsignable false, // fixed_prec_scale false, // auto_increment @@ -677,14 +677,14 @@ TypeInfoDef const mysqlc_types[] = { // ----------- MySQL-Type: YEAR SDBC-Type: INTEGER ---------- { "YEAR", // Typename - com::sun::star::sdbc::DataType::SMALLINT, // sdbc-type + css::sdbc::DataType::SMALLINT, // sdbc-type 10, // Precision "", // Literal prefix "", // Literal suffix "[(M)] [UNSIGNED] [ZEROFILL]", // Create params - com::sun::star::sdbc::ColumnValue::NULLABLE, // nullable + css::sdbc::ColumnValue::NULLABLE, // nullable false, // case sensitive - com::sun::star::sdbc::ColumnSearch::FULL, // searchable + css::sdbc::ColumnSearch::FULL, // searchable true, // unsignable false, // fixed_prec_scale true, // auto_increment diff --git a/cui/source/customize/SvxNotebookbarConfigPage.cxx b/cui/source/customize/SvxNotebookbarConfigPage.cxx index f04815570cf2..7bde0055bcfc 100644 --- a/cui/source/customize/SvxNotebookbarConfigPage.cxx +++ b/cui/source/customize/SvxNotebookbarConfigPage.cxx @@ -43,10 +43,10 @@ #include <o3tl/string_view.hxx> #include <com/sun/star/frame/theUICommandDescription.hpp> -namespace uno = com::sun::star::uno; -namespace frame = com::sun::star::frame; -namespace container = com::sun::star::container; -namespace beans = com::sun::star::beans; +namespace uno = css::uno; +namespace frame = css::frame; +namespace container = css::container; +namespace beans = css::beans; static bool isCategoryAvailable(std::u16string_view sClassId, std::u16string_view sUIItemId, std::u16string_view sActiveCategory, bool& isCategory) diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index feae0442ef90..9b79a931163f 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -94,12 +94,12 @@ #include <comphelper/processfactory.hxx> #include <config_features.h> -namespace uno = com::sun::star::uno; -namespace frame = com::sun::star::frame; -namespace lang = com::sun::star::lang; -namespace container = com::sun::star::container; -namespace beans = com::sun::star::beans; -namespace graphic = com::sun::star::graphic; +namespace uno = css::uno; +namespace frame = css::frame; +namespace lang = css::lang; +namespace container = css::container; +namespace beans = css::beans; +namespace graphic = css::graphic; #if OSL_DEBUG_LEVEL > 1 diff --git a/cui/source/inc/CommandCategoryListBox.hxx b/cui/source/inc/CommandCategoryListBox.hxx index c4882ae1745d..e1de4de2e371 100644 --- a/cui/source/inc/CommandCategoryListBox.hxx +++ b/cui/source/inc/CommandCategoryListBox.hxx @@ -69,12 +69,11 @@ public: void SetStylesInfo(SfxStylesInfo_Impl* pStyles); // Adds children of the given macro group to the functions list - void - addChildren(const weld::TreeIter* parentEntry, - const css::uno::Reference<com::sun::star::script::browse::XBrowseNode>& parentNode, - CuiConfigFunctionListBox* pFunctionListBox, const OUString& filterTerm, - SaveInData* pCurrentSaveInData, - std::vector<std::unique_ptr<weld::TreeIter>>& rNodesToExpand); + void addChildren(const weld::TreeIter* parentEntry, + const css::uno::Reference<css::script::browse::XBrowseNode>& parentNode, + CuiConfigFunctionListBox* pFunctionListBox, const OUString& filterTerm, + SaveInData* pCurrentSaveInData, + std::vector<std::unique_ptr<weld::TreeIter>>& rNodesToExpand); void set_visible(bool bVisible) { m_xControl->set_visible(bVisible); } }; diff --git a/dbaccess/qa/unit/dbtest_base.cxx b/dbaccess/qa/unit/dbtest_base.cxx index 8978f4a7ef17..cbb082c8db49 100644 --- a/dbaccess/qa/unit/dbtest_base.cxx +++ b/dbaccess/qa/unit/dbtest_base.cxx @@ -73,7 +73,7 @@ void DBTestBase::createDBDocument(const OUString& rDriverURL) uno::Reference< XOfficeDatabaseDocument > xDocument( m_xSFactory->createInstance(u"com.sun.star.sdb.OfficeDatabaseDocument"_ustr), UNO_QUERY_THROW); - uno::Reference< com::sun::star::frame::XStorable > xStorable(xDocument, UNO_QUERY_THROW); + uno::Reference< css::frame::XStorable > xStorable(xDocument, UNO_QUERY_THROW); uno::Reference< XDataSource > xDataSource = xDocument->getDataSource(); uno::Reference< XPropertySet > xPropertySet(xDataSource, UNO_QUERY_THROW); diff --git a/dbaccess/qa/unit/tdf119625.cxx b/dbaccess/qa/unit/tdf119625.cxx index cf8296cc3a34..24189e9a494d 100644 --- a/dbaccess/qa/unit/tdf119625.cxx +++ b/dbaccess/qa/unit/tdf119625.cxx @@ -101,7 +101,7 @@ void Tdf119625Test::testTime() CPPUNIT_ASSERT(xRes->next()); CPPUNIT_ASSERT_EQUAL(xRow->getShort(1), e.id); auto time_got = xRow->getTime(4); - auto time_expected = com::sun::star::util::Time(0, e.s, e.m, e.h, false); + auto time_expected = css::util::Time(0, e.s, e.m, e.h, false); auto equal_times = time_got == time_expected; CPPUNIT_ASSERT(equal_times); } diff --git a/dbaccess/source/ui/dlg/directsql.cxx b/dbaccess/source/ui/dlg/directsql.cxx index 1b2be95019be..bf80d7203562 100644 --- a/dbaccess/source/ui/dlg/directsql.cxx +++ b/dbaccess/source/ui/dlg/directsql.cxx @@ -239,7 +239,7 @@ namespace dbaui if (m_xDirectSQL->get_active()) { - Reference< com::sun::star::beans::XPropertySet > xStatementProps(xStatement, UNO_QUERY_THROW); + Reference< css::beans::XPropertySet > xStatementProps(xStatement, UNO_QUERY_THROW); try { xStatementProps->setPropertyValue(PROPERTY_ESCAPE_PROCESSING, Any(false)); diff --git a/desktop/inc/lib/init.hxx b/desktop/inc/lib/init.hxx index 25169b4e01a6..169d7e5b64d4 100644 --- a/desktop/inc/lib/init.hxx +++ b/desktop/inc/lib/init.hxx @@ -281,7 +281,7 @@ namespace desktop { /// Helper function to convert JSON to a vector of PropertyValues. /// Public to be unit-test-able. - DESKTOP_DLLPUBLIC std::vector<com::sun::star::beans::PropertyValue> jsonToPropertyValuesVector(const char* pJSON); + DESKTOP_DLLPUBLIC std::vector<css::beans::PropertyValue> jsonToPropertyValuesVector(const char* pJSON); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx b/desktop/qa/desktop_lib/test_desktop_lib.cxx index fa36de31ff73..31a72a0a5dfe 100644 --- a/desktop/qa/desktop_lib/test_desktop_lib.cxx +++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx @@ -998,7 +998,7 @@ void DesktopLOKTest::testWriterComments() { LibLODocument_Impl* pDocument = loadDoc("blank_text.odt"); pDocument->pClass->registerCallback(pDocument, &DesktopLOKTest::callback, this); - uno::Reference<awt::XReschedule> xToolkit = com::sun::star::awt::Toolkit::create(comphelper::getProcessComponentContext()); + uno::Reference<awt::XReschedule> xToolkit = css::awt::Toolkit::create(comphelper::getProcessComponentContext()); // Insert a comment at the beginning of the document and wait till the main // loop grabs the focus, so characters end up in the annotation window. @@ -1024,7 +1024,7 @@ void DesktopLOKTest::testWriterComments() pDocument->pClass->postKeyEvent(pDocument, LOK_KEYEVENT_KEYINPUT, 'e', 0); pDocument->pClass->postKeyEvent(pDocument, LOK_KEYEVENT_KEYINPUT, 's', 0); pDocument->pClass->postKeyEvent(pDocument, LOK_KEYEVENT_KEYINPUT, 't', 0); - pDocument->pClass->postKeyEvent(pDocument, LOK_KEYEVENT_KEYINPUT, 0, com::sun::star::awt::Key::ESCAPE); + pDocument->pClass->postKeyEvent(pDocument, LOK_KEYEVENT_KEYINPUT, 0, css::awt::Key::ESCAPE); Scheduler::ProcessEventsToIdle(); // Test that the typed characters ended up in the right window. @@ -2987,7 +2987,7 @@ void DesktopLOKTest::testTextSelectionHandles() // deselect & check m_aTextSelectionStart = ""_ostr; m_aTextSelectionEnd = ""_ostr; - pDocument->pClass->postKeyEvent(pDocument, LOK_KEYEVENT_KEYINPUT, 0, com::sun::star::awt::Key::ESCAPE); + pDocument->pClass->postKeyEvent(pDocument, LOK_KEYEVENT_KEYINPUT, 0, css::awt::Key::ESCAPE); Scheduler::ProcessEventsToIdle(); pText = pDocument->pClass->getTextSelection(pDocument, "text/plain;charset=utf-8", nullptr); CPPUNIT_ASSERT_EQUAL(static_cast<char *>(nullptr), pText); @@ -3140,7 +3140,7 @@ void DesktopLOKTest::testSpellcheckerMultiView() pDocument->pClass->postKeyEvent(pDocument, LOK_KEYEVENT_KEYINPUT, 'a', 0); pDocument->pClass->postKeyEvent(pDocument, LOK_KEYEVENT_KEYINPUT, 'a', 0); pDocument->pClass->postKeyEvent(pDocument, LOK_KEYEVENT_KEYINPUT, 'a', 0); - pDocument->pClass->postKeyEvent(pDocument, LOK_KEYEVENT_KEYINPUT, 0, com::sun::star::awt::Key::ESCAPE); + pDocument->pClass->postKeyEvent(pDocument, LOK_KEYEVENT_KEYINPUT, 0, css::awt::Key::ESCAPE); // Start spellchecking. pDocument->pClass->postUnoCommand(pDocument, ".uno:SpellDialog", nullptr, false); @@ -3308,7 +3308,7 @@ void DesktopLOKTest::testJumpCursor() pDocument->pClass->postKeyEvent(pDocument, LOK_KEYEVENT_KEYINPUT, 'v', 0); pDocument->pClass->postKeyEvent(pDocument, LOK_KEYEVENT_KEYINPUT, 'i', 0); pDocument->pClass->postKeyEvent(pDocument, LOK_KEYEVENT_KEYINPUT, 'a', 0); - pDocument->pClass->postKeyEvent(pDocument, LOK_KEYEVENT_KEYINPUT, 0, com::sun::star::awt::Key::ESCAPE); + pDocument->pClass->postKeyEvent(pDocument, LOK_KEYEVENT_KEYINPUT, 0, css::awt::Key::ESCAPE); Scheduler::ProcessEventsToIdle(); // There is a cursor jump to (0, 0) due to diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index c38fd40944ee..ec7d7f30a0c8 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -1264,7 +1264,7 @@ private: if (xJavaComponentLoader.is()) { - const css::uno::Reference< ::com::sun::star::registry::XRegistryKey > xRegistryKey; + const css::uno::Reference< css::registry::XRegistryKey > xRegistryKey; try { xJavaComponentLoader->activate(u""_ustr, u""_ustr, u""_ustr, xRegistryKey); diff --git a/desktop/source/deployment/manager/dp_commandenvironments.cxx b/desktop/source/deployment/manager/dp_commandenvironments.cxx index 4a0a88f42432..1252cf94e29a 100644 --- a/desktop/source/deployment/manager/dp_commandenvironments.cxx +++ b/desktop/source/deployment/manager/dp_commandenvironments.cxx @@ -28,12 +28,12 @@ #include "dp_commandenvironments.hxx" #include <osl/diagnose.h> -namespace deployment = com::sun::star::deployment; -namespace task = com::sun::star::task; -namespace ucb = com::sun::star::ucb; -namespace uno = com::sun::star::uno; +namespace deployment = css::deployment; +namespace task = css::task; +namespace ucb = css::ucb; +namespace uno = css::uno; -using ::com::sun::star::uno::Reference; +using css::uno::Reference; namespace dp_manager { diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx index 61fa44517be9..b6db9d10c483 100644 --- a/desktop/source/deployment/manager/dp_extensionmanager.cxx +++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx @@ -55,14 +55,14 @@ #include <set> #include <string_view> -namespace lang = com::sun::star::lang; -namespace task = com::sun::star::task; -namespace ucb = com::sun::star::ucb; -namespace uno = com::sun::star::uno; -namespace beans = com::sun::star::beans; -namespace util = com::sun::star::util; - -using ::com::sun::star::uno::Reference; +namespace lang = css::lang; +namespace task = css::task; +namespace ucb = css::ucb; +namespace uno = css::uno; +namespace beans = css::beans; +namespace util = css::util; + +using css::uno::Reference; namespace { diff --git a/desktop/source/deployment/manager/dp_informationprovider.cxx b/desktop/source/deployment/manager/dp_informationprovider.cxx index 14208c3b27a3..5ce8e60b52e0 100644 --- a/desktop/source/deployment/manager/dp_informationprovider.cxx +++ b/desktop/source/deployment/manager/dp_informationprovider.cxx @@ -45,13 +45,13 @@ #include <dp_version.hxx> #include <dp_update.hxx> -namespace beans = com::sun::star::beans ; -namespace deployment = com::sun::star::deployment ; -namespace lang = com::sun::star::lang ; -namespace task = com::sun::star::task ; -namespace css_ucb = com::sun::star::ucb ; -namespace uno = com::sun::star::uno ; -namespace xml = com::sun::star::xml ; +namespace beans = css::beans ; +namespace deployment = css::deployment ; +namespace lang = css::lang ; +namespace task = css::task ; +namespace css_ucb = css::ucb ; +namespace uno = css::uno ; +namespace xml = css::xml ; namespace dp_info { diff --git a/desktop/source/deployment/manager/dp_properties.cxx b/desktop/source/deployment/manager/dp_properties.cxx index e356c9393bb5..ab170d52d75e 100644 --- a/desktop/source/deployment/manager/dp_properties.cxx +++ b/desktop/source/deployment/manager/dp_properties.cxx @@ -26,12 +26,12 @@ #include <dp_ucb.h> #include "dp_properties.hxx" -namespace lang = com::sun::star::lang; -namespace ucb = com::sun::star::ucb; -namespace uno = com::sun::star::uno; +namespace lang = css::lang; +namespace ucb = css::ucb; +namespace uno = css::uno; -using ::com::sun::star::uno::Reference; +using css::uno::Reference; constexpr OUString PROP_SUPPRESS_LICENSE = u"SUPPRESS_LICENSE"_ustr; constexpr OUStringLiteral PROP_EXTENSION_UPDATE = u"EXTENSION_UPDATE"; diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index a0f73fd49f8a..f17f1484b63d 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -7778,7 +7778,7 @@ static void lo_status_indicator_callback(void *data, comphelper::LibreOfficeKit: /// Used by preloadData (LibreOfficeKit) for providing different shortcuts for different languages. static void preLoadShortCutAccelerators() { - std::unordered_map<OUString, css::uno::Reference<com::sun::star::ui::XAcceleratorConfiguration>>& acceleratorConfs = SfxLokHelper::getAcceleratorConfs(); + std::unordered_map<OUString, css::uno::Reference<css::ui::XAcceleratorConfiguration>>& acceleratorConfs = SfxLokHelper::getAcceleratorConfs(); css::uno::Sequence<OUString> installedLocales(officecfg::Setup::Office::InstalledLocales::get()->getElementNames()); OUString actualLang = officecfg::Setup::L10N::ooLocale::get(); diff --git a/desktop/source/lib/lokinteractionhandler.hxx b/desktop/source/lib/lokinteractionhandler.hxx index c3641db0762f..06aa62b9bcca 100644 --- a/desktop/source/lib/lokinteractionhandler.hxx +++ b/desktop/source/lib/lokinteractionhandler.hxx @@ -41,9 +41,9 @@ information easily via callbacks. TODO: the callbacks are not implemented yet, we just approve any interaction that we get. */ -class LOKInteractionHandler: public cppu::WeakImplHelper<com::sun::star::lang::XServiceInfo, - com::sun::star::lang::XInitialization, - com::sun::star::task::XInteractionHandler2> +class LOKInteractionHandler: public cppu::WeakImplHelper<css::lang::XServiceInfo, + css::lang::XInitialization, + css::task::XInteractionHandler2> { private: desktop::LibLibreOffice_Impl * m_pLOKit; @@ -76,7 +76,7 @@ private: bool handlePasswordRequest(const css::uno::Sequence<css::uno::Reference<css::task::XInteractionContinuation>> &rContinuations, const css::uno::Any& rRequest); static bool handleMacroConfirmationRequest(const css::uno::Reference<css::task::XInteractionRequest>& xRequest); - static bool handleFilterOptionsRequest(const ::com::sun::star::uno::Reference<::com::sun::star::task::XInteractionRequest>& Request); + static bool handleFilterOptionsRequest(const css::uno::Reference<css::task::XInteractionRequest>& Request); static bool handlePackageReparationRequest(const css::uno::Reference<css::task::XInteractionRequest>& xRequest); static bool handleLoadReadOnlyRequest(const css::uno::Reference<css::task::XInteractionRequest>& xRequest); @@ -95,13 +95,13 @@ public: virtual sal_Bool SAL_CALL supportsService(OUString const & rServiceName) override; - virtual com::sun::star::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; - virtual void SAL_CALL initialize(com::sun::star::uno::Sequence<com::sun::star::uno::Any > const & rArguments) override; + virtual void SAL_CALL initialize(css::uno::Sequence<css::uno::Any > const & rArguments) override; - virtual void SAL_CALL handle(com::sun::star::uno::Reference<com::sun::star::task::XInteractionRequest> const & rRequest) override; + virtual void SAL_CALL handle(css::uno::Reference<css::task::XInteractionRequest> const & rRequest) override; - virtual sal_Bool SAL_CALL handleInteractionRequest(const ::com::sun::star::uno::Reference<::com::sun::star::task::XInteractionRequest>& Request) override; + virtual sal_Bool SAL_CALL handleInteractionRequest(const css::uno::Reference<css::task::XInteractionRequest>& Request) override; }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/update/check/download.cxx b/extensions/source/update/check/download.cxx index 7f876ec56d85..17056cc53820 100644 --- a/extensions/source/update/check/download.cxx +++ b/extensions/source/update/check/download.cxx @@ -35,10 +35,10 @@ #include "download.hxx" -namespace beans = com::sun::star::beans ; -namespace container = com::sun::star::container ; -namespace lang = com::sun::star::lang ; -namespace uno = com::sun::star::uno ; +namespace beans = css::beans ; +namespace container = css::container ; +namespace lang = css::lang ; +namespace uno = css::uno ; namespace { diff --git a/extensions/source/update/check/updatecheck.cxx b/extensions/source/update/check/updatecheck.cxx index 139eabbd2050..41c05ac635fc 100644 --- a/extensions/source/update/check/updatecheck.cxx +++ b/extensions/source/update/check/updatecheck.cxx @@ -53,12 +53,12 @@ #include "updateprotocol.hxx" #include "updatecheckconfig.hxx" -namespace beans = com::sun::star::beans ; -namespace deployment = com::sun::star::deployment ; -namespace lang = com::sun::star::lang ; -namespace c3s = com::sun::star::system ; -namespace task = com::sun::star::task ; -namespace uno = com::sun::star::uno ; +namespace beans = css::beans ; +namespace deployment = css::deployment ; +namespace lang = css::lang ; +namespace c3s = css::system ; +namespace task = css::task ; +namespace uno = css::uno ; constexpr OUStringLiteral PROPERTY_TITLE = u"BubbleHeading"; constexpr OUStringLiteral PROPERTY_TEXT = u"BubbleText"; diff --git a/extensions/source/update/check/updatecheckconfig.cxx b/extensions/source/update/check/updatecheckconfig.cxx index e62ff5fe93c9..718a33539523 100644 --- a/extensions/source/update/check/updatecheckconfig.cxx +++ b/extensions/source/update/check/updatecheckconfig.cxx @@ -36,11 +36,11 @@ #include <shlobj.h> #endif -namespace container = com::sun::star::container ; -namespace beans = com::sun::star::beans ; -namespace lang = com::sun::star::lang ; -namespace util = com::sun::star::util ; -namespace uno = com::sun::star::uno ; +namespace container = css::container ; +namespace beans = css::beans ; +namespace lang = css::lang ; +namespace util = css::util ; +namespace uno = css::uno ; #define LAST_CHECK "LastCheck" #define UPDATE_VERSION "UpdateVersion" diff --git a/extensions/source/update/check/updatecheckjob.cxx b/extensions/source/update/check/updatecheckjob.cxx index 7c34671ed876..b6e56196328e 100644 --- a/extensions/source/update/check/updatecheckjob.cxx +++ b/extensions/source/update/check/updatecheckjob.cxx @@ -36,11 +36,11 @@ #include <com/sun/star/frame/XTerminateListener.hpp> #include <com/sun/star/task/XJob.hpp> -namespace beans = com::sun::star::beans ; -namespace frame = com::sun::star::frame ; -namespace lang = com::sun::star::lang ; -namespace task = com::sun::star::task ; -namespace uno = com::sun::star::uno ; +namespace beans = css::beans ; +namespace frame = css::frame ; +namespace lang = css::lang ; +namespace task = css::task ; +namespace uno = css::uno ; namespace { diff --git a/extensions/source/update/check/updateprotocoltest.cxx b/extensions/source/update/check/updateprotocoltest.cxx index 070f930af160..b22b9c8be27a 100644 --- a/extensions/source/update/check/updateprotocoltest.cxx +++ b/extensions/source/update/check/updateprotocoltest.cxx @@ -28,8 +28,8 @@ #include <stdio.h> #include "sal/log.hxx" -namespace task = ::com::sun::star::task; -namespace uno = ::com::sun::star::uno; +namespace task = css::task; +namespace uno = css::uno; SAL_IMPLEMENT_MAIN() diff --git a/extensions/source/update/feed/test/updatefeedtest.cxx b/extensions/source/update/feed/test/updatefeedtest.cxx index 119aab24a3d1..4c3b8017414b 100644 --- a/extensions/source/update/feed/test/updatefeedtest.cxx +++ b/extensions/source/update/feed/test/updatefeedtest.cxx @@ -31,10 +31,10 @@ #include <sal/log.hxx> #include <stdio.h> -namespace deployment = ::com::sun::star::deployment; -namespace lang = ::com::sun::star::lang; -namespace uno = ::com::sun::star::uno; -namespace xml = ::com::sun::star::xml; +namespace deployment = css::deployment; +namespace lang = css::lang; +namespace uno = css::uno; +namespace xml = css::xml; SAL_IMPLEMENT_MAIN() diff --git a/extensions/source/update/feed/updatefeed.cxx b/extensions/source/update/feed/updatefeed.cxx index 241a74d385f4..f1d77008f7e4 100644 --- a/extensions/source/update/feed/updatefeed.cxx +++ b/extensions/source/update/feed/updatefeed.cxx @@ -56,15 +56,15 @@ #include <utility> #include <vcl/svapp.hxx> -namespace beans = com::sun::star::beans ; -namespace container = com::sun::star::container ; -namespace deployment = com::sun::star::deployment ; -namespace io = com::sun::star::io ; -namespace lang = com::sun::star::lang ; -namespace task = com::sun::star::task ; -namespace ucb = com::sun::star::ucb ; -namespace uno = com::sun::star::uno ; -namespace xml = com::sun::star::xml ; +namespace beans = css::beans ; +namespace container = css::container ; +namespace deployment = css::deployment ; +namespace io = css::io ; +namespace lang = css::lang ; +namespace task = css::task ; +namespace ucb = css::ucb ; +namespace uno = css::uno ; +namespace xml = css::xml ; namespace diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index d39fc7c2ddda..9e93a6f84df6 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -4625,12 +4625,12 @@ rtl::Reference<SdrObject> SvxMSDffManager::ImportShape( const DffRecordHeader& r if (seqAdjustmentValues[0].State == css::beans::PropertyState_DEFAULT_VALUE) { pseqAdjustmentValues[0].Value <<= -90.0; - pseqAdjustmentValues[0].State = com::sun::star::beans::PropertyState_DIRECT_VALUE; + pseqAdjustmentValues[0].State = css::beans::PropertyState_DIRECT_VALUE; } if (seqAdjustmentValues[1].State == css::beans::PropertyState_DEFAULT_VALUE) { pseqAdjustmentValues[1].Value <<= 0.0; - pseqAdjustmentValues[1].State = com::sun::star::beans::PropertyState_DIRECT_VALUE; + pseqAdjustmentValues[1].State = css::beans::PropertyState_DIRECT_VALUE; } seqAdjustmentValues[0].Value >>= fStartAngle; seqAdjustmentValues[1].Value >>= fEndAngle; diff --git a/forms/source/component/Time.cxx b/forms/source/component/Time.cxx index 2b8c2339b80f..b98d0fe24f11 100644 --- a/forms/source/component/Time.cxx +++ b/forms/source/component/Time.cxx @@ -245,7 +245,7 @@ bool OTimeModel::commitControlValueToDbColumn( bool /*_bPostReset*/ ) { util::DateTime aDateTime = m_xColumn->getTimestamp(); if (aDateTime.Year == 0 && aDateTime.Month == 0 && aDateTime.Day == 0) - aDateTime = ::com::sun::star::util::DateTime(0,0,0,0,30,12,1899, false); + aDateTime = css::util::DateTime(0,0,0,0,30,12,1899, false); aDateTime.NanoSeconds = aTime.NanoSeconds; aDateTime.Seconds = aTime.Seconds; aDateTime.Minutes = aTime.Minutes; diff --git a/forms/source/xforms/convert.cxx b/forms/source/xforms/convert.cxx index d16ec31a3b42..1192cc729b93 100644 --- a/forms/source/xforms/convert.cxx +++ b/forms/source/xforms/convert.cxx @@ -134,7 +134,7 @@ namespace // all okay? if ( !bWellformed ) - throw com::sun::star::lang::IllegalArgumentException(); + throw css::lang::IllegalArgumentException(); return aDate; } @@ -204,7 +204,7 @@ namespace // all okay? if ( !bWellformed ) - throw com::sun::star::lang::IllegalArgumentException(); + throw css::lang::IllegalArgumentException(); return aTime; } diff --git a/forms/source/xforms/datatypes.cxx b/forms/source/xforms/datatypes.cxx index 91cb67efcf9f..2e7f1537184d 100644 --- a/forms/source/xforms/datatypes.cxx +++ b/forms/source/xforms/datatypes.cxx @@ -859,7 +859,7 @@ namespace xforms { aTypeValue = Convert::get().toAny( value, getCppuType() ); } - catch (com::sun::star::lang::IllegalArgumentException) + catch (css::lang::IllegalArgumentException) { return false; } @@ -916,7 +916,7 @@ namespace xforms { aTypedValue = Convert::get().toAny( value, getCppuType() ); } - catch (com::sun::star::lang::IllegalArgumentException) + catch (css::lang::IllegalArgumentException) { return false; } @@ -996,7 +996,7 @@ namespace xforms { aTypedValue = Convert::get().toAny( value, getCppuType() ); } - catch (com::sun::star::uno::RuntimeException) + catch (css::uno::RuntimeException) { return false; } diff --git a/framework/source/uielement/subtoolbarcontroller.cxx b/framework/source/uielement/subtoolbarcontroller.cxx index 170acdc20d68..ffa4dd0924fa 100644 --- a/framework/source/uielement/subtoolbarcontroller.cxx +++ b/framework/source/uielement/subtoolbarcontroller.cxx @@ -51,7 +51,7 @@ class SubToolBarController : public ToolBarBase css::uno::Reference< css::ui::XUIElement > m_xUIElement; void disposeUIElement(); public: - explicit SubToolBarController( const rtl::Reference< com::sun::star::uno::XComponentContext >& rxContext, + explicit SubToolBarController( const rtl::Reference< css::uno::XComponentContext >& rxContext, const css::uno::Sequence< css::uno::Any >& rxArgs ); virtual ~SubToolBarController() override; @@ -100,7 +100,7 @@ public: } SubToolBarController::SubToolBarController( - const rtl::Reference< com::sun::star::uno::XComponentContext >& rxContext, + const rtl::Reference< css::uno::XComponentContext >& rxContext, const css::uno::Sequence< css::uno::Any >& rxArgs ) : ToolBarBase( rxContext, diff --git a/i18npool/source/localedata/LocaleNode.cxx b/i18npool/source/localedata/LocaleNode.cxx index 2689e9a5dc8a..dcc26f5bc604 100644 --- a/i18npool/source/localedata/LocaleNode.cxx +++ b/i18npool/source/localedata/LocaleNode.cxx @@ -41,7 +41,7 @@ typedef ::o3tl::sorted_vector< OUString > NameSet; typedef ::o3tl::sorted_vector< sal_Int16 > ValueSet; -namespace cssi = ::com::sun::star::i18n; +namespace cssi = css::i18n; LocaleNode::LocaleNode (OUString name, const Reference< XAttributeList > & attr) : aName(std::move(name)) diff --git a/include/basegfx/matrix/b3dhommatrixtools.hxx b/include/basegfx/matrix/b3dhommatrixtools.hxx index 6b65d24603f2..ec83f2c3eb5b 100644 --- a/include/basegfx/matrix/b3dhommatrixtools.hxx +++ b/include/basegfx/matrix/b3dhommatrixtools.hxx @@ -33,11 +33,10 @@ namespace basegfx::utils B3DHomMatrix. drawing::HomogenMatrix4 is not used by OOo */ BASEGFX_DLLPUBLIC B3DHomMatrix -UnoHomogenMatrixToB3DHomMatrix(const com::sun::star::drawing::HomogenMatrix& rMatrixIn); +UnoHomogenMatrixToB3DHomMatrix(const css::drawing::HomogenMatrix& rMatrixIn); -BASEGFX_DLLPUBLIC void -B3DHomMatrixToUnoHomogenMatrix(const B3DHomMatrix& rMatrixIn, - com::sun::star::drawing::HomogenMatrix& rMatrixOut); +BASEGFX_DLLPUBLIC void B3DHomMatrixToUnoHomogenMatrix(const B3DHomMatrix& rMatrixIn, + css::drawing::HomogenMatrix& rMatrixOut); } // end of namespace basegfx::tools diff --git a/include/oox/ppt/presentationfragmenthandler.hxx b/include/oox/ppt/presentationfragmenthandler.hxx index 29e7bcf12bfc..cd9084235221 100644 --- a/include/oox/ppt/presentationfragmenthandler.hxx +++ b/include/oox/ppt/presentationfragmenthandler.hxx @@ -53,7 +53,7 @@ private: const oox::ppt::SlidePersistPtr& rPersist ); void importSlide(sal_uInt32 nSlide, bool bFirstSlide, bool bImportNotes); void importMasterSlides(); - void importMasterSlide(const ::com::sun::star::uno::Reference<::com::sun::star::frame::XModel>& xModel, + void importMasterSlide(const css::uno::Reference<css::frame::XModel>& xModel, ::oox::ppt::PowerPointImport& rFilter, const OUString& rMasterFragmentPath); void saveThemeToGrabBag(const oox::drawingml::ThemePtr& pThemePtr, sal_Int32 nThemeIdx); diff --git a/include/sfx2/lokhelper.hxx b/include/sfx2/lokhelper.hxx index a35670332097..ca2212139cc8 100644 --- a/include/sfx2/lokhelper.hxx +++ b/include/sfx2/lokhelper.hxx @@ -87,7 +87,7 @@ class SFX2_DLLPUBLIC SfxLokHelper { public: /// Gets the short cut accelerators. - static std::unordered_map<OUString, css::uno::Reference<com::sun::star::ui::XAcceleratorConfiguration>>& getAcceleratorConfs(); + static std::unordered_map<OUString, css::uno::Reference<css::ui::XAcceleratorConfiguration>>& getAcceleratorConfs(); /// Create a new view shell from the current view frame. /// This assumes a single document is ever loaded. static int createView(); diff --git a/include/svx/fmdmod.hxx b/include/svx/fmdmod.hxx index 69ef27704040..df19a78a1197 100644 --- a/include/svx/fmdmod.hxx +++ b/include/svx/fmdmod.hxx @@ -29,9 +29,9 @@ public: virtual ~SvxFmMSFactory() {} - virtual ::com::sun::star::uno::Reference<::com::sun::star::uno::XInterface> + virtual css::uno::Reference<css::uno::XInterface> SAL_CALL createInstance(const OUString& ServiceSpecifier) override; - virtual ::com::sun::star::uno::Sequence<OUString> SAL_CALL getAvailableServiceNames() override; + virtual css::uno::Sequence<OUString> SAL_CALL getAvailableServiceNames() override; }; #endif // INCLUDED_SVX_FMDMOD_HXX diff --git a/include/test/sheet/xsheetcellrangecontainer.hxx b/include/test/sheet/xsheetcellrangecontainer.hxx index 734c2c4e2fc1..98b082b01a50 100644 --- a/include/test/sheet/xsheetcellrangecontainer.hxx +++ b/include/test/sheet/xsheetcellrangecontainer.hxx @@ -30,7 +30,7 @@ public: protected: ~XSheetCellRangeContainer() {} - static css::uno::Sequence<com::sun::star::table::CellRangeAddress> createCellRangeAddresses(); + static css::uno::Sequence<css::table::CellRangeAddress> createCellRangeAddresses(); }; } diff --git a/include/test/sheet/xsheetconditionalentries.hxx b/include/test/sheet/xsheetconditionalentries.hxx index 673e7ceb1784..81518afb5980 100644 --- a/include/test/sheet/xsheetconditionalentries.hxx +++ b/include/test/sheet/xsheetconditionalentries.hxx @@ -24,8 +24,7 @@ class OOO_DLLPUBLIC_TEST XSheetConditionalEntries { public: virtual css::uno::Reference<css::uno::XInterface> init() = 0; - virtual css::uno::Sequence<com::sun::star::beans::PropertyValue> - createCondition(const sal_Int32 nr) = 0; + virtual css::uno::Sequence<css::beans::PropertyValue> createCondition(const sal_Int32 nr) = 0; void testAddNew(); void testClear(); diff --git a/include/test/unoapi_test.hxx b/include/test/unoapi_test.hxx index f09499bf2c5a..a7b12bc10263 100644 --- a/include/test/unoapi_test.hxx +++ b/include/test/unoapi_test.hxx @@ -75,9 +75,8 @@ protected: rtl::Reference<TestInteractionHandler> xInteractionHandler; private: - void - setTestInteractionHandler(const char* pPassword, - std::vector<com::sun::star::beans::PropertyValue>& rFilterOptions); + void setTestInteractionHandler(const char* pPassword, + std::vector<css::beans::PropertyValue>& rFilterOptions); bool mbSkipValidation; OUString m_aBaseString; diff --git a/include/unotools/weakref.hxx b/include/unotools/weakref.hxx index 34a7242bdfc1..45b965fd4fdd 100644 --- a/include/unotools/weakref.hxx +++ b/include/unotools/weakref.hxx @@ -46,7 +46,7 @@ namespace unotools avoid overly tight requirements on when interface_type needs to be complete.) */ template <class interface_type> -class SAL_WARN_UNUSED WeakReference : public com::sun::star::uno::WeakReferenceHelper +class SAL_WARN_UNUSED WeakReference : public css::uno::WeakReferenceHelper { public: /** Default ctor. Creates an empty weak reference. diff --git a/libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx b/libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx index f23148eaf2f9..5616a163fed9 100644 --- a/libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx +++ b/libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx @@ -252,41 +252,41 @@ gtv_lok_dialog_signal_key(GtkWidget* pDialogDrawingArea, GdkEventKey* pEvent) switch (pEvent->keyval) { case GDK_KEY_BackSpace: - nKeyCode = com::sun::star::awt::Key::BACKSPACE; + nKeyCode = css::awt::Key::BACKSPACE; break; case GDK_KEY_Delete: - nKeyCode = com::sun::star::awt::Key::DELETE; + nKeyCode = css::awt::Key::DELETE; break; case GDK_KEY_Return: case GDK_KEY_KP_Enter: - nKeyCode = com::sun::star::awt::Key::RETURN; + nKeyCode = css::awt::Key::RETURN; break; case GDK_KEY_Escape: - nKeyCode = com::sun::star::awt::Key::ESCAPE; + nKeyCode = css::awt::Key::ESCAPE; break; case GDK_KEY_Tab: - nKeyCode = com::sun::star::awt::Key::TAB; + nKeyCode = css::awt::Key::TAB; break; case GDK_KEY_Down: - nKeyCode = com::sun::star::awt::Key::DOWN; + nKeyCode = css::awt::Key::DOWN; break; case GDK_KEY_Up: - nKeyCode = com::sun::star::awt::Key::UP; + nKeyCode = css::awt::Key::UP; break; case GDK_KEY_Left: - nKeyCode = com::sun::star::awt::Key::LEFT; + nKeyCode = css::awt::Key::LEFT; break; case GDK_KEY_Right: - nKeyCode = com::sun::star::awt::Key::RIGHT; + nKeyCode = css::awt::Key::RIGHT; break; case GDK_KEY_Page_Down: - nKeyCode = com::sun::star::awt::Key::PAGEDOWN; + nKeyCode = css::awt::Key::PAGEDOWN; break; case GDK_KEY_Page_Up: - nKeyCode = com::sun::star::awt::Key::PAGEUP; + nKeyCode = css::awt::Key::PAGEUP; break; case GDK_KEY_Insert: - nKeyCode = com::sun::star::awt::Key::INSERT; + nKeyCode = css::awt::Key::INSERT; break; case GDK_KEY_Shift_L: case GDK_KEY_Shift_R: @@ -307,7 +307,7 @@ gtv_lok_dialog_signal_key(GtkWidget* pDialogDrawingArea, GdkEventKey* pEvent) break; default: if (pEvent->keyval >= GDK_KEY_F1 && pEvent->keyval <= GDK_KEY_F26) - nKeyCode = com::sun::star::awt::Key::F1 + (pEvent->keyval - GDK_KEY_F1); + nKeyCode = css::awt::Key::F1 + (pEvent->keyval - GDK_KEY_F1); else nCharCode = gdk_keyval_to_unicode(pEvent->keyval); } diff --git a/libreofficekit/source/gtk/lokdocview.cxx b/libreofficekit/source/gtk/lokdocview.cxx index 6d34f263733d..bf2af004fe41 100644 --- a/libreofficekit/source/gtk/lokdocview.cxx +++ b/libreofficekit/source/gtk/lokdocview.cxx @@ -661,41 +661,41 @@ signalKey (GtkWidget* pWidget, GdkEventKey* pEvent) switch (pEvent->keyval) { case GDK_KEY_BackSpace: - nKeyCode = com::sun::star::awt::Key::BACKSPACE; + nKeyCode = css::awt::Key::BACKSPACE; break; case GDK_KEY_Delete: - nKeyCode = com::sun::star::awt::Key::DELETE; + nKeyCode = css::awt::Key::DELETE; break; case GDK_KEY_Return: case GDK_KEY_KP_Enter: - nKeyCode = com::sun::star::awt::Key::RETURN; + nKeyCode = css::awt::Key::RETURN; break; case GDK_KEY_Escape: - nKeyCode = com::sun::star::awt::Key::ESCAPE; + nKeyCode = css::awt::Key::ESCAPE; break; case GDK_KEY_Tab: - nKeyCode = com::sun::star::awt::Key::TAB; + nKeyCode = css::awt::Key::TAB; break; case GDK_KEY_Down: - nKeyCode = com::sun::star::awt::Key::DOWN; + nKeyCode = css::awt::Key::DOWN; break; case GDK_KEY_Up: - nKeyCode = com::sun::star::awt::Key::UP; + nKeyCode = css::awt::Key::UP; break; case GDK_KEY_Left: - nKeyCode = com::sun::star::awt::Key::LEFT; + nKeyCode = css::awt::Key::LEFT; break; case GDK_KEY_Right: - nKeyCode = com::sun::star::awt::Key::RIGHT; + nKeyCode = css::awt::Key::RIGHT; break; case GDK_KEY_Page_Down: - nKeyCode = com::sun::star::awt::Key::PAGEDOWN; + nKeyCode = css::awt::Key::PAGEDOWN; break; case GDK_KEY_Page_Up: - nKeyCode = com::sun::star::awt::Key::PAGEUP; + nKeyCode = css::awt::Key::PAGEUP; break; case GDK_KEY_Insert: - nKeyCode = com::sun::star::awt::Key::INSERT; + nKeyCode = css::awt::Key::INSERT; break; case GDK_KEY_Shift_L: case GDK_KEY_Shift_R: @@ -716,7 +716,7 @@ signalKey (GtkWidget* pWidget, GdkEventKey* pEvent) break; default: if (pEvent->keyval >= GDK_KEY_F1 && pEvent->keyval <= GDK_KEY_F26) - nKeyCode = com::sun::star::awt::Key::F1 + (pEvent->keyval - GDK_KEY_F1); + nKeyCode = css::awt::Key::F1 + (pEvent->keyval - GDK_KEY_F1); else nCharCode = gdk_keyval_to_unicode(pEvent->keyval); } diff --git a/linguistic/qa/restprotocol.cxx b/linguistic/qa/restprotocol.cxx index 6a3d2c150ae7..687fa16b9624 100644 --- a/linguistic/qa/restprotocol.cxx +++ b/linguistic/qa/restprotocol.cxx @@ -152,11 +152,11 @@ void TestRestProtocol::testProofreading() CPPUNIT_ASSERT_EQUAL(u"duden"_ustr, *LanguageToolCfg::RestProtocol::get()); - Reference<::com::sun::star::linguistic2::XProofreader> xProofreader( + Reference<css::linguistic2::XProofreader> xProofreader( m_xSFactory->createInstance(u"com.sun.star.linguistic2.Proofreader"_ustr), UNO_QUERY); CPPUNIT_ASSERT(xProofreader.is()); - com::sun::star::linguistic2::ProofreadingResult aResult + css::linguistic2::ProofreadingResult aResult = xProofreader->doProofreading(u"id"_ustr, u"ths is a tst"_ustr, aLocale, 0, 0, {}); CPPUNIT_ASSERT_EQUAL(sal_Int32(2), aResult.aErrors.getLength()); diff --git a/oox/qa/unit/wpc_drawing_canvas.cxx b/oox/qa/unit/wpc_drawing_canvas.cxx index 677ad43066f1..0e35891835af 100644 --- a/oox/qa/unit/wpc_drawing_canvas.cxx +++ b/oox/qa/unit/wpc_drawing_canvas.cxx @@ -149,7 +149,7 @@ CPPUNIT_TEST_FIXTURE(TestWPC, WPC_BentConnector) CPPUNIT_ASSERT(xInfo->supportsService(u"com.sun.star.drawing.ConnectorShape"_ustr)); uno::Reference<beans::XPropertySet> xShapeProps(xGroup->getByIndex(2), uno::UNO_QUERY); - com::sun::star::drawing::ConnectorType eEdgeKind; + css::drawing::ConnectorType eEdgeKind; xShapeProps->getPropertyValue(UNO_NAME_EDGEKIND) >>= eEdgeKind; CPPUNIT_ASSERT_EQUAL(drawing::ConnectorType::ConnectorType_STANDARD, eEdgeKind); @@ -324,7 +324,7 @@ CPPUNIT_TEST_FIXTURE(TestWPC, WPC_CurvedConnector2) CPPUNIT_ASSERT(xInfo->supportsService(u"com.sun.star.drawing.ConnectorShape"_ustr)); uno::Reference<beans::XPropertySet> xShapeProps(xGroup->getByIndex(3), uno::UNO_QUERY); - com::sun::star::drawing::ConnectorType eEdgeKind; + css::drawing::ConnectorType eEdgeKind; xShapeProps->getPropertyValue(UNO_NAME_EDGEKIND) >>= eEdgeKind; CPPUNIT_ASSERT_EQUAL(drawing::ConnectorType::ConnectorType_CURVE, eEdgeKind); diff --git a/oox/source/docprop/ooxmldocpropimport.cxx b/oox/source/docprop/ooxmldocpropimport.cxx index 432edd825d6d..3b9ccd5f0f96 100644 --- a/oox/source/docprop/ooxmldocpropimport.cxx +++ b/oox/source/docprop/ooxmldocpropimport.cxx @@ -182,7 +182,7 @@ void SAL_CALL DocumentPropertiesImport::importProperties( aParser.parseStream( rCustomStream, true ); } -Reference < com::sun::star::io::XInputStream > SAL_CALL DocumentPropertiesImport::getCorePropertiesStream( +Reference < css::io::XInputStream > SAL_CALL DocumentPropertiesImport::getCorePropertiesStream( const Reference< XStorage >& rxSource) { Sequence< InputSource > aCoreStreams = lclGetCoreStreams(rxSource); @@ -192,7 +192,7 @@ Reference < com::sun::star::io::XInputStream > SAL_CALL DocumentPropertiesImport return aCoreStreams[0].aInputStream; } -Reference < com::sun::star::io::XInputStream > SAL_CALL DocumentPropertiesImport::getExtendedPropertiesStream( +Reference < css::io::XInputStream > SAL_CALL DocumentPropertiesImport::getExtendedPropertiesStream( const Reference< XStorage >& rxSource) { Sequence< InputSource > aExtStreams = lclGetExtStreams(rxSource); @@ -202,7 +202,7 @@ Reference < com::sun::star::io::XInputStream > SAL_CALL DocumentPropertiesImport return aExtStreams[0].aInputStream; } -css::uno::Sequence< css::uno::Reference< com::sun::star::io::XInputStream > > SAL_CALL DocumentPropertiesImport::getCustomPropertiesStreams( +css::uno::Sequence< css::uno::Reference< css::io::XInputStream > > SAL_CALL DocumentPropertiesImport::getCustomPropertiesStreams( const Reference< XStorage >& rxSource) { Sequence <InputSource> aExtStreams = lclGetCustomStreams(rxSource); diff --git a/oox/source/docprop/ooxmldocpropimport.hxx b/oox/source/docprop/ooxmldocpropimport.hxx index ba406bae9aed..60409209ca2e 100644 --- a/oox/source/docprop/ooxmldocpropimport.hxx +++ b/oox/source/docprop/ooxmldocpropimport.hxx @@ -45,11 +45,11 @@ public: virtual void SAL_CALL importProperties( const css::uno::Reference< css::embed::XStorage >& rxSource, const css::uno::Reference< css::document::XDocumentProperties >& rxDocumentProperties ) override; - virtual css::uno::Reference < com::sun::star::io::XInputStream > SAL_CALL getCorePropertiesStream( + virtual css::uno::Reference < css::io::XInputStream > SAL_CALL getCorePropertiesStream( const css::uno::Reference< css::embed::XStorage >& rxSource) override; - virtual css::uno::Reference < com::sun::star::io::XInputStream > SAL_CALL getExtendedPropertiesStream( + virtual css::uno::Reference < css::io::XInputStream > SAL_CALL getExtendedPropertiesStream( const css::uno::Reference< css::embed::XStorage >& rxSource) override; - virtual css::uno::Sequence< css::uno::Reference< com::sun::star::io::XInputStream > > SAL_CALL getCustomPropertiesStreams( + virtual css::uno::Sequence< css::uno::Reference< css::io::XInputStream > > SAL_CALL getCustomPropertiesStreams( const css::uno::Reference< css::embed::XStorage >& rxSource) override; private: diff --git a/oox/source/drawingml/chart/axisconverter.cxx b/oox/source/drawingml/chart/axisconverter.cxx index 6a2ab5a12875..8c65da8e88b0 100644 --- a/oox/source/drawingml/chart/axisconverter.cxx +++ b/oox/source/drawingml/chart/axisconverter.cxx @@ -149,8 +149,8 @@ void AxisConverter::convertFromModel(const Reference<XCoordinateSystem>& rxCoord Reference< XAxis > xAxis; try { - namespace cssc = ::com::sun::star::chart; - namespace cssc2 = ::com::sun::star::chart2; + namespace cssc = css::chart; + namespace cssc2 = css::chart2; const TypeGroupInfo& rTypeInfo = rTypeGroups.front()->getTypeInfo(); ObjectFormatter& rFormatter = getFormatter(); diff --git a/oox/source/drawingml/chart/chartspaceconverter.cxx b/oox/source/drawingml/chart/chartspaceconverter.cxx index dc233fec8129..b3bc7d4a8e21 100644 --- a/oox/source/drawingml/chart/chartspaceconverter.cxx +++ b/oox/source/drawingml/chart/chartspaceconverter.cxx @@ -244,7 +244,7 @@ void ChartSpaceConverter::convertFromModel( const Reference< XShapes >& rxExtern /* Following all conversions needing the old Chart1 API that involves full initialization of the chart view. */ - namespace cssc = ::com::sun::star::chart; + namespace cssc = css::chart; Reference< cssc::XChartDocument > xChart1Doc( getChartDocument(), UNO_QUERY ); if( xChart1Doc.is() ) { diff --git a/oox/source/drawingml/chart/plotareaconverter.cxx b/oox/source/drawingml/chart/plotareaconverter.cxx index fdb12d9a7f64..1fa8b6f9b673 100644 --- a/oox/source/drawingml/chart/plotareaconverter.cxx +++ b/oox/source/drawingml/chart/plotareaconverter.cxx @@ -212,7 +212,7 @@ View3DConverter::~View3DConverter() void View3DConverter::convertFromModel( const Reference< XDiagram >& rxDiagram, TypeGroupConverter const & rTypeGroup ) { - namespace cssd = ::com::sun::star::drawing; + namespace cssd = css::drawing; PropertySet aPropSet( rxDiagram ); sal_Int32 nRotationY = 0; @@ -466,7 +466,7 @@ void PlotAreaConverter::convertPositionFromModel() try { - namespace cssc = ::com::sun::star::chart; + namespace cssc = css::chart; Reference< cssc::XChartDocument > xChart1Doc( getChartDocument(), UNO_QUERY_THROW ); Reference< cssc::XDiagramPositioning > xPositioning( xChart1Doc->getDiagram(), UNO_QUERY_THROW ); // for pie charts, always set inner plot area size to exclude the data labels as Excel does diff --git a/oox/source/drawingml/chart/seriesconverter.cxx b/oox/source/drawingml/chart/seriesconverter.cxx index cc80c202f90d..97da1a6b5b8f 100644 --- a/oox/source/drawingml/chart/seriesconverter.cxx +++ b/oox/source/drawingml/chart/seriesconverter.cxx @@ -170,7 +170,7 @@ void lclConvertLabelFormatting( PropertySet& rPropSet, ObjectFormatter& rFormatt if( !(bDataSeriesLabel || rDataLabel.monLabelPos.has_value()) ) return; - namespace csscd = ::com::sun::star::chart::DataLabelPlacement; + namespace csscd = css::chart::DataLabelPlacement; sal_Int32 nPlacement = -1; switch( rDataLabel.monLabelPos.value_or( XML_TOKEN_INVALID ) ) { @@ -534,7 +534,7 @@ void ErrorBarConverter::convertFromModel( const Reference< XDataSeries >& rxData aBarProp.setProperty( PROP_ShowNegativeError, bShowNeg ); // type of displayed error - namespace cssc = ::com::sun::star::chart; + namespace cssc = css::chart; switch( mrModel.mnValueType ) { case XML_cust: diff --git a/oox/source/drawingml/chart/titleconverter.cxx b/oox/source/drawingml/chart/titleconverter.cxx index b5d9ecd67d97..0ee8affc7984 100644 --- a/oox/source/drawingml/chart/titleconverter.cxx +++ b/oox/source/drawingml/chart/titleconverter.cxx @@ -203,8 +203,8 @@ void LegendConverter::convertFromModel( const Reference< XDiagram >& rxDiagram ) try { - namespace cssc = ::com::sun::star::chart; - namespace cssc2 = ::com::sun::star::chart2; + namespace cssc = css::chart; + namespace cssc2 = css::chart2; // create the legend Reference< XLegend > xLegend( createInstance( u"com.sun.star.chart2.Legend"_ustr ), UNO_QUERY_THROW ); diff --git a/oox/source/drawingml/chart/typegroupconverter.cxx b/oox/source/drawingml/chart/typegroupconverter.cxx index 6d135be07c53..7a8a506af82b 100644 --- a/oox/source/drawingml/chart/typegroupconverter.cxx +++ b/oox/source/drawingml/chart/typegroupconverter.cxx @@ -69,7 +69,7 @@ const char SERVICE_CHART2_BUBBLE[] = "com.sun.star.chart2.BubbleChartType"; const char SERVICE_CHART2_SURFACE[] = "com.sun.star.chart2.ColumnChartType"; // Todo const char SERVICE_CHART2_HISTO[] = "com.sun.star.chart2.HistogramChartType"; -namespace csscd = ::com::sun::star::chart::DataLabelPlacement; +namespace csscd = css::chart::DataLabelPlacement; const TypeGroupInfo spTypeInfos[] = { @@ -491,7 +491,7 @@ void TypeGroupConverter::convertMarker( PropertySet& rPropSet, sal_Int32 nOoxSym if( isSeriesFrameFormat() ) return; - namespace cssc = ::com::sun::star::chart2; + namespace cssc = css::chart2; // symbol style cssc::Symbol aSymbol; @@ -538,7 +538,7 @@ void TypeGroupConverter::convertLineSmooth( PropertySet& rPropSet, bool bOoxSmoo { if( !isSeriesFrameFormat() && (maTypeInfo.meTypeCategory != TYPECATEGORY_RADAR) ) { - namespace cssc = ::com::sun::star::chart2; + namespace cssc = css::chart2; cssc::CurveStyle eCurveStyle = bOoxSmooth ? cssc::CurveStyle_CUBIC_SPLINES : cssc::CurveStyle_LINES; rPropSet.setProperty( PROP_CurveStyle, eCurveStyle ); } @@ -549,7 +549,7 @@ void TypeGroupConverter::convertBarGeometry( PropertySet& rPropSet, sal_Int32 nO if( !(mb3dChart && (maTypeInfo.meTypeCategory == TYPECATEGORY_BAR)) ) return; - namespace cssc = ::com::sun::star::chart2; + namespace cssc = css::chart2; sal_Int32 nGeom3d = cssc::DataPointGeometry3D::CUBOID; switch( nOoxShape ) @@ -615,7 +615,7 @@ void TypeGroupConverter::insertDataSeries( const Reference< XChartType >& rxChar PropertySet aSeriesProp( rxSeries ); // series stacking mode - namespace cssc = ::com::sun::star::chart2; + namespace cssc = css::chart2; cssc::StackingDirection eStacking = cssc::StackingDirection_NO_STACKING; // stacked overrides deep-3d if( isStacked() || isPercent() ) diff --git a/oox/source/drawingml/textparagraphpropertiescontext.cxx b/oox/source/drawingml/textparagraphpropertiescontext.cxx index 138bfe395621..c94954daf0e3 100644 --- a/oox/source/drawingml/textparagraphpropertiescontext.cxx +++ b/oox/source/drawingml/textparagraphpropertiescontext.cxx @@ -54,7 +54,7 @@ namespace { double lclGetGraphicAspectRatio( const Reference< XGraphic >& rxGraphic ) { double fRatio = 1.0; - Reference< com::sun::star::beans::XPropertySet > xGraphicPropertySet( rxGraphic, UNO_QUERY_THROW ); + Reference< css::beans::XPropertySet > xGraphicPropertySet( rxGraphic, UNO_QUERY_THROW ); css::awt::Size aSizeHmm( 0, 0 ); xGraphicPropertySet->getPropertyValue( u"Size100thMM"_ustr ) >>= aSizeHmm; diff --git a/oox/source/ppt/presentationfragmenthandler.cxx b/oox/source/ppt/presentationfragmenthandler.cxx index 9a1ea8679cef..086aca0de1b1 100644 --- a/oox/source/ppt/presentationfragmenthandler.cxx +++ b/oox/source/ppt/presentationfragmenthandler.cxx @@ -191,7 +191,7 @@ void PresentationFragmentHandler::importCustomSlideShow(std::vector<CustomShow>& for (size_t i = 0; i < rCustomShowList.size(); ++i) { - Reference<com::sun::star::container::XIndexContainer> xShow(mxShowFactory->createInstance(), + Reference<css::container::XIndexContainer> xShow(mxShowFactory->createInstance(), UNO_QUERY); if (xShow.is()) { diff --git a/sc/source/filter/excel/xehelper.cxx b/sc/source/filter/excel/xehelper.cxx index f910aa4aaad5..ea93333b8a54 100644 --- a/sc/source/filter/excel/xehelper.cxx +++ b/sc/source/filter/excel/xehelper.cxx @@ -367,7 +367,7 @@ XclExpStringRef lclCreateFormattedString( // script type handling Reference< XBreakIterator > xBreakIt = rRoot.GetDoc().GetBreakIterator(); - namespace ApiScriptType = ::com::sun::star::i18n::ScriptType; + namespace ApiScriptType = css::i18n::ScriptType; // #i63255# get script type for leading weak characters sal_Int16 nLastScript = XclExpStringHelper::GetLeadingScriptType( rRoot, rText ); @@ -443,7 +443,7 @@ XclExpStringRef lclCreateFormattedString( // script type handling Reference< XBreakIterator > xBreakIt = rRoot.GetDoc().GetBreakIterator(); - namespace ApiScriptType = ::com::sun::star::i18n::ScriptType; + namespace ApiScriptType = css::i18n::ScriptType; // #i63255# get script type for leading weak characters sal_Int16 nLastScript = XclExpStringHelper::GetLeadingScriptType( rRoot, rEE.GetText() ); @@ -659,7 +659,7 @@ XclExpStringRef XclExpStringHelper::CreateString( sal_Int16 XclExpStringHelper::GetLeadingScriptType( const XclExpRoot& rRoot, const OUString& rString ) { - namespace ApiScriptType = ::com::sun::star::i18n::ScriptType; + namespace ApiScriptType = css::i18n::ScriptType; Reference< XBreakIterator > xBreakIt = rRoot.GetDoc().GetBreakIterator(); sal_Int32 nStrPos = 0; sal_Int32 nStrLen = rString.getLength(); diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx index ece9f1c2333a..01bc9bfe8d81 100644 --- a/sc/source/filter/excel/xestyle.cxx +++ b/sc/source/filter/excel/xestyle.cxx @@ -836,7 +836,7 @@ sal_Int16 lclCheckFontItems( const SfxItemSet& rItemSet, sal_Int16 XclExpFontHelper::GetFirstUsedScript( const XclExpRoot& rRoot, const SfxItemSet& rItemSet ) { - namespace ApiScriptType = ::com::sun::star::i18n::ScriptType; + namespace ApiScriptType = css::i18n::ScriptType; /* #i17050# #i107170# We need to determine which font items are set in the item set, and which script type we should prefer according to the diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx index 513febf2b257..2f1ceadc0735 100644 --- a/sc/source/filter/excel/xiescher.cxx +++ b/sc/source/filter/excel/xiescher.cxx @@ -1539,7 +1539,7 @@ void XclImpTextObj::DoPreProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject& SdrTextVertAdjust eVerAlign = SDRTEXTVERTADJUST_TOP; // orientation (this is only a fake, drawing does not support real text orientation) - namespace csst = ::com::sun::star::text; + namespace csst = css::text; csst::WritingMode eWriteMode = csst::WritingMode_LR_TB; switch( maTextData.maData.mnOrient ) { @@ -2183,7 +2183,7 @@ void XclImpButtonObj::DoProcessControl( ScfPropertySet& rPropSet ) const rPropSet.SetProperty( u"Align"_ustr, nHorAlign ); // vertical text alignment - namespace csss = ::com::sun::star::style; + namespace csss = css::style; csss::VerticalAlignment eVerAlign = csss::VerticalAlignment_MIDDLE; switch( maTextData.maData.GetVerAlign() ) { @@ -2201,7 +2201,7 @@ void XclImpButtonObj::DoProcessControl( ScfPropertySet& rPropSet ) const rPropSet.SetBoolProperty( u"DefaultButton"_ustr, bDefButton ); // button type (flags cannot be combined in OOo) - namespace cssa = ::com::sun::star::awt; + namespace cssa = css::awt; cssa::PushButtonType eButtonType = cssa::PushButtonType_STANDARD; if( ::get_flag( maTextData.maData.mnButtonFlags, EXC_OBJ_BUTTON_CLOSE ) ) eButtonType = cssa::PushButtonType_OK; @@ -2286,7 +2286,7 @@ void XclImpCheckBoxObj::DoProcessControl( ScfPropertySet& rPropSet ) const rPropSet.SetProperty( u"DefaultState"_ustr, nApiState ); // box style - namespace AwtVisualEffect = ::com::sun::star::awt::VisualEffect; + namespace AwtVisualEffect = css::awt::VisualEffect; sal_Int16 nEffect = ::get_flagvalue( mnCheckBoxFlags, EXC_OBJ_CHECKBOX_FLAT, AwtVisualEffect::FLAT, AwtVisualEffect::LOOK3D ); rPropSet.SetProperty( u"VisualEffect"_ustr, nEffect ); @@ -2294,7 +2294,7 @@ void XclImpCheckBoxObj::DoProcessControl( ScfPropertySet& rPropSet ) const rPropSet.SetBoolProperty( u"MultiLine"_ustr, false ); // #i40279# always centered vertically - namespace csss = ::com::sun::star::style; + namespace csss = css::style; rPropSet.SetProperty( u"VerticalAlign"_ustr, csss::VerticalAlignment_MIDDLE ); // background color @@ -2425,7 +2425,7 @@ void XclImpLabelObj::DoProcessControl( ScfPropertySet& rPropSet ) const // text alignment (always top/left aligned) rPropSet.SetProperty( u"Align"_ustr, sal_Int16( 0 ) ); - namespace csss = ::com::sun::star::style; + namespace csss = css::style; rPropSet.SetProperty( u"VerticalAlign"_ustr, csss::VerticalAlignment_TOP ); // always wrap text automatically @@ -2696,7 +2696,7 @@ void XclImpScrollBarObj::DoProcessControl( ScfPropertySet& rPropSet ) const rPropSet.SetProperty< sal_Int32 >( u"BlockIncrement"_ustr, mnPageStep ); rPropSet.SetProperty( u"VisibleSize"_ustr, ::std::min< sal_Int32 >( mnPageStep, 1 ) ); - namespace AwtScrollOrient = ::com::sun::star::awt::ScrollBarOrientation; + namespace AwtScrollOrient = css::awt::ScrollBarOrientation; sal_Int32 nApiOrient = ::get_flagvalue( mnOrient, EXC_OBJ_SCROLLBAR_HOR, AwtScrollOrient::HORIZONTAL, AwtScrollOrient::VERTICAL ); rPropSet.SetProperty( u"Orientation"_ustr, nApiOrient ); } @@ -2733,7 +2733,7 @@ void XclImpTbxObjListBase::ReadLbsData( XclImpStream& rStrm ) void XclImpTbxObjListBase::SetBoxFormatting( ScfPropertySet& rPropSet ) const { // border style - namespace AwtVisualEffect = ::com::sun::star::awt::VisualEffect; + namespace AwtVisualEffect = css::awt::VisualEffect; sal_Int16 nApiBorder = ::get_flagvalue( mnListFlags, EXC_OBJ_LISTBOX_FLAT, AwtVisualEffect::FLAT, AwtVisualEffect::LOOK3D ); rPropSet.SetProperty( u"Border"_ustr, nApiBorder ); @@ -3547,7 +3547,7 @@ rtl::Reference<SdrObject> XclImpDffConverter::CreateSdrObject( const XclImpPictu if( aGraphic.GetType() != GraphicType::NONE ) { ErrCode nError = ERRCODE_NONE; - namespace cssea = ::com::sun::star::embed::Aspects; + namespace cssea = css::embed::Aspects; sal_Int64 nAspects = rPicObj.IsSymbol() ? cssea::MSOLE_ICON : cssea::MSOLE_CONTENT; xSdrObj = CreateSdrOLEFromStorage( diff --git a/sc/source/filter/excel/xlstyle.cxx b/sc/source/filter/excel/xlstyle.cxx index 0ba44a00bc83..1a89878d65b3 100644 --- a/sc/source/filter/excel/xlstyle.cxx +++ b/sc/source/filter/excel/xlstyle.cxx @@ -164,7 +164,7 @@ Color XclDefaultPalette::GetDefColor( sal_uInt16 nXclIndex ) const // Font Data ================================================================== -namespace Awt = ::com::sun::star::awt; +namespace Awt = css::awt; namespace AwtFontFamily = Awt::FontFamily; namespace AwtFontLineStyle = Awt::FontUnderline; namespace AwtFontStrikeout = Awt::FontStrikeout; @@ -747,7 +747,7 @@ void XclFontPropSetHelper::WriteFontProperties( ScfPropSetHelper& XclFontPropSetHelper::GetChartHelper( sal_Int16 nScript ) { - namespace ApiScriptType = ::com::sun::star::i18n::ScriptType; + namespace ApiScriptType = css::i18n::ScriptType; switch( nScript ) { case ApiScriptType::LATIN: return maHlpChWstrn; diff --git a/sc/source/ui/drawfunc/chartsh.cxx b/sc/source/ui/drawfunc/chartsh.cxx index 7a0a63b76195..96f72e115cbe 100644 --- a/sc/source/ui/drawfunc/chartsh.cxx +++ b/sc/source/ui/drawfunc/chartsh.cxx @@ -38,7 +38,7 @@ using namespace css::uno; using namespace sfx2::sidebar; -namespace drawing = com::sun::star::drawing; +namespace drawing = css::drawing; namespace { diff --git a/sc/source/ui/unoobj/cellvaluebinding.cxx b/sc/source/ui/unoobj/cellvaluebinding.cxx index c0caf001c20d..21844d268365 100644 --- a/sc/source/ui/unoobj/cellvaluebinding.cxx +++ b/sc/source/ui/unoobj/cellvaluebinding.cxx @@ -42,7 +42,7 @@ namespace calc #define PROP_HANDLE_BOUND_CELL 1 - namespace lang = ::com::sun::star::lang; + namespace lang = css::lang; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::table; diff --git a/scripting/source/provider/URIHelper.cxx b/scripting/source/provider/URIHelper.cxx index a335abbaad3d..f1ed31f47f02 100644 --- a/scripting/source/provider/URIHelper.cxx +++ b/scripting/source/provider/URIHelper.cxx @@ -29,10 +29,10 @@ namespace func_provider { -namespace uno = ::com::sun::star::uno; -namespace ucb = ::com::sun::star::ucb; -namespace lang = ::com::sun::star::lang; -namespace uri = ::com::sun::star::uri; +namespace uno = css::uno; +namespace ucb = css::ucb; +namespace lang = css::lang; +namespace uri = css::uri; constexpr OUString SHARE = u"share"_ustr; diff --git a/sd/qa/unit/export-tests-ooxml2.cxx b/sd/qa/unit/export-tests-ooxml2.cxx index 34b990d7578f..892ce86f231a 100644 --- a/sd/qa/unit/export-tests-ooxml2.cxx +++ b/sd/qa/unit/export-tests-ooxml2.cxx @@ -1011,7 +1011,7 @@ CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest2, testTdf105739) CPPUNIT_ASSERT_EQUAL(int(drawing::FillStyle_GRADIENT), static_cast<int>(aFillStyle)); // Test gradient properties - com::sun::star::awt::Gradient2 aFillGradient; + css::awt::Gradient2 aFillGradient; aXBackgroundPropSet->getPropertyValue(u"FillGradient"_ustr) >>= aFillGradient; // MCGR: Use the completely imported gradient to check for correctness diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx index 6e6cd651d3b9..1af789b4df21 100644 --- a/sd/qa/unit/import-tests.cxx +++ b/sd/qa/unit/import-tests.cxx @@ -367,7 +367,7 @@ CPPUNIT_TEST_FIXTURE(SdImportTest, testTdf153466) uno::Reference<beans::XPropertySet> xBackground( xPageSet->getPropertyValue(u"Background"_ustr).get<uno::Reference<beans::XPropertySet>>()); - com::sun::star::drawing::RectanglePoint aRectanglePoint; + css::drawing::RectanglePoint aRectanglePoint; xBackground->getPropertyValue(u"FillBitmapRectanglePoint"_ustr) >>= aRectanglePoint; CPPUNIT_ASSERT_EQUAL(drawing::RectanglePoint::RectanglePoint_RIGHT_BOTTOM, aRectanglePoint); diff --git a/sd/source/console/PresenterScreen.hxx b/sd/source/console/PresenterScreen.hxx index 3bbdcdac2348..62c9601d05ac 100644 --- a/sd/source/console/PresenterScreen.hxx +++ b/sd/source/console/PresenterScreen.hxx @@ -230,7 +230,7 @@ private: */ css::uno::Reference<css::drawing::framework::XResourceId> GetMainPaneId ( const css::uno::Reference<css::presentation::XPresentation2>& rxPresentation, - const css::uno::Reference<com::sun::star::uno::XComponentContext>& xContext) const; + const css::uno::Reference<css::uno::XComponentContext>& xContext) const; }; } diff --git a/sd/source/ui/controller/displaymodecontroller.cxx b/sd/source/ui/controller/displaymodecontroller.cxx index 59f91e48ba13..1e50cc90cbcd 100644 --- a/sd/source/ui/controller/displaymodecontroller.cxx +++ b/sd/source/ui/controller/displaymodecontroller.cxx @@ -254,7 +254,7 @@ Sequence< OUString > SAL_CALL DisplayModeController::getSupportedServiceNames( } -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* com_sun_star_comp_sd_DisplayModeController_get_implementation( css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { diff --git a/sd/source/ui/inc/CustomAnimationPane.hxx b/sd/source/ui/inc/CustomAnimationPane.hxx index a04a38af8c18..47f8b580c515 100644 --- a/sd/source/ui/inc/CustomAnimationPane.hxx +++ b/sd/source/ui/inc/CustomAnimationPane.hxx @@ -99,7 +99,7 @@ private: static bool setProperty1Value( sal_Int32 nType, const CustomAnimationEffectPtr& pEffect, const css::uno::Any& rValue ); sal_Int32 fillAnimationLB( bool bHasText ); PathKind getCreatePathKind() const; - void createPath( PathKind eKind, std::vector< ::com::sun::star::uno::Any >& rTargets, double fDuration ); + void createPath( PathKind eKind, std::vector< css::uno::Any >& rTargets, double fDuration ); DECL_LINK( implControlListBoxHdl, weld::ComboBox&, void ); DECL_LINK( implClickHdl, weld::Button&, void ); diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx index da6d64bbf926..989582749c0a 100644 --- a/sd/source/ui/inc/DrawViewShell.hxx +++ b/sd/source/ui/inc/DrawViewShell.hxx @@ -510,7 +510,7 @@ private: std::vector<std::unique_ptr<SdrExternalToolEdit>> m_ExternalEdits; SdViewOptions maViewOptions; - css::uno::Reference<com::sun::star::presentation::XSlideShow> mxSlideShow; + css::uno::Reference<css::presentation::XSlideShow> mxSlideShow; }; /// Merge the background properties together and deposit the result in rMergeAttr diff --git a/sfx2/source/notebookbar/NotebookbarTabControl.cxx b/sfx2/source/notebookbar/NotebookbarTabControl.cxx index 1f4714e0cad8..6b08a6a56e33 100644 --- a/sfx2/source/notebookbar/NotebookbarTabControl.cxx +++ b/sfx2/source/notebookbar/NotebookbarTabControl.cxx @@ -283,7 +283,7 @@ void NotebookbarTabControl::FillShortcutsToolBox(Reference<XComponentContext> co ToolBox* pShortcuts ) { - Reference<::com::sun::star::container::XIndexAccess> xIndex; + Reference<css::container::XIndexAccess> xIndex; try { diff --git a/sfx2/source/view/lokhelper.cxx b/sfx2/source/view/lokhelper.cxx index f7259567236f..e37a88105d54 100644 --- a/sfx2/source/view/lokhelper.cxx +++ b/sfx2/source/view/lokhelper.cxx @@ -121,7 +121,7 @@ int SfxLokHelper::createView() return createView(pViewShell->GetViewFrame(), pViewShell->GetDocId()); } -std::unordered_map<OUString, css::uno::Reference<com::sun::star::ui::XAcceleratorConfiguration>>& SfxLokHelper::getAcceleratorConfs() +std::unordered_map<OUString, css::uno::Reference<css::ui::XAcceleratorConfiguration>>& SfxLokHelper::getAcceleratorConfs() { return SfxApplication::GetOrCreate()->GetAcceleratorConfs_Impl(); } diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index ae443cd72e30..a184d0a0f8b8 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -3134,7 +3134,7 @@ bool SfxViewShell::ExecKey_Impl(const KeyEvent& aKey) OUString key = sModule + viewLang; // Check it in configurations map. Create a configuration manager if there isn't one for the key. - std::unordered_map<OUString, css::uno::Reference<com::sun::star::ui::XAcceleratorConfiguration>>& acceleratorConfs = SfxApplication::Get()->GetAcceleratorConfs_Impl(); + std::unordered_map<OUString, css::uno::Reference<css::ui::XAcceleratorConfiguration>>& acceleratorConfs = SfxApplication::Get()->GetAcceleratorConfs_Impl(); if (acceleratorConfs.find(key) == acceleratorConfs.end()) { // Create a new configuration manager for the module. diff --git a/slideshow/source/engine/box2dtools.cxx b/slideshow/source/engine/box2dtools.cxx index 656e002137f0..93aa8936a035 100644 --- a/slideshow/source/engine/box2dtools.cxx +++ b/slideshow/source/engine/box2dtools.cxx @@ -267,7 +267,7 @@ void box2DWorld::createStaticFrameAroundSlide(const ::basegfx::B2DVector& rSlide pStaticBody->CreateFixture(&aFixtureDef); } -void box2DWorld::setShapePosition(const css::uno::Reference<com::sun::star::drawing::XShape> xShape, +void box2DWorld::setShapePosition(const css::uno::Reference<css::drawing::XShape> xShape, const basegfx::B2DPoint& rOutPos) { const auto iter = mpXShapeToBodyMap.find(xShape); @@ -277,8 +277,8 @@ void box2DWorld::setShapePosition(const css::uno::Reference<com::sun::star::draw } void box2DWorld::setShapePositionByLinearVelocity( - const css::uno::Reference<com::sun::star::drawing::XShape> xShape, - const basegfx::B2DPoint& rOutPos, const double fPassedTime) + const css::uno::Reference<css::drawing::XShape> xShape, const basegfx::B2DPoint& rOutPos, + const double fPassedTime) { assert(mpBox2DWorld); if (fPassedTime > 0) // this only makes sense if there was an advance in time @@ -290,9 +290,8 @@ void box2DWorld::setShapePositionByLinearVelocity( } } -void box2DWorld::setShapeLinearVelocity( - const css::uno::Reference<com::sun::star::drawing::XShape> xShape, - const basegfx::B2DVector& rVelocity) +void box2DWorld::setShapeLinearVelocity(const css::uno::Reference<css::drawing::XShape> xShape, + const basegfx::B2DVector& rVelocity) { assert(mpBox2DWorld); const auto iter = mpXShapeToBodyMap.find(xShape); @@ -301,7 +300,7 @@ void box2DWorld::setShapeLinearVelocity( pBox2DBody->setLinearVelocity(rVelocity); } -void box2DWorld::setShapeAngle(const css::uno::Reference<com::sun::star::drawing::XShape> xShape, +void box2DWorld::setShapeAngle(const css::uno::Reference<css::drawing::XShape> xShape, const double fAngle) { const auto iter = mpXShapeToBodyMap.find(xShape); @@ -311,7 +310,7 @@ void box2DWorld::setShapeAngle(const css::uno::Reference<com::sun::star::drawing } void box2DWorld::setShapeAngleByAngularVelocity( - const css::uno::Reference<com::sun::star::drawing::XShape> xShape, const double fAngle, + const css::uno::Reference<css::drawing::XShape> xShape, const double fAngle, const double fPassedTime) { assert(mpBox2DWorld); @@ -324,9 +323,8 @@ void box2DWorld::setShapeAngleByAngularVelocity( } } -void box2DWorld::setShapeAngularVelocity( - const css::uno::Reference<com::sun::star::drawing::XShape> xShape, - const double fAngularVelocity) +void box2DWorld::setShapeAngularVelocity(const css::uno::Reference<css::drawing::XShape> xShape, + const double fAngularVelocity) { assert(mpBox2DWorld); const auto iter = mpXShapeToBodyMap.find(xShape); @@ -335,8 +333,8 @@ void box2DWorld::setShapeAngularVelocity( pBox2DBody->setAngularVelocity(fAngularVelocity); } -void box2DWorld::setShapeCollision( - const css::uno::Reference<com::sun::star::drawing::XShape> xShape, bool bCanCollide) +void box2DWorld::setShapeCollision(const css::uno::Reference<css::drawing::XShape> xShape, + bool bCanCollide) { assert(mpBox2DWorld); const auto iter = mpXShapeToBodyMap.find(xShape); @@ -449,18 +447,17 @@ void box2DWorld::setHasWorldStepper(const bool bHasWorldStepper) mbHasWorldStepper = bHasWorldStepper; } -void box2DWorld::queueDynamicPositionUpdate( - const css::uno::Reference<com::sun::star::drawing::XShape>& xShape, - const basegfx::B2DPoint& rOutPos) +void box2DWorld::queueDynamicPositionUpdate(const css::uno::Reference<css::drawing::XShape>& xShape, + const basegfx::B2DPoint& rOutPos) { Box2DDynamicUpdateInformation aQueueElement = { xShape, {}, BOX2D_UPDATE_POSITION_CHANGE }; aQueueElement.maPosition = rOutPos; maShapeParallelUpdateQueue.push(aQueueElement); } -void box2DWorld::queueLinearVelocityUpdate( - const css::uno::Reference<com::sun::star::drawing::XShape>& xShape, - const basegfx::B2DVector& rVelocity, const int nDelayForSteps) +void box2DWorld::queueLinearVelocityUpdate(const css::uno::Reference<css::drawing::XShape>& xShape, + const basegfx::B2DVector& rVelocity, + const int nDelayForSteps) { Box2DDynamicUpdateInformation aQueueElement = { xShape, {}, BOX2D_UPDATE_LINEAR_VELOCITY, nDelayForSteps }; @@ -468,17 +465,16 @@ void box2DWorld::queueLinearVelocityUpdate( maShapeParallelUpdateQueue.push(aQueueElement); } -void box2DWorld::queueDynamicRotationUpdate( - const css::uno::Reference<com::sun::star::drawing::XShape>& xShape, const double fAngle) +void box2DWorld::queueDynamicRotationUpdate(const css::uno::Reference<css::drawing::XShape>& xShape, + const double fAngle) { Box2DDynamicUpdateInformation aQueueElement = { xShape, {}, BOX2D_UPDATE_ANGLE }; aQueueElement.mfAngle = fAngle; maShapeParallelUpdateQueue.push(aQueueElement); } -void box2DWorld::queueAngularVelocityUpdate( - const css::uno::Reference<com::sun::star::drawing::XShape>& xShape, - const double fAngularVelocity, const int nDelayForSteps) +void box2DWorld::queueAngularVelocityUpdate(const css::uno::Reference<css::drawing::XShape>& xShape, + const double fAngularVelocity, const int nDelayForSteps) { Box2DDynamicUpdateInformation aQueueElement = { xShape, {}, BOX2D_UPDATE_ANGULAR_VELOCITY, nDelayForSteps }; @@ -486,17 +482,16 @@ void box2DWorld::queueAngularVelocityUpdate( maShapeParallelUpdateQueue.push(aQueueElement); } -void box2DWorld::queueShapeVisibilityUpdate( - const css::uno::Reference<com::sun::star::drawing::XShape>& xShape, const bool bVisibility) +void box2DWorld::queueShapeVisibilityUpdate(const css::uno::Reference<css::drawing::XShape>& xShape, + const bool bVisibility) { Box2DDynamicUpdateInformation aQueueElement = { xShape, {}, BOX2D_UPDATE_VISIBILITY }; aQueueElement.mbVisibility = bVisibility; maShapeParallelUpdateQueue.push(aQueueElement); } -void box2DWorld::queueShapePositionUpdate( - const css::uno::Reference<com::sun::star::drawing::XShape>& xShape, - const basegfx::B2DPoint& rOutPos) +void box2DWorld::queueShapePositionUpdate(const css::uno::Reference<css::drawing::XShape>& xShape, + const basegfx::B2DPoint& rOutPos) { Box2DDynamicUpdateInformation aQueueElement = { xShape, {}, BOX2D_UPDATE_POSITION }; aQueueElement.maPosition = rOutPos; @@ -504,7 +499,7 @@ void box2DWorld::queueShapePositionUpdate( } void box2DWorld::queueShapePathAnimationUpdate( - const css::uno::Reference<com::sun::star::drawing::XShape>& xShape, + const css::uno::Reference<css::drawing::XShape>& xShape, const slideshow::internal::ShapeAttributeLayerSharedPtr& pAttrLayer, const bool bIsFirstUpdate) { // Workaround for PathAnimations since they do not have their own AttributeType @@ -514,7 +509,7 @@ void box2DWorld::queueShapePathAnimationUpdate( } void box2DWorld::queueShapeAnimationUpdate( - const css::uno::Reference<com::sun::star::drawing::XShape>& xShape, + const css::uno::Reference<css::drawing::XShape>& xShape, const slideshow::internal::ShapeAttributeLayerSharedPtr& pAttrLayer, const slideshow::internal::AttributeType eAttrType, const bool bIsFirstUpdate) { @@ -540,7 +535,7 @@ void box2DWorld::queueShapeAnimationUpdate( } void box2DWorld::queueShapeAnimationEndUpdate( - const css::uno::Reference<com::sun::star::drawing::XShape>& xShape, + const css::uno::Reference<css::drawing::XShape>& xShape, const slideshow::internal::AttributeType eAttrType) { switch (eAttrType) diff --git a/slideshow/source/engine/slide/slideimpl.cxx b/slideshow/source/engine/slide/slideimpl.cxx index 80f652d1287a..230aab96c132 100644 --- a/slideshow/source/engine/slide/slideimpl.cxx +++ b/slideshow/source/engine/slide/slideimpl.cxx @@ -1159,7 +1159,7 @@ void SlideImpl::prefetch() std::vector<Graphic*> graphics; for (sal_Int32 i = 0; i < mxDrawPage->getCount(); i++) { - com::sun::star::uno::Reference<com::sun::star::drawing::XShape> xShape(mxDrawPage->getByIndex(i), com::sun::star::uno::UNO_QUERY_THROW); + css::uno::Reference<css::drawing::XShape> xShape(mxDrawPage->getByIndex(i), css::uno::UNO_QUERY_THROW); SdrObject* pObj = SdrObject::getSdrObjectFromXShape(xShape); if (!pObj) continue; diff --git a/slideshow/source/engine/transitions/ellipsewipe.cxx b/slideshow/source/engine/transitions/ellipsewipe.cxx index 7a5001efd70b..2f39334a716c 100644 --- a/slideshow/source/engine/transitions/ellipsewipe.cxx +++ b/slideshow/source/engine/transitions/ellipsewipe.cxx @@ -30,7 +30,7 @@ namespace slideshow::internal { ::basegfx::B2DPoint rCenter(0.5,0.5); double fRadius = ::basegfx::pruneScaleValue( t * M_SQRT2 / 2.0 ); - if( mnSubType == com::sun::star::animations::TransitionSubType::VERTICAL ) + if( mnSubType == css::animations::TransitionSubType::VERTICAL ) { // oval: ::basegfx::B2DPolygon poly ( diff --git a/slideshow/source/inc/box2dtools.hxx b/slideshow/source/inc/box2dtools.hxx index e876468df7e6..ffa95655f03b 100644 --- a/slideshow/source/inc/box2dtools.hxx +++ b/slideshow/source/inc/box2dtools.hxx @@ -145,7 +145,7 @@ private: @param rVelocity Velocity vector in LO user space coordinates. */ - void setShapeLinearVelocity(const css::uno::Reference<com::sun::star::drawing::XShape> xShape, + void setShapeLinearVelocity(const css::uno::Reference<css::drawing::XShape> xShape, const basegfx::B2DVector& rVelocity); /** Sets rotation angle of the shape's corresponding Box2D body @@ -156,8 +156,7 @@ private: @param fAngle Angle of rotation in degrees. */ - void setShapeAngle(const css::uno::Reference<com::sun::star::drawing::XShape> xShape, - const double fAngle); + void setShapeAngle(const css::uno::Reference<css::drawing::XShape> xShape, const double fAngle); /** Rotates shape's corresponding Box2D body to specified angle @@ -174,9 +173,8 @@ private: @param fPassedTime Time frame which the Box2D body should rotate to the specified angle. */ - void setShapeAngleByAngularVelocity( - const css::uno::Reference<com::sun::star::drawing::XShape> xShape, const double fAngle, - const double fPassedTime); + void setShapeAngleByAngularVelocity(const css::uno::Reference<css::drawing::XShape> xShape, + const double fAngle, const double fPassedTime); /** Sets angular velocity of the shape's corresponding Box2D body. @@ -186,7 +184,7 @@ private: @param fAngularVelocity Angular velocity in degrees per second. */ - void setShapeAngularVelocity(const css::uno::Reference<com::sun::star::drawing::XShape> xShape, + void setShapeAngularVelocity(const css::uno::Reference<css::drawing::XShape> xShape, const double fAngularVelocity); /** Sets whether a shape's corresponding Box2D body has collision in the Box2D World or not @@ -200,7 +198,7 @@ private: true if collisions should be enabled for the corresponding Box2D body of this shape and false if it should be disabled. */ - void setShapeCollision(const css::uno::Reference<com::sun::star::drawing::XShape> xShape, + void setShapeCollision(const css::uno::Reference<css::drawing::XShape> xShape, const bool bCanCollide); /** Process the updates queued in the maShapeParallelUpdateQueue @@ -222,14 +220,12 @@ private: const int nPositionIterations = 2); /// Queue a rotation update that is simulated as if shape's corresponding box2D body rotated to given angle when processed - void - queueDynamicRotationUpdate(const css::uno::Reference<com::sun::star::drawing::XShape>& xShape, - const double fAngle); + void queueDynamicRotationUpdate(const css::uno::Reference<css::drawing::XShape>& xShape, + const double fAngle); /// Queue an angular velocity update that sets the shape's corresponding box2D body angular velocity to the given value when processed - void - queueAngularVelocityUpdate(const css::uno::Reference<com::sun::star::drawing::XShape>& xShape, - const double fAngularVelocity, const int nDelayForSteps = 0); + void queueAngularVelocityUpdate(const css::uno::Reference<css::drawing::XShape>& xShape, + const double fAngularVelocity, const int nDelayForSteps = 0); /// Queue an collision update that sets the collision of shape's corresponding box2D body when processed void queueShapeVisibilityUpdate(const css::uno::Reference<css::drawing::XShape>& xShape, @@ -333,7 +329,7 @@ public: /// Queue an appropriate update for a path animation that is in parallel with a physics animation void queueShapePathAnimationUpdate( - const css::uno::Reference<com::sun::star::drawing::XShape>& xShape, + const css::uno::Reference<css::drawing::XShape>& xShape, const slideshow::internal::ShapeAttributeLayerSharedPtr& pAttrLayer, const bool bIsFirstUpdate); diff --git a/svtools/source/uno/wizard/wizardpagecontroller.cxx b/svtools/source/uno/wizard/wizardpagecontroller.cxx index 67776a38e937..3bf7e5309269 100644 --- a/svtools/source/uno/wizard/wizardpagecontroller.cxx +++ b/svtools/source/uno/wizard/wizardpagecontroller.cxx @@ -56,7 +56,7 @@ namespace svt::uno css::uno::Reference<css::awt::XWindow> xPageWindow(m_xWizardPage->getWindow(), UNO_SET_THROW); // tdf#132110 use the current size of the child as the size request - com::sun::star::awt::Rectangle aChildRect = xPageWindow->getPosSize(); + css::awt::Rectangle aChildRect = xPageWindow->getPosSize(); pParent->set_size_request(aChildRect.Width, aChildRect.Height); xPageWindow->setVisible(true); diff --git a/svx/source/sdr/properties/graphicproperties.cxx b/svx/source/sdr/properties/graphicproperties.cxx index 0df3ee38bad1..71adb3e258ce 100644 --- a/svx/source/sdr/properties/graphicproperties.cxx +++ b/svx/source/sdr/properties/graphicproperties.cxx @@ -50,8 +50,8 @@ namespace sdr::properties else { RectangleProperties::applyDefaultStyleSheetFromSdrModel(); - SetMergedItem(XFillStyleItem(com::sun::star::drawing::FillStyle_NONE)); - SetMergedItem(XLineStyleItem(com::sun::star::drawing::LineStyle_NONE)); + SetMergedItem(XFillStyleItem(css::drawing::FillStyle_NONE)); + SetMergedItem(XLineStyleItem(css::drawing::LineStyle_NONE)); } } diff --git a/svx/source/sdr/properties/oleproperties.cxx b/svx/source/sdr/properties/oleproperties.cxx index a0e0e82d37d7..dc834514a65d 100644 --- a/svx/source/sdr/properties/oleproperties.cxx +++ b/svx/source/sdr/properties/oleproperties.cxx @@ -37,8 +37,8 @@ namespace sdr::properties else { RectangleProperties::applyDefaultStyleSheetFromSdrModel(); - SetMergedItem(XFillStyleItem(com::sun::star::drawing::FillStyle_NONE)); - SetMergedItem(XLineStyleItem(com::sun::star::drawing::LineStyle_NONE)); + SetMergedItem(XFillStyleItem(css::drawing::FillStyle_NONE)); + SetMergedItem(XLineStyleItem(css::drawing::LineStyle_NONE)); } } diff --git a/svx/source/tbxctrls/tbxcolorupdate.cxx b/svx/source/tbxctrls/tbxcolorupdate.cxx index c84d37fe73eb..9c36ee157019 100644 --- a/svx/source/tbxctrls/tbxcolorupdate.cxx +++ b/svx/source/tbxctrls/tbxcolorupdate.cxx @@ -371,7 +371,7 @@ namespace svx { } - void ToolboxButtonLineStyleUpdater::Update(const com::sun::star::frame::FeatureStateEvent& rEvent) + void ToolboxButtonLineStyleUpdater::Update(const css::frame::FeatureStateEvent& rEvent) { if (rEvent.FeatureURL.Complete == ".uno:LineDash") { diff --git a/svx/source/unodraw/SvxXTextColumns.cxx b/svx/source/unodraw/SvxXTextColumns.cxx index 8e5bcd27a94f..0ee73c49bf28 100644 --- a/svx/source/unodraw/SvxXTextColumns.cxx +++ b/svx/source/unodraw/SvxXTextColumns.cxx @@ -58,8 +58,8 @@ SfxItemPropertyMapEntry const saTextColumns_Impl[] = { css::beans::PropertyAttribute::READONLY, 0 }, { u"AutomaticDistance"_ustr, WID_TXTCOL_AUTO_DISTANCE, cppu::UnoType<sal_Int32>::get(), 0, 0 }, { u"SeparatorLineWidth"_ustr, WID_TXTCOL_LINE_WIDTH, cppu::UnoType<sal_Int32>::get(), 0, 0 }, - { u"SeparatorLineColor"_ustr, WID_TXTCOL_LINE_COLOR, - cppu::UnoType<com::sun::star::util::Color>::get(), 0, 0 }, + { u"SeparatorLineColor"_ustr, WID_TXTCOL_LINE_COLOR, cppu::UnoType<css::util::Color>::get(), 0, + 0 }, { u"SeparatorLineRelativeHeight"_ustr, WID_TXTCOL_LINE_REL_HGT, cppu::UnoType<sal_Int32>::get(), 0, 0 }, { u"SeparatorLineVerticalAlignment"_ustr, WID_TXTCOL_LINE_ALIGN, @@ -117,7 +117,7 @@ private: //separator line sal_Int32 m_nSepLineWidth = 0; - com::sun::star::util::Color m_nSepLineColor = 0; // black + css::util::Color m_nSepLineColor = 0; // black sal_Int32 m_nSepLineHeightRelative = 100; // full height css::style::VerticalAlignment m_nSepLineVertAlign = css::style::VerticalAlignment_MIDDLE; bool m_bSepLineIsOn = false; diff --git a/sw/source/ui/vba/vbafind.hxx b/sw/source/ui/vba/vbafind.hxx index 110a084bd276..58198d1f3125 100644 --- a/sw/source/ui/vba/vbafind.hxx +++ b/sw/source/ui/vba/vbafind.hxx @@ -60,7 +60,7 @@ private: /// @throws css::uno::RuntimeException SwVbaFind( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, css::uno::Reference< css::frame::XModel > xModel ); public: - static css::uno::Reference< ooo::vba::word::XFind > GetOrCreateFind(const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< com::sun::star::uno::XComponentContext >& rContext, const css::uno::Reference< com::sun::star::frame::XModel >& xModel, const css::uno::Reference< css::text::XTextRange >& xTextRange); + static css::uno::Reference< ooo::vba::word::XFind > GetOrCreateFind(const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XTextRange >& xTextRange); virtual ~SwVbaFind() override; // Attributes diff --git a/sw/source/ui/vba/vbalistformat.cxx b/sw/source/ui/vba/vbalistformat.cxx index 229c9c459e63..0dcce10ee881 100644 --- a/sw/source/ui/vba/vbalistformat.cxx +++ b/sw/source/ui/vba/vbalistformat.cxx @@ -288,7 +288,7 @@ void SAL_CALL SwVbaListFormat::ConvertNumbersToText( ) rPropertySet->getPropertyValue(u"ParaTabStops"_ustr) >>= stops; css::style::TabStop tabStop{}; tabStop.Position = nListtabStopPosition; - tabStop.Alignment = com::sun::star::style::TabAlign::TabAlign_LEFT; + tabStop.Alignment = css::style::TabAlign::TabAlign_LEFT; tabStop.FillChar = ' '; rPropertySet->setPropertyValue(u"ParaTabStops"_ustr, css::uno::Any(comphelper::combineSequences({ tabStop }, stops))); diff --git a/sw/source/uibase/inc/navipi.hxx b/sw/source/uibase/inc/navipi.hxx index a90cbc667169..5068c10315fd 100644 --- a/sw/source/uibase/inc/navipi.hxx +++ b/sw/source/uibase/inc/navipi.hxx @@ -133,10 +133,10 @@ class SwNavigationPI final : public PanelLayout public: static std::unique_ptr<PanelLayout> Create(weld::Widget* pParent, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxFrame, + const css::uno::Reference< css::frame::XFrame >& rxFrame, SfxBindings* pBindings); SwNavigationPI(weld::Widget* pParent, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxFrame, + const css::uno::Reference< css::frame::XFrame >& rxFrame, SfxBindings* _pBindings, SfxNavigator* pNavigatorDlg); virtual ~SwNavigationPI() override; diff --git a/sw/source/uibase/sidebar/A11yCheckIssuesPanel.cxx b/sw/source/uibase/sidebar/A11yCheckIssuesPanel.cxx index 593d2ec127fe..5e6e934ee598 100644 --- a/sw/source/uibase/sidebar/A11yCheckIssuesPanel.cxx +++ b/sw/source/uibase/sidebar/A11yCheckIssuesPanel.cxx @@ -101,7 +101,7 @@ std::unique_ptr<PanelLayout> A11yCheckIssuesPanel::Create(weld::Widget* pParent, SfxBindings* pBindings) { if (pParent == nullptr) - throw ::com::sun::star::lang::IllegalArgumentException( + throw css::lang::IllegalArgumentException( u"no parent window given to A11yCheckIssuesPanel::Create"_ustr, nullptr, 0); return std::make_unique<A11yCheckIssuesPanel>(pParent, pBindings); } diff --git a/sw/source/uibase/sidebar/CommentsPanel.cxx b/sw/source/uibase/sidebar/CommentsPanel.cxx index edad2a8d5c17..0910db3a49cb 100644 --- a/sw/source/uibase/sidebar/CommentsPanel.cxx +++ b/sw/source/uibase/sidebar/CommentsPanel.cxx @@ -181,8 +181,8 @@ Thread::~Thread() {} std::unique_ptr<PanelLayout> CommentsPanel::Create(weld::Widget* pParent) { if (pParent == nullptr) - throw ::com::sun::star::lang::IllegalArgumentException( - "no parent window given to CommentsPanel::Create", nullptr, 0); + throw css::lang::IllegalArgumentException("no parent window given to CommentsPanel::Create", + nullptr, 0); return std::make_unique<CommentsPanel>(pParent); } diff --git a/sw/source/uibase/sidebar/PageFooterPanel.cxx b/sw/source/uibase/sidebar/PageFooterPanel.cxx index 8060f91308f0..3817a0a97970 100644 --- a/sw/source/uibase/sidebar/PageFooterPanel.cxx +++ b/sw/source/uibase/sidebar/PageFooterPanel.cxx @@ -39,7 +39,7 @@ std::unique_ptr<PanelLayout> PageFooterPanel::Create( SfxBindings* pBindings) { if( pParent == nullptr ) - throw ::com::sun::star::lang::IllegalArgumentException(u"no parent window given to PageFooterPanel::Create"_ustr, nullptr, 0); + throw css::lang::IllegalArgumentException(u"no parent window given to PageFooterPanel::Create"_ustr, nullptr, 0); return std::make_unique<PageFooterPanel>(pParent, pBindings); } diff --git a/sw/source/uibase/sidebar/PageFormatPanel.cxx b/sw/source/uibase/sidebar/PageFormatPanel.cxx index 57aa6f03a01b..aecefa803080 100644 --- a/sw/source/uibase/sidebar/PageFormatPanel.cxx +++ b/sw/source/uibase/sidebar/PageFormatPanel.cxx @@ -48,7 +48,7 @@ std::unique_ptr<PanelLayout> PageFormatPanel::Create( SfxBindings* pBindings) { if( pParent == nullptr ) - throw ::com::sun::star::lang::IllegalArgumentException(u"no parent window given to PageFormatPanel::Create"_ustr, nullptr, 0); + throw css::lang::IllegalArgumentException(u"no parent window given to PageFormatPanel::Create"_ustr, nullptr, 0); return std::make_unique<PageFormatPanel>(pParent, pBindings); } diff --git a/sw/source/uibase/sidebar/PageHeaderPanel.cxx b/sw/source/uibase/sidebar/PageHeaderPanel.cxx index f77799314751..38b1b88402d6 100644 --- a/sw/source/uibase/sidebar/PageHeaderPanel.cxx +++ b/sw/source/uibase/sidebar/PageHeaderPanel.cxx @@ -39,9 +39,9 @@ std::unique_ptr<PanelLayout> PageHeaderPanel::Create( SfxBindings* pBindings) { if( pParent == nullptr ) - throw ::com::sun::star::lang::IllegalArgumentException(u"no parent window given to PageHeaderPanel::Create"_ustr, nullptr, 0); + throw css::lang::IllegalArgumentException(u"no parent window given to PageHeaderPanel::Create"_ustr, nullptr, 0); if( pBindings == nullptr ) - throw ::com::sun::star::lang::IllegalArgumentException(u"no SfxBindings given to PageHeaderPanel::Create"_ustr, nullptr, 0); + throw css::lang::IllegalArgumentException(u"no SfxBindings given to PageHeaderPanel::Create"_ustr, nullptr, 0); return std::make_unique<PageHeaderPanel>(pParent, pBindings); } diff --git a/sw/source/uibase/sidebar/PageStylesPanel.cxx b/sw/source/uibase/sidebar/PageStylesPanel.cxx index e35640cd6fbd..d1f8744d2b07 100644 --- a/sw/source/uibase/sidebar/PageStylesPanel.cxx +++ b/sw/source/uibase/sidebar/PageStylesPanel.cxx @@ -81,9 +81,9 @@ static SvxPageUsage PosToPageUsage_Impl( sal_uInt16 nPos ) std::unique_ptr<PanelLayout> PageStylesPanel::Create(weld::Widget* pParent, SfxBindings* pBindings) { if( pParent == nullptr ) - throw ::com::sun::star::lang::IllegalArgumentException(u"no parent window given to PageStylesPanel::Create"_ustr, nullptr, 0); + throw css::lang::IllegalArgumentException(u"no parent window given to PageStylesPanel::Create"_ustr, nullptr, 0); if( pBindings == nullptr ) - throw ::com::sun::star::lang::IllegalArgumentException(u"no SfxBindings given to PageStylesPanel::Create"_ustr, nullptr, 0); + throw css::lang::IllegalArgumentException(u"no SfxBindings given to PageStylesPanel::Create"_ustr, nullptr, 0); return std::make_unique<PageStylesPanel>(pParent, pBindings); } diff --git a/sw/source/writerfilter/dmapper/GraphicImport.cxx b/sw/source/writerfilter/dmapper/GraphicImport.cxx index 396508332e51..23330a742f26 100644 --- a/sw/source/writerfilter/dmapper/GraphicImport.cxx +++ b/sw/source/writerfilter/dmapper/GraphicImport.cxx @@ -488,9 +488,9 @@ GraphicImport::~GraphicImport() { } -com::sun::star::awt::Point GraphicImport::GetGraphicObjectPosition() const +css::awt::Point GraphicImport::GetGraphicObjectPosition() const { - return (com::sun::star::awt::Point(m_pImpl->m_nLeftPosition, m_pImpl->m_nTopPosition)); + return (css::awt::Point(m_pImpl->m_nLeftPosition, m_pImpl->m_nTopPosition)); } bool GraphicImport::GetLayoutInCell() const diff --git a/sw/source/writerfilter/dmapper/GraphicImport.hxx b/sw/source/writerfilter/dmapper/GraphicImport.hxx index c29f06a99a6f..19ce3eeb251e 100644 --- a/sw/source/writerfilter/dmapper/GraphicImport.hxx +++ b/sw/source/writerfilter/dmapper/GraphicImport.hxx @@ -99,7 +99,7 @@ public: bool IsGraphic() const; sal_Int32 GetLeftMarginOrig() const; - com::sun::star::awt::Point GetGraphicObjectPosition() const; + css::awt::Point GetGraphicObjectPosition() const; bool GetLayoutInCell() const; diff --git a/test/source/text/textsettings.cxx b/test/source/text/textsettings.cxx index c930c13e4356..e64654ae122d 100644 --- a/test/source/text/textsettings.cxx +++ b/test/source/text/textsettings.cxx @@ -36,7 +36,7 @@ bool isPropertyReadOnly(css::uno::Reference<css::beans::XPropertySet> const& rxP for (auto const& rProperty : xProperties) { if (rProperty.Name == rPropertyName) - return (rProperty.Attributes & com::sun::star::beans::PropertyAttribute::READONLY) != 0; + return (rProperty.Attributes & css::beans::PropertyAttribute::READONLY) != 0; } return false; diff --git a/toolkit/source/controls/table/tablecontrol_impl.cxx b/toolkit/source/controls/table/tablecontrol_impl.cxx index 40820fbe68e2..c868ca827c49 100644 --- a/toolkit/source/controls/table/tablecontrol_impl.cxx +++ b/toolkit/source/controls/table/tablecontrol_impl.cxx @@ -55,8 +55,8 @@ namespace svt::table using ::com::sun::star::accessibility::XAccessible; using ::com::sun::star::uno::Reference; - namespace AccessibleEventId = ::com::sun::star::accessibility::AccessibleEventId; - namespace AccessibleTableModelChangeType = ::com::sun::star::accessibility::AccessibleTableModelChangeType; + namespace AccessibleEventId = css::accessibility::AccessibleEventId; + namespace AccessibleTableModelChangeType = css::accessibility::AccessibleTableModelChangeType; //= SuppressCursor diff --git a/ucb/source/ucp/ext/ucpext_content.cxx b/ucb/source/ucp/ext/ucpext_content.cxx index a4de29fa6054..f37c733b49bb 100644 --- a/ucb/source/ucp/ext/ucpext_content.cxx +++ b/ucb/source/ucp/ext/ucpext_content.cxx @@ -72,8 +72,8 @@ namespace ucb::ucp::ext using ::com::sun::star::deployment::PackageInformationProvider; using ::com::sun::star::deployment::XPackageInformationProvider; - namespace OpenMode = ::com::sun::star::ucb::OpenMode; - namespace PropertyAttribute = ::com::sun::star::beans::PropertyAttribute; + namespace OpenMode = css::ucb::OpenMode; + namespace PropertyAttribute = css::beans::PropertyAttribute; //= helper diff --git a/ucb/source/ucp/webdav-curl/DAVResourceAccess.hxx b/ucb/source/ucp/webdav-curl/DAVResourceAccess.hxx index 5d5ea07bdd01..bf2e50b741c5 100644 --- a/ucb/source/ucp/webdav-curl/DAVResourceAccess.hxx +++ b/ucb/source/ucp/webdav-curl/DAVResourceAccess.hxx @@ -47,7 +47,7 @@ class DAVResourceAccess osl::Mutex m_aMutex; OUString m_aURL; OUString m_aPath; - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > m_aFlags; + css::uno::Sequence< css::beans::NamedValue > m_aFlags; rtl::Reference< DAVSession > m_xSession; rtl::Reference< DAVSessionFactory > m_xSessionFactory; css::uno::Reference< css::uno::XComponentContext > m_xContext; @@ -63,7 +63,7 @@ public: DAVResourceAccess & operator=( const DAVResourceAccess & rOther ); /// @throws DAVException - void setFlags( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rFlags ); + void setFlags( const css::uno::Sequence< css::beans::NamedValue >& rFlags ); /// @throws DAVException void setURL( const OUString & rNewURL ); diff --git a/ucb/source/ucp/webdav-curl/DAVSession.hxx b/ucb/source/ucp/webdav-curl/DAVSession.hxx index b73ceb561357..918ee72d60fd 100644 --- a/ucb/source/ucp/webdav-curl/DAVSession.hxx +++ b/ucb/source/ucp/webdav-curl/DAVSession.hxx @@ -61,7 +61,7 @@ public: } virtual bool CanUse( const OUString & rURI, - const ::com::sun::star::uno::Sequence<::com::sun::star::beans::NamedValue>& rFlags ) = 0; + const css::uno::Sequence<css::beans::NamedValue>& rFlags ) = 0; virtual bool UsesProxy() = 0; diff --git a/ucb/source/ucp/webdav-curl/DAVSessionFactory.hxx b/ucb/source/ucp/webdav-curl/DAVSessionFactory.hxx index 2699035ebbe2..e8e1b8396538 100644 --- a/ucb/source/ucp/webdav-curl/DAVSessionFactory.hxx +++ b/ucb/source/ucp/webdav-curl/DAVSessionFactory.hxx @@ -52,10 +52,10 @@ public: virtual ~DAVSessionFactory() override; /// @throws DAVException - rtl::Reference<DAVSession> createDAVSession( - const OUString& inUri, - const ::com::sun::star::uno::Sequence<::com::sun::star::beans::NamedValue>& rFlags, - const css::uno::Reference<css::uno::XComponentContext>& rxContext); + rtl::Reference<DAVSession> + createDAVSession(const OUString& inUri, + const css::uno::Sequence<css::beans::NamedValue>& rFlags, + const css::uno::Reference<css::uno::XComponentContext>& rxContext); private: typedef std::map<OUString, DAVSession*> Map; diff --git a/unoxml/qa/unit/domtest.cxx b/unoxml/qa/unit/domtest.cxx index de17af86057c..8d872d765f7e 100644 --- a/unoxml/qa/unit/domtest.cxx +++ b/unoxml/qa/unit/domtest.cxx @@ -293,7 +293,7 @@ public: } uno::Reference<uno::XComponentContext> xContext(comphelper::getProcessComponentContext(), css::uno::UNO_SET_THROW); - const uno::Reference<com::sun::star::ucb::XSimpleFileAccess> xFileAccess( + const uno::Reference<css::ucb::XSimpleFileAccess> xFileAccess( xContext->getServiceManager()->createInstanceWithContext( u"com.sun.star.ucb.SimpleFileAccess"_ustr, xContext), uno::UNO_QUERY_THROW); @@ -308,7 +308,7 @@ public: mxDomBuilder->parseURI(u""_ustr); CPPUNIT_FAIL("XDocumentBuilder.parseURI(\"\")"); } - catch (com::sun::star::ucb::ContentCreationException&) + catch (css::ucb::ContentCreationException&) { } diff --git a/unoxml/qa/unit/rdftest.cxx b/unoxml/qa/unit/rdftest.cxx index 3b6de1d02006..61c556369d21 100644 --- a/unoxml/qa/unit/rdftest.cxx +++ b/unoxml/qa/unit/rdftest.cxx @@ -63,7 +63,7 @@ CPPUNIT_TEST_FIXTURE(RDFStreamTest, testCVE_2012_0037) { const uno::Reference<uno::XComponentContext> xContext(comphelper::getProcessComponentContext(), css::uno::UNO_SET_THROW); - const uno::Reference<com::sun::star::ucb::XSimpleFileAccess> xFileAccess( + const uno::Reference<css::ucb::XSimpleFileAccess> xFileAccess( xContext->getServiceManager()->createInstanceWithContext( u"com.sun.star.ucb.SimpleFileAccess"_ustr, xContext), uno::UNO_QUERY_THROW); @@ -202,7 +202,7 @@ CPPUNIT_TEST_FIXTURE(RDFStreamTest, testSPARQL) { const uno::Reference<uno::XComponentContext> xContext(comphelper::getProcessComponentContext(), css::uno::UNO_SET_THROW); - const uno::Reference<com::sun::star::ucb::XSimpleFileAccess> xFileAccess( + const uno::Reference<css::ucb::XSimpleFileAccess> xFileAccess( xContext->getServiceManager()->createInstanceWithContext( u"com.sun.star.ucb.SimpleFileAccess"_ustr, xContext), uno::UNO_QUERY_THROW); @@ -372,7 +372,7 @@ CPPUNIT_TEST_FIXTURE(RDFStreamTest, testRDF) xDocRepo->createGraph(xFoo); CPPUNIT_FAIL("expected ElementExistException"); } - catch (com::sun::star::container::ElementExistException&) + catch (css::container::ElementExistException&) { } @@ -400,7 +400,7 @@ CPPUNIT_TEST_FIXTURE(RDFStreamTest, testRDF) // 8. empty: stmts CPPUNIT_ASSERT(!xEnum->hasMoreElements()); - const uno::Reference<com::sun::star::ucb::XSimpleFileAccess> xFileAccess( + const uno::Reference<css::ucb::XSimpleFileAccess> xFileAccess( xContext->getServiceManager()->createInstanceWithContext( u"com.sun.star.ucb.SimpleFileAccess"_ustr, xContext), uno::UNO_QUERY_THROW); @@ -555,7 +555,7 @@ CPPUNIT_TEST_FIXTURE(RDFStreamTest, testRDF) xDocRepo->importGraph(rdf::FileFormat::RDF_XML, xInputStream, xBar, xBase); CPPUNIT_FAIL("importing existing graph did not fail"); } - catch (com::sun::star::container::ElementExistException&) + catch (css::container::ElementExistException&) { } @@ -591,7 +591,7 @@ CPPUNIT_TEST_FIXTURE(RDFStreamTest, testRDF) xBazGraph->clear(); CPPUNIT_FAIL("deleted graph not invalid (clear)"); } - catch (com::sun::star::container::NoSuchElementException&) + catch (css::container::NoSuchElementException&) { } @@ -600,7 +600,7 @@ CPPUNIT_TEST_FIXTURE(RDFStreamTest, testRDF) xBazGraph->addStatement(xFoo, xFoo, xFoo); CPPUNIT_FAIL("deleted graph not invalid (add)"); } - catch (com::sun::star::container::NoSuchElementException&) + catch (css::container::NoSuchElementException&) { } @@ -609,7 +609,7 @@ CPPUNIT_TEST_FIXTURE(RDFStreamTest, testRDF) xBazGraph->removeStatements(nullptr, nullptr, nullptr); CPPUNIT_FAIL("deleted graph not invalid (remove)"); } - catch (com::sun::star::container::NoSuchElementException&) + catch (css::container::NoSuchElementException&) { } @@ -618,7 +618,7 @@ CPPUNIT_TEST_FIXTURE(RDFStreamTest, testRDF) xBazGraph->getStatements(nullptr, nullptr, nullptr); CPPUNIT_FAIL("deleted graph not invalid (remove)"); } - catch (com::sun::star::container::NoSuchElementException&) + catch (css::container::NoSuchElementException&) { } } @@ -942,7 +942,7 @@ CPPUNIT_TEST_FIXTURE(RDFStreamTest, testTdf123293) { const uno::Reference<uno::XComponentContext> xContext(comphelper::getProcessComponentContext(), css::uno::UNO_SET_THROW); - const uno::Reference<com::sun::star::ucb::XSimpleFileAccess> xFileAccess( + const uno::Reference<css::ucb::XSimpleFileAccess> xFileAccess( xContext->getServiceManager()->createInstanceWithContext( u"com.sun.star.ucb.SimpleFileAccess"_ustr, xContext), uno::UNO_QUERY_THROW); @@ -1121,7 +1121,7 @@ CPPUNIT_TEST_FIXTURE(RDFStreamTest, testDocumentMetadataAccess) { } - const uno::Reference<com::sun::star::ucb::XSimpleFileAccess> xFileAccess( + const uno::Reference<css::ucb::XSimpleFileAccess> xFileAccess( xContext->getServiceManager()->createInstanceWithContext( u"com.sun.star.ucb.SimpleFileAccess"_ustr, xContext), uno::UNO_QUERY_THROW); diff --git a/vcl/qt5/QtAccessibleWidget.cxx b/vcl/qt5/QtAccessibleWidget.cxx index 96288bb3cc98..91d0379cbb70 100644 --- a/vcl/qt5/QtAccessibleWidget.cxx +++ b/vcl/qt5/QtAccessibleWidget.cxx @@ -197,15 +197,15 @@ sal_Int16 lcl_matchQtTextBoundaryType(QAccessible::TextBoundaryType boundaryType switch (boundaryType) { case QAccessible::CharBoundary: - return com::sun::star::accessibility::AccessibleTextType::CHARACTER; + return css::accessibility::AccessibleTextType::CHARACTER; case QAccessible::WordBoundary: - return com::sun::star::accessibility::AccessibleTextType::WORD; + return css::accessibility::AccessibleTextType::WORD; case QAccessible::SentenceBoundary: - return com::sun::star::accessibility::AccessibleTextType::SENTENCE; + return css::accessibility::AccessibleTextType::SENTENCE; case QAccessible::ParagraphBoundary: - return com::sun::star::accessibility::AccessibleTextType::PARAGRAPH; + return css::accessibility::AccessibleTextType::PARAGRAPH; case QAccessible::LineBoundary: - return com::sun::star::accessibility::AccessibleTextType::LINE; + return css::accessibility::AccessibleTextType::LINE; case QAccessible::NoBoundary: // assert here, better handle it directly at call site assert(false diff --git a/vcl/qt5/QtTransferable.cxx b/vcl/qt5/QtTransferable.cxx index 509bcf6bc684..62aca604f6b0 100644 --- a/vcl/qt5/QtTransferable.cxx +++ b/vcl/qt5/QtTransferable.cxx @@ -316,8 +316,7 @@ QVariant QtMimeData::retrieveData(const QString& mimeType, QMetaType) const try { // tdf#129809 take a reference in case m_aContents is replaced during this call - css::uno::Reference<com::sun::star::datatransfer::XTransferable> xCurrentContents( - m_aContents); + css::uno::Reference<css::datatransfer::XTransferable> xCurrentContents(m_aContents); aValue = xCurrentContents->getTransferData(aFlavor); } catch (...) diff --git a/vcl/source/control/throbber.cxx b/vcl/source/control/throbber.cxx index 9daf031b0599..f348fe5ec776 100644 --- a/vcl/source/control/throbber.cxx +++ b/vcl/source/control/throbber.cxx @@ -37,7 +37,7 @@ using ::com::sun::star::uno::Reference; using ::com::sun::star::graphic::XGraphic; using ::com::sun::star::graphic::XGraphicProvider; using ::com::sun::star::uno::Exception; -namespace ImageScaleMode = ::com::sun::star::awt::ImageScaleMode; +namespace ImageScaleMode = css::awt::ImageScaleMode; Throbber::Throbber( vcl::Window* i_parentWindow, WinBits i_style ) :ImageControl( i_parentWindow, i_style ) diff --git a/vcl/source/outdev/outdev.cxx b/vcl/source/outdev/outdev.cxx index ce2a3940dc8a..8b4d816b69bd 100644 --- a/vcl/source/outdev/outdev.cxx +++ b/vcl/source/outdev/outdev.cxx @@ -774,7 +774,7 @@ Reference< css::rendering::XSpriteCanvas > OutputDevice::GetSpriteCanvas() const } // Generic implementation, Window will override. -com::sun::star::uno::Reference< css::rendering::XCanvas > OutputDevice::ImplGetCanvas( bool bSpriteCanvas ) const +css::uno::Reference< css::rendering::XCanvas > OutputDevice::ImplGetCanvas( bool bSpriteCanvas ) const { /* Arguments: 0: ptr to creating instance (Window or VirtualDevice) diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index fb613b3e6ba6..925d84ac43bb 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -530,7 +530,7 @@ VclBuilder::VclBuilder(vcl::Window* pParent, std::u16string_view sUIDir, const O if (rType == "role") { sal_Int16 role = BuilderUtils::getRoleFromName(rParam); - if (role != com::sun::star::accessibility::AccessibleRole::UNKNOWN) + if (role != css::accessibility::AccessibleRole::UNKNOWN) pSource->SetAccessibleRole(role); } else diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx index 284877d3213f..173edb8932e0 100644 --- a/vcl/source/window/window2.cxx +++ b/vcl/source/window/window2.cxx @@ -1662,7 +1662,7 @@ bool Window::set_property(const OUString &rKey, const OUString &rValue) else if (rKey == "accessible-role") { sal_Int16 role = BuilderUtils::getRoleFromName(rValue); - if (role != com::sun::star::accessibility::AccessibleRole::UNKNOWN) + if (role != css::accessibility::AccessibleRole::UNKNOWN) SetAccessibleRole(role); } else if (rKey == "use-markup") diff --git a/vcl/unx/gtk4/a11y.cxx b/vcl/unx/gtk4/a11y.cxx index dff2f3b49d2f..9b1ba0193d3a 100644 --- a/vcl/unx/gtk4/a11y.cxx +++ b/vcl/unx/gtk4/a11y.cxx @@ -275,63 +275,63 @@ static void applyStates(GtkAccessible* pGtkAccessible, const sal_Int64 nStates = xContext->getAccessibleStateSet(); gtk_accessible_update_property( pGtkAccessible, GTK_ACCESSIBLE_PROPERTY_MODAL, - bool(nStates & com::sun::star::accessibility::AccessibleStateType::MODAL), + bool(nStates & css::accessibility::AccessibleStateType::MODAL), GTK_ACCESSIBLE_PROPERTY_MULTI_LINE, - bool(nStates & com::sun::star::accessibility::AccessibleStateType::MULTI_LINE), + bool(nStates & css::accessibility::AccessibleStateType::MULTI_LINE), GTK_ACCESSIBLE_PROPERTY_MULTI_SELECTABLE, - bool(nStates & com::sun::star::accessibility::AccessibleStateType::MULTI_SELECTABLE), + bool(nStates & css::accessibility::AccessibleStateType::MULTI_SELECTABLE), GTK_ACCESSIBLE_PROPERTY_READ_ONLY, - bool(!(nStates & com::sun::star::accessibility::AccessibleStateType::EDITABLE)), -1); - if (nStates & com::sun::star::accessibility::AccessibleStateType::HORIZONTAL) + bool(!(nStates & css::accessibility::AccessibleStateType::EDITABLE)), -1); + if (nStates & css::accessibility::AccessibleStateType::HORIZONTAL) { gtk_accessible_update_property(pGtkAccessible, GTK_ACCESSIBLE_PROPERTY_ORIENTATION, GTK_ORIENTATION_HORIZONTAL, -1); } - else if (nStates & com::sun::star::accessibility::AccessibleStateType::VERTICAL) + else if (nStates & css::accessibility::AccessibleStateType::VERTICAL) { gtk_accessible_update_property(pGtkAccessible, GTK_ACCESSIBLE_PROPERTY_ORIENTATION, GTK_ORIENTATION_VERTICAL, -1); } - gtk_accessible_update_state( - pGtkAccessible, GTK_ACCESSIBLE_STATE_BUSY, - bool(nStates & com::sun::star::accessibility::AccessibleStateType::BUSY), - GTK_ACCESSIBLE_STATE_DISABLED, - bool(!(nStates & com::sun::star::accessibility::AccessibleStateType::ENABLED)), -1); + gtk_accessible_update_state(pGtkAccessible, GTK_ACCESSIBLE_STATE_BUSY, + bool(nStates & css::accessibility::AccessibleStateType::BUSY), + GTK_ACCESSIBLE_STATE_DISABLED, + bool(!(nStates & css::accessibility::AccessibleStateType::ENABLED)), + -1); // when explicitly setting any value for GTK_ACCESSIBLE_STATE_CHECKED, // Gtk will also report ATSPI_STATE_CHECKABLE on the AT-SPI layer - if (nStates & com::sun::star::accessibility::AccessibleStateType::CHECKABLE) + if (nStates & css::accessibility::AccessibleStateType::CHECKABLE) { GtkAccessibleTristate eState = GTK_ACCESSIBLE_TRISTATE_FALSE; - if (nStates & com::sun::star::accessibility::AccessibleStateType::INDETERMINATE) + if (nStates & css::accessibility::AccessibleStateType::INDETERMINATE) eState = GTK_ACCESSIBLE_TRISTATE_MIXED; - else if (nStates & com::sun::star::accessibility::AccessibleStateType::CHECKED) + else if (nStates & css::accessibility::AccessibleStateType::CHECKED) eState = GTK_ACCESSIBLE_TRISTATE_TRUE; gtk_accessible_update_state(pGtkAccessible, GTK_ACCESSIBLE_STATE_CHECKED, eState, -1); } - if (nStates & com::sun::star::accessibility::AccessibleStateType::EXPANDABLE) + if (nStates & css::accessibility::AccessibleStateType::EXPANDABLE) { gtk_accessible_update_state( pGtkAccessible, GTK_ACCESSIBLE_STATE_EXPANDED, - bool(nStates & com::sun::star::accessibility::AccessibleStateType::EXPANDED), -1); + bool(nStates & css::accessibility::AccessibleStateType::EXPANDED), -1); } - if (nStates & com::sun::star::accessibility::AccessibleStateType::SELECTABLE) + if (nStates & css::accessibility::AccessibleStateType::SELECTABLE) { gtk_accessible_update_state( pGtkAccessible, GTK_ACCESSIBLE_STATE_SELECTED, - bool(nStates & com::sun::star::accessibility::AccessibleStateType::SELECTED), -1); + bool(nStates & css::accessibility::AccessibleStateType::SELECTED), -1); } const sal_Int16 nRole = xContext->getAccessibleRole(); - if (nRole == com::sun::star::accessibility::AccessibleRole::TOGGLE_BUTTON) + if (nRole == css::accessibility::AccessibleRole::TOGGLE_BUTTON) { GtkAccessibleTristate eState = GTK_ACCESSIBLE_TRISTATE_FALSE; - if (nStates & com::sun::star::accessibility::AccessibleStateType::INDETERMINATE) + if (nStates & css::accessibility::AccessibleStateType::INDETERMINATE) eState = GTK_ACCESSIBLE_TRISTATE_MIXED; - else if (nStates & com::sun::star::accessibility::AccessibleStateType::PRESSED) + else if (nStates & css::accessibility::AccessibleStateType::PRESSED) eState = GTK_ACCESSIBLE_TRISTATE_TRUE; gtk_accessible_update_state(pGtkAccessible, GTK_ACCESSIBLE_STATE_PRESSED, eState, -1); } diff --git a/vcl/unx/gtk4/gtkaccessibleeventlistener.cxx b/vcl/unx/gtk4/gtkaccessibleeventlistener.cxx index 5a1b2a38076e..6d395413b417 100644 --- a/vcl/unx/gtk4/gtkaccessibleeventlistener.cxx +++ b/vcl/unx/gtk4/gtkaccessibleeventlistener.cxx @@ -28,14 +28,14 @@ GtkAccessibleEventListener::~GtkAccessibleEventListener() g_object_unref(m_pLoAccessible); } -void GtkAccessibleEventListener::disposing(const com::sun::star::lang::EventObject&) +void GtkAccessibleEventListener::disposing(const css::lang::EventObject&) { assert(m_pLoAccessible); GtkAccessibleRegistry::remove(m_pLoAccessible->uno_accessible); } void GtkAccessibleEventListener::notifyEvent( - const com::sun::star::accessibility::AccessibleEventObject& rEvent) + const css::accessibility::AccessibleEventObject& rEvent) { switch (rEvent.EventId) { diff --git a/vcl/unx/gtk4/gtkaccessibletext.cxx b/vcl/unx/gtk4/gtkaccessibletext.cxx index 66934708e529..b00d0994dfa9 100644 --- a/vcl/unx/gtk4/gtkaccessibletext.cxx +++ b/vcl/unx/gtk4/gtkaccessibletext.cxx @@ -28,15 +28,15 @@ sal_Int16 lcl_GtkTextGranularityToUNOBoundaryType(GtkAccessibleTextGranularity e switch (eGranularity) { case GTK_ACCESSIBLE_TEXT_GRANULARITY_CHARACTER: - return com::sun::star::accessibility::AccessibleTextType::CHARACTER; + return css::accessibility::AccessibleTextType::CHARACTER; case GTK_ACCESSIBLE_TEXT_GRANULARITY_WORD: - return com::sun::star::accessibility::AccessibleTextType::WORD; + return css::accessibility::AccessibleTextType::WORD; case GTK_ACCESSIBLE_TEXT_GRANULARITY_SENTENCE: - return com::sun::star::accessibility::AccessibleTextType::SENTENCE; + return css::accessibility::AccessibleTextType::SENTENCE; case GTK_ACCESSIBLE_TEXT_GRANULARITY_LINE: - return com::sun::star::accessibility::AccessibleTextType::LINE; + return css::accessibility::AccessibleTextType::LINE; case GTK_ACCESSIBLE_TEXT_GRANULARITY_PARAGRAPH: - return com::sun::star::accessibility::AccessibleTextType::PARAGRAPH; + return css::accessibility::AccessibleTextType::PARAGRAPH; default: assert(false && "Unhandled GtkAccessibleTextGranularity."); return GTK_ACCESSIBLE_TEXT_GRANULARITY_CHARACTER; @@ -178,7 +178,7 @@ static gboolean lo_accessible_text_get_attributes(GtkAccessibleText* self, unsig css::uno::Sequence<css::beans::PropertyValue> aAttribs; css::uno::Reference<css::accessibility::XAccessibleTextAttributes> xAttributes( - xText, com::sun::star::uno::UNO_QUERY); + xText, css::uno::UNO_QUERY); if (xAttributes.is()) aAttribs = xAttributes->getRunAttributes(offset, css::uno::Sequence<OUString>()); else @@ -211,7 +211,7 @@ static void lo_accessible_text_get_default_attributes(GtkAccessibleText* self, return; css::uno::Reference<css::accessibility::XAccessibleTextAttributes> xAttributes( - xText, com::sun::star::uno::UNO_QUERY); + xText, css::uno::UNO_QUERY); if (!xAttributes.is()) return; @@ -243,7 +243,7 @@ static gboolean lo_accessible_text_get_extents(GtkAccessibleText* self, unsigned return false; } - com::sun::star::awt::Rectangle aBounds = xText->getCharacterBounds(start); + css::awt::Rectangle aBounds = xText->getCharacterBounds(start); extents->origin.x = aBounds.X; extents->origin.y = aBounds.Y; extents->size.width = aBounds.Width; diff --git a/winaccessibility/inc/AccDescendantManagerEventListener.hxx b/winaccessibility/inc/AccDescendantManagerEventListener.hxx index 1c7bc16252aa..2795e1b68ab3 100644 --- a/winaccessibility/inc/AccDescendantManagerEventListener.hxx +++ b/winaccessibility/inc/AccDescendantManagerEventListener.hxx @@ -36,7 +36,7 @@ enum class UnoMSAAEvent; class AccDescendantManagerEventListener: public AccComponentEventListener { private: - std::vector<com::sun::star::accessibility::XAccessible*> m_aUnselectedChildrenForDeletion; + std::vector<css::accessibility::XAccessible*> m_aUnselectedChildrenForDeletion; public: AccDescendantManagerEventListener(css::accessibility::XAccessible* pAcc, AccObjectWinManager& rManager); diff --git a/winaccessibility/inc/AccObjectWinManager.hxx b/winaccessibility/inc/AccObjectWinManager.hxx index e03fa8a1c7bf..5c2f2f569485 100644 --- a/winaccessibility/inc/AccObjectWinManager.hxx +++ b/winaccessibility/inc/AccObjectWinManager.hxx @@ -51,8 +51,8 @@ AccObjectWinManager complete the functions: class AccObjectWinManager { private: - typedef std::map<com::sun::star::accessibility::XAccessible*, AccObject> XIdToAccObjHash; - typedef std::map<HWND, com::sun::star::accessibility::XAccessible*> XHWNDToXAccHash; + typedef std::map<css::accessibility::XAccessible*, AccObject> XIdToAccObjHash; + typedef std::map<HWND, css::accessibility::XAccessible*> XHWNDToXAccHash; typedef std::map<const long, AccObject*> XResIdToAccObjHash; typedef std::map<const HWND, css::accessibility::XAccessible* > diff --git a/winaccessibility/source/UAccCOM/AccTextBase.cxx b/winaccessibility/source/UAccCOM/AccTextBase.cxx index 8cb082d29192..784e6cdd6430 100644 --- a/winaccessibility/source/UAccCOM/AccTextBase.cxx +++ b/winaccessibility/source/UAccCOM/AccTextBase.cxx @@ -49,15 +49,15 @@ sal_Int16 lcl_matchIA2TextBoundaryType(IA2TextBoundaryType boundaryType) switch (boundaryType) { case IA2_TEXT_BOUNDARY_CHAR: - return com::sun::star::accessibility::AccessibleTextType::CHARACTER; + return css::accessibility::AccessibleTextType::CHARACTER; case IA2_TEXT_BOUNDARY_WORD: - return com::sun::star::accessibility::AccessibleTextType::WORD; + return css::accessibility::AccessibleTextType::WORD; case IA2_TEXT_BOUNDARY_SENTENCE: - return com::sun::star::accessibility::AccessibleTextType::SENTENCE; + return css::accessibility::AccessibleTextType::SENTENCE; case IA2_TEXT_BOUNDARY_PARAGRAPH: - return com::sun::star::accessibility::AccessibleTextType::PARAGRAPH; + return css::accessibility::AccessibleTextType::PARAGRAPH; case IA2_TEXT_BOUNDARY_LINE: - return com::sun::star::accessibility::AccessibleTextType::LINE; + return css::accessibility::AccessibleTextType::LINE; case IA2_TEXT_BOUNDARY_ALL: // assert here, better handle it directly at call site assert(false diff --git a/winaccessibility/source/service/AccEventListener.cxx b/winaccessibility/source/service/AccEventListener.cxx index 190037aa7751..82b435e62399 100644 --- a/winaccessibility/source/service/AccEventListener.cxx +++ b/winaccessibility/source/service/AccEventListener.cxx @@ -96,8 +96,7 @@ void AccEventListener::HandleNameChangedEvent() * @param oldValue the child to be deleted * @param newValue the child to be added */ -void AccEventListener::HandleChildChangedEvent(com::sun::star::uno::Any oldValue, - com::sun::star::uno::Any newValue) +void AccEventListener::HandleChildChangedEvent(css::uno::Any oldValue, css::uno::Any newValue) { Reference<XAccessible> xChild; if (newValue >>= xChild) diff --git a/writerperfect/qa/unit/DirectoryStreamTest.cxx b/writerperfect/qa/unit/DirectoryStreamTest.cxx index fd75805f5899..64827a90d875 100644 --- a/writerperfect/qa/unit/DirectoryStreamTest.cxx +++ b/writerperfect/qa/unit/DirectoryStreamTest.cxx @@ -20,8 +20,8 @@ #include <DirectoryStream.hxx> #include <com/sun/star/ucb/XContent.hpp> -namespace ucb = com::sun::star::ucb; -namespace uno = com::sun::star::uno; +namespace ucb = css::ucb; +namespace uno = css::uno; using std::unique_ptr; diff --git a/writerperfect/qa/unit/WPXSvStreamTest.cxx b/writerperfect/qa/unit/WPXSvStreamTest.cxx index 117f5e167e88..1bb20508ae9f 100644 --- a/writerperfect/qa/unit/WPXSvStreamTest.cxx +++ b/writerperfect/qa/unit/WPXSvStreamTest.cxx @@ -26,9 +26,9 @@ #include <WPXSvInputStream.hxx> -namespace io = com::sun::star::io; -namespace ucb = com::sun::star::ucb; -namespace uno = com::sun::star::uno; +namespace io = css::io; +namespace ucb = css::ucb; +namespace uno = css::uno; using std::shared_ptr; using std::unique_ptr; diff --git a/writerperfect/qa/unit/WpftFilterFixture.cxx b/writerperfect/qa/unit/WpftFilterFixture.cxx index 0931f6777820..bd8b8286fe08 100644 --- a/writerperfect/qa/unit/WpftFilterFixture.cxx +++ b/writerperfect/qa/unit/WpftFilterFixture.cxx @@ -13,9 +13,9 @@ #include <com/sun/star/document/XTypeDetection.hpp> #include <com/sun/star/frame/theDesktop.hpp> -namespace document = com::sun::star::document; -namespace frame = com::sun::star::frame; -namespace uno = com::sun::star::uno; +namespace document = css::document; +namespace frame = css::frame; +namespace uno = css::uno; namespace writerperfect::test { diff --git a/writerperfect/qa/unit/WpftFilterTestBase.cxx b/writerperfect/qa/unit/WpftFilterTestBase.cxx index ca9dcc317c5a..85f8e1d79e49 100644 --- a/writerperfect/qa/unit/WpftFilterTestBase.cxx +++ b/writerperfect/qa/unit/WpftFilterTestBase.cxx @@ -15,7 +15,7 @@ #include "WpftLoader.hxx" -namespace uno = com::sun::star::uno; +namespace uno = css::uno; namespace writerperfect::test { diff --git a/writerperfect/qa/unit/WpftLoader.cxx b/writerperfect/qa/unit/WpftLoader.cxx index 7d75033098d9..2b9473efc751 100644 --- a/writerperfect/qa/unit/WpftLoader.cxx +++ b/writerperfect/qa/unit/WpftLoader.cxx @@ -28,14 +28,14 @@ #include <ucbhelper/content.hxx> -namespace beans = com::sun::star::beans; -namespace container = com::sun::star::container; -namespace document = com::sun::star::document; -namespace frame = com::sun::star::frame; -namespace lang = com::sun::star::lang; -namespace ucb = com::sun::star::ucb; -namespace uno = com::sun::star::uno; -namespace util = com::sun::star::util; +namespace beans = css::beans; +namespace container = css::container; +namespace document = css::document; +namespace frame = css::frame; +namespace lang = css::lang; +namespace ucb = css::ucb; +namespace uno = css::uno; +namespace util = css::util; namespace writerperfect::test { diff --git a/writerperfect/source/common/DirectoryStream.cxx b/writerperfect/source/common/DirectoryStream.cxx index 79b7aeadb680..6f0d593cefbf 100644 --- a/writerperfect/source/common/DirectoryStream.cxx +++ b/writerperfect/source/common/DirectoryStream.cxx @@ -41,10 +41,10 @@ #include <WPXSvInputStream.hxx> #include <utility> -namespace io = com::sun::star::io; -namespace sdbc = com::sun::star::sdbc; -namespace ucb = com::sun::star::ucb; -namespace uno = com::sun::star::uno; +namespace io = css::io; +namespace sdbc = css::sdbc; +namespace ucb = css::ucb; +namespace uno = css::uno; namespace writerperfect { diff --git a/writerperfect/source/common/WPXSvInputStream.cxx b/writerperfect/source/common/WPXSvInputStream.cxx index a22c94a8b3e5..1f68b6810f76 100644 --- a/writerperfect/source/common/WPXSvInputStream.cxx +++ b/writerperfect/source/common/WPXSvInputStream.cxx @@ -34,8 +34,8 @@ namespace writerperfect using namespace ::com::sun::star::uno; using namespace ::com::sun::star::io; -namespace container = com::sun::star::container; -namespace packages = com::sun::star::packages; +namespace container = css::container; +namespace packages = css::packages; namespace { diff --git a/writerperfect/source/impress/KeynoteImportFilter.cxx b/writerperfect/source/impress/KeynoteImportFilter.cxx index 9c09a94df91c..04d4e8d992f8 100644 --- a/writerperfect/source/impress/KeynoteImportFilter.cxx +++ b/writerperfect/source/impress/KeynoteImportFilter.cxx @@ -27,8 +27,8 @@ using writerperfect::WPXSvInputStream; -namespace beans = com::sun::star::beans; -namespace ucb = com::sun::star::ucb; +namespace beans = css::beans; +namespace ucb = css::ucb; bool KeynoteImportFilter::doImportDocument(weld::Window*, librevenge::RVNGInputStream& rInput, OdpGenerator& rGenerator, utl::MediaDescriptor&) @@ -59,7 +59,7 @@ KeynoteImportFilter::detect(css::uno::Sequence<css::beans::PropertyValue>& Descr bool bIsPackage = false; bool bUCBContentChanged = false; const beans::PropertyValue* pValue = Descriptor.getConstArray(); - css::uno::Reference<com::sun::star::io::XInputStream> xInputStream; + css::uno::Reference<css::io::XInputStream> xInputStream; css::uno::Reference<ucb::XContent> xContent; css::uno::Sequence<beans::NamedValue> lComponentDataNV; css::uno::Sequence<beans::PropertyValue> lComponentDataPV; diff --git a/xmloff/qa/unit/style.cxx b/xmloff/qa/unit/style.cxx index 486dd7bb8bc1..72511b6212dc 100644 --- a/xmloff/qa/unit/style.cxx +++ b/xmloff/qa/unit/style.cxx @@ -80,7 +80,7 @@ struct XmlFont } }; -Color asColor(com::sun::star::rendering::RGBColor const& rRGBColor) +Color asColor(css::rendering::RGBColor const& rRGBColor) { basegfx::BColor aBColor(rRGBColor.Red, rRGBColor.Green, rRGBColor.Blue); return Color(aBColor); diff --git a/xmloff/source/chart/SchXMLChartContext.cxx b/xmloff/source/chart/SchXMLChartContext.cxx index 418bea825054..c79071dac166 100644 --- a/xmloff/source/chart/SchXMLChartContext.cxx +++ b/xmloff/source/chart/SchXMLChartContext.cxx @@ -232,7 +232,7 @@ SchXMLChartContext::SchXMLChartContext( SchXMLImportHelper& rImpHelper, mbRowHasLabels( false ), meDataRowSource( chart::ChartDataRowSource_COLUMNS ), mbIsStockChart( false ), - mPieSubType(com::sun::star::chart2::PieChartSubType_NONE) + mPieSubType(css::chart2::PieChartSubType_NONE) { } @@ -318,7 +318,7 @@ void SchXMLChartContext::startFastElement( sal_Int32 /*nElement*/, OUString sAutoStyleName; OUString aOldChartTypeName; bool bHasAddin = false; - mPieSubType = com::sun::star::chart2::PieChartSubType_NONE; + mPieSubType = css::chart2::PieChartSubType_NONE; for( auto& aIter : sax_fastparser::castToFastAttributeList(xAttrList) ) { @@ -392,12 +392,12 @@ void SchXMLChartContext::startFastElement( sal_Int32 /*nElement*/, break; case XML_ELEMENT(LO_EXT, XML_SUB_BAR): if (aIter.toString().toBoolean()) { - mPieSubType = com::sun::star::chart2::PieChartSubType_BAR; + mPieSubType = css::chart2::PieChartSubType_BAR; } break; case XML_ELEMENT(LO_EXT, XML_SUB_PIE): if (aIter.toString().toBoolean()) { - mPieSubType = com::sun::star::chart2::PieChartSubType_PIE; + mPieSubType = css::chart2::PieChartSubType_PIE; } break; default: diff --git a/xmloff/source/chart/SchXMLChartContext.hxx b/xmloff/source/chart/SchXMLChartContext.hxx index 6c7b6ececfa2..b7f94fa6c986 100644 --- a/xmloff/source/chart/SchXMLChartContext.hxx +++ b/xmloff/source/chart/SchXMLChartContext.hxx @@ -100,7 +100,7 @@ private: bool mbRowHasLabels; css::chart::ChartDataRowSource meDataRowSource; bool mbIsStockChart; - com::sun::star::chart2::PieChartSubType mPieSubType; + css::chart2::PieChartSubType mPieSubType; OUString msCategoriesAddress; OUString msChartAddress; diff --git a/xmloff/source/meta/MetaExportComponent.cxx b/xmloff/source/meta/MetaExportComponent.cxx index fba83b40297b..e4a23caaff1c 100644 --- a/xmloff/source/meta/MetaExportComponent.cxx +++ b/xmloff/source/meta/MetaExportComponent.cxx @@ -52,7 +52,7 @@ XMLMetaExportComponent::~XMLMetaExportComponent() { } -void SAL_CALL XMLMetaExportComponent::setSourceDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) +void SAL_CALL XMLMetaExportComponent::setSourceDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) { try { diff --git a/xmlsecurity/source/component/documentdigitalsignatures.cxx b/xmlsecurity/source/component/documentdigitalsignatures.cxx index 60549f37852b..bff14dd61a8a 100644 --- a/xmlsecurity/source/component/documentdigitalsignatures.cxx +++ b/xmlsecurity/source/component/documentdigitalsignatures.cxx @@ -95,7 +95,7 @@ private: /// @throws css::uno::RuntimeException css::uno::Sequence<css::security::DocumentSignatureInformation> ImplVerifySignatures(const css::uno::Reference<css::embed::XStorage>& rxStorage, - const ::com::sun::star::uno::Reference<css::io::XInputStream>& xSignStream, + const css::uno::Reference<css::io::XInputStream>& xSignStream, DocumentSignatureMode eMode); css::uno::Sequence<css::uno::Reference<css::security::XCertificate>> @@ -168,7 +168,7 @@ public: css::uno::Sequence<css::uno::Reference<css::security::XCertificate>> SAL_CALL chooseEncryptionCertificate(const CertificateKind certificateKind) override; css::uno::Reference<css::security::XCertificate> SAL_CALL chooseCertificateWithProps( - css::uno::Sequence<::com::sun::star::beans::PropertyValue>& Properties) override; + css::uno::Sequence<css::beans::PropertyValue>& Properties) override; sal_Bool SAL_CALL signDocumentWithCertificate( css::uno::Reference<css::security::XCertificate> const & xCertificate, @@ -709,7 +709,7 @@ DocumentDigitalSignatures::chooseEncryptionCertificate(const CertificateKind cer return aCerts; } -css::uno::Reference< css::security::XCertificate > DocumentDigitalSignatures::chooseCertificateWithProps(Sequence<::com::sun::star::beans::PropertyValue>& rProperties) +css::uno::Reference< css::security::XCertificate > DocumentDigitalSignatures::chooseCertificateWithProps(Sequence<css::beans::PropertyValue>& rProperties) { std::map<OUString, OUString> aProperties; auto xCert = chooseCertificatesImpl( aProperties, CertificateChooserUserAction::Sign )[0]; |