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>

15 files changed, 98 insertions, 104 deletions

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;