Commit Graph

69 Commits

Author SHA1 Message Date
David Tardon
ab382911ae move anonymous namespace to .cxx
Change-Id: I52d2ed4b0454233da21e9040dd324772247113c1
2013-04-06 13:33:33 +02:00
Kohei Yoshida
428b0aecee Move ScFormulaCell into its own header source files: formulacell.?xx.
Change-Id: I65f2cb12c06784b5bcf6c6a2fad773825b6c409c
2013-03-28 17:03:56 -04:00
Kohei Yoshida
987085cbb1 bInterpret is always set false. Remove it.
Change-Id: I067f8eb4b81231e3ea7f084a6608c29e0dfeaf2b
2013-03-22 21:49:21 -04:00
Kohei Yoshida
6de145fdfa String to OUString.
Change-Id: Ib31cd61f960a73924988aa35c24e106cf668b78b
2013-03-22 21:49:20 -04:00
Kohei Yoshida
7d1d5f290d Remove unused method parameter.
Change-Id: Ib297f38ab5428f4251d5f482c87bcac926250aa9
2013-03-22 21:49:19 -04:00
Kohei Yoshida
2ce72093cd ScDocFunc::PutCell() is no longer used. Remove it.
Change-Id: Id76a8cfe2d67c3461aab6ea0bb71a99abba65e84
2013-03-22 21:49:19 -04:00
Kohei Yoshida
a67e7ca6cd ScDocFunc::SetFormulaCell() to replace use of PutCell() for formula cells.
Due to the complexity of the formula cell class, we'll keep this cell class
until further notice.

Change-Id: I0e11d0aa6ca2ee959a1963c606ad0684aeec27ed
2013-03-22 21:49:18 -04:00
Kohei Yoshida
bcf5b54b47 Add SetStringCell() and SetEditCell() to ScDocFunc.
More on averting the use of PutCell().

Change-Id: I3881d7d468780eefe8016c754a053eb42ad3c5ad
2013-03-22 21:49:17 -04:00
Kohei Yoshida
8aac68741b Convert some of ScDocFunc::PutCell() to SetValueCell().
Also implement the telepathy serialization part.

Change-Id: Ie67b26d5f7778d0c1f09a9ef748e0fe846ac3dc5
2013-03-22 21:49:17 -04:00
Kohei Yoshida
25869d8c9b First cut on implementing SetValueCell in ScDocFunc. Not tested yet.
Also, I have yet to implement the undo and redo for this.

ScDocFunc::PutCell needs to be eventually eliminated, in order to avoid
direct use of cell classes outside the document.

Change-Id: Iae7abc048fc67214037fa0a080fdadbadfa074fd
2013-03-22 21:49:16 -04:00
Matúš Kukan
9adf29502b tubes: correctly use SAL_INFO and SAL_WARN macros
Change-Id: Ib08ff43a4a65029b37ddbddea1538d570d258300
2012-08-16 15:38:37 +02:00
Matúš Kukan
c3c2dcf80d tubes: do not encode UUID into file name anymore
Change-Id: I6c3828eb9c2f2d1810822e90006fc1af4bfcf277
2012-08-08 10:04:20 +02:00
Matúš Kukan
b870f1420e tubes: make contacts dialog a member of Collaboration class
Change-Id: Ib50b550f9486bc1abfeefd5d1aac57c0d712ec04
2012-08-08 10:04:17 +02:00
Matúš Kukan
34c6421bdd tubes: handle TeleConference internally in Collaboration
Hopefully, this simplifies the tubes <-> app interface

Change-Id: I8933fde490941b259d5d133972db26a09ab380d5
2012-08-08 10:04:16 +02:00
Matúš Kukan
b3da63d28f tubes: avoid boost::signaling received packets
Change-Id: I63e262aa05ec7c06c15eaf74201b6ac1966e2e56
2012-08-04 22:51:36 +02:00
Matúš Kukan
ee1b41dcc2 tubes: avoid ugly SAL_DLLPUBLIC_EXPORT here
Change-Id: Icd839cd70dd32f766ad52d74fcf3cff28281da7e
2012-08-04 22:51:36 +02:00
Matúš Kukan
8b3596bccd tubes: get rid of old way of demo collaboration and ScDocFuncDemo
Also merge ScDocFuncRecv into ScDocFuncSend, now that is possible.

