Remove unnecessary namespacing

Change-Id: I0ea52709f9a77d928a6704797ebd5be4c375e964

2 files changed, 22 insertions, 21 deletions

diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx
index 6d2c4b5b30a2..242ec24360c6 100644
--- a/sfx2/source/doc/objxtor.cxx
+++ b/sfx2/source/doc/objxtor.cxx
@@ -1066,12 +1066,11 @@ SfxObjectShell* SfxObjectShell::CreateObject( const String& rServiceName, SfxObj
 {
     if ( rServiceName.Len() )
     {
-        ::com::sun::star::uno::Reference < ::com::sun::star::frame::XModel > xDoc(
-        ::comphelper::getProcessServiceFactory()->createInstance( rServiceName ), UNO_QUERY );
+        uno::Reference < frame::XModel > xDoc( ::comphelper::getProcessServiceFactory()->createInstance( rServiceName ), UNO_QUERY );
         if ( xDoc.is() )
         {
-            ::com::sun::star::uno::Reference < ::com::sun::star::lang::XUnoTunnel > xObj( xDoc, UNO_QUERY );
-            ::com::sun::star::uno::Sequence < sal_Int8 > aSeq( SvGlobalName( SFX_GLOBAL_CLASSID ).GetByteSequence() );
+            uno::Reference < lang::XUnoTunnel > xObj( xDoc, UNO_QUERY );
+            uno::Sequence < sal_Int8 > aSeq( SvGlobalName( SFX_GLOBAL_CLASSID ).GetByteSequence() );
             sal_Int64 nHandle = xObj->getSomething( aSeq );
             if ( nHandle )
             {
diff --git a/svx/source/form/fmservs.cxx b/svx/source/form/fmservs.cxx
index 14834685e6a3..b65bf8dfae2e 100644
--- a/svx/source/form/fmservs.cxx
+++ b/svx/source/form/fmservs.cxx
@@ -22,17 +22,19 @@
 #include <comphelper/processfactory.hxx>
 #include "fmservs.hxx"
 
+using namespace com::sun::star;
+
 // ------------------------------------------------------------------------
 #define DECL_SERVICE(ImplName)                      \
-::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL ImplName##_NewInstance_Impl(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > &) throw( ::com::sun::star::uno::Exception );
+uno::Reference< uno::XInterface > SAL_CALL ImplName##_NewInstance_Impl(const uno::Reference< lang::XMultiServiceFactory > &) throw( uno::Exception );
 
-#define REGISTER_SERVICE(ImplName, ServiceName)                         \
+#define REGISTER_SERVICE(ImplName, ServiceName)                     \
     sString = (ServiceName);                                        \
-    xSingleFactory = ::cppu::createSingleFactory(xServiceFactory,               \
-                        OUString(), ImplName##_NewInstance_Impl,             \
-                        ::com::sun::star::uno::Sequence< OUString>(&sString, 1));    \
-    if (xSingleFactory.is())                                            \
-        xSet->insert(::com::sun::star::uno::makeAny(xSingleFactory));
+    xSingleFactory = ::cppu::createSingleFactory(xServiceFactory,   \
+                        OUString(), ImplName##_NewInstance_Impl,    \
+                        uno::Sequence< OUString>(&sString, 1));     \
+    if (xSingleFactory.is())                                        \
+        xSet->insert(uno::makeAny(xSingleFactory));
 
 
     DECL_SERVICE( FmXGridControl )
@@ -44,11 +46,11 @@
 namespace svxform
 {
 
-#define DECL_SELFAWARE_SERVICE( ClassName )                     \
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL ClassName##_Create(      \
-                const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& );  \
-    OUString SAL_CALL ClassName##_GetImplementationName();                                           \
-    ::com::sun::star::uno::Sequence< OUString > SAL_CALL ClassName##_GetSupportedServiceNames();     \
+#define DECL_SELFAWARE_SERVICE( ClassName )                                    \
+    uno::Reference< uno::XInterface > SAL_CALL ClassName##_Create(             \
+                const uno::Reference< lang::XMultiServiceFactory >& );         \
+    OUString SAL_CALL ClassName##_GetImplementationName();                     \
+    uno::Sequence< OUString > SAL_CALL ClassName##_GetSupportedServiceNames(); \
 
 
 #define REGISTER_SELFAWARE_SERVICE( ClassName )                     \
@@ -58,7 +60,7 @@ namespace svxform
                         ClassName##_GetSupportedServiceNames()      \
                      );                                             \
     if ( xSingleFactory.is() )                                      \
-        xSet->insert( ::com::sun::star::uno::makeAny( xSingleFactory ) );
+        xSet->insert( uno::makeAny( xSingleFactory ) );
 
 
     // ------------------------------------------------------------------------
@@ -67,13 +69,13 @@ namespace svxform
     // ------------------------------------------------------------------------
     void ImplSmartRegisterUnoServices()
     {
-        ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >  xServiceFactory(::comphelper::getProcessServiceFactory(), ::com::sun::star::uno::UNO_QUERY);
-        ::com::sun::star::uno::Reference< ::com::sun::star::container::XSet >  xSet(xServiceFactory, ::com::sun::star::uno::UNO_QUERY);
+        uno::Reference< lang::XMultiServiceFactory >  xServiceFactory(::comphelper::getProcessServiceFactory(), uno::UNO_QUERY);
+        uno::Reference< container::XSet >  xSet(xServiceFactory, uno::UNO_QUERY);
         if (!xSet.is())
             return;
 
-        ::com::sun::star::uno::Sequence< OUString> aServices;
-        ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory >  xSingleFactory;
+        uno::Sequence< OUString> aServices;
+        uno::Reference< lang::XSingleServiceFactory >  xSingleFactory;
 
         OUString sString;