diff options
author | Matúš Kukan <matus.kukan@gmail.com> | 2012-07-26 17:56:12 +0200 |
---|---|---|
committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-07-26 22:15:58 +0200 |
commit | df2369657ebe36c3888bb032e693bf1fcb49bb51 (patch) | |
tree | 9aaf358dde0a0b139cc8ea0738410fb144c1f772 /sc/source/ui/collab/contacts.cxx | |
parent | 4eed899c596fdcb777ccb0a59c72718c6b2c295d (diff) |
tubes: send file when inviting contact to MUC collaboration
- add UUID info to TeleConference
- let SendFile function take argument for contact instead of getting
contact from the channel info, what couldn't work for MUC channel
Change-Id: I4dc45c084966a030ff4b503e192d452797f0bfdd
Diffstat (limited to 'sc/source/ui/collab/contacts.cxx')
-rw-r--r-- | sc/source/ui/collab/contacts.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sc/source/ui/collab/contacts.cxx b/sc/source/ui/collab/contacts.cxx index 72c29a01ccc5..e6e2239c50a1 100644 --- a/sc/source/ui/collab/contacts.cxx +++ b/sc/source/ui/collab/contacts.cxx @@ -107,6 +107,8 @@ class TubeContacts : public ModelessDialog { TpContact* pContact = pAC->mpContact; pSender->GetConference()->invite( pContact ); + pSender->SendFile( pContact, OStringToOUString( + pSender->GetConference()->getUuid(), RTL_TEXTENCODING_UTF8 ) ); } } } @@ -135,7 +137,7 @@ class TubeContacts : public ModelessDialog { ScDocFuncSend* pSender = EnsureScDocFuncSendInCurrentSfxObjectShell(); pSender->SetCollaboration( pConference ); - pSender->SendFile( OStringToOUString( + pSender->SendFile( pContact, OStringToOUString( pConference->getUuid(), RTL_TEXTENCODING_UTF8 ) ); } } |