diff options
author | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 12:06:47 +0200 |
---|---|---|
committer | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 14:23:11 +0200 |
commit | 1946794ae09ba732022fe6a74ea45e304ab70b84 (patch) | |
tree | e32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /desktop/source/app/officeipcthread.hxx | |
parent | 5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (diff) |
mass removal of rtl:: prefixes for O(U)String*
Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk
have kept them, in order not to break external API (the automatic using declaration
is LO-internal).
Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
Diffstat (limited to 'desktop/source/app/officeipcthread.hxx')
-rw-r--r-- | desktop/source/app/officeipcthread.hxx | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/desktop/source/app/officeipcthread.hxx b/desktop/source/app/officeipcthread.hxx index f60084d4dd00..a17e11681722 100644 --- a/desktop/source/app/officeipcthread.hxx +++ b/desktop/source/app/officeipcthread.hxx @@ -45,23 +45,23 @@ oslSignalAction SAL_CALL SalMainPipeExchangeSignal_impl(void* /*pData*/, oslSign // that was given by command line or by IPC pipe communication. struct ProcessDocumentsRequest { - ProcessDocumentsRequest(boost::optional< rtl::OUString > const & cwdUrl): + ProcessDocumentsRequest(boost::optional< OUString > const & cwdUrl): aCwdUrl(cwdUrl), pcProcessed( NULL ) {} - boost::optional< ::rtl::OUString > aCwdUrl; - ::rtl::OUString aModule; - std::vector< rtl::OUString > aOpenList; // Documents that should be opened in the default way - std::vector< rtl::OUString > aViewList; // Documents that should be opened in viewmode - std::vector< rtl::OUString > aStartList; // Documents/Presentations that should be started - std::vector< rtl::OUString > aPrintList; // Documents that should be printed on default printer - std::vector< rtl::OUString > aForceOpenList; // Documents that should be forced to open for editing (even templates) - std::vector< rtl::OUString > aForceNewList; // Documents that should be forced to create a new document - ::rtl::OUString aPrinterName; // The printer name that should be used for printing - std::vector< rtl::OUString > aPrintToList; // Documents that should be printed on the given printer - std::vector< rtl::OUString > aConversionList; - ::rtl::OUString aConversionParams; - ::rtl::OUString aConversionOut; - std::vector< rtl::OUString > aInFilter; + boost::optional< OUString > aCwdUrl; + OUString aModule; + std::vector< OUString > aOpenList; // Documents that should be opened in the default way + std::vector< OUString > aViewList; // Documents that should be opened in viewmode + std::vector< OUString > aStartList; // Documents/Presentations that should be started + std::vector< OUString > aPrintList; // Documents that should be printed on default printer + std::vector< OUString > aForceOpenList; // Documents that should be forced to open for editing (even templates) + std::vector< OUString > aForceNewList; // Documents that should be forced to create a new document + OUString aPrinterName; // The printer name that should be used for printing + std::vector< OUString > aPrintToList; // Documents that should be printed on the given printer + std::vector< OUString > aConversionList; + OUString aConversionParams; + OUString aConversionOut; + std::vector< OUString > aInFilter; ::osl::Condition *pcProcessed; // pointer condition to be set when the request has been processed }; @@ -139,11 +139,11 @@ class OfficeIPCThreadController : public ::cppu::WeakImplHelper2< virtual ~OfficeIPCThreadController() {} // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw ( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw ( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw ( ::com::sun::star::uno::RuntimeException ); // XEventListener |