Change-Id: I39bec141a99a8c8ce00400f581cce8d87f7d1972
2012-08-04 22:51:33 +02:00
Matúš Kukan
8aef9f4027 tubes: stop collaborating when the contact leaves
Change-Id: I779aededb95eac6cbfb2fec3e97d207704244e25
2012-08-04 01:57:16 +02:00
Matúš Kukan
56977dfaa5 tubes: fix leaking ScCollaboration; add it to ScDocShell
Change-Id: I43c951b5694ad38aa1a2e5da7cc99dfb52685349
2012-08-04 01:57:14 +02:00
Matúš Kukan
3ef03fbf80 tubes: make TeleManager::getConference() static
Change-Id: Ic7023a40eb2f09802b100d9317c0a6a66d901476
2012-08-04 01:57:10 +02:00
Matúš Kukan
bc21b49a46 tubes: move sc/source/ui/collab/contacts.* to tubes
- sc no longer directly links against telepathy
- there is new class ScCollaboration derived from abstract Collaboration
  describing collaboration functionality for apps used in tubes/
- also added resource manager into tubes/

Change-Id: Ic89ae955f5b47490f4f4b8781bcee5dea5336bae
2012-08-02 18:00:55 +02:00
Matúš Kukan
df2369657e 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
2012-07-26 22:15:58 +02:00
Matúš Kukan
bb9399e2cf tubes: kill double-singletonning of TeleManager
I am not sure why it was introduced in
0dae49a03c
and hope that it's safe to remove it now.

Change-Id: I62f0ac230a83473386eabc45c9fcc387f62631e3
2012-07-26 15:59:19 +02:00
Matúš Kukan
da5220d7d2 tubes: fix crash: do not delete boost::shared_ptr's pointer
This prevents a crash on exit for INTERCEPT=demo but there is another:
Open more calc documents, close one, and then type something -> crash.
I wonder if this was working in the past.

Change-Id: I599b1babb02488d317c6684aba7431b5de7af15b
2012-07-24 13:51:12 +02:00
Matúš Kukan
bbeb2ea423 tubes: remove unused method
Change-Id: I8657786fe64753a2e2a57febd1d56b39f83dec33
2012-07-24 13:51:11 +02:00
Matúš Kukan
1fe939da1d tubes: small cleaning
Change-Id: I15337276f21febba44b84d3618fedfc08013a3da
2012-07-21 22:09:14 +02:00
Matúš Kukan
4d8e800d05 tubes: remove TelePacket, it's just simple string
Change-Id: Iabfb50454c573ac9c01aba1b309822c4ef6fcc73
2012-07-21 22:09:12 +02:00
Matúš Kukan
57e5be3fc3 tubes: move ScDocFuncRecv::fileReceived to TeleManager_fileReceived
Change-Id: Ie2ab2c2d545f6fcbdc21171868c99b1756c90792
2012-07-20 21:39:14 +02:00
Matúš Kukan
37c67a1378 tubes: send a file for collaboration when buddy session starts
Channels for file and for tube are independent in telepathy,
so let sender create UUID and pass it to receiver, who then can
bind the document to the channel.
UUID for tube channel goes through telepathy.
UUID for file channel is encoded in the filename for now.

Tubes specific CreateDocFunc is re-introduced, so we could set
current UUID after file is received and when the document is being
constructed, get channel from TeleManager with this UUID.
This is not immune to constructing other documents in the middle of binding
proccess.

Change-Id: I57c7e57a5d7d3ccd7d94677a8cf2719c78baa2fd
2012-07-20 12:46:59 +02:00
Julien Nabet
b37bcdded6 Prefer prefix ++/-- operators for non-primitive types
Change-Id: Iba122812b0485f6e8097e1767b64d7ed67f9684e
2012-07-20 08:35:11 +02:00
Eike Rathke
98cd5f3fa3 tubes: reintroduced handling of extending formats in ScViewFunc::EnterData()
In ScDocFunc*::SetNormalString() pass the underlying
ScDocument::SetString() return value back to caller.

Change-Id: Ie75169af1bd9bc55d1447ee14e1206407d750c73
2012-07-17 16:40:31 +02:00
Eike Rathke
bf4c5e3454 tubes: check mpConference before using it
Change-Id: I8949ae1f43439465701244b501f6779debc34565
2012-07-17 16:40:28 +02:00
Matúš Kukan
f5ee5d794f tubes: add possibility to invite contacts to MUC
Change-Id: Ia27c725aff1d16d21ee1f5abcfff9a107bd87a82
2012-07-17 16:40:27 +02:00
Matúš Kukan
53b180a49a tubes: associate the document directly with TeleConference
Packet communication now goes directly through TeleConference and
TeleManager is used only for receiving files and new channels.

This should also allow collaboration of different documents with
different contacts independently.

Change-Id: Iaf719dce156f1c4c9edc3db4ff0964dec0e0c944
2012-07-17 16:40:25 +02:00
Matúš Kukan
36170cd0db tubes: start collaboration from the File->Collaborate menu as the only way
This also kills LIBO_TUBES variable.
Listen button is used for registering client handlers (was LIBO_TUBES=slave).
It may not be possible (if the name is already in use by another process).

Change-Id: I04e0eb8721fa8e74c6cff585c79124b18046aad4
2012-07-17 16:40:24 +02:00
Matúš Kukan
eafd7161ed tubes: remove unused TeleManager::mbAcceptIncoming
Change-Id: Idb4f8e4e47be88efa9e199588936cf426b3e1ce4
2012-07-17 16:40:24 +02:00
Matúš Kukan
f0685e2c69 tubes: create TeleManager when starting Collaboration dialog
And store the reference. I need to find a place where to unref it.

Change-Id: I4a9d6d8dfadf94c21cfed06524f495e8e48b8323
2012-07-17 16:40:23 +02:00
Matúš Kukan
fd9d7f35d9 tubes: split TeleManager::connect method.
Use createAccountManager instead.
Optionally also register clients for accepting tubes. Will be used more later.

Change-Id: I353d45e95fa130c0c578b74d016b650039358ea7
2012-07-17 16:40:23 +02:00
Matúš Kukan
17c5492214 tubes: reduce the use of boost::shared_ptr
Change-Id: Iafb38cf635ac8a967e5a94965f537fe0fa021f87
2012-07-17 16:40:22 +02:00
Eike Rathke
44b3211385 include tubes/warnings_guard_boost_signals2.hpp [-Werror=shadow]
Change-Id: I20236d46f5ed631b073f572a16a098f64f998179
2012-07-17 16:40:22 +02:00
Matúš Kukan
ac08e4b336 tubes: unref TeleManager if we do not store the pointer 2012-07-17 16:40:18 +02:00
Matúš Kukan
3ee62ed5a0 tubes: remove unused SetCollaboration method 2012-07-17 16:40:17 +02:00
Matúš Kukan
b5dbf32abf tubes: create InitTeleManager method 2012-07-17 16:40:15 +02:00
Matúš Kukan
0b4ab5f2ec tubes: extract class definitions to sendfunc.hxx 2012-07-17 16:40:15 +02:00
Matúš Kukan
d10839a1bd tubes: start collaboration from the contacts widget 2012-07-17 16:40:14 +02:00
Matúš Kukan
deea13f965 tubes: ScDocFuncSend: store pointer to TeleManager 2012-07-17 16:40:13 +02:00
Matúš Kukan
603c2cb9dd tubes: remove ScCollaboration layer 2012-07-17 16:40:12 +02:00
Michael Meeks
bfb7015446 tubes: cleanup abstraction, and add in-process demo mode
Pass const rtl::OUString &s around instead of random pointers.
Allow sc/ to build and work without telepathy enabled.
Add aforementioned demo mode hack.
2012-07-17 16:40:10 +02:00
Eike Rathke
eee8efc644 tubes: LINK is gone 2012-07-17 16:40:04 +02:00
Eike Rathke
5eb6e49f27 tubes: shared_ptr for ScDocFunc chains and ScCollaboration 2012-07-17 16:40:03 +02:00