diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2013-11-13 08:52:41 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2013-11-14 11:13:24 +0100 |
commit | 24cad6a6490b245bd88ec3e3c87195628914f6a2 (patch) | |
tree | 12d9e7ec629054f5ad0a6990783d3e639449afeb /include | |
parent | 8061c8c70b7ffcd8f472d2f5b909911f2095fec7 (diff) |
Move MediaDescriptor from comphelper to unotools
...so it will be able to use SvtSecurityOptions internally.
Change-Id: Id7433247e8fc53651935578510bedbcca5aa2ac9
Diffstat (limited to 'include')
-rw-r--r-- | include/oox/core/filterbase.hxx | 10 | ||||
-rw-r--r-- | include/oox/core/filterdetect.hxx | 4 | ||||
-rw-r--r-- | include/oox/core/xmlfilterbase.hxx | 6 | ||||
-rw-r--r-- | include/unotools/mediadescriptor.hxx (renamed from include/comphelper/mediadescriptor.hxx) | 27 |
4 files changed, 24 insertions, 23 deletions
diff --git a/include/oox/core/filterbase.hxx b/include/oox/core/filterbase.hxx index 8d1836f9ce6f..6280f9d0001c 100644 --- a/include/oox/core/filterbase.hxx +++ b/include/oox/core/filterbase.hxx @@ -55,6 +55,8 @@ namespace com { namespace sun { namespace star { namespace comphelper { class IDocPasswordVerifier; +} +namespace utl { class MediaDescriptor; } @@ -141,7 +143,7 @@ public: ::comphelper::SequenceAsHashMap& getFilterData() const; /** Returns the media descriptor. */ - ::comphelper::MediaDescriptor& getMediaDescriptor() const; + utl::MediaDescriptor& getMediaDescriptor() const; /** Returns the URL of the imported or exported file. */ const OUString& getFileUrl() const; @@ -253,11 +255,11 @@ public: // ------------------------------------------------------------------------ protected: virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > - implGetInputStream( ::comphelper::MediaDescriptor& rMediaDesc ) const; + implGetInputStream( utl::MediaDescriptor& rMediaDesc ) const; virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > - implGetOutputStream( ::comphelper::MediaDescriptor& rMediaDesc ) const; + implGetOutputStream( utl::MediaDescriptor& rMediaDesc ) const; - virtual bool implFinalizeExport( ::comphelper::MediaDescriptor& rMediaDescriptor ); + virtual bool implFinalizeExport( utl::MediaDescriptor& rMediaDescriptor ); ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > getMainDocumentStream( ) const; diff --git a/include/oox/core/filterdetect.hxx b/include/oox/core/filterdetect.hxx index c3379a340c6a..4caaaf7a1316 100644 --- a/include/oox/core/filterdetect.hxx +++ b/include/oox/core/filterdetect.hxx @@ -33,7 +33,7 @@ namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } -namespace comphelper { class MediaDescriptor; } +namespace utl { class MediaDescriptor; } namespace oox { class AttributeList; } @@ -118,7 +118,7 @@ public: its input stream is returned. */ ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > - extractUnencryptedPackage( ::comphelper::MediaDescriptor& rMediaDesc ) const; + extractUnencryptedPackage( utl::MediaDescriptor& rMediaDesc ) const; // com.sun.star.lang.XServiceInfo interface ------------------------------- diff --git a/include/oox/core/xmlfilterbase.hxx b/include/oox/core/xmlfilterbase.hxx index 648b50da97aa..87234fb22328 100644 --- a/include/oox/core/xmlfilterbase.hxx +++ b/include/oox/core/xmlfilterbase.hxx @@ -233,12 +233,12 @@ public: protected: virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > - implGetInputStream( ::comphelper::MediaDescriptor& rMediaDesc ) const; + implGetInputStream( utl::MediaDescriptor& rMediaDesc ) const; virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > - implGetOutputStream( ::comphelper::MediaDescriptor& rMediaDesc ) const; + implGetOutputStream( utl::MediaDescriptor& rMediaDesc ) const; - virtual bool implFinalizeExport( ::comphelper::MediaDescriptor& rMediaDescriptor ); + virtual bool implFinalizeExport( utl::MediaDescriptor& rMediaDescriptor ); private: virtual StorageRef implCreateStorage( diff --git a/include/comphelper/mediadescriptor.hxx b/include/unotools/mediadescriptor.hxx index 4cc457e1f5c8..2a0cb0fefa1d 100644 --- a/include/comphelper/mediadescriptor.hxx +++ b/include/unotools/mediadescriptor.hxx @@ -17,21 +17,20 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_COMPHELPER_MEDIADESCRIPTOR_HXX -#define INCLUDED_COMPHELPER_MEDIADESCRIPTOR_HXX +#ifndef INCLUDED_UNOTOOLS_MEDIADESCRIPTOR_HXX +#define INCLUDED_UNOTOOLS_MEDIADESCRIPTOR_HXX #include <comphelper/docpasswordrequest.hxx> #include <comphelper/sequenceashashmap.hxx> #include <rtl/ustring.hxx> -#include <comphelper/comphelperdllapi.h> +#include <unotools/unotoolsdllapi.h> namespace com { namespace sun { namespace star { namespace io { class XInputStream; } } } } +namespace comphelper { class IDocPasswordVerifier; } -namespace comphelper{ - -class IDocPasswordVerifier; +namespace utl { /** @short can be used to work with a ::com::sun::star::document::MediaDescriptor struct. @@ -43,7 +42,7 @@ class IDocPasswordVerifier; @attention This class isnt threadsafe and must be guarded from outside! */ -class COMPHELPER_DLLPUBLIC MediaDescriptor : public SequenceAsHashMap +class UNOTOOLS_DLLPUBLIC MediaDescriptor : public comphelper::SequenceAsHashMap { public: @@ -260,8 +259,8 @@ class COMPHELPER_DLLPUBLIC MediaDescriptor : public SequenceAsHashMap found, or the user has chossen to cancel password input. */ ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > requestAndVerifyDocPassword( - IDocPasswordVerifier& rVerifier, - DocPasswordRequestType eRequestType, + comphelper::IDocPasswordVerifier& rVerifier, + comphelper::DocPasswordRequestType eRequestType, const ::std::vector< OUString >* pDefaultPasswords = 0 ); //------------------------------------------- @@ -288,7 +287,7 @@ class COMPHELPER_DLLPUBLIC MediaDescriptor : public SequenceAsHashMap @throw [css::lang::IllegalArgumentException] if the given PostData stream is <NULL/>. */ - COMPHELPER_DLLPRIVATE sal_Bool impl_openStreamWithPostData( + SAL_DLLPRIVATE sal_Bool impl_openStreamWithPostData( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& _rxPostData ) throw(::com::sun::star::uno::RuntimeException); @@ -314,7 +313,7 @@ class COMPHELPER_DLLPUBLIC MediaDescriptor : public SequenceAsHashMap @throw [css::uno::RuntimeException] if the MediaDescriptor seems to be invalid! */ - COMPHELPER_DLLPRIVATE sal_Bool impl_openStreamWithURL( + SAL_DLLPRIVATE sal_Bool impl_openStreamWithURL( const OUString& sURL, sal_Bool bLockFile ) throw(::com::sun::star::uno::RuntimeException); @@ -336,11 +335,11 @@ class COMPHELPER_DLLPUBLIC MediaDescriptor : public SequenceAsHashMap @return TRUE, if the stream was already part of the descriptor or could be created as new item. FALSE otherwise. */ - COMPHELPER_DLLPRIVATE sal_Bool impl_addInputStream( sal_Bool bLockFile ); + SAL_DLLPRIVATE sal_Bool impl_addInputStream( sal_Bool bLockFile ); }; -} // namespace comphelper +} -#endif // INCLUDED_COMPHELPER_MEDIADESCRIPTOR_HXX +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |