Kaydet (Commit) e26245b3 authored tarafından Noel Grandin's avatar Noel Grandin Kaydeden (comit) Noel Grandin

com::sun::star->css in smoketest,sot

Change-Id: I59a083cd53baa76ea271cfc0470487899b92dca4
Reviewed-on: https://gerrit.libreoffice.org/19666Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
üst 95b22704
......@@ -142,8 +142,7 @@ void Test::test() {
css::uno::Sequence< css::beans::PropertyValue > args(2);
args[0].Name = "MacroExecutionMode";
args[0].Handle = -1;
args[0].Value <<=
com::sun::star::document::MacroExecMode::ALWAYS_EXECUTE_NO_WARN;
args[0].Value <<= css::document::MacroExecMode::ALWAYS_EXECUTE_NO_WARN;
args[0].State = css::beans::PropertyState_DIRECT_VALUE;
args[1].Name = "ReadOnly";
args[1].Handle = -1;
......@@ -170,7 +169,7 @@ void Test::test() {
css::uno::UNO_QUERY_THROW);
Result result;
// Shifted to main thread to work around potential deadlocks (i112867):
com::sun::star::awt::AsyncCallback::create(
css::awt::AsyncCallback::create(
connection_.getComponentContext())->addCallback(
new Callback(
disp, url, css::uno::Sequence< css::beans::PropertyValue >(),
......
......@@ -45,9 +45,9 @@ using namespace::com::sun::star::datatransfer;
*/
struct DataFlavorRepresentation
{
const char* pMimeType;
const char* pName;
const ::com::sun::star::uno::Type* pType;
const char* pMimeType;
const char* pName;
const css::uno::Type* pType;
};
namespace
......
......@@ -285,7 +285,7 @@ bool StgEntry::Init()
static OUString ToUpperUnicode( const OUString & rStr )
{
// I don't know the locale, so en_US is hopefully fine
static CharClass aCC( LanguageTag( com::sun::star::lang::Locale( "en", "US", "" )) );
static CharClass aCC( LanguageTag( css::lang::Locale( "en", "US", "" )) );
return aCC.uppercase( rStr );
}
......
......@@ -273,7 +273,7 @@ bool SotStorageStream::Commit()
return GetError() == SVSTREAM_OK;
}
bool SotStorageStream::SetProperty( const OUString& rName, const ::com::sun::star::uno::Any& rValue )
bool SotStorageStream::SetProperty( const OUString& rName, const css::uno::Any& rValue )
{
UCBStorageStream* pStg = dynamic_cast<UCBStorageStream*>( pOwnStm );
if ( pStg )
......@@ -821,7 +821,7 @@ bool SotStorage::IsOLEStorage( SvStream* pStream )
return Storage::IsStorageFile( pStream );
}
SotStorage* SotStorage::OpenOLEStorage( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage,
SotStorage* SotStorage::OpenOLEStorage( const css::uno::Reference < css::embed::XStorage >& xStorage,
const OUString& rEleName, StreamMode nMode )
{
sal_Int32 nEleMode = embed::ElementModes::SEEKABLEREAD;
......@@ -858,7 +858,7 @@ SotStorage* SotStorage::OpenOLEStorage( const com::sun::star::uno::Reference < c
return new SotStorage( pStream, true );
}
SotClipboardFormatId SotStorage::GetFormatID( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage )
SotClipboardFormatId SotStorage::GetFormatID( const css::uno::Reference < css::embed::XStorage >& xStorage )
{
uno::Reference< beans::XPropertySet > xProps( xStorage, uno::UNO_QUERY );
if ( !xProps.is() )
......@@ -868,7 +868,7 @@ SotClipboardFormatId SotStorage::GetFormatID( const com::sun::star::uno::Referen
xProps->getPropertyValue("MediaType") >>= aMediaType;
if ( !aMediaType.isEmpty() )
{
::com::sun::star::datatransfer::DataFlavor aDataFlavor;
css::datatransfer::DataFlavor aDataFlavor;
aDataFlavor.MimeType = aMediaType;
return SotExchange::GetFormat( aDataFlavor );
}
......@@ -876,7 +876,7 @@ SotClipboardFormatId SotStorage::GetFormatID( const com::sun::star::uno::Referen
return SotClipboardFormatId::NONE;
}
sal_Int32 SotStorage::GetVersion( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage )
sal_Int32 SotStorage::GetVersion( const css::uno::Reference < css::embed::XStorage >& xStorage )
{
SotClipboardFormatId nSotFormatID = SotStorage::GetFormatID( xStorage );
switch( nSotFormatID )
......
......@@ -657,13 +657,13 @@ UCBStorageStream_Impl::UCBStorageStream_Impl( const OUString& rName, StreamMode
try
{
// create the content
Reference< ::com::sun::star::ucb::XCommandEnvironment > xComEnv;
Reference< css::ucb::XCommandEnvironment > xComEnv;
OUString aTemp( rName );
if ( bRepair )
{
xComEnv = new ::ucbhelper::CommandEnvironment( Reference< ::com::sun::star::task::XInteractionHandler >(), xProgress );
xComEnv = new ::ucbhelper::CommandEnvironment( Reference< css::task::XInteractionHandler >(), xProgress );
aTemp += "?repairpackage";
}
......@@ -679,8 +679,8 @@ UCBStorageStream_Impl::UCBStorageStream_Impl( const OUString& rName, StreamMode
if ( nErr == rtl_Digest_E_None )
{
sal_uInt8* pBuffer = aBuffer;
::com::sun::star::uno::Sequence < sal_Int8 > aSequ( reinterpret_cast<sal_Int8*>(pBuffer), RTL_DIGEST_LENGTH_SHA1 );
::com::sun::star::uno::Any aAny;
css::uno::Sequence < sal_Int8 > aSequ( reinterpret_cast<sal_Int8*>(pBuffer), RTL_DIGEST_LENGTH_SHA1 );
css::uno::Any aAny;
aAny <<= aSequ;
m_pContent->setPropertyValue("EncryptionKey", aAny );
}
......@@ -1405,7 +1405,7 @@ bool UCBStorageStream::CopyTo( BaseStorageStream* pDestStm )
return true;
}
bool UCBStorageStream::SetProperty( const OUString& rName, const ::com::sun::star::uno::Any& rValue )
bool UCBStorageStream::SetProperty( const OUString& rName, const css::uno::Any& rValue )
{
if ( rName == "Title")
return false;
......@@ -1676,11 +1676,11 @@ void UCBStorage_Impl::Init()
if ( !pStream->GetError() )
{
::utl::OInputStreamWrapper* pHelper = new ::utl::OInputStreamWrapper( *pStream );
com::sun::star::uno::Reference < ::com::sun::star::io::XInputStream > xInputStream( pHelper );
css::uno::Reference < css::io::XInputStream > xInputStream( pHelper );
// create a manifest reader object that will read in the manifest from the stream
Reference < ::com::sun::star::packages::manifest::XManifestReader > xReader =
::com::sun::star::packages::manifest::ManifestReader::create(
Reference < css::packages::manifest::XManifestReader > xReader =
css::packages::manifest::ManifestReader::create(
::comphelper::getProcessComponentContext() ) ;
Sequence < Sequence < PropertyValue > > aProps = xReader->readManifestSequence( xInputStream );
......@@ -1715,7 +1715,7 @@ void UCBStorage_Impl::Init()
if ( !m_aContentType.isEmpty() )
{
// get the clipboard format using the content type
::com::sun::star::datatransfer::DataFlavor aDataFlavor;
css::datatransfer::DataFlavor aDataFlavor;
aDataFlavor.MimeType = m_aContentType;
m_nFormat = SotExchange::GetFormat( aDataFlavor );
......@@ -1736,13 +1736,13 @@ void UCBStorage_Impl::CreateContent()
try
{
// create content; where to put StreamMode ?! ( already done when opening the file of the package ? )
Reference< ::com::sun::star::ucb::XCommandEnvironment > xComEnv;
Reference< css::ucb::XCommandEnvironment > xComEnv;
OUString aTemp( m_aURL );
if ( m_bRepairPackage )
{
xComEnv = new ::ucbhelper::CommandEnvironment( Reference< ::com::sun::star::task::XInteractionHandler >(),
xComEnv = new ::ucbhelper::CommandEnvironment( Reference< css::task::XInteractionHandler >(),
m_xProgressHandler );
aTemp += "?repairpackage";
}
......@@ -1821,10 +1821,10 @@ void UCBStorage_Impl::ReadContent()
// streams can be external OLE objects, so they are now folders, but storages!
OUString aName( m_aURL + "/" + xRow->getString(1));
Reference< ::com::sun::star::ucb::XCommandEnvironment > xComEnv;
Reference< css::ucb::XCommandEnvironment > xComEnv;
if ( m_bRepairPackage )
{
xComEnv = new ::ucbhelper::CommandEnvironment( Reference< ::com::sun::star::task::XInteractionHandler >(),
xComEnv = new ::ucbhelper::CommandEnvironment( Reference< css::task::XInteractionHandler >(),
m_xProgressHandler );
aName += "?repairpackage";
}
......@@ -1968,7 +1968,7 @@ void UCBStorage_Impl::SetProps( const Sequence < Sequence < PropertyValue > >& r
if ( !m_aContentType.isEmpty() )
{
// get the clipboard format using the content type
::com::sun::star::datatransfer::DataFlavor aDataFlavor;
css::datatransfer::DataFlavor aDataFlavor;
aDataFlavor.MimeType = m_aContentType;
m_nFormat = SotExchange::GetFormat( aDataFlavor );
......@@ -2120,7 +2120,7 @@ sal_Int16 UCBStorage_Impl::Commit()
OUString aName( m_aURL );
aName += "/";
aName += pElement->m_aOriginalName;
pContent = new ::ucbhelper::Content( aName, Reference< ::com::sun::star::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() );
pContent = new ::ucbhelper::Content( aName, Reference< css::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() );
xDeleteContent.reset(pContent); // delete it later on exit scope
}
......@@ -2251,11 +2251,11 @@ sal_Int16 UCBStorage_Impl::Commit()
// get the stream from the temp file and create an output stream wrapper
SvStream* pStream = pTempFile->GetStream( STREAM_STD_READWRITE );
::utl::OOutputStreamWrapper* pHelper = new ::utl::OOutputStreamWrapper( *pStream );
com::sun::star::uno::Reference < ::com::sun::star::io::XOutputStream > xOutputStream( pHelper );
css::uno::Reference < css::io::XOutputStream > xOutputStream( pHelper );
// create a manifest writer object that will fill the stream
Reference < ::com::sun::star::packages::manifest::XManifestWriter > xWriter =
::com::sun::star::packages::manifest::ManifestWriter::create(
Reference < css::packages::manifest::XManifestWriter > xWriter =
css::packages::manifest::ManifestWriter::create(
::comphelper::getProcessComponentContext() );
sal_Int32 nCount = GetObjectCount() + 1;
Sequence < Sequence < PropertyValue > > aProps( nCount );
......@@ -2422,7 +2422,7 @@ void UCBStorage::SetClass( const SvGlobalName & rClass, SotClipboardFormatId nOr
// in UCB storages only the content type will be stored, all other information can be reconstructed
// ( see the UCBStorage_Impl::Init() method )
::com::sun::star::datatransfer::DataFlavor aDataFlavor;
css::datatransfer::DataFlavor aDataFlavor;
SotExchange::GetFormatDataFlavor( pImp->m_nFormat, aDataFlavor );
pImp->m_aContentType = aDataFlavor.MimeType;
}
......@@ -2441,7 +2441,7 @@ void UCBStorage::SetClassId( const ClsId& rClsId )
pImp->m_nFormat = GetFormatId_Impl( pImp->m_aClassId );
if ( pImp->m_nFormat != SotClipboardFormatId::NONE )
{
::com::sun::star::datatransfer::DataFlavor aDataFlavor;
css::datatransfer::DataFlavor aDataFlavor;
SotExchange::GetFormatDataFlavor( pImp->m_nFormat, aDataFlavor );
pImp->m_aUserTypeName = aDataFlavor.HumanPresentableName;
pImp->m_aContentType = aDataFlavor.MimeType;
......
......@@ -689,9 +689,9 @@ void SAL_CALL OLESimpleStorage::removeEventListener(
void SAL_CALL OLESimpleStorage::commit()
throw ( ::com::sun::star::io::IOException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException, std::exception )
throw ( css::io::IOException,
css::lang::WrappedTargetException,
css::uno::RuntimeException, std::exception )
{
::osl::MutexGuard aGuard( m_aMutex );
......@@ -715,9 +715,9 @@ void SAL_CALL OLESimpleStorage::commit()
void SAL_CALL OLESimpleStorage::revert()
throw ( ::com::sun::star::io::IOException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException, std::exception )
throw ( css::io::IOException,
css::lang::WrappedTargetException,
css::uno::RuntimeException, std::exception )
{
::osl::MutexGuard aGuard( m_aMutex );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment