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 /hwpfilter | |
| parent | 8061c8c70b7ffcd8f472d2f5b909911f2095fec7 (diff) | |
Move MediaDescriptor from comphelper to unotools
...so it will be able to use SvtSecurityOptions internally.
Change-Id: Id7433247e8fc53651935578510bedbcca5aa2ac9
Diffstat (limited to 'hwpfilter')
| -rw-r--r-- | hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk | 1 | ||||
| -rw-r--r-- | hwpfilter/Library_hwp.mk | 1 | ||||
| -rw-r--r-- | hwpfilter/source/hwpreader.cxx | 4 | ||||
| -rw-r--r-- | hwpfilter/source/hwpreader.hxx | 6 |
4 files changed, 7 insertions, 5 deletions
diff --git a/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk b/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk index 07ae9f88d281..0098ebb9cf94 100644 --- a/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk +++ b/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk @@ -35,6 +35,7 @@ $(eval $(call gb_CppunitTest_use_ure,hwpfilter_test_hwpfilter)) $(eval $(call gb_CppunitTest_use_components,hwpfilter_test_hwpfilter,\ configmgr/source/configmgr \ + framework/util/fwk \ hwpfilter/source/hwp \ ucb/source/core/ucb1 \ ucb/source/ucp/file/ucpfile1 \ diff --git a/hwpfilter/Library_hwp.mk b/hwpfilter/Library_hwp.mk index 059e8b4841dd..7ee4ec7f24fe 100644 --- a/hwpfilter/Library_hwp.mk +++ b/hwpfilter/Library_hwp.mk @@ -16,6 +16,7 @@ $(eval $(call gb_Library_use_libraries,hwp,\ cppu \ cppuhelper \ sal \ + utl \ $(gb_UWINAPI) \ )) diff --git a/hwpfilter/source/hwpreader.cxx b/hwpfilter/source/hwpreader.cxx index 29fa1a10f0bf..e752ae70ca3c 100644 --- a/hwpfilter/source/hwpreader.cxx +++ b/hwpfilter/source/hwpreader.cxx @@ -125,11 +125,11 @@ HwpReader::~HwpReader() sal_Bool HwpReader::filter(const Sequence< PropertyValue >& rDescriptor) throw(RuntimeException) { - comphelper::MediaDescriptor aDescriptor(rDescriptor); + utl::MediaDescriptor aDescriptor(rDescriptor); aDescriptor.addInputStream(); Reference< XInputStream > xInputStream( - aDescriptor[comphelper::MediaDescriptor::PROP_INPUTSTREAM()], UNO_QUERY_THROW); + aDescriptor[utl::MediaDescriptor::PROP_INPUTSTREAM()], UNO_QUERY_THROW); HStream stream; Sequence < sal_Int8 > aBuffer; diff --git a/hwpfilter/source/hwpreader.hxx b/hwpfilter/source/hwpreader.hxx index bb04fdd4ba6e..b7214c766210 100644 --- a/hwpfilter/source/hwpreader.hxx +++ b/hwpfilter/source/hwpreader.hxx @@ -54,7 +54,7 @@ using namespace ::com::sun::star::xml::sax; #include <assert.h> -#include <comphelper/mediadescriptor.hxx> +#include <unotools/mediadescriptor.hxx> #include "hwpfile.h" #include "hcode.h" @@ -273,11 +273,11 @@ OUString HwpImportFilter::detect( ::com::sun::star::uno::Sequence< ::com::sun::s { OUString sTypeName; - comphelper::MediaDescriptor aDescriptor(rDescriptor); + utl::MediaDescriptor aDescriptor(rDescriptor); aDescriptor.addInputStream(); Reference< XInputStream > xInputStream( - aDescriptor[comphelper::MediaDescriptor::PROP_INPUTSTREAM()], UNO_QUERY); + aDescriptor[utl::MediaDescriptor::PROP_INPUTSTREAM()], UNO_QUERY); if (xInputStream.is()) { |