diff options
| author | Noel Grandin <noel@peralex.com> | 2015-10-29 12:44:31 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-10-29 11:18:10 +0000 |
| commit | 95b22704e8452e6360d0acf846e8c967aab146d7 (patch) | |
| tree | 267d1bc02e2ba65aef23a19d9bfb7d96a9af9ebf /svl | |
| parent | 457f8fd4d33053510b0e44d210b7febd2f07a4ff (diff) | |
com::sun::star->css in starmath,stoc,svgio,svl
Change-Id: If4308b358a55351f6e951ebf055df076ce4ad4ce
Reviewed-on: https://gerrit.libreoffice.org/19667
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'svl')
42 files changed, 624 insertions, 640 deletions
diff --git a/svl/qa/unit/test_URIHelper.cxx b/svl/qa/unit/test_URIHelper.cxx index 56cbad9c53ea..f27149b57a01 100644 --- a/svl/qa/unit/test_URIHelper.cxx +++ b/svl/qa/unit/test_URIHelper.cxx @@ -386,7 +386,7 @@ void Test::testFindFirstURLInText() { { "generic:path", 0, 0, 0 }, { "wfs:", 0, 0, 0 } }; - CharClass charClass( m_context, LanguageTag( com::sun::star::lang::Locale("en", "US", ""))); + CharClass charClass( m_context, LanguageTag( css::lang::Locale("en", "US", ""))); for (std::size_t i = 0; i < SAL_N_ELEMENTS(tests); ++i) { OUString input(OUString::createFromAscii(tests[i].input)); sal_Int32 begin = 0; diff --git a/svl/source/config/cjkoptions.cxx b/svl/source/config/cjkoptions.cxx index 8b5fc4efb6e5..69d456b907bc 100644 --- a/svl/source/config/cjkoptions.cxx +++ b/svl/source/config/cjkoptions.cxx @@ -63,7 +63,7 @@ public: SvtCJKOptions_Impl(); virtual ~SvtCJKOptions_Impl(); - virtual void Notify( const com::sun::star::uno::Sequence< OUString >& rPropertyNames ) override; + virtual void Notify( const css::uno::Sequence< OUString >& rPropertyNames ) override; void Load(); bool IsLoaded() { return bIsLoaded; } diff --git a/svl/source/config/languageoptions.cxx b/svl/source/config/languageoptions.cxx index 2022cbe551e0..3ec918d881b3 100644 --- a/svl/source/config/languageoptions.cxx +++ b/svl/source/config/languageoptions.cxx @@ -144,10 +144,10 @@ SvtScriptType SvtLanguageOptions::GetScriptTypeOfLanguage( sal_uInt16 nLang ) SvtScriptType nScript; switch (nScriptType) { - case ::com::sun::star::i18n::ScriptType::ASIAN: + case css::i18n::ScriptType::ASIAN: nScript = SvtScriptType::ASIAN; break; - case ::com::sun::star::i18n::ScriptType::COMPLEX: + case css::i18n::ScriptType::COMPLEX: nScript = SvtScriptType::COMPLEX; break; default: @@ -211,7 +211,7 @@ void SvtSystemLanguageOptions::ImplCommit() //does nothing } -void SvtSystemLanguageOptions::Notify( const com::sun::star::uno::Sequence< OUString >& ) +void SvtSystemLanguageOptions::Notify( const css::uno::Sequence< OUString >& ) { // no listeners supported yet } @@ -257,13 +257,13 @@ bool SvtSystemLanguageOptions::isKeyboardLayoutTypeInstalled(sal_Int16 scriptTyp bool SvtSystemLanguageOptions::isCTLKeyboardLayoutInstalled() const { - return isKeyboardLayoutTypeInstalled(::com::sun::star::i18n::ScriptType::COMPLEX); + return isKeyboardLayoutTypeInstalled(css::i18n::ScriptType::COMPLEX); } bool SvtSystemLanguageOptions::isCJKKeyboardLayoutInstalled() const { - return isKeyboardLayoutTypeInstalled(::com::sun::star::i18n::ScriptType::ASIAN); + return isKeyboardLayoutTypeInstalled(css::i18n::ScriptType::ASIAN); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/source/fsstor/fsstorage.hxx b/svl/source/fsstor/fsstorage.hxx index cc559fb4dca6..1fb746fe7cb6 100644 --- a/svl/source/fsstor/fsstorage.hxx +++ b/svl/source/fsstor/fsstorage.hxx @@ -36,10 +36,10 @@ #include <ucbhelper/content.hxx> struct FSStorage_Impl; -class FSStorage : public ::com::sun::star::lang::XTypeProvider - , public ::com::sun::star::embed::XStorage - , public ::com::sun::star::embed::XHierarchicalStorageAccess - , public ::com::sun::star::beans::XPropertySet +class FSStorage : public css::lang::XTypeProvider + , public css::embed::XStorage + , public css::embed::XHierarchicalStorageAccess + , public css::beans::XPropertySet , public ::cppu::OWeakObject { ::osl::Mutex m_aMutex; @@ -51,25 +51,25 @@ public: FSStorage( const ::ucbhelper::Content& aContent, sal_Int32 nMode, - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext ); + css::uno::Reference< css::uno::XComponentContext > xContext ); virtual ~FSStorage(); ::ucbhelper::Content* GetContent(); static void CopyStreamToSubStream( const OUString& aSourceURL, - const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xDest, + const css::uno::Reference< css::embed::XStorage >& xDest, const OUString& aNewEntryName ); void CopyContentToStorage_Impl( ::ucbhelper::Content* pContent, - const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xDest ); + const css::uno::Reference< css::embed::XStorage >& xDest ); static bool MakeFolderNoUI( const OUString& rFolder ); // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& rType ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL acquire() throw() override; @@ -77,236 +77,236 @@ public: // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() + throw( css::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() + throw( css::uno::RuntimeException, std::exception ) override; // XStorage - virtual void SAL_CALL copyToStorage( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xDest ) - throw ( ::com::sun::star::embed::InvalidStorageException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::io::IOException, - ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL copyToStorage( const css::uno::Reference< css::embed::XStorage >& xDest ) + throw ( css::embed::InvalidStorageException, + css::lang::IllegalArgumentException, + css::io::IOException, + css::embed::StorageWrappedTargetException, + css::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > SAL_CALL openStreamElement( + virtual css::uno::Reference< css::io::XStream > SAL_CALL openStreamElement( const OUString& aStreamName, sal_Int32 nOpenMode ) - throw ( ::com::sun::star::embed::InvalidStorageException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::packages::WrongPasswordException, - ::com::sun::star::io::IOException, - ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; - - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > SAL_CALL openEncryptedStreamElement( + throw ( css::embed::InvalidStorageException, + css::lang::IllegalArgumentException, + css::packages::WrongPasswordException, + css::io::IOException, + css::embed::StorageWrappedTargetException, + css::uno::RuntimeException, std::exception ) override; + + virtual css::uno::Reference< css::io::XStream > SAL_CALL openEncryptedStreamElement( const OUString& aStreamName, sal_Int32 nOpenMode, const OUString& aPass ) - throw ( ::com::sun::star::embed::InvalidStorageException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::packages::NoEncryptionException, - ::com::sun::star::packages::WrongPasswordException, - ::com::sun::star::io::IOException, - ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; - - virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > SAL_CALL openStorageElement( + throw ( css::embed::InvalidStorageException, + css::lang::IllegalArgumentException, + css::packages::NoEncryptionException, + css::packages::WrongPasswordException, + css::io::IOException, + css::embed::StorageWrappedTargetException, + css::uno::RuntimeException, std::exception ) override; + + virtual css::uno::Reference< css::embed::XStorage > SAL_CALL openStorageElement( const OUString& aStorName, sal_Int32 nStorageMode ) - throw ( ::com::sun::star::embed::InvalidStorageException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::io::IOException, - ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::embed::InvalidStorageException, + css::lang::IllegalArgumentException, + css::io::IOException, + css::embed::StorageWrappedTargetException, + css::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > SAL_CALL cloneStreamElement( + virtual css::uno::Reference< css::io::XStream > SAL_CALL cloneStreamElement( const OUString& aStreamName ) - throw ( ::com::sun::star::embed::InvalidStorageException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::packages::WrongPasswordException, - ::com::sun::star::io::IOException, - ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; - - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > SAL_CALL cloneEncryptedStreamElement( + throw ( css::embed::InvalidStorageException, + css::lang::IllegalArgumentException, + css::packages::WrongPasswordException, + css::io::IOException, + css::embed::StorageWrappedTargetException, + css::uno::RuntimeException, std::exception ) override; + + virtual css::uno::Reference< css::io::XStream > SAL_CALL cloneEncryptedStreamElement( const OUString& aStreamName, const OUString& aPass ) - throw ( ::com::sun::star::embed::InvalidStorageException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::packages::NoEncryptionException, - ::com::sun::star::packages::WrongPasswordException, - ::com::sun::star::io::IOException, - ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::embed::InvalidStorageException, + css::lang::IllegalArgumentException, + css::packages::NoEncryptionException, + css::packages::WrongPasswordException, + css::io::IOException, + css::embed::StorageWrappedTargetException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL copyLastCommitTo( - const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xTargetStorage ) - throw ( ::com::sun::star::embed::InvalidStorageException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::io::IOException, - ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::embed::XStorage >& xTargetStorage ) + throw ( css::embed::InvalidStorageException, + css::lang::IllegalArgumentException, + css::io::IOException, + css::embed::StorageWrappedTargetException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL copyStorageElementLastCommitTo( const OUString& aStorName, - const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xTargetStorage ) - throw ( ::com::sun::star::embed::InvalidStorageException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::io::IOException, - ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::embed::XStorage >& xTargetStorage ) + throw ( css::embed::InvalidStorageException, + css::lang::IllegalArgumentException, + css::io::IOException, + css::embed::StorageWrappedTargetException, + css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL isStreamElement( const OUString& aElementName ) - throw ( ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::embed::InvalidStorageException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::container::NoSuchElementException, + css::lang::IllegalArgumentException, + css::embed::InvalidStorageException, + css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL isStorageElement( const OUString& aElementName ) - throw ( ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::embed::InvalidStorageException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::container::NoSuchElementException, + css::lang::IllegalArgumentException, + css::embed::InvalidStorageException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL removeElement( const OUString& aElementName ) - throw ( ::com::sun::star::embed::InvalidStorageException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::io::IOException, - ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::embed::InvalidStorageException, + css::lang::IllegalArgumentException, + css::container::NoSuchElementException, + css::io::IOException, + css::embed::StorageWrappedTargetException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL renameElement( const OUString& rEleName, const OUString& rNewName ) - throw ( ::com::sun::star::embed::InvalidStorageException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::container::ElementExistException, - ::com::sun::star::io::IOException, - ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::embed::InvalidStorageException, + css::lang::IllegalArgumentException, + css::container::NoSuchElementException, + css::container::ElementExistException, + css::io::IOException, + css::embed::StorageWrappedTargetException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL copyElementTo( const OUString& aElementName, - const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xDest, + const css::uno::Reference< css::embed::XStorage >& xDest, const OUString& aNewName ) - throw ( ::com::sun::star::embed::InvalidStorageException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::container::ElementExistException, - ::com::sun::star::io::IOException, - ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::embed::InvalidStorageException, + css::lang::IllegalArgumentException, + css::container::NoSuchElementException, + css::container::ElementExistException, + css::io::IOException, + css::embed::StorageWrappedTargetException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL moveElementTo( const OUString& aElementName, - const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xDest, + const css::uno::Reference< css::embed::XStorage >& xDest, const OUString& rNewName ) - throw ( ::com::sun::star::embed::InvalidStorageException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::container::ElementExistException, - ::com::sun::star::io::IOException, - ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::embed::InvalidStorageException, + css::lang::IllegalArgumentException, + css::container::NoSuchElementException, + css::container::ElementExistException, + css::io::IOException, + css::embed::StorageWrappedTargetException, + css::uno::RuntimeException, std::exception ) override; // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) - throw ( ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) + throw ( css::container::NoSuchElementException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() + throw ( css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Type SAL_CALL getElementType() + throw ( css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL hasElements() - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::uno::RuntimeException, std::exception ) override; // XComponent virtual void SAL_CALL dispose() - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL addEventListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::lang::XEventListener >& xListener ) + throw ( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL removeEventListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::lang::XEventListener >& xListener ) + throw ( css::uno::RuntimeException, std::exception ) override; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() + throw ( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) - throw ( ::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) + throw ( css::beans::UnknownPropertyException, + css::beans::PropertyVetoException, + css::lang::IllegalArgumentException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) - throw ( ::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) + throw ( css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) - throw ( ::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) + throw ( css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) - throw ( ::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) + throw ( css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw ( ::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw ( css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw ( ::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw ( css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception ) override; // XHierarchicalStorageAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XExtendedStorageStream > SAL_CALL openStreamElementByHierarchicalName( const OUString& sStreamPath, ::sal_Int32 nOpenMode ) - throw ( ::com::sun::star::embed::InvalidStorageException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::packages::WrongPasswordException, - ::com::sun::star::io::IOException, - ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; - - virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XExtendedStorageStream > SAL_CALL openEncryptedStreamElementByHierarchicalName( const OUString& sStreamName, ::sal_Int32 nOpenMode, const OUString& sPassword ) - throw ( ::com::sun::star::embed::InvalidStorageException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::packages::NoEncryptionException, - ::com::sun::star::packages::WrongPasswordException, - ::com::sun::star::io::IOException, - ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::embed::XExtendedStorageStream > SAL_CALL openStreamElementByHierarchicalName( const OUString& sStreamPath, ::sal_Int32 nOpenMode ) + throw ( css::embed::InvalidStorageException, + css::lang::IllegalArgumentException, + css::packages::WrongPasswordException, + css::io::IOException, + css::embed::StorageWrappedTargetException, + css::uno::RuntimeException, std::exception ) override; + + virtual css::uno::Reference< css::embed::XExtendedStorageStream > SAL_CALL openEncryptedStreamElementByHierarchicalName( const OUString& sStreamName, ::sal_Int32 nOpenMode, const OUString& sPassword ) + throw ( css::embed::InvalidStorageException, + css::lang::IllegalArgumentException, + css::packages::NoEncryptionException, + css::packages::WrongPasswordException, + css::io::IOException, + css::embed::StorageWrappedTargetException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL removeStreamElementByHierarchicalName( const OUString& sElementPath ) - throw ( ::com::sun::star::embed::InvalidStorageException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::io::IOException, - ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::embed::InvalidStorageException, + css::lang::IllegalArgumentException, + css::container::NoSuchElementException, + css::io::IOException, + css::embed::StorageWrappedTargetException, + css::uno::RuntimeException, std::exception ) override; }; #endif diff --git a/svl/source/fsstor/oinputstreamcontainer.hxx b/svl/source/fsstor/oinputstreamcontainer.hxx index 1504594a758d..007f23e962e1 100644 --- a/svl/source/fsstor/oinputstreamcontainer.hxx +++ b/svl/source/fsstor/oinputstreamcontainer.hxx @@ -30,14 +30,14 @@ #include <osl/mutex.hxx> -class OFSInputStreamContainer : public cppu::WeakImplHelper < ::com::sun::star::io::XInputStream - ,::com::sun::star::embed::XExtendedStorageStream > - , public ::com::sun::star::io::XSeekable +class OFSInputStreamContainer : public cppu::WeakImplHelper < css::io::XInputStream + ,css::embed::XExtendedStorageStream > + , public css::io::XSeekable { ::osl::Mutex m_aMutex; - ::com::sun::star::uno::Reference < ::com::sun::star::io::XInputStream > m_xInputStream; - ::com::sun::star::uno::Reference < ::com::sun::star::io::XSeekable > m_xSeekable; + css::uno::Reference < css::io::XInputStream > m_xInputStream; + css::uno::Reference < css::io::XSeekable > m_xSeekable; bool m_bSeekable; @@ -46,40 +46,40 @@ class OFSInputStreamContainer : public cppu::WeakImplHelper < ::com::sun::star:: ::cppu::OInterfaceContainerHelper* m_pListenersContainer; // list of listeners public: - explicit OFSInputStreamContainer( const ::com::sun::star::uno::Reference < ::com::sun::star::io::XInputStream >& xStream ); + explicit OFSInputStreamContainer( const css::uno::Reference < css::io::XInputStream >& xStream ); virtual ~OFSInputStreamContainer(); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& rType ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; // XInputStream - virtual sal_Int32 SAL_CALL readBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) - throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL readSomeBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) - throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL readBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) + throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL readSomeBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) + throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) - throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL available( ) - throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL closeInput( ) - throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) override; //XStream - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getInputStream( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > SAL_CALL getOutputStream( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getInputStream( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::io::XOutputStream > SAL_CALL getOutputStream( ) throw (css::uno::RuntimeException, std::exception) override; //XSeekable - virtual void SAL_CALL seek( sal_Int64 location ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int64 SAL_CALL getPosition() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int64 SAL_CALL getLength() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL seek( sal_Int64 location ) throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getPosition() throw (css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getLength() throw (css::io::IOException, css::uno::RuntimeException, std::exception) override; //XComponent - virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; }; diff --git a/svl/source/fsstor/ostreamcontainer.hxx b/svl/source/fsstor/ostreamcontainer.hxx index 47aff4981a9d..e4a441c9866d 100644 --- a/svl/source/fsstor/ostreamcontainer.hxx +++ b/svl/source/fsstor/ostreamcontainer.hxx @@ -35,22 +35,22 @@ #include <osl/mutex.hxx> class OFSStreamContainer : public cppu::OWeakObject, - public ::com::sun::star::lang::XTypeProvider, - public ::com::sun::star::embed::XExtendedStorageStream, - public ::com::sun::star::io::XSeekable, - public ::com::sun::star::io::XInputStream, - public ::com::sun::star::io::XOutputStream, - public ::com::sun::star::io::XTruncate, - public ::com::sun::star::io::XAsyncOutputMonitor + public css::lang::XTypeProvider, + public css::embed::XExtendedStorageStream, + public css::io::XSeekable, + public css::io::XInputStream, + public css::io::XOutputStream, + public css::io::XTruncate, + public css::io::XAsyncOutputMonitor { ::osl::Mutex m_aMutex; - ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > m_xStream; - ::com::sun::star::uno::Reference< ::com::sun::star::io::XSeekable > m_xSeekable; - ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > m_xInputStream; - ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > m_xOutputStream; - ::com::sun::star::uno::Reference< ::com::sun::star::io::XTruncate > m_xTruncate; - ::com::sun::star::uno::Reference< ::com::sun::star::io::XAsyncOutputMonitor > m_xAsyncOutputMonitor; + css::uno::Reference< css::io::XStream > m_xStream; + css::uno::Reference< css::io::XSeekable > m_xSeekable; + css::uno::Reference< css::io::XInputStream > m_xInputStream; + css::uno::Reference< css::io::XOutputStream > m_xOutputStream; + css::uno::Reference< css::io::XTruncate > m_xTruncate; + css::uno::Reference< css::io::XAsyncOutputMonitor > m_xAsyncOutputMonitor; bool m_bDisposed; bool m_bInputClosed; @@ -60,56 +60,56 @@ class OFSStreamContainer : public cppu::OWeakObject, ::cppu::OTypeCollection* m_pTypeCollection; public: - explicit OFSStreamContainer( const ::com::sun::star::uno::Reference < ::com::sun::star::io::XStream >& xStream ); + explicit OFSStreamContainer( const css::uno::Reference < css::io::XStream >& xStream ); virtual ~OFSStreamContainer(); // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& rType ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() + throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() + throw( css::uno::RuntimeException, std::exception ) override; // XStream - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getInputStream( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > SAL_CALL getOutputStream( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getInputStream( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::io::XOutputStream > SAL_CALL getOutputStream( ) throw (css::uno::RuntimeException, std::exception) override; // XComponent - virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; // XSeekable - virtual void SAL_CALL seek( sal_Int64 location ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int64 SAL_CALL getPosition() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int64 SAL_CALL getLength() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL seek( sal_Int64 location ) throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getPosition() throw (css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getLength() throw (css::io::IOException, css::uno::RuntimeException, std::exception) override; // XInputStream - virtual sal_Int32 SAL_CALL readBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) - throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL readSomeBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL readBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) + throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL readSomeBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) - throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL available( ) - throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL closeInput( ) - throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) override; // XOutputStream - virtual void SAL_CALL writeBytes( const ::com::sun::star::uno::Sequence< sal_Int8 >& aData ) throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL flush( ) throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL closeOutput( ) throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL writeBytes( const css::uno::Sequence< sal_Int8 >& aData ) throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL flush( ) throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL closeOutput( ) throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override; // XTruncate - virtual void SAL_CALL truncate() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL truncate() throw (css::io::IOException, css::uno::RuntimeException, std::exception) override; // XAsyncOutputMonitor - virtual void SAL_CALL waitForCompletion( ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL waitForCompletion( ) throw (css::io::IOException, css::uno::RuntimeException, std::exception) override; }; diff --git a/svl/source/inc/fsfactory.hxx b/svl/source/inc/fsfactory.hxx index d70d2c5a42d2..a06045163491 100644 --- a/svl/source/inc/fsfactory.hxx +++ b/svl/source/inc/fsfactory.hxx @@ -27,36 +27,36 @@ #include <cppuhelper/implbase.hxx> #include <osl/diagnose.h> -class FSStorageFactory : public ::cppu::WeakImplHelper< ::com::sun::star::lang::XSingleServiceFactory, - ::com::sun::star::lang::XServiceInfo > +class FSStorageFactory : public ::cppu::WeakImplHelper< css::lang::XSingleServiceFactory, + css::lang::XServiceInfo > { - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; + css::uno::Reference< css::uno::XComponentContext > m_xContext; public: - FSStorageFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ) + FSStorageFactory( const css::uno::Reference< css::uno::XComponentContext >& xContext ) : m_xContext( xContext ) { OSL_ENSURE( xContext.is(), "No service manager is provided!\n" ); } - static ::com::sun::star::uno::Sequence< OUString > SAL_CALL + static css::uno::Sequence< OUString > SAL_CALL impl_staticGetSupportedServiceNames(); static OUString SAL_CALL impl_staticGetImplementationName(); - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL + static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_staticCreateSelfInstance( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ); + const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ); // XSingleServiceFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance() throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance() throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override; }; diff --git a/svl/source/inc/passwordcontainer.hxx b/svl/source/inc/passwordcontainer.hxx index 36914b9e698a..3b75cc265cfc 100644 --- a/svl/source/inc/passwordcontainer.hxx +++ b/svl/source/inc/passwordcontainer.hxx @@ -206,7 +206,7 @@ public: mainCont( point ), hasEncoded( false ) { - ::com::sun::star::uno::Sequence< OUString > aNode( 1 ); + css::uno::Sequence< OUString > aNode( 1 ); *aNode.getArray() = path; *aNode.getArray() += "/Store"; EnableNotification( aNode ); @@ -222,7 +222,7 @@ public: void setUseStorage( bool bUse ); bool useStorage(); - virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) override; + virtual void Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override; }; @@ -233,151 +233,151 @@ enum PasswordState { }; class PasswordContainer : public ::cppu::WeakImplHelper< - ::com::sun::star::task::XPasswordContainer2, - ::com::sun::star::lang::XServiceInfo, - ::com::sun::star::lang::XEventListener > + css::task::XPasswordContainer2, + css::lang::XServiceInfo, + css::lang::XEventListener > { private: PassMap m_aContainer; StorageItem* m_pStorageFile; ::osl::Mutex mMutex; OUString m_aMasterPasswd; // master password is set when the string is not empty - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > mComponent; + css::uno::Reference< css::lang::XComponent > mComponent; SysCredentialsConfig mUrlContainer; - ::com::sun::star::uno::Sequence< ::com::sun::star::task::UserRecord > CopyToUserRecordSequence( + css::uno::Sequence< css::task::UserRecord > CopyToUserRecordSequence( const ::std::list< NamePassRecord >& original, - const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler ) + const css::uno::Reference< css::task::XInteractionHandler >& Handler ) throw(css::uno::RuntimeException, std::exception); - ::com::sun::star::task::UserRecord CopyToUserRecord( + css::task::UserRecord CopyToUserRecord( const NamePassRecord& aRecord, bool& io_bTryToDecode, - const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& aHandler ); + const css::uno::Reference< css::task::XInteractionHandler >& aHandler ); - ::com::sun::star::uno::Sequence< ::com::sun::star::task::UserRecord > FindUsr( + css::uno::Sequence< css::task::UserRecord > FindUsr( const ::std::list< NamePassRecord >& userlist, const OUString& name, - const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler ) + const css::uno::Reference< css::task::XInteractionHandler >& Handler ) throw(css::uno::RuntimeException, std::exception); bool createUrlRecord( const PassMap::iterator & rIter, bool bName, const OUString & aName, - const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& aHandler, - ::com::sun::star::task::UrlRecord & rRec ) - throw( ::com::sun::star::uno::RuntimeException ); + const css::uno::Reference< css::task::XInteractionHandler >& aHandler, + css::task::UrlRecord & rRec ) + throw( css::uno::RuntimeException ); -::com::sun::star::task::UrlRecord find( +css::task::UrlRecord find( const OUString& aURL, const OUString& aName, bool bName, // only needed to support empty user names - const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& aHandler ) throw(::com::sun::star::uno::RuntimeException, std::exception); + const css::uno::Reference< css::task::XInteractionHandler >& aHandler ) throw(css::uno::RuntimeException, std::exception); static OUString GetDefaultMasterPassword(); static OUString RequestPasswordFromUser( - ::com::sun::star::task::PasswordRequestMode aRMode, - const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& xHandler ); + css::task::PasswordRequestMode aRMode, + const css::uno::Reference< css::task::XInteractionHandler >& xHandler ); - OUString GetMasterPassword( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler ) - throw(::com::sun::star::uno::RuntimeException, std::exception); + OUString GetMasterPassword( const css::uno::Reference< css::task::XInteractionHandler >& Handler ) + throw(css::uno::RuntimeException, std::exception); void UpdateVector( const OUString& url, ::std::list< NamePassRecord >& toUpdate, NamePassRecord& rec, bool writeFile ) - throw(::com::sun::star::uno::RuntimeException); + throw(css::uno::RuntimeException); void PrivateAdd( const OUString& aUrl, const OUString& aUserName, - const ::com::sun::star::uno::Sequence< OUString >& aPasswords, + const css::uno::Sequence< OUString >& aPasswords, char aMode, - const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler ) + const css::uno::Reference< css::task::XInteractionHandler >& Handler ) throw(css::uno::RuntimeException, std::exception); static ::std::vector< OUString > DecodePasswords( const OUString& aLine, const OUString& aMasterPassword ) - throw(::com::sun::star::uno::RuntimeException); + throw(css::uno::RuntimeException); static OUString EncodePasswords(const std::vector< OUString >& lines, const OUString& aMasterPassword ) - throw(::com::sun::star::uno::RuntimeException); + throw(css::uno::RuntimeException); public: - PasswordContainer( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& ); + PasswordContainer( const css::uno::Reference< css::lang::XMultiServiceFactory >& ); virtual ~PasswordContainer(); virtual void SAL_CALL add( const OUString& aUrl, const OUString& aUserName, - const ::com::sun::star::uno::Sequence< OUString >& aPasswords, - const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< OUString >& aPasswords, + const css::uno::Reference< css::task::XInteractionHandler >& Handler ) + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPersistent( const OUString& aUrl, const OUString& aUserName, - const ::com::sun::star::uno::Sequence< OUString >& aPasswords, - const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< OUString >& aPasswords, + const css::uno::Reference< css::task::XInteractionHandler >& Handler ) + throw(css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::task::UrlRecord SAL_CALL + virtual css::task::UrlRecord SAL_CALL find( const OUString& aUrl, - const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::task::XInteractionHandler >& Handler ) + throw(css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::task::UrlRecord SAL_CALL + virtual css::task::UrlRecord SAL_CALL findForName( const OUString& aUrl, const OUString& aUserName, - const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::task::XInteractionHandler >& Handler ) + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL remove( const OUString& aUrl, const OUString& aUserName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePersistent( const OUString& aUrl, const OUString& aUserName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeAllPersistent() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeAllPersistent() throw(css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::task::UrlRecord > SAL_CALL - getAllPersistent( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::task::UrlRecord > SAL_CALL + getAllPersistent( const css::uno::Reference< css::task::XInteractionHandler >& Handler ) throw(css::uno::RuntimeException, std::exception) override; // provide factory - static OUString SAL_CALL impl_getStaticImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< OUString > SAL_CALL - impl_getStaticSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > SAL_CALL - impl_createFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& ServiceManager ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - impl_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ) throw( ::com::sun::star::uno::RuntimeException ); + static OUString SAL_CALL impl_getStaticImplementationName( ) throw(css::uno::RuntimeException); + static css::uno::Sequence< OUString > SAL_CALL + impl_getStaticSupportedServiceNames( ) throw(css::uno::RuntimeException); + static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL + impl_createFactory( const css::uno::Reference< css::lang::XMultiServiceFactory >& ServiceManager ) throw(css::uno::RuntimeException); + static css::uno::Reference< css::uno::XInterface > SAL_CALL + impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::RuntimeException ); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL + getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) + throw(css::uno::RuntimeException, std::exception) override; // XMasterPasswordHandling - virtual sal_Bool SAL_CALL authorizateWithMasterPassword( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& xHandler ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL changeMasterPassword( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& xHandler ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeMasterPassword() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasMasterPassword( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL allowPersistentStoring( sal_Bool bAllow ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isPersistentStoringAllowed( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL authorizateWithMasterPassword( const css::uno::Reference< css::task::XInteractionHandler >& xHandler ) + throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL changeMasterPassword( const css::uno::Reference< css::task::XInteractionHandler >& xHandler ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeMasterPassword() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasMasterPassword( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL allowPersistentStoring( sal_Bool bAllow ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isPersistentStoringAllowed( ) throw (css::uno::RuntimeException, std::exception) override; // XMasterPasswordHandling2 - virtual sal_Bool SAL_CALL useDefaultMasterPassword( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& xHandler ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isDefaultMasterPasswordUsed( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL useDefaultMasterPassword( const css::uno::Reference< css::task::XInteractionHandler >& xHandler ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isDefaultMasterPasswordUsed( ) throw (css::uno::RuntimeException, std::exception) override; // XUrlContainer - virtual void SAL_CALL addUrl( const OUString& Url, sal_Bool MakePersistent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL findUrl( const OUString& Url ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeUrl( const OUString& Url ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getUrls( sal_Bool OnlyPersistent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addUrl( const OUString& Url, sal_Bool MakePersistent ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL findUrl( const OUString& Url ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeUrl( const OUString& Url ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getUrls( sal_Bool OnlyPersistent ) throw (css::uno::RuntimeException, std::exception) override; void Notify(); }; @@ -388,7 +388,7 @@ class MasterPasswordRequest_Impl : public ucbhelper::InteractionRequest ::rtl::Reference< ucbhelper::InteractionSupplyAuthentication > m_xAuthSupplier; public: - MasterPasswordRequest_Impl( ::com::sun::star::task::PasswordRequestMode Mode ); + MasterPasswordRequest_Impl( css::task::PasswordRequestMode Mode ); const ::rtl::Reference< ucbhelper::InteractionSupplyAuthentication > & getAuthenticationSupplier() const { return m_xAuthSupplier; } diff --git a/svl/source/inc/strmadpt.hxx b/svl/source/inc/strmadpt.hxx index ef1771f9c529..079cda74dd86 100644 --- a/svl/source/inc/strmadpt.hxx +++ b/svl/source/inc/strmadpt.hxx @@ -27,17 +27,14 @@ class SvOutputStreamOpenLockBytes: public SvOpenLockBytes { - com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > - m_xOutputStream; - sal_uInt64 m_nPosition; + css::uno::Reference< css::io::XOutputStream > m_xOutputStream; + sal_uInt64 m_nPosition; public: TYPEINFO_OVERRIDE(); SvOutputStreamOpenLockBytes( - const com::sun::star::uno::Reference< - com::sun::star::io::XOutputStream > & - rTheOutputStream): + const css::uno::Reference< css::io::XOutputStream > & rTheOutputStream): m_xOutputStream(rTheOutputStream), m_nPosition(0) {} virtual ErrCode ReadAt(sal_uInt64, void *, sal_uLong, sal_Size *) const override; diff --git a/svl/source/items/cenumitm.cxx b/svl/source/items/cenumitm.cxx index 695132eef1f0..a01f4b3eb99e 100644 --- a/svl/source/items/cenumitm.cxx +++ b/svl/source/items/cenumitm.cxx @@ -47,7 +47,7 @@ bool SfxEnumItemInterface::GetPresentation(SfxItemPresentation, SfxMapUnit, } // virtual -bool SfxEnumItemInterface::QueryValue(com::sun::star::uno::Any& rVal, sal_uInt8) +bool SfxEnumItemInterface::QueryValue(css::uno::Any& rVal, sal_uInt8) const { rVal <<= sal_Int32(GetEnumValue()); @@ -55,7 +55,7 @@ bool SfxEnumItemInterface::QueryValue(com::sun::star::uno::Any& rVal, sal_uInt8) } // virtual -bool SfxEnumItemInterface::PutValue(const com::sun::star::uno::Any& rVal, +bool SfxEnumItemInterface::PutValue(const css::uno::Any& rVal, sal_uInt8) { sal_Int32 nTheValue = 0; @@ -175,14 +175,14 @@ bool SfxBoolItem::GetPresentation(SfxItemPresentation, } // virtual -bool SfxBoolItem::QueryValue(com::sun::star::uno::Any& rVal, sal_uInt8) const +bool SfxBoolItem::QueryValue(css::uno::Any& rVal, sal_uInt8) const { rVal <<= m_bValue; return true; } // virtual -bool SfxBoolItem::PutValue(const com::sun::star::uno::Any& rVal, sal_uInt8) +bool SfxBoolItem::PutValue(const css::uno::Any& rVal, sal_uInt8) { bool bTheValue = bool(); if (rVal >>= bTheValue) diff --git a/svl/source/items/cintitem.cxx b/svl/source/items/cintitem.cxx index f7a1a7a77eb1..4013cf771f16 100644 --- a/svl/source/items/cintitem.cxx +++ b/svl/source/items/cintitem.cxx @@ -43,7 +43,7 @@ bool CntByteItem::GetPresentation(SfxItemPresentation, } // virtual -bool CntByteItem::QueryValue(com::sun::star::uno::Any& rVal, sal_uInt8) const +bool CntByteItem::QueryValue(css::uno::Any& rVal, sal_uInt8) const { sal_Int8 nValue = m_nValue; rVal <<= nValue; @@ -51,7 +51,7 @@ bool CntByteItem::QueryValue(com::sun::star::uno::Any& rVal, sal_uInt8) const } // virtual -bool CntByteItem::PutValue(const com::sun::star::uno::Any& rVal, sal_uInt8) +bool CntByteItem::PutValue(const css::uno::Any& rVal, sal_uInt8) { sal_Int8 nValue = sal_Int8(); if (rVal >>= nValue) @@ -116,7 +116,7 @@ bool CntUInt16Item::GetPresentation(SfxItemPresentation, } // virtual -bool CntUInt16Item::QueryValue(com::sun::star::uno::Any& rVal, sal_uInt8) const +bool CntUInt16Item::QueryValue(css::uno::Any& rVal, sal_uInt8) const { sal_Int32 nValue = m_nValue; rVal <<= nValue; @@ -124,7 +124,7 @@ bool CntUInt16Item::QueryValue(com::sun::star::uno::Any& rVal, sal_uInt8) const } // virtual -bool CntUInt16Item::PutValue(const com::sun::star::uno::Any& rVal, sal_uInt8) +bool CntUInt16Item::PutValue(const css::uno::Any& rVal, sal_uInt8) { sal_Int32 nValue = 0; if (rVal >>= nValue) @@ -186,7 +186,7 @@ bool CntInt32Item::GetPresentation(SfxItemPresentation, } // virtual -bool CntInt32Item::QueryValue(com::sun::star::uno::Any& rVal, sal_uInt8) const +bool CntInt32Item::QueryValue(css::uno::Any& rVal, sal_uInt8) const { sal_Int32 nValue = m_nValue; rVal <<= nValue; @@ -194,7 +194,7 @@ bool CntInt32Item::QueryValue(com::sun::star::uno::Any& rVal, sal_uInt8) const } // virtual -bool CntInt32Item::PutValue(const com::sun::star::uno::Any& rVal, sal_uInt8) +bool CntInt32Item::PutValue(const css::uno::Any& rVal, sal_uInt8) { sal_Int32 nValue = 0; if (rVal >>= nValue) @@ -257,7 +257,7 @@ bool CntUInt32Item::GetPresentation(SfxItemPresentation, } // virtual -bool CntUInt32Item::QueryValue(com::sun::star::uno::Any& rVal, sal_uInt8) const +bool CntUInt32Item::QueryValue(css::uno::Any& rVal, sal_uInt8) const { sal_Int32 nValue = m_nValue; DBG_ASSERT( nValue>=0, "Overflow in UInt32 value!"); @@ -266,7 +266,7 @@ bool CntUInt32Item::QueryValue(com::sun::star::uno::Any& rVal, sal_uInt8) const } // virtual -bool CntUInt32Item::PutValue(const com::sun::star::uno::Any& rVal, sal_uInt8) +bool CntUInt32Item::PutValue(const css::uno::Any& rVal, sal_uInt8) { sal_Int32 nValue = 0; if (rVal >>= nValue) diff --git a/svl/source/items/cntwall.cxx b/svl/source/items/cntwall.cxx index fcd7419b7f2b..7728f6b56d8a 100644 --- a/svl/source/items/cntwall.cxx +++ b/svl/source/items/cntwall.cxx @@ -135,14 +135,14 @@ SfxPoolItem* CntWallpaperItem::Clone( SfxItemPool* ) const } // virtual -bool CntWallpaperItem::QueryValue( com::sun::star::uno::Any&, sal_uInt8) const +bool CntWallpaperItem::QueryValue( css::uno::Any&, sal_uInt8) const { OSL_FAIL("Not implemented!"); return false; } // virtual -bool CntWallpaperItem::PutValue( const com::sun::star::uno::Any&, sal_uInt8) +bool CntWallpaperItem::PutValue( const css::uno::Any&, sal_uInt8) { OSL_FAIL("Not implemented!"); return false; diff --git a/svl/source/items/ctypeitm.cxx b/svl/source/items/ctypeitm.cxx index 36eaa98faa02..3f87e5468df7 100644 --- a/svl/source/items/ctypeitm.cxx +++ b/svl/source/items/ctypeitm.cxx @@ -172,14 +172,14 @@ void CntContentTypeItem::SetValue( const INetContentType eType ) } // virtual -bool CntContentTypeItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8) const +bool CntContentTypeItem::QueryValue( css::uno::Any& rVal, sal_uInt8) const { rVal <<= OUString(GetValue()); return true; } // virtual -bool CntContentTypeItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8) +bool CntContentTypeItem::PutValue( const css::uno::Any& rVal, sal_uInt8) { OUString aValue; if ( rVal >>= aValue ) diff --git a/svl/source/items/custritm.cxx b/svl/source/items/custritm.cxx index 3b97df923d64..8109d4877689 100644 --- a/svl/source/items/custritm.cxx +++ b/svl/source/items/custritm.cxx @@ -46,7 +46,7 @@ bool CntUnencodedStringItem::GetPresentation(SfxItemPresentation, SfxMapUnit, } // virtual -bool CntUnencodedStringItem::QueryValue(com::sun::star::uno::Any& rVal, sal_uInt8) +bool CntUnencodedStringItem::QueryValue(css::uno::Any& rVal, sal_uInt8) const { rVal <<= OUString(m_aValue); @@ -54,7 +54,7 @@ bool CntUnencodedStringItem::QueryValue(com::sun::star::uno::Any& rVal, sal_uInt } // virtual -bool CntUnencodedStringItem::PutValue(const com::sun::star::uno::Any& rVal, +bool CntUnencodedStringItem::PutValue(const css::uno::Any& rVal, sal_uInt8) { OUString aTheValue; diff --git a/svl/source/items/globalnameitem.cxx b/svl/source/items/globalnameitem.cxx index 1c02c1d4933b..67aec474d1e4 100644 --- a/svl/source/items/globalnameitem.cxx +++ b/svl/source/items/globalnameitem.cxx @@ -68,15 +68,15 @@ SfxPoolItem* SfxGlobalNameItem::Clone(SfxItemPool *) const } // virtual -bool SfxGlobalNameItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 ) +bool SfxGlobalNameItem::PutValue( const css::uno::Any& rVal, sal_uInt8 ) { - com::sun::star::uno::Reference < com::sun::star::script::XTypeConverter > xConverter - ( com::sun::star::script::Converter::create( ::comphelper::getProcessComponentContext() )); - com::sun::star::uno::Sequence< sal_Int8 > aSeq; - com::sun::star::uno::Any aNew; + css::uno::Reference < css::script::XTypeConverter > xConverter + ( css::script::Converter::create( ::comphelper::getProcessComponentContext() )); + css::uno::Sequence< sal_Int8 > aSeq; + css::uno::Any aNew; - try { aNew = xConverter->convertTo( rVal, cppu::UnoType<com::sun::star::uno::Sequence < sal_Int8 >>::get() ); } - catch (com::sun::star::uno::Exception&) {} + try { aNew = xConverter->convertTo( rVal, cppu::UnoType<css::uno::Sequence < sal_Int8 >>::get() ); } + catch (css::uno::Exception&) {} aNew >>= aSeq; if ( aSeq.getLength() == 16 ) { @@ -89,9 +89,9 @@ bool SfxGlobalNameItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt } // virtual -bool SfxGlobalNameItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 ) const +bool SfxGlobalNameItem::QueryValue( css::uno::Any& rVal, sal_uInt8 ) const { - com::sun::star::uno::Sequence< sal_Int8 > aSeq( 16 ); + css::uno::Sequence< sal_Int8 > aSeq( 16 ); void const * pData = &m_aName.GetCLSID(); memcpy( aSeq.getArray(), pData, 16 ); rVal <<= aSeq; diff --git a/svl/source/items/ilstitem.cxx b/svl/source/items/ilstitem.cxx index 36680c4ccff2..fe36cb62337a 100644 --- a/svl/source/items/ilstitem.cxx +++ b/svl/source/items/ilstitem.cxx @@ -38,7 +38,7 @@ SfxIntegerListItem::SfxIntegerListItem( sal_uInt16 which, const ::std::vector < m_aList[n] = rList[n]; } -SfxIntegerListItem::SfxIntegerListItem( sal_uInt16 which, const ::com::sun::star::uno::Sequence < sal_Int32 >& rList ) +SfxIntegerListItem::SfxIntegerListItem( sal_uInt16 which, const css::uno::Sequence < sal_Int32 >& rList ) : SfxPoolItem( which ) { m_aList.realloc( rList.getLength() ); @@ -70,13 +70,13 @@ SfxPoolItem* SfxIntegerListItem::Clone( SfxItemPool * ) const return new SfxIntegerListItem( *this ); } -bool SfxIntegerListItem::PutValue ( const com::sun::star::uno::Any& rVal, sal_uInt8 ) +bool SfxIntegerListItem::PutValue ( const css::uno::Any& rVal, sal_uInt8 ) { - ::com::sun::star::uno::Reference < ::com::sun::star::script::XTypeConverter > xConverter - ( ::com::sun::star::script::Converter::create(::comphelper::getProcessComponentContext()) ); - ::com::sun::star::uno::Any aNew; + css::uno::Reference < css::script::XTypeConverter > xConverter + ( css::script::Converter::create(::comphelper::getProcessComponentContext()) ); + css::uno::Any aNew; try { aNew = xConverter->convertTo( rVal, cppu::UnoType<css::uno::Sequence < sal_Int32 >>::get() ); } - catch (::com::sun::star::uno::Exception&) + catch (css::uno::Exception&) { return true; } @@ -84,7 +84,7 @@ bool SfxIntegerListItem::PutValue ( const com::sun::star::uno::Any& rVal, sal_u return ( aNew >>= m_aList ); } -bool SfxIntegerListItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 ) const +bool SfxIntegerListItem::QueryValue( css::uno::Any& rVal, sal_uInt8 ) const { rVal <<= m_aList; return true; diff --git a/svl/source/items/imageitm.cxx b/svl/source/items/imageitm.cxx index f81e7bb47869..4c56f41f1fca 100644 --- a/svl/source/items/imageitm.cxx +++ b/svl/source/items/imageitm.cxx @@ -65,21 +65,21 @@ bool SfxImageItem::operator==( const SfxPoolItem& rItem ) const (*pImp == *static_cast<const SfxImageItem&>(rItem).pImp); } -bool SfxImageItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 ) const +bool SfxImageItem::QueryValue( css::uno::Any& rVal, sal_uInt8 ) const { - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > aSeq( 4 ); - aSeq[0] = ::com::sun::star::uno::makeAny( GetValue() ); - aSeq[1] = ::com::sun::star::uno::makeAny( pImp->nAngle ); - aSeq[2] = ::com::sun::star::uno::makeAny( pImp->bMirrored ); - aSeq[3] = ::com::sun::star::uno::makeAny( OUString( pImp->aURL )); + css::uno::Sequence< css::uno::Any > aSeq( 4 ); + aSeq[0] = css::uno::makeAny( GetValue() ); + aSeq[1] = css::uno::makeAny( pImp->nAngle ); + aSeq[2] = css::uno::makeAny( pImp->bMirrored ); + aSeq[3] = css::uno::makeAny( OUString( pImp->aURL )); - rVal = ::com::sun::star::uno::makeAny( aSeq ); + rVal = css::uno::makeAny( aSeq ); return true; } -bool SfxImageItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 ) +bool SfxImageItem::PutValue( const css::uno::Any& rVal, sal_uInt8 ) { - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > aSeq; + css::uno::Sequence< css::uno::Any > aSeq; if (( rVal >>= aSeq ) && ( aSeq.getLength() == 4 )) { sal_Int16 nVal = sal_Int16(); diff --git a/svl/source/items/int64item.cxx b/svl/source/items/int64item.cxx index 7875690b2c2f..ed5f7889b4c9 100644 --- a/svl/source/items/int64item.cxx +++ b/svl/source/items/int64item.cxx @@ -42,14 +42,14 @@ bool SfxInt64Item::GetPresentation( } bool SfxInt64Item::QueryValue( - com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const + css::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const { rVal <<= mnValue; return true; } bool SfxInt64Item::PutValue( - const com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) + const css::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) { sal_Int64 nVal; diff --git a/svl/source/items/intitem.cxx b/svl/source/items/intitem.cxx index 735648e787dd..05eb03912451 100644 --- a/svl/source/items/intitem.cxx +++ b/svl/source/items/intitem.cxx @@ -70,7 +70,7 @@ bool SfxInt16Item::GetPresentation(SfxItemPresentation, // virtual -bool SfxInt16Item::QueryValue(com::sun::star::uno::Any& rVal, sal_uInt8) const +bool SfxInt16Item::QueryValue(css::uno::Any& rVal, sal_uInt8) const { sal_Int16 nValue = m_nValue; rVal <<= nValue; @@ -78,7 +78,7 @@ bool SfxInt16Item::QueryValue(com::sun::star::uno::Any& rVal, sal_uInt8) const } // virtual -bool SfxInt16Item::PutValue(const com::sun::star::uno::Any& rVal, sal_uInt8 ) +bool SfxInt16Item::PutValue(const css::uno::Any& rVal, sal_uInt8 ) { sal_Int16 nValue = sal_Int16(); if (rVal >>= nValue) diff --git a/svl/source/items/lckbitem.cxx b/svl/source/items/lckbitem.cxx index faeeae6745eb..c9418d4ec0fc 100644 --- a/svl/source/items/lckbitem.cxx +++ b/svl/source/items/lckbitem.cxx @@ -114,9 +114,9 @@ SvStream& SfxLockBytesItem::Store(SvStream &rStream, sal_uInt16 ) const } // virtual -bool SfxLockBytesItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 ) +bool SfxLockBytesItem::PutValue( const css::uno::Any& rVal, sal_uInt8 ) { - com::sun::star::uno::Sequence< sal_Int8 > aSeq; + css::uno::Sequence< sal_Int8 > aSeq; if ( rVal >>= aSeq ) { if ( aSeq.getLength() ) @@ -138,7 +138,7 @@ bool SfxLockBytesItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 } // virtual -bool SfxLockBytesItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 ) const +bool SfxLockBytesItem::QueryValue( css::uno::Any& rVal, sal_uInt8 ) const { if ( _xVal.Is() ) { @@ -151,14 +151,14 @@ bool SfxLockBytesItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 ) c return false; sal_uLong nRead = 0; - com::sun::star::uno::Sequence< sal_Int8 > aSeq( nLen ); + css::uno::Sequence< sal_Int8 > aSeq( nLen ); _xVal->ReadAt( 0, aSeq.getArray(), nLen, &nRead ); rVal <<= aSeq; } else { - com::sun::star::uno::Sequence< sal_Int8 > aSeq( 0 ); + css::uno::Sequence< sal_Int8 > aSeq( 0 ); rVal <<= aSeq; } diff --git a/svl/source/items/poolitem.cxx b/svl/source/items/poolitem.cxx index 3212f0de5a8c..7df7535d65cb 100644 --- a/svl/source/items/poolitem.cxx +++ b/svl/source/items/poolitem.cxx @@ -251,7 +251,7 @@ bool SfxPoolItem::HasMetrics() const -bool SfxPoolItem::QueryValue( com::sun::star::uno::Any&, sal_uInt8 ) const +bool SfxPoolItem::QueryValue( css::uno::Any&, sal_uInt8 ) const { OSL_FAIL("There is no implementation for QueryValue for this item!"); return false; @@ -259,7 +259,7 @@ bool SfxPoolItem::QueryValue( com::sun::star::uno::Any&, sal_uInt8 ) const -bool SfxPoolItem::PutValue( const com::sun::star::uno::Any&, sal_uInt8 ) +bool SfxPoolItem::PutValue( const css::uno::Any&, sal_uInt8 ) { OSL_FAIL("There is no implementation for PutValue for this item!"); return false; diff --git a/svl/source/items/rectitem.cxx b/svl/source/items/rectitem.cxx index 48ab896aba6a..ffc1d8ad4800 100644 --- a/svl/source/items/rectitem.cxx +++ b/svl/source/items/rectitem.cxx @@ -103,7 +103,7 @@ SvStream& SfxRectangleItem::Store(SvStream &rStream, sal_uInt16 ) const -bool SfxRectangleItem::QueryValue( com::sun::star::uno::Any& rVal, +bool SfxRectangleItem::QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId) const { nMemberId &= ~CONVERT_TWIPS; @@ -111,7 +111,7 @@ bool SfxRectangleItem::QueryValue( com::sun::star::uno::Any& rVal, { case 0: { - rVal <<= com::sun::star::awt::Rectangle( aVal.getX(), + rVal <<= css::awt::Rectangle( aVal.getX(), aVal.getY(), aVal.getWidth(), aVal.getHeight() ); @@ -128,12 +128,12 @@ bool SfxRectangleItem::QueryValue( com::sun::star::uno::Any& rVal, } -bool SfxRectangleItem::PutValue( const com::sun::star::uno::Any& rVal, +bool SfxRectangleItem::PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) { bool bRet = false; nMemberId &= ~CONVERT_TWIPS; - com::sun::star::awt::Rectangle aValue; + css::awt::Rectangle aValue; sal_Int32 nVal = 0; if ( !nMemberId ) bRet = (rVal >>= aValue); diff --git a/svl/source/items/slstitm.cxx b/svl/source/items/slstitm.cxx index 5221e46a94a3..9bf84eab905c 100644 --- a/svl/source/items/slstitm.cxx +++ b/svl/source/items/slstitm.cxx @@ -243,7 +243,7 @@ OUString SfxStringListItem::GetString() } -void SfxStringListItem::SetStringList( const com::sun::star::uno::Sequence< OUString >& rList ) +void SfxStringListItem::SetStringList( const css::uno::Sequence< OUString >& rList ) { DBG_ASSERT(GetRefCount()==0,"SetString:RefCount!=0"); @@ -258,7 +258,7 @@ void SfxStringListItem::SetStringList( const com::sun::star::uno::Sequence< OUSt pImp->aList.push_back(rList[n]); } -void SfxStringListItem::GetStringList( com::sun::star::uno::Sequence< OUString >& rList ) const +void SfxStringListItem::GetStringList( css::uno::Sequence< OUString >& rList ) const { long nCount = pImp->aList.size(); @@ -268,9 +268,9 @@ void SfxStringListItem::GetStringList( com::sun::star::uno::Sequence< OUString > } // virtual -bool SfxStringListItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 ) +bool SfxStringListItem::PutValue( const css::uno::Any& rVal, sal_uInt8 ) { - com::sun::star::uno::Sequence< OUString > aValue; + css::uno::Sequence< OUString > aValue; if ( rVal >>= aValue ) { SetStringList( aValue ); @@ -282,14 +282,14 @@ bool SfxStringListItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt } // virtual -bool SfxStringListItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 ) const +bool SfxStringListItem::QueryValue( css::uno::Any& rVal, sal_uInt8 ) const { // GetString() is not const!!! SfxStringListItem* pThis = const_cast< SfxStringListItem * >( this ); - com::sun::star::uno::Sequence< OUString > aStringList; + css::uno::Sequence< OUString > aStringList; pThis->GetStringList( aStringList ); - rVal = ::com::sun::star::uno::makeAny( aStringList ); + rVal = css::uno::makeAny( aStringList ); return true; } diff --git a/svl/source/items/srchitem.cxx b/svl/source/items/srchitem.cxx index 6d98b8c5cc3f..1756a43b369b 100644 --- a/svl/source/items/srchitem.cxx +++ b/svl/source/items/srchitem.cxx @@ -371,7 +371,7 @@ void SvxSearchItem::SetTransliterationFlags( sal_Int32 nFlags ) m_aSearchOpt.transliterateFlags = nFlags; } -bool SvxSearchItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const +bool SvxSearchItem::QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId ) const { nMemberId &= ~CONVERT_TWIPS; switch ( nMemberId ) @@ -467,7 +467,7 @@ bool SvxSearchItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMembe -bool SvxSearchItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) +bool SvxSearchItem::PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) { nMemberId &= ~CONVERT_TWIPS; bool bRet = false; @@ -614,7 +614,7 @@ bool SvxSearchItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nM { if ( nInt == LANGUAGE_NONE ) { - m_aSearchOpt.Locale = ::com::sun::star::lang::Locale(); + m_aSearchOpt.Locale = css::lang::Locale(); } else { diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx index 043575e18b37..23605a869399 100644 --- a/svl/source/items/style.cxx +++ b/svl/source/items/style.cxx @@ -771,12 +771,12 @@ void SfxStyleSheetBasePool::Remove( SfxStyleSheetBase* p ) // this works well under normal conditions (checked breaking and counting // on SfxStyleSheetBase constructors and destructors) - // com::sun::star::uno::Reference< com::sun::star::lang::XComponent > xComp( static_cast< ::cppu::OWeakObject* >((*aIter).get()), com::sun::star::uno::UNO_QUERY ); + // css::uno::Reference< css::lang::XComponent > xComp( static_cast< ::cppu::OWeakObject* >((*aIter).get()), css::uno::UNO_QUERY ); // if( xComp.is() ) try // { // xComp->dispose(); // } - // catch( com::sun::star::uno::Exception& ) + // catch( css::uno::Exception& ) // { // } Broadcast( SfxStyleSheetHint( SfxStyleSheetHintId::ERASED, *p ) ); @@ -814,13 +814,12 @@ struct StyleSheetDisposerFunctor final : public svl::StyleSheetDisposer Dispose(rtl::Reference<SfxStyleSheetBase> styleSheet) override { cppu::OWeakObject* weakObject = static_cast< ::cppu::OWeakObject* >(styleSheet.get()); - com::sun::star::uno::Reference< com::sun::star::lang::XComponent > - xComp( weakObject, com::sun::star::uno::UNO_QUERY ); + css::uno::Reference< css::lang::XComponent > xComp( weakObject, css::uno::UNO_QUERY ); if( xComp.is() ) try { xComp->dispose(); } - catch( com::sun::star::uno::Exception& ) + catch( css::uno::Exception& ) { } mPool->Broadcast( SfxStyleSheetHint( SfxStyleSheetHintId::ERASED, *styleSheet.get() ) ); @@ -938,16 +937,16 @@ SfxStyleSheetBase* SfxStyleSheetPool::Create( const OUString& rName, } SfxUnoStyleSheet::SfxUnoStyleSheet( const OUString& _rName, const SfxStyleSheetBasePool& _rPool, SfxStyleFamily _eFamily, sal_uInt16 _nMaske ) -: ::cppu::ImplInheritanceHelper2< SfxStyleSheet, ::com::sun::star::style::XStyle, ::com::sun::star::lang::XUnoTunnel >( _rName, _rPool, _eFamily, _nMaske ) +: ::cppu::ImplInheritanceHelper2< SfxStyleSheet, css::style::XStyle, css::lang::XUnoTunnel >( _rName, _rPool, _eFamily, _nMaske ) { } -SfxUnoStyleSheet* SfxUnoStyleSheet::getUnoStyleSheet( const ::com::sun::star::uno::Reference< ::com::sun::star::style::XStyle >& xStyle ) +SfxUnoStyleSheet* SfxUnoStyleSheet::getUnoStyleSheet( const css::uno::Reference< css::style::XStyle >& xStyle ) { SfxUnoStyleSheet* pRet = dynamic_cast< SfxUnoStyleSheet* >( xStyle.get() ); if( !pRet ) { - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XUnoTunnel > xUT( xStyle, ::com::sun::star::uno::UNO_QUERY ); + css::uno::Reference< css::lang::XUnoTunnel > xUT( xStyle, css::uno::UNO_QUERY ); if( xUT.is() ) pRet = reinterpret_cast<SfxUnoStyleSheet*>(sal::static_int_cast<sal_uIntPtr>(xUT->getSomething( SfxUnoStyleSheet::getIdentifier()))); } @@ -957,7 +956,7 @@ SfxUnoStyleSheet* SfxUnoStyleSheet::getUnoStyleSheet( const ::com::sun::star::un /** * XUnoTunnel */ -::sal_Int64 SAL_CALL SfxUnoStyleSheet::getSomething( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& rId ) throw (::com::sun::star::uno::RuntimeException, std::exception) +::sal_Int64 SAL_CALL SfxUnoStyleSheet::getSomething( const css::uno::Sequence< ::sal_Int8 >& rId ) throw (css::uno::RuntimeException, std::exception) { if( rId.getLength() == 16 && 0 == memcmp( getIdentifier().getConstArray(), rId.getConstArray(), 16 ) ) { @@ -980,7 +979,7 @@ namespace class theSfxUnoStyleSheetIdentifier : public rtl::Static< UnoTunnelIdInit, theSfxUnoStyleSheetIdentifier > {}; } -const ::com::sun::star::uno::Sequence< ::sal_Int8 >& SfxUnoStyleSheet::getIdentifier() +const css::uno::Sequence< ::sal_Int8 >& SfxUnoStyleSheet::getIdentifier() { return theSfxUnoStyleSheetIdentifier::get().getSeq(); } diff --git a/svl/source/items/szitem.cxx b/svl/source/items/szitem.cxx index 46cff2d7a2ad..90a7074eeb64 100644 --- a/svl/source/items/szitem.cxx +++ b/svl/source/items/szitem.cxx @@ -99,7 +99,7 @@ SvStream& SfxSizeItem::Store(SvStream &rStream, sal_uInt16 ) const } -bool SfxSizeItem::QueryValue( com::sun::star::uno::Any& rVal, +bool SfxSizeItem::QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId ) const { bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); @@ -116,7 +116,7 @@ bool SfxSizeItem::QueryValue( com::sun::star::uno::Any& rVal, { case 0: { - rVal <<= com::sun::star::awt::Size( aTmp.getWidth(), aTmp.getHeight() ); + rVal <<= css::awt::Size( aTmp.getWidth(), aTmp.getHeight() ); break; } case MID_WIDTH: @@ -130,14 +130,14 @@ bool SfxSizeItem::QueryValue( com::sun::star::uno::Any& rVal, } -bool SfxSizeItem::PutValue( const com::sun::star::uno::Any& rVal, +bool SfxSizeItem::PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) { bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; bool bRet = false; - com::sun::star::awt::Size aValue; + css::awt::Size aValue; if ( !nMemberId ) bRet = ( rVal >>= aValue ); else diff --git a/svl/source/items/visitem.cxx b/svl/source/items/visitem.cxx index a73f5b00ed69..d73e54deeb0c 100644 --- a/svl/source/items/visitem.cxx +++ b/svl/source/items/visitem.cxx @@ -52,14 +52,14 @@ bool SfxVisibilityItem::GetPresentation(SfxItemPresentation, // virtual -bool SfxVisibilityItem::QueryValue(com::sun::star::uno::Any& rVal, sal_uInt8) const +bool SfxVisibilityItem::QueryValue(css::uno::Any& rVal, sal_uInt8) const { rVal <<= m_nValue; return true; } // virtual -bool SfxVisibilityItem::PutValue(const com::sun::star::uno::Any& rVal, sal_uInt8) +bool SfxVisibilityItem::PutValue(const css::uno::Any& rVal, sal_uInt8) { if (rVal >>= m_nValue) return true; diff --git a/svl/source/misc/documentlockfile.cxx b/svl/source/misc/documentlockfile.cxx index ba55fcb61272..9441c2924b95 100644 --- a/svl/source/misc/documentlockfile.cxx +++ b/svl/source/misc/documentlockfile.cxx @@ -107,7 +107,7 @@ bool DocumentLockFile::CreateOwnLockFile() xSeekable->seek( 0 ); - uno::Reference < ::com::sun::star::ucb::XCommandEnvironment > xEnv; + uno::Reference < css::ucb::XCommandEnvironment > xEnv; ::ucbhelper::Content aTargetContent( m_aURL, xEnv, comphelper::getProcessComponentContext() ); ucb::InsertCommandArgument aInsertArg; @@ -159,7 +159,7 @@ uno::Reference< io::XInputStream > DocumentLockFile::OpenStream() { ::osl::MutexGuard aGuard( m_aMutex ); - uno::Reference < ::com::sun::star::ucb::XCommandEnvironment > xEnv; + uno::Reference < css::ucb::XCommandEnvironment > xEnv; ::ucbhelper::Content aSourceContent( m_aURL, xEnv, comphelper::getProcessComponentContext() ); // the file can be opened readonly, no locking will be done @@ -172,7 +172,7 @@ bool DocumentLockFile::OverwriteOwnLockFile() // allows to overwrite the lock file with the current data try { - uno::Reference < ::com::sun::star::ucb::XCommandEnvironment > xEnv; + uno::Reference < css::ucb::XCommandEnvironment > xEnv; ::ucbhelper::Content aTargetContent( m_aURL, xEnv, comphelper::getProcessComponentContext() ); LockFileEntry aNewEntry = GenerateOwnEntry(); @@ -207,7 +207,7 @@ void DocumentLockFile::RemoveFile() || !aFileData[LockFileComponent::USERURL].equals( aNewEntry[LockFileComponent::USERURL] ) ) throw io::IOException(); // not the owner, access denied - uno::Reference < ::com::sun::star::ucb::XCommandEnvironment > xEnv; + uno::Reference < css::ucb::XCommandEnvironment > xEnv; ::ucbhelper::Content aCnt(m_aURL, xEnv, comphelper::getProcessComponentContext()); aCnt.executeCommand(OUString("delete"), uno::makeAny(true)); diff --git a/svl/source/misc/ownlist.cxx b/svl/source/misc/ownlist.cxx index d2b87c9b8ad6..b174c67650c5 100644 --- a/svl/source/misc/ownlist.cxx +++ b/svl/source/misc/ownlist.cxx @@ -115,7 +115,7 @@ SvCommand & SvCommandList::Append return aCommandList.back(); } -bool SvCommandList::FillFromSequence( const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >& aCommandSequence ) +bool SvCommandList::FillFromSequence( const css::uno::Sequence < css::beans::PropertyValue >& aCommandSequence ) { const sal_Int32 nCount = aCommandSequence.getLength(); OUString aCommand, aArg; @@ -132,7 +132,7 @@ bool SvCommandList::FillFromSequence( const com::sun::star::uno::Sequence < com: return true; } -void SvCommandList::FillSequence( com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >& aCommandSequence ) +void SvCommandList::FillSequence( css::uno::Sequence < css::beans::PropertyValue >& aCommandSequence ) { const sal_Int32 nCount = aCommandList.size(); aCommandSequence.realloc( nCount ); diff --git a/svl/source/misc/strmadpt.cxx b/svl/source/misc/strmadpt.cxx index 367ea56db03f..399a4cc03efd 100644 --- a/svl/source/misc/strmadpt.cxx +++ b/svl/source/misc/strmadpt.cxx @@ -412,10 +412,7 @@ void SvInputStream::SetSize(sal_uInt64) SetError(ERRCODE_IO_NOTSUPPORTED); } -SvInputStream::SvInputStream( - com::sun::star::uno::Reference< com::sun::star::io::XInputStream > - const & - rTheStream): +SvInputStream::SvInputStream( css::uno::Reference< css::io::XInputStream > const & rTheStream): m_xStream(rTheStream), m_pPipe(0), m_nSeekedFrom(STREAM_SEEK_TO_END) diff --git a/svl/source/misc/urihelper.cxx b/svl/source/misc/urihelper.cxx index 3199e420a3de..ab47bb6de3b6 100644 --- a/svl/source/misc/urihelper.cxx +++ b/svl/source/misc/urihelper.cxx @@ -264,7 +264,7 @@ URIHelper::normalizedMakeRelative( OUString URIHelper::simpleNormalizedMakeRelative( OUString const & baseUriReference, OUString const & uriReference) { - com::sun::star::uno::Reference< com::sun::star::uri::XUriReference > rel( + css::uno::Reference< css::uri::XUriReference > rel( URIHelper::normalizedMakeRelative( comphelper::getProcessComponentContext(), baseUriReference, uriReference)); diff --git a/svl/source/numbers/numfmuno.cxx b/svl/source/numbers/numfmuno.cxx index e74572275ed6..89b54db038b1 100644 --- a/svl/source/numbers/numfmuno.cxx +++ b/svl/source/numbers/numfmuno.cxx @@ -1090,9 +1090,9 @@ uno::Sequence<OUString> SAL_CALL SvNumberFormatSettingsObj::getSupportedServiceN } -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_uno_util_numbers_SvNumberFormatterServiceObject_get_implementation(::com::sun::star::uno::XComponentContext*, - ::com::sun::star::uno::Sequence<css::uno::Any> const &) +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +com_sun_star_uno_util_numbers_SvNumberFormatterServiceObject_get_implementation(css::uno::XComponentContext*, + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new SvNumberFormatterServiceObj()); } diff --git a/svl/source/numbers/numfmuno.hxx b/svl/source/numbers/numfmuno.hxx index d4664124c864..c618c7efee6e 100644 --- a/svl/source/numbers/numfmuno.hxx +++ b/svl/source/numbers/numfmuno.hxx @@ -38,8 +38,8 @@ class SvNumberFormatsSupplierObj; * SvNumberFormatterServiceObj is registered globally as a Service */ class SvNumberFormatterServiceObj : public cppu::WeakImplHelper< - com::sun::star::util::XNumberFormatter2, - com::sun::star::lang::XServiceInfo> + css::util::XNumberFormatter2, + css::lang::XServiceInfo> { private: ::rtl::Reference< SvNumberFormatsSupplierObj > xSupplier; @@ -51,59 +51,58 @@ public: // XNumberFormatter virtual void SAL_CALL attachNumberFormatsSupplier( - const ::com::sun::star::uno::Reference< - ::com::sun::star::util::XNumberFormatsSupplier >& xSupplier ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > + const css::uno::Reference< css::util::XNumberFormatsSupplier >& xSupplier ) + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XNumberFormatsSupplier > SAL_CALL getNumberFormatsSupplier() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL detectNumberFormat( sal_Int32 nKey, const OUString& aString ) - throw(::com::sun::star::util::NotNumericException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::util::NotNumericException, + css::uno::RuntimeException, std::exception) override; virtual double SAL_CALL convertStringToNumber( sal_Int32 nKey, const OUString& aString ) - throw(::com::sun::star::util::NotNumericException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::util::NotNumericException, + css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL convertNumberToString( sal_Int32 nKey, double fValue ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::util::Color SAL_CALL queryColorForNumber( sal_Int32 nKey, - double fValue, ::com::sun::star::util::Color aDefaultColor ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::util::Color SAL_CALL queryColorForNumber( sal_Int32 nKey, + double fValue, css::util::Color aDefaultColor ) + throw(css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL formatString( sal_Int32 nKey, const OUString& aString ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::util::Color SAL_CALL queryColorForString( sal_Int32 nKey, + throw(css::uno::RuntimeException, std::exception) override; + virtual css::util::Color SAL_CALL queryColorForString( sal_Int32 nKey, const OUString& aString, - ::com::sun::star::util::Color aDefaultColor ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + css::util::Color aDefaultColor ) + throw(css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getInputString( sal_Int32 nKey, double fValue ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // XNumberFormatPreviewer virtual OUString SAL_CALL convertNumberToPreviewString( const OUString& aFormat, double fValue, - const ::com::sun::star::lang::Locale& nLocale, sal_Bool bAllowEnglish ) - throw(::com::sun::star::util::MalformedNumberFormatException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::util::Color SAL_CALL queryPreviewColorForNumber( + const css::lang::Locale& nLocale, sal_Bool bAllowEnglish ) + throw(css::util::MalformedNumberFormatException, + css::uno::RuntimeException, std::exception) override; + virtual css::util::Color SAL_CALL queryPreviewColorForNumber( const OUString& aFormat, double fValue, - const ::com::sun::star::lang::Locale& nLocale, sal_Bool bAllowEnglish, - ::com::sun::star::util::Color aDefaultColor ) - throw(::com::sun::star::util::MalformedNumberFormatException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::lang::Locale& nLocale, sal_Bool bAllowEnglish, + css::util::Color aDefaultColor ) + throw(css::util::MalformedNumberFormatException, + css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; }; class SvNumberFormatsObj : public cppu::WeakImplHelper< - com::sun::star::util::XNumberFormats, - com::sun::star::util::XNumberFormatTypes, - com::sun::star::lang::XServiceInfo> + css::util::XNumberFormats, + css::util::XNumberFormatTypes, + css::lang::XServiceInfo> { private: SvNumberFormatsSupplierObj& rSupplier; @@ -115,51 +114,51 @@ public: // XNumberFormats - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL - getByKey( sal_Int32 nKey ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL queryKeys( sal_Int16 nType, - const ::com::sun::star::lang::Locale& nLocale, sal_Bool bCreate ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL + getByKey( sal_Int32 nKey ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int32 > SAL_CALL queryKeys( sal_Int16 nType, + const css::lang::Locale& nLocale, sal_Bool bCreate ) + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL queryKey( const OUString& aFormat, - const ::com::sun::star::lang::Locale& nLocale, sal_Bool bScan ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + const css::lang::Locale& nLocale, sal_Bool bScan ) + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL addNew( const OUString& aFormat, - const ::com::sun::star::lang::Locale& nLocale ) - throw(::com::sun::star::util::MalformedNumberFormatException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::lang::Locale& nLocale ) + throw(css::util::MalformedNumberFormatException, + css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL addNewConverted( const OUString& aFormat, - const ::com::sun::star::lang::Locale& nLocale, - const ::com::sun::star::lang::Locale& nNewLocale ) - throw(::com::sun::star::util::MalformedNumberFormatException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeByKey( sal_Int32 nKey ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + const css::lang::Locale& nLocale, + const css::lang::Locale& nNewLocale ) + throw(css::util::MalformedNumberFormatException, + css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeByKey( sal_Int32 nKey ) throw(css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL generateFormat( sal_Int32 nBaseKey, - const ::com::sun::star::lang::Locale& nLocale, sal_Bool bThousands, + const css::lang::Locale& nLocale, sal_Bool bThousands, sal_Bool bRed, sal_Int16 nDecimals, sal_Int16 nLeading ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // XNumberFormatTypes - virtual sal_Int32 SAL_CALL getStandardIndex( const ::com::sun::star::lang::Locale& nLocale ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getStandardIndex( const css::lang::Locale& nLocale ) + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getStandardFormat( sal_Int16 nType, - const ::com::sun::star::lang::Locale& nLocale ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + const css::lang::Locale& nLocale ) + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getFormatIndex( sal_Int16 nIndex, - const ::com::sun::star::lang::Locale& nLocale ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + const css::lang::Locale& nLocale ) + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isTypeCompatible( sal_Int16 nOldType, sal_Int16 nNewType ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getFormatForLocale( sal_Int32 nKey, - const ::com::sun::star::lang::Locale& nLocale ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + const css::lang::Locale& nLocale ) + throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; private: SvNumberFormatsObj(); // never implemented @@ -167,9 +166,9 @@ private: class SvNumberFormatObj : public cppu::WeakImplHelper< - com::sun::star::beans::XPropertySet, - com::sun::star::beans::XPropertyAccess, - com::sun::star::lang::XServiceInfo> + css::beans::XPropertySet, + css::beans::XPropertyAccess, + css::lang::XServiceInfo> { private: SvNumberFormatsSupplierObj& rSupplier; @@ -181,70 +180,70 @@ public: virtual ~SvNumberFormatObj(); // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, - const ::com::sun::star::uno::Any& aValue ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( + const css::uno::Any& aValue ) + throw(css::beans::UnknownPropertyException, + css::beans::PropertyVetoException, + css::lang::IllegalArgumentException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& xListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< + css::beans::XPropertyChangeListener >& xListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< + css::beans::XPropertyChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< + css::beans::XVetoableChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< + css::beans::XVetoableChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XPropertyAccess - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL - getPropertyValues() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue >& aProps ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL + getPropertyValues() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< + css::beans::PropertyValue >& aProps ) + throw(css::beans::UnknownPropertyException, + css::beans::PropertyVetoException, + css::lang::IllegalArgumentException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; }; class SvNumberFormatSettingsObj : public cppu::WeakImplHelper< - com::sun::star::beans::XPropertySet, - com::sun::star::lang::XServiceInfo> + css::beans::XPropertySet, + css::lang::XServiceInfo> { private: SvNumberFormatsSupplierObj& rSupplier; @@ -256,53 +255,53 @@ public: // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, - const ::com::sun::star::uno::Any& aValue ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( + const css::uno::Any& aValue ) + throw(css::beans::UnknownPropertyException, + css::beans::PropertyVetoException, + css::lang::IllegalArgumentException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& xListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< + css::beans::XPropertyChangeListener >& xListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< + css::beans::XPropertyChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< + css::beans::XVetoableChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< + css::beans::XVetoableChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; }; diff --git a/svl/source/numbers/supservs.cxx b/svl/source/numbers/supservs.cxx index 6fed0a08ef08..d3d07e71756e 100644 --- a/svl/source/numbers/supservs.cxx +++ b/svl/source/numbers/supservs.cxx @@ -40,7 +40,7 @@ using namespace ::com::sun::star::util; using namespace ::utl; -SvNumberFormatsSupplierServiceObject::SvNumberFormatsSupplierServiceObject(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB) +SvNumberFormatsSupplierServiceObject::SvNumberFormatsSupplierServiceObject(const css::uno::Reference< css::uno::XComponentContext >& _rxORB) :m_pOwnFormatter(NULL) ,m_xORB(_rxORB) { @@ -166,9 +166,9 @@ void SvNumberFormatsSupplierServiceObject::implEnsureFormatter() } -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_uno_util_numbers_SvNumberFormatsSupplierServiceObject_get_implementation(::com::sun::star::uno::XComponentContext* context, - ::com::sun::star::uno::Sequence<css::uno::Any> const &) +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +com_sun_star_uno_util_numbers_SvNumberFormatsSupplierServiceObject_get_implementation(css::uno::XComponentContext* context, + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new SvNumberFormatsSupplierServiceObject(context)); } diff --git a/svl/source/numbers/supservs.hxx b/svl/source/numbers/supservs.hxx index ed3cf55da1b1..ff498a991ece 100644 --- a/svl/source/numbers/supservs.hxx +++ b/svl/source/numbers/supservs.hxx @@ -29,48 +29,47 @@ * SvNumberFormatsSupplierServiceObject - a number formats supplier which * - can be instantiated as an service * - works with it's own SvNumberFormatter instance - * - can be initialized (::com::sun::star::lang::XInitialization) - * with a specific language (i.e. ::com::sun::star::lang::Locale) + * - can be initialized (css::lang::XInitialization) + * with a specific language (i.e. css::lang::Locale) */ class SvNumberFormatsSupplierServiceObject :public SvNumberFormatsSupplierObj - ,public ::com::sun::star::lang::XInitialization - ,public ::com::sun::star::lang::XServiceInfo + ,public css::lang::XInitialization + ,public css::lang::XServiceInfo { protected: - SvNumberFormatter* m_pOwnFormatter; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > - m_xORB; + SvNumberFormatter* m_pOwnFormatter; + css::uno::Reference< css::uno::XComponentContext > m_xORB; public: - explicit SvNumberFormatsSupplierServiceObject(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB); + explicit SvNumberFormatsSupplierServiceObject(const css::uno::Reference< css::uno::XComponentContext >& _rxORB); virtual ~SvNumberFormatsSupplierServiceObject(); // XInterface virtual void SAL_CALL acquire() throw() override { SvNumberFormatsSupplierObj::acquire(); } virtual void SAL_CALL release() throw() override { SvNumberFormatsSupplierObj::release(); } - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& _rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& _rType ) throw(css::uno::RuntimeException, std::exception) override { return SvNumberFormatsSupplierObj::queryInterface(_rType); } // XAggregation - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) throw(css::uno::RuntimeException, std::exception) override; // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; // XNumberFormatsSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL - getNumberFormatSettings() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormats > SAL_CALL - getNumberFormats() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL + getNumberFormatSettings() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XNumberFormats > SAL_CALL + getNumberFormats() throw(css::uno::RuntimeException, std::exception) override; // XUnoTunnler - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw (css::uno::RuntimeException, std::exception) override; protected: void implEnsureFormatter(); diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx index 23fbb3da73f6..07d9dd10f9f8 100644 --- a/svl/source/numbers/zforfind.cxx +++ b/svl/source/numbers/zforfind.cxx @@ -3335,8 +3335,7 @@ void ImpSvNumberInputScan::InitText() delete [] pUpperMonthText; delete [] pUpperAbbrevMonthText; - ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::CalendarItem2 > xElems - = pCal->getMonths(); + css::uno::Sequence< css::i18n::CalendarItem2 > xElems = pCal->getMonths(); nElems = xElems.getLength(); pUpperMonthText = new OUString[nElems]; pUpperAbbrevMonthText = new OUString[nElems]; @@ -3418,7 +3417,7 @@ void ImpSvNumberInputScan::InvalidateDateAcceptancePatterns() { if (sDateAcceptancePatterns.getLength()) { - sDateAcceptancePatterns = ::com::sun::star::uno::Sequence< OUString >(); + sDateAcceptancePatterns = css::uno::Sequence< OUString >(); } } diff --git a/svl/source/numbers/zforfind.hxx b/svl/source/numbers/zforfind.hxx index cbadd292b1e9..9c7ae84d8736 100644 --- a/svl/source/numbers/zforfind.hxx +++ b/svl/source/numbers/zforfind.hxx @@ -169,7 +169,7 @@ private: @see IsAcceptedDatePattern() */ sal_Int32 nAcceptedDatePattern; - com::sun::star::uno::Sequence< OUString > sDateAcceptancePatterns; + css::uno::Sequence< OUString > sDateAcceptancePatterns; /** If input matched a date acceptance pattern that starts at input particle sStrArray[nDatePatternStart]. diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx index fe6f19f27faf..bbae9c00332a 100644 --- a/svl/source/numbers/zforlist.cxx +++ b/svl/source/numbers/zforlist.cxx @@ -298,7 +298,7 @@ void SvNumberFormatter::ImpConstruct( LanguageType eLang ) xLocaleData.init( m_xContext, maLanguageTag ); xCalendar.init( m_xContext, maLanguageTag.getLocale() ); xTransliteration.init( m_xContext, eLang, - ::com::sun::star::i18n::TransliterationModules_IGNORE_CASE ); + css::i18n::TransliterationModules_IGNORE_CASE ); xNatNum.init( m_xContext ); // cached locale data items @@ -1750,13 +1750,13 @@ sal_uInt32 SvNumberFormatter::TestNewString(const OUString& sFormatString, return nRes; } -SvNumberformat* SvNumberFormatter::ImpInsertFormat( const ::com::sun::star::i18n::NumberFormatCode& rCode, +SvNumberformat* SvNumberFormatter::ImpInsertFormat( const css::i18n::NumberFormatCode& rCode, sal_uInt32 nPos, bool bAfterChangingSystemCL, sal_Int16 nOrgIndex ) { OUString aCodeStr( rCode.Code ); if ( rCode.Index < NF_INDEX_TABLE_LOCALE_DATA_DEFAULTS && - rCode.Usage == ::com::sun::star::i18n::KNumberFormatUsage::CURRENCY && + rCode.Usage == css::i18n::KNumberFormatUsage::CURRENCY && rCode.Index != NF_CURRENCY_1000DEC2_CCC ) { // strip surrounding [$...] on automatic currency if ( aCodeStr.indexOf( "[$" ) >= 0) @@ -1962,7 +1962,7 @@ sal_uInt32 SvNumberFormatter::GetFormatSpecialInfo( const OUString& rFormatStrin } sal_Int32 SvNumberFormatter::ImpGetFormatCodeIndex( - ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::NumberFormatCode >& rSeq, + css::uno::Sequence< css::i18n::NumberFormatCode >& rSeq, const NfIndexTableOffset nTabOff ) { const sal_Int32 nLen = rSeq.getLength(); @@ -2010,7 +2010,7 @@ sal_Int32 SvNumberFormatter::ImpGetFormatCodeIndex( else { // we need at least _some_ format rSeq.realloc(1); - rSeq[0] = ::com::sun::star::i18n::NumberFormatCode(); + rSeq[0] = css::i18n::NumberFormatCode(); rSeq[0].Code = OUStringBuffer(). append('0'). append(GetNumDecimalSep()). @@ -2022,7 +2022,7 @@ sal_Int32 SvNumberFormatter::ImpGetFormatCodeIndex( sal_Int32 SvNumberFormatter::ImpAdjustFormatCodeDefault( - ::com::sun::star::i18n::NumberFormatCode * pFormatArr, + css::i18n::NumberFormatCode * pFormatArr, sal_Int32 nCnt, bool bCheckCorrectness ) { using namespace ::com::sun::star; @@ -3553,10 +3553,10 @@ const NfCurrencyEntry* SvNumberFormatter::GetCurrencyEntry( bool & bFoundBank, void SvNumberFormatter::GetCompatibilityCurrency( OUString& rSymbol, OUString& rAbbrev ) const { - ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::Currency2 > + css::uno::Sequence< css::i18n::Currency2 > xCurrencies( xLocaleData->getAllCurrencies() ); - const ::com::sun::star::i18n::Currency2 *pCurrencies = xCurrencies.getConstArray(); + const css::i18n::Currency2 *pCurrencies = xCurrencies.getConstArray(); sal_Int32 nCurrencies = xCurrencies.getLength(); sal_Int32 j; @@ -3664,8 +3664,7 @@ void SvNumberFormatter::ImpInitCurrencyTable() theCurrencyTable::get().begin(), std::move(pEntry)); sal_uInt16 nCurrencyPos = 1; - ::com::sun::star::uno::Sequence< ::com::sun::star::lang::Locale > xLoc = - LocaleDataWrapper::getInstalledLocaleNames(); + css::uno::Sequence< css::lang::Locale > xLoc = LocaleDataWrapper::getInstalledLocaleNames(); sal_Int32 nLocaleCount = xLoc.getLength(); SAL_INFO( "svl.numbers", "number of locales: \"" << nLocaleCount << "\"" ); css::lang::Locale const * const pLocales = xLoc.getConstArray(); @@ -3934,7 +3933,7 @@ NfCurrencyEntry::NfCurrencyEntry( const LocaleDataWrapper& rLocaleData, Language } -NfCurrencyEntry::NfCurrencyEntry( const ::com::sun::star::i18n::Currency & rCurr, +NfCurrencyEntry::NfCurrencyEntry( const css::i18n::Currency & rCurr, const LocaleDataWrapper& rLocaleData, LanguageType eLang ) { aSymbol = rCurr.Symbol; diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx index eccf63f917d5..c740cbe81ded 100644 --- a/svl/source/numbers/zformat.cxx +++ b/svl/source/numbers/zformat.cxx @@ -3104,7 +3104,7 @@ void SvNumberformat::SwitchToOtherCalendar( OUString& rOrgCalendar, if ( rCal.getUniqueID() == GREGORIAN ) { using namespace ::com::sun::star::i18n; - ::com::sun::star::uno::Sequence< OUString > xCals = rCal.getAllCalendars( + css::uno::Sequence< OUString > xCals = rCal.getAllCalendars( rLoc().getLanguageTag().getLocale() ); sal_Int32 nCnt = xCals.getLength(); if ( nCnt > 1 ) @@ -4978,7 +4978,7 @@ OUString SvNumberformat::ImpGetNatNumString( const SvNumberNatNum& rNum, OUString SvNumberformat::impTransliterateImpl(const OUString& rStr, const SvNumberNatNum& rNum ) const { - com::sun::star::lang::Locale aLocale( LanguageTag( rNum.GetLang() ).getLocale() ); + css::lang::Locale aLocale( LanguageTag( rNum.GetLang() ).getLocale() ); return GetFormatter().GetNatNum()->getNativeNumberString( rStr, aLocale, rNum.GetNatNum() ); } @@ -4986,14 +4986,14 @@ OUString SvNumberformat::impTransliterateImpl(const OUString& rStr, void SvNumberformat::impTransliterateImpl(OUStringBuffer& rStr, const SvNumberNatNum& rNum ) const { - com::sun::star::lang::Locale aLocale( LanguageTag( rNum.GetLang() ).getLocale() ); + css::lang::Locale aLocale( LanguageTag( rNum.GetLang() ).getLocale() ); OUString sTemp(rStr.makeStringAndClear()); sTemp = GetFormatter().GetNatNum()->getNativeNumberString( sTemp, aLocale, rNum.GetNatNum() ); rStr.append(sTemp); } -void SvNumberformat::GetNatNumXml( com::sun::star::i18n::NativeNumberXmlAttributes& rAttr, +void SvNumberformat::GetNatNumXml( css::i18n::NativeNumberXmlAttributes& rAttr, sal_uInt16 nNumFor ) const { if ( nNumFor <= 3 ) @@ -5001,19 +5001,19 @@ void SvNumberformat::GetNatNumXml( com::sun::star::i18n::NativeNumberXmlAttribut const SvNumberNatNum& rNum = NumFor[nNumFor].GetNatNum(); if ( rNum.IsSet() ) { - com::sun::star::lang::Locale aLocale( + css::lang::Locale aLocale( LanguageTag( rNum.GetLang() ).getLocale() ); rAttr = GetFormatter().GetNatNum()->convertToXmlAttributes( aLocale, rNum.GetNatNum() ); } else { - rAttr = com::sun::star::i18n::NativeNumberXmlAttributes(); + rAttr = css::i18n::NativeNumberXmlAttributes(); } } else { - rAttr = com::sun::star::i18n::NativeNumberXmlAttributes(); + rAttr = css::i18n::NativeNumberXmlAttributes(); } } diff --git a/svl/source/passwordcontainer/passwordcontainer.cxx b/svl/source/passwordcontainer/passwordcontainer.cxx index 8aa6c2a2d91b..bd9bd61cd897 100644 --- a/svl/source/passwordcontainer/passwordcontainer.cxx +++ b/svl/source/passwordcontainer/passwordcontainer.cxx @@ -1176,7 +1176,7 @@ void SAL_CALL PasswordContainer::removeMasterPassword() } sal_Bool SAL_CALL PasswordContainer::hasMasterPassword( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( mMutex ); @@ -1188,7 +1188,7 @@ sal_Bool SAL_CALL PasswordContainer::hasMasterPassword( ) } sal_Bool SAL_CALL PasswordContainer::allowPersistentStoring( sal_Bool bAllow ) - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( mMutex ); @@ -1206,7 +1206,7 @@ sal_Bool SAL_CALL PasswordContainer::allowPersistentStoring( sal_Bool bAllow ) } sal_Bool SAL_CALL PasswordContainer::isPersistentStoringAllowed() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( mMutex ); diff --git a/svl/source/passwordcontainer/syscreds.hxx b/svl/source/passwordcontainer/syscreds.hxx index 6b19516d2488..d3605c262506 100644 --- a/svl/source/passwordcontainer/syscreds.hxx +++ b/svl/source/passwordcontainer/syscreds.hxx @@ -35,16 +35,11 @@ class SysCredentialsConfigItem : public utl::ConfigItem explicit SysCredentialsConfigItem( SysCredentialsConfig * pOwner ); //virtual ~SysCredentialsConfigItem(); - virtual void Notify( - const com::sun::star::uno::Sequence< OUString > & - seqPropertyNames ) override; + virtual void Notify( const css::uno::Sequence< OUString > & seqPropertyNames ) override; - com::sun::star::uno::Sequence< OUString > - getSystemCredentialsURLs(); + css::uno::Sequence< OUString > getSystemCredentialsURLs(); - void setSystemCredentialsURLs( - const com::sun::star::uno::Sequence< OUString > & - seqURLList ); + void setSystemCredentialsURLs( const css::uno::Sequence< OUString > & seqURLList ); //bool isSystemCredentialsURL( const OUString & rURL ) const; @@ -53,7 +48,7 @@ class SysCredentialsConfigItem : public utl::ConfigItem ::osl::Mutex m_aMutex; bool m_bInited; - com::sun::star::uno::Sequence< OUString > m_seqURLs; + css::uno::Sequence< OUString > m_seqURLs; SysCredentialsConfig * m_pOwner; }; @@ -67,7 +62,7 @@ class SysCredentialsConfig OUString find( OUString const & rURL ); void add( OUString const & rURL, bool bPersistent ); void remove( OUString const & rURL ); - com::sun::star::uno::Sequence< OUString > list( bool bOnlyPersistent ); + css::uno::Sequence< OUString > list( bool bOnlyPersistent ); void persistentConfigChanged(); diff --git a/svl/source/uno/pathservice.cxx b/svl/source/uno/pathservice.cxx index f963ed41af5f..f0930bed0cf2 100644 --- a/svl/source/uno/pathservice.cxx +++ b/svl/source/uno/pathservice.cxx @@ -83,9 +83,9 @@ public: }; -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_comp_svl_PathService_get_implementation(::com::sun::star::uno::XComponentContext*, - ::com::sun::star::uno::Sequence<css::uno::Any> const &) +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +com_sun_star_comp_svl_PathService_get_implementation(css::uno::XComponentContext*, + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new PathService()); } |