diff options
author | Matúš Kukan <matus.kukan@gmail.com> | 2012-08-07 23:34:19 +0200 |
---|---|---|
committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-08-08 10:04:20 +0200 |
commit | c3c2dcf80de012b620de8563d7e872c3ae556881 (patch) | |
tree | d85f4b62fa10b0db479c720a37b8ca7ccdc01b44 /sc | |
parent | 1fa1894ec4ac7dd2ba314716d5565f3dac87592a (diff) |
tubes: do not encode UUID into file name anymore
Change-Id: I6c3828eb9c2f2d1810822e90006fc1af4bfcf277
Diffstat (limited to 'sc')
-rw-r--r-- | sc/source/ui/collab/sccollaboration.cxx | 9 | ||||
-rw-r--r-- | sc/source/ui/collab/sendfunc.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/inc/sccollaboration.hxx | 2 |
3 files changed, 5 insertions, 8 deletions
diff --git a/sc/source/ui/collab/sccollaboration.cxx b/sc/source/ui/collab/sccollaboration.cxx index 78e97217c482..74c067c611c4 100644 --- a/sc/source/ui/collab/sccollaboration.cxx +++ b/sc/source/ui/collab/sccollaboration.cxx @@ -45,13 +45,10 @@ void ScCollaboration::PacketReceived( const OString& rPacket ) const return pSender->RecvMessage( rPacket ); } -void ScCollaboration::SaveAndSendFile( TpContact* pContact, const OUString& sUuid ) const +void ScCollaboration::SaveAndSendFile( TpContact* pContact ) const { - String aTmpPath = utl::TempFile::CreateTempName(); - aTmpPath.Append( OUString("_") ); - aTmpPath.Append( sUuid ); - aTmpPath.Append( OUString("_") ); - aTmpPath.Append( OUString(".ods") ); + OUString aTmpPath = utl::TempFile::CreateTempName(); + aTmpPath += ".ods"; rtl::OUString aFileURL; ::utl::LocalFileHelper::ConvertPhysicalNameToURL( aTmpPath, aFileURL ); diff --git a/sc/source/ui/collab/sendfunc.cxx b/sc/source/ui/collab/sendfunc.cxx index d4b0253bed82..7a7c7414e000 100644 --- a/sc/source/ui/collab/sendfunc.cxx +++ b/sc/source/ui/collab/sendfunc.cxx @@ -121,7 +121,7 @@ sal_Bool ScDocFuncSend::SetNormalString( bool& o_rbNumFmtSet, const ScAddress& r o_rbNumFmtSet = false; if ( rtl::OUString( rText ) == "saveme" ) - mpCollaboration->SaveAndSendFile( NULL, rText ); + mpCollaboration->SaveAndSendFile( NULL ); if ( rtl::OUString( rText ) == "contacts" ) mpCollaboration->DisplayContacts(); diff --git a/sc/source/ui/inc/sccollaboration.hxx b/sc/source/ui/inc/sccollaboration.hxx index cc71fe959cef..ece2604b3bbd 100644 --- a/sc/source/ui/inc/sccollaboration.hxx +++ b/sc/source/ui/inc/sccollaboration.hxx @@ -25,7 +25,7 @@ public: virtual void ContactLeft() const; virtual void PacketReceived( const OString& rPacket ) const; - virtual void SaveAndSendFile( TpContact* pContact, const OUString& rURL ) const; + virtual void SaveAndSendFile( TpContact* pContact ) const; virtual void StartCollaboration( TeleConference* pConference ); private: friend class ScDocShell; |