Kaydet (Commit) 24cad6a6 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Move MediaDescriptor from comphelper to unotools

...so it will be able to use SvtSecurityOptions internally.

Change-Id: Id7433247e8fc53651935578510bedbcca5aa2ac9
üst 8061c8c7
......@@ -19,7 +19,7 @@
#include "soundhandler.hxx"
#include <comphelper/mediadescriptor.hxx>
#include <unotools/mediadescriptor.hxx>
#include <com/sun/star/io/XInputStream.hpp>
#include <com/sun/star/frame/DispatchResultState.hpp>
......@@ -267,10 +267,10 @@ void SAL_CALL SoundHandler::dispatchWithNotification(const css::util::URL&
{
//close streams otherwise on windows we can't reopen the file in the
//media player when we pass the url to directx as it'll already be open
::comphelper::MediaDescriptor aDescriptor(lDescriptor);
utl::MediaDescriptor aDescriptor(lDescriptor);
css::uno::Reference< css::io::XInputStream > xInputStream =
aDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_INPUTSTREAM(),
aDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_INPUTSTREAM(),
css::uno::Reference< css::io::XInputStream >());
if (xInputStream.is()) xInputStream->closeInput();
}
......@@ -344,8 +344,8 @@ OUString SAL_CALL SoundHandler::detect( css::uno::Sequence< css::beans::Property
OUString sTypeName;
// Analyze given descriptor to find filename or input stream or ...
::comphelper::MediaDescriptor aDescriptor(lDescriptor);
OUString sURL = aDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_URL(), OUString());
utl::MediaDescriptor aDescriptor(lDescriptor);
OUString sURL = aDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_URL(), OUString());
if (
(sURL.getLength() ) &&
......@@ -357,7 +357,7 @@ OUString SAL_CALL SoundHandler::detect( css::uno::Sequence< css::beans::Property
// a) look for given extension of url to map our type decision HARD CODED!!!
// b) return preferred type every time... it's easy :-)
sTypeName = "wav_Wave_Audio_File";
aDescriptor[::comphelper::MediaDescriptor::PROP_TYPENAME()] <<= sTypeName;
aDescriptor[utl::MediaDescriptor::PROP_TYPENAME()] <<= sTypeName;
aDescriptor >> lDescriptor;
}
......
......@@ -157,7 +157,6 @@
#include <com/sun/star/util/XUpdatable.hpp>
#include <com/sun/star/view/XSelectionSupplier.hpp>
#include <comphelper/InlineContainer.hxx>
#include <comphelper/mediadescriptor.hxx>
#include <comphelper/processfactory.hxx>
#include <comphelper/property.hxx>
#include <comphelper/servicehelper.hxx>
......@@ -301,6 +300,7 @@
#include <tools/gen.hxx>
#include <unotools/configitem.hxx>
#include <unotools/lingucfg.hxx>
#include <unotools/mediadescriptor.hxx>
#include <unotools/pathoptions.hxx>
#include <unotools/streamwrap.hxx>
#include <unotools/syslocale.hxx>
......
......@@ -209,7 +209,6 @@
#include <comphelper/classids.hxx>
#include <comphelper/documentconstants.hxx>
#include <comphelper/genericpropertyset.hxx>
#include <comphelper/mediadescriptor.hxx>
#include <comphelper/processfactory.hxx>
#include <comphelper/propertysetinfo.hxx>
#include <comphelper/scopeguard.hxx>
......
......@@ -21,7 +21,7 @@
#include "servicenames.hxx"
#include "MediaDescriptorHelper.hxx"
#include "macros.hxx"
#include <comphelper/mediadescriptor.hxx>
#include <unotools/mediadescriptor.hxx>
#include <com/sun/star/document/XImporter.hpp>
#include <com/sun/star/document/XFilter.hpp>
#include <com/sun/star/frame/XLoadable.hpp>
......@@ -78,9 +78,9 @@ APPHELPER_XSERVICEINFO_IMPL(ChartFrameLoader,CHART_FRAMELOADER_SERVICE_IMPLEMENT
uno::Reference< frame::XModel > xModel;
bool bHaveLoadedModel = false;
comphelper::MediaDescriptor aMediaDescriptor(rMediaDescriptor);
utl::MediaDescriptor aMediaDescriptor(rMediaDescriptor);
{
comphelper::MediaDescriptor::const_iterator aIt( aMediaDescriptor.find( aMediaDescriptor.PROP_MODEL()));
utl::MediaDescriptor::const_iterator aIt( aMediaDescriptor.find( aMediaDescriptor.PROP_MODEL()));
if( aIt != aMediaDescriptor.end())
{
xModel.set( (*aIt).second.get< uno::Reference< frame::XModel > >());
......@@ -136,7 +136,7 @@ APPHELPER_XSERVICEINFO_IMPL(ChartFrameLoader,CHART_FRAMELOADER_SERVICE_IMPLEMENT
if(!bHaveLoadedModel)
try
{
comphelper::MediaDescriptor::const_iterator aIt( aMediaDescriptor.find( aMediaDescriptor.PROP_URL()));
utl::MediaDescriptor::const_iterator aIt( aMediaDescriptor.find( aMediaDescriptor.PROP_URL()));
if( aIt != aMediaDescriptor.end())
{
OUString aURL( (*aIt).second.get< OUString >());
......
......@@ -21,7 +21,6 @@
#include "macros.hxx"
#include "MediaDescriptorHelper.hxx"
#include "ContainerHelper.hxx"
#include <comphelper/mediadescriptor.hxx>
// for ERRCODE_SFX_GENERAL etc.
// header contains only macros
......
......@@ -91,7 +91,6 @@ $(eval $(call gb_Library_add_exception_objects,comphelper,\
comphelper/source/misc/interaction \
comphelper/source/misc/listenernotification \
comphelper/source/misc/logging \
comphelper/source/misc/mediadescriptor \
comphelper/source/misc/mimeconfighelper \
comphelper/source/misc/namedvaluecollection \
comphelper/source/misc/numberedcollection \
......
......@@ -44,7 +44,6 @@
#include <com/sun/star/util/NumberFormatsSupplier.hpp>
#include <comphelper/interaction.hxx>
#include <comphelper/mediadescriptor.hxx>
#include <comphelper/seqstream.hxx>
#include <comphelper/sequence.hxx>
#include <connectivity/dbexception.hxx>
......
......@@ -66,7 +66,6 @@
#include <comphelper/enumhelper.hxx>
#include <comphelper/genericpropertyset.hxx>
#include <comphelper/interaction.hxx>
#include <comphelper/mediadescriptor.hxx>
#include <comphelper/namedvaluecollection.hxx>
#include <comphelper/numberedcollection.hxx>
#include <comphelper/property.hxx>
......
......@@ -25,7 +25,6 @@
#include <osl/diagnose.h>
#include <comphelper/property.hxx>
#include <comphelper/sequence.hxx>
#include <comphelper/mediadescriptor.hxx>
#include <comphelper/namedvaluecollection.hxx>
#include <comphelper/classids.hxx>
#include <com/sun/star/frame/XUntitledNumbers.hpp>
......
......@@ -48,7 +48,7 @@
#include <com/sun/star/frame/XStorable.hpp>
#include <tools/urlobj.hxx>
#include <comphelper/mediadescriptor.hxx>
#include <unotools/mediadescriptor.hxx>
#include <vector>
#include <osl/thread.hxx>
......@@ -231,7 +231,7 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatch
if ( !aDispatchRequest.aPreselectedFactory.isEmpty() )
{
aArgs[nCount-1].Name = ::comphelper::MediaDescriptor::PROP_DOCUMENTSERVICE();
aArgs[nCount-1].Name = utl::MediaDescriptor::PROP_DOCUMENTSERVICE();
aArgs[nCount-1].Value <<= aDispatchRequest.aPreselectedFactory;
}
......
......@@ -22,7 +22,7 @@
#include "basecontainer.hxx"
#include <com/sun/star/document/XTypeDetection.hpp>
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
#include <comphelper/mediadescriptor.hxx>
#include <unotools/mediadescriptor.hxx>
#include <cppuhelper/implbase1.hxx>
......@@ -77,7 +77,7 @@ private:
* Get all format types that we handle.
*/
void impl_getAllFormatTypes(
const com::sun::star::util::URL& aParsedURL, comphelper::MediaDescriptor& rDescriptor,
const com::sun::star::util::URL& aParsedURL, utl::MediaDescriptor& rDescriptor,
FlatDetection& rFlatTypes);
//---------------------------------------
......@@ -126,7 +126,7 @@ private:
An empty value if detection failed. .... but see rLastChance
for additional returns!
*/
OUString impl_detectTypeFlatAndDeep( ::comphelper::MediaDescriptor& rDescriptor ,
OUString impl_detectTypeFlatAndDeep( utl::MediaDescriptor& rDescriptor ,
const FlatDetection& lFlatTypes ,
sal_Bool bAllowDeep ,
OUStringList& rUsedDetectors,
......@@ -144,7 +144,7 @@ private:
@param rDescriptor
a stl representation of the MediaDescriptor as in/out parameter.
*/
void impl_seekStreamToZero(comphelper::MediaDescriptor& rDescriptor);
void impl_seekStreamToZero(utl::MediaDescriptor& rDescriptor);
//---------------------------------------
......@@ -166,7 +166,7 @@ private:
a stl representation of the MediaDescriptor as in/out parameter.
*/
OUString impl_askDetectService(const OUString& sDetectService,
::comphelper::MediaDescriptor& rDescriptor );
utl::MediaDescriptor& rDescriptor );
//---------------------------------------
......@@ -183,7 +183,7 @@ private:
@return [string]
a valid type name or an empty string if user canceled interaction.
*/
OUString impl_askUserForTypeAndFilterIfAllowed(::comphelper::MediaDescriptor& rDescriptor);
OUString impl_askUserForTypeAndFilterIfAllowed(utl::MediaDescriptor& rDescriptor);
//---------------------------------------
......@@ -220,7 +220,7 @@ private:
Note: If an interactionHandler is part of the given descriptor too, it was already used.
Means: let the exception pass trough the top most interface method!
*/
void impl_openStream(::comphelper::MediaDescriptor& rDescriptor)
void impl_openStream(utl::MediaDescriptor& rDescriptor)
throw (css::uno::Exception);
//---------------------------------------
......@@ -243,7 +243,7 @@ private:
@return TRUE the specified type and its registrations was valid(!) and
could be set on the descriptor.
*/
sal_Bool impl_validateAndSetTypeOnDescriptor( ::comphelper::MediaDescriptor& rDescriptor,
sal_Bool impl_validateAndSetTypeOnDescriptor( utl::MediaDescriptor& rDescriptor,
const OUString& sType );
//---------------------------------------
......@@ -265,7 +265,7 @@ private:
@return TRUE the specified type and its registrations was valid(!) and
could be set on the descriptor.
*/
sal_Bool impl_validateAndSetFilterOnDescriptor( ::comphelper::MediaDescriptor& rDescriptor,
sal_Bool impl_validateAndSetFilterOnDescriptor( utl::MediaDescriptor& rDescriptor,
const OUString& sFilter );
//---------------------------------------
......@@ -281,7 +281,7 @@ private:
reference to the MediaDescriptor (represented by an easy-to-use
stl interface!), which should be patched.
*/
void impl_removeTypeFilterFromDescriptor(::comphelper::MediaDescriptor& rDescriptor);
void impl_removeTypeFilterFromDescriptor(utl::MediaDescriptor& rDescriptor);
//---------------------------------------
......@@ -315,7 +315,7 @@ private:
rDescriptor will be changed by selecting another filter.
(see code)
*/
void impl_checkResultsAndAddBestFilter(::comphelper::MediaDescriptor& rDescriptor,
void impl_checkResultsAndAddBestFilter(utl::MediaDescriptor& rDescriptor,
OUString& sType );
//-------------------------------------------
......
......@@ -45,7 +45,7 @@
#include <com/sun/star/container/XNameAccess.hpp>
#include <comphelper/processfactory.hxx>
#include <comphelper/sequenceashashmap.hxx>
#include <comphelper/mediadescriptor.hxx>
#include <unotools/mediadescriptor.hxx>
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <comphelper/genericpropertyset.hxx>
#include <comphelper/propertysetinfo.hxx>
......@@ -77,9 +77,9 @@ sal_Bool SAL_CALL XmlFilterAdaptor::importImpl( const Sequence< ::com::sun::star
sal_Int32 nSteps= 0;
sal_Int32 nProgressRange = 4;
comphelper::MediaDescriptor aMediaMap(aDescriptor);
utl::MediaDescriptor aMediaMap(aDescriptor);
Reference< XStatusIndicator > xStatusIndicator(aMediaMap.getUnpackedValueOrDefault(
comphelper::MediaDescriptor::PROP_STATUSINDICATOR(), Reference< XStatusIndicator >()));
utl::MediaDescriptor::PROP_STATUSINDICATOR(), Reference< XStatusIndicator >()));
if (xStatusIndicator.is()){
xStatusIndicator->start(OUString( "Loading :" ),nProgressRange);
......@@ -203,9 +203,9 @@ sal_Bool SAL_CALL XmlFilterAdaptor::exportImpl( const Sequence< ::com::sun::star
// Status Bar
sal_Int32 nSteps= 1;
sal_Int32 nProgressRange(3);
comphelper::MediaDescriptor aMediaMap(aDescriptor);
utl::MediaDescriptor aMediaMap(aDescriptor);
Reference< XStatusIndicator > xStatusIndicator(aMediaMap.getUnpackedValueOrDefault(
comphelper::MediaDescriptor::PROP_STATUSINDICATOR(), Reference< XStatusIndicator >()));
utl::MediaDescriptor::PROP_STATUSINDICATOR(), Reference< XStatusIndicator >()));
if (xStatusIndicator.is())
xStatusIndicator->start(OUString( "Saving :" ),nProgressRange);
......
......@@ -250,7 +250,6 @@
#include <comphelper/enumhelper.hxx>
#include <comphelper/extract.hxx>
#include <comphelper/interaction.hxx>
#include <comphelper/mediadescriptor.hxx>
#include <comphelper/namedvaluecollection.hxx>
#include <comphelper/processfactory.hxx>
#include <comphelper/sequence.hxx>
......@@ -337,6 +336,7 @@
#include <unotools/configpaths.hxx>
#include <unotools/historyoptions.hxx>
#include <unotools/localfilehelper.hxx>
#include <unotools/mediadescriptor.hxx>
#include <unotools/moduleoptions.hxx>
#include <unotools/pathoptions.hxx>
#include <unotools/streamwrap.hxx>
......
......@@ -41,7 +41,7 @@
#include <com/sun/star/task/XStatusIndicator.hpp>
#include <com/sun/star/util/XModifyListener.hpp>
#include <comphelper/mediadescriptor.hxx>
#include <unotools/mediadescriptor.hxx>
#include <vcl/timer.hxx>
#include <vcl/evntpost.hxx>
#include <cppuhelper/implbase5.hxx>
......@@ -800,13 +800,13 @@ class AutoRecovery : // attention! Must be the first base class to guarentee ri
//---------------------------------------
// TODO document me
void implts_openOneDoc(const OUString& sURL ,
::comphelper::MediaDescriptor& lDescriptor,
utl::MediaDescriptor& lDescriptor,
AutoRecovery::TDocumentInfo& rInfo );
//---------------------------------------
// TODO document me
void implts_generateNewTempURL(const OUString& sBackupPath ,
::comphelper::MediaDescriptor& rMediaDescriptor,
utl::MediaDescriptor& rMediaDescriptor,
AutoRecovery::TDocumentInfo& rInfo );
//---------------------------------------
......@@ -1006,11 +1006,11 @@ class AutoRecovery : // attention! Must be the first base class to guarentee ri
is used to set the new created progress as parameter on these set.
*/
void impl_establishProgress(const AutoRecovery::TDocumentInfo& rInfo ,
::comphelper::MediaDescriptor& rArgs ,
utl::MediaDescriptor& rArgs ,
const css::uno::Reference< css::frame::XFrame >& xNewFrame);
void impl_forgetProgress(const AutoRecovery::TDocumentInfo& rInfo ,
::comphelper::MediaDescriptor& rArgs ,
utl::MediaDescriptor& rArgs ,
const css::uno::Reference< css::frame::XFrame >& xNewFrame);
//---------------------------------------
......
......@@ -22,7 +22,7 @@
#include <threadhelp/writeguard.hxx>
#include <threadhelp/readguard.hxx>
#include <services.h>
#include <comphelper/mediadescriptor.hxx>
#include <unotools/mediadescriptor.hxx>
#include <com/sun/star/io/XInputStream.hpp>
#include <com/sun/star/frame/DispatchResultState.hpp>
......@@ -181,8 +181,8 @@ OUString SAL_CALL Oxt_Handler::detect( css::uno::Sequence< css::beans::PropertyV
OUString sTypeName;
// Analyze given descriptor to find filename or input stream or ...
::comphelper::MediaDescriptor aDescriptor( lDescriptor );
OUString sURL = aDescriptor.getUnpackedValueOrDefault( ::comphelper::MediaDescriptor::PROP_URL(), OUString() );
utl::MediaDescriptor aDescriptor( lDescriptor );
OUString sURL = aDescriptor.getUnpackedValueOrDefault( utl::MediaDescriptor::PROP_URL(), OUString() );
long nLength = sURL.getLength();
if ( ( nLength > 4 ) && sURL.matchIgnoreAsciiCase( ".oxt", nLength-4 ) )
......@@ -193,7 +193,7 @@ OUString SAL_CALL Oxt_Handler::detect( css::uno::Sequence< css::beans::PropertyV
// a) look for given extension of url to map our type decision HARD CODED!!!
// b) return preferred type every time... it's easy :-)
sTypeName = "oxt_OpenOffice_Extension";
aDescriptor[::comphelper::MediaDescriptor::PROP_TYPENAME()] <<= sTypeName;
aDescriptor[utl::MediaDescriptor::PROP_TYPENAME()] <<= sTypeName;
aDescriptor >> lDescriptor;
}
......
......@@ -41,7 +41,7 @@
#include <toolkit/helper/vclunohelper.hxx>
#include <comphelper/sequenceashashmap.hxx>
#include <comphelper/mediadescriptor.hxx>
#include <unotools/mediadescriptor.hxx>
#include <vcl/svapp.hxx>
#include <osl/mutex.hxx>
......@@ -392,9 +392,9 @@ void StatusIndicatorFactory::implts_makeParentVisibleIfAllowed()
xModel = xController->getModel();
if (xModel.is())
{
::comphelper::MediaDescriptor lDocArgs(xModel->getArgs());
utl::MediaDescriptor lDocArgs(xModel->getArgs());
bHiddenDoc = lDocArgs.getUnpackedValueOrDefault(
::comphelper::MediaDescriptor::PROP_HIDDEN(),
utl::MediaDescriptor::PROP_HIDDEN(),
(sal_Bool)sal_False);
}
}
......
......@@ -35,7 +35,7 @@
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/util/URL.hpp>
#include <comphelper/mediadescriptor.hxx>
#include <unotools/mediadescriptor.hxx>
#include <comphelper/sequenceashashmap.hxx>
#include <cppuhelper/implbase2.hxx>
......@@ -148,7 +148,7 @@ private:
@descr Inside this struct e.g. the URL, its type and filter name,
the stream or a model directly are saved.
*/
::comphelper::MediaDescriptor m_lMediaDescriptor;
utl::MediaDescriptor m_lMediaDescriptor;
/** @short because the mediadescriptor contains the complete URL ... but
some functionality need the structured version, we hold it twice :-(.
......@@ -370,7 +370,7 @@ public:
/** TODO document me ... */
static void initializeUIDefaults(
const css::uno::Reference< css::uno::XComponentContext >& i_rxContext,
::comphelper::MediaDescriptor& io_lMediaDescriptor,
utl::MediaDescriptor& io_lMediaDescriptor,
const bool _bUIMode,
QuietInteraction** o_ppQuiteInteraction
);
......
......@@ -31,7 +31,7 @@
#include <com/sun/star/ui/XUIElement.hpp>
#include <comphelper/processfactory.hxx>
#include <comphelper/mediadescriptor.hxx>
#include <unotools/mediadescriptor.hxx>
#include <vcl/svapp.hxx>
#include <toolkit/helper/vclunohelper.hxx>
......@@ -274,8 +274,8 @@ sal_Bool implts_isPreviewModel( const uno::Reference< frame::XModel >& xModel )
{
if ( xModel.is() )
{
::comphelper::MediaDescriptor aDesc( xModel->getArgs() );
return aDesc.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_PREVIEW(), (sal_Bool)sal_False);
utl::MediaDescriptor aDesc( xModel->getArgs() );
return aDesc.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_PREVIEW(), (sal_Bool)sal_False);
}
else
return sal_False;
......
......@@ -71,7 +71,6 @@
#include <toolkit/helper/vclunohelper.hxx>
#include <toolkit/awt/vclxwindow.hxx>
#include <toolkit/awt/vclxmenu.hxx>
#include <comphelper/mediadescriptor.hxx>
#include <comphelper/uno3.hxx>
#include <rtl/instance.hxx>
#include <unotools/cmdoptions.hxx>
......
......@@ -59,7 +59,7 @@
#include <svtools/toolboxcontroller.hxx>
#include <unotools/cmdoptions.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <comphelper/mediadescriptor.hxx>
#include <unotools/mediadescriptor.hxx>
#include <comphelper/processfactory.hxx>
#include <svtools/miscopt.hxx>
#include <svl/imageitm.hxx>
......@@ -1652,9 +1652,9 @@ sal_Bool ToolBarManager::IsPluginMode() const
if ( xModel.is() )
{
Sequence< PropertyValue > aSeq = xModel->getArgs();
comphelper::MediaDescriptor aMediaDescriptor( aSeq );
utl::MediaDescriptor aMediaDescriptor( aSeq );
bPluginMode = aMediaDescriptor.getUnpackedValueOrDefault< sal_Bool >(
comphelper::MediaDescriptor::PROP_VIEWONLY(), sal_False );
utl::MediaDescriptor::PROP_VIEWONLY(), sal_False );
}
}
......
......@@ -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 \
......
......@@ -16,6 +16,7 @@ $(eval $(call gb_Library_use_libraries,hwp,\
cppu \
cppuhelper \
sal \
utl \
$(gb_UWINAPI) \
))
......
......@@ -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;
......
......@@ -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())
{
......
......@@ -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;
......
......@@ -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 -------------------------------
......
......@@ -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(
......
......@@ -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: */
......@@ -327,7 +327,6 @@
#include <com/sun/star/xml/sax/XLocator.hpp>
#include <comphelper/configurationhelper.hxx>
#include <comphelper/docpasswordhelper.hxx>
#include <comphelper/mediadescriptor.hxx>
#include <comphelper/processfactory.hxx>
#include <comphelper/seqstream.hxx>
#include <comphelper/sequenceashashmap.hxx>
......@@ -395,6 +394,7 @@
#include <unotools/fltrcfg.hxx>
#include <unotools/fontcvt.hxx>
#include <unotools/fontdefs.hxx>