diff options
| author | Noel Grandin <noel@peralex.com> | 2013-05-17 11:21:57 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-05-21 08:23:59 +0200 |
| commit | 184c48ee7a4b1c5c6f19a3b9c71bdbc6472068f8 (patch) | |
| tree | 5fc5e5e124da13c813b051d29402cd9b7223dd92 /svx | |
| parent | 53d083213358b14b465f68339328252560cb1255 (diff) | |
Remove unnecessary namespacing
Change-Id: I0ea52709f9a77d928a6704797ebd5be4c375e964
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/form/fmservs.cxx | 36 |
1 files changed, 19 insertions, 17 deletions
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; |