diff options
| author | Noel Grandin <noel@peralex.com> | 2015-09-11 14:40:54 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-09-12 19:53:18 +0000 |
| commit | 4a9b401f9877b348a0e716e79cb8cc41645ceba3 (patch) | |
| tree | ecddc4e20b644d12e3c83589be2c5692f827e7f0 /desktop/source/deployment/inc/dp_misc.h | |
| parent | tdf#92794: '$' should be replaced in error dialog of addressbook (diff) | |
| download | core-4a9b401f9877b348a0e716e79cb8cc41645ceba3.tar.gz core-4a9b401f9877b348a0e716e79cb8cc41645ceba3.zip | |
desktop: com::sun::star->css
Change-Id: Ie94dea9b4f48829132ceadcbf36634eeed191bb9
Reviewed-on: https://gerrit.libreoffice.org/18498
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'desktop/source/deployment/inc/dp_misc.h')
| -rw-r--r-- | desktop/source/deployment/inc/dp_misc.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/desktop/source/deployment/inc/dp_misc.h b/desktop/source/deployment/inc/dp_misc.h index 5a548afc9d35..e2d2412c95fb 100644 --- a/desktop/source/deployment/inc/dp_misc.h +++ b/desktop/source/deployment/inc/dp_misc.h @@ -48,9 +48,9 @@ protected: }; -inline void try_dispose( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> const & x ) +inline void try_dispose( css::uno::Reference< css::uno::XInterface> const & x ) { - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent> xComp( x, ::com::sun::star::uno::UNO_QUERY ); + css::uno::Reference< css::lang::XComponent> xComp( x, css::uno::UNO_QUERY ); if (xComp.is()) xComp->dispose(); } @@ -94,9 +94,9 @@ DESKTOP_DEPLOYMENTMISC_DLLPUBLIC OUString generateRandomPipeId(); class AbortChannel; DESKTOP_DEPLOYMENTMISC_DLLPUBLIC -::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> resolveUnoURL( +css::uno::Reference< css::uno::XInterface> resolveUnoURL( OUString const & connectString, - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> const & xLocalContext, + css::uno::Reference< css::uno::XComponentContext> const & xLocalContext, AbortChannel * abortChannel = 0 ); @@ -105,7 +105,7 @@ DESKTOP_DEPLOYMENTMISC_DLLPUBLIC bool office_is_running(); DESKTOP_DEPLOYMENTMISC_DLLPUBLIC oslProcess raiseProcess( OUString const & appURL, - ::com::sun::star::uno::Sequence< OUString > const & args ); + css::uno::Sequence< OUString > const & args ); @@ -146,15 +146,15 @@ void TRACE(OUString const & sText); DESKTOP_DEPLOYMENTMISC_DLLPUBLIC void syncRepositories( bool force, - ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XCommandEnvironment> const & xCmdEnv); + css::uno::Reference< + css::ucb::XCommandEnvironment> const & xCmdEnv); /** workaround: for some reason the bridge threads which communicate with the uno.exe process are not released on time */ DESKTOP_DEPLOYMENTMISC_DLLPUBLIC void disposeBridges( - com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > + css::uno::Reference< css::uno::XComponentContext > const & ctx); } |