strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix odma plugin for new ucbhelper API

Browse source 
Change-Id: I40c58967aca4f9a808feb8528f2f3ba651bb2a80
This commit is contained in:
Michael Meeks 2012-09-15 19:51:09 +01:00
parent d7515f60dc
commit 084d40d601
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ucb/source/ucp/odma/odma_content.cxx
View file

@ -349,7 +349,9 @@ uno::Any SAL_CALL Content::execute(
rtl::OUString aURL = m_xIdentifier->getContentIdentifier(); rtl::OUString aURL = m_xIdentifier->getContentIdentifier();
rtl::OUString sFileURL = openDoc(); rtl::OUString sFileURL = openDoc();
delete m_pContent; delete m_pContent;
m_pContent = new ::ucbhelper::Content(sFileURL,NULL); m_pContent = new ::ucbhelper::Content
(sFileURL,NULL,
comphelper::ComponentContext(m_xSMgr).getUNOContext());
if(!m_pContent->isDocument()) if(!m_pContent->isDocument())
{ {
rtl::OUString sErrorMsg("File: "); rtl::OUString sErrorMsg("File: ");
@ -507,7 +509,8 @@ uno::Any SAL_CALL Content::execute(
sal_Int32 nLastIndex = sFileURL.lastIndexOf( sal_Unicode('/') ); sal_Int32 nLastIndex = sFileURL.lastIndexOf( sal_Unicode('/') );
// Create a new Content object for the "shadow" file // Create a new Content object for the "shadow" file
// corresponding to the opened document from the DMS. // corresponding to the opened document from the DMS.
::ucbhelper::Content aContent(sFileURL.copy(0,nLastIndex),NULL); ::ucbhelper::Content aContent(sFileURL.copy(0,nLastIndex),NULL,
comphelper::ComponentContext(m_xSMgr).getUNOContext());
// aTransferInfo.NameClash = ucb::NameClash::OVERWRITE; // aTransferInfo.NameClash = ucb::NameClash::OVERWRITE;
aTransferInfo.NewTitle = sFileURL.copy( 1 + nLastIndex ); aTransferInfo.NewTitle = sFileURL.copy( 1 + nLastIndex );
// Copy our saved backup copy to the "shadow" file. // Copy our saved backup copy to the "shadow" file.