summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu5
-rw-r--r--sc/inc/sc.hrc1
-rw-r--r--sc/sdi/cellsh.sdi1
-rw-r--r--sc/sdi/scalc.sdi25
-rw-r--r--sc/source/ui/view/cellsh3.cxx13
-rw-r--r--sc/uiconfig/scalc/menubar/menubar.xml2
6 files changed, 47 insertions, 0 deletions
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index be058594cfe9..e6767b7826e7 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -763,6 +763,11 @@
<value xml:lang="en-US">Sheet Area Input Field</value>
</prop>
</node>
+ <node oor:name=".uno:Collaborate" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Collaborate...</value>
+ </prop>
+ </node>
<node oor:name=".uno:UnderlineNone" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Underline: Off</value>
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 71ef7c816731..19e9396f9917 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -158,6 +158,7 @@
#define SID_CHOOSE_DESIGN (SC_VIEW_START + 82)
#define SID_EURO_CONVERTER (SC_VIEW_START + 83)
+#define SID_COLLABORATION (SC_VIEW_START + 84)
#define SID_EXTERNAL_SOURCE (SC_VIEW_START + 85)
#define SID_SC_INPUT_TEXTWYSIWYG (SC_VIEW_START + 86)
diff --git a/sc/sdi/cellsh.sdi b/sc/sdi/cellsh.sdi
index f20b07c4cf36..77eea5c9fb78 100644
--- a/sc/sdi/cellsh.sdi
+++ b/sc/sdi/cellsh.sdi
@@ -181,6 +181,7 @@ interface CellSelection
SID_INSERT_POSTIT [ ExecMethod = ExecuteEdit; StateMethod = GetCellState; ]
+ SID_COLLABORATION [ ExecMethod = Execute; ]
SID_TABOP [ ExecMethod = ExecuteEdit; StateMethod = GetState; ]
SID_CONSOLIDATE [ ExecMethod = ExecuteEdit; StateMethod = GetState; ]
FID_INSERT_NAME [ ExecMethod = ExecuteEdit; StateMethod = GetState; ]
diff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdi
index 050c64512366..451ffca2ce8c 100644
--- a/sc/sdi/scalc.sdi
+++ b/sc/sdi/scalc.sdi
@@ -2648,6 +2648,31 @@ SfxVoidItem FocusCellAddress FID_FOCUS_POSWND
]
//--------------------------------------------------------------------------
+SfxVoidItem Collaborate SID_COLLABORATION
+()
+[
+ /* flags: */
+ AutoUpdate = FALSE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = TRUE,
+ ReadOnlyDoc = TRUE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
+ RecordPerSet;
+ Synchron;
+
+ /* config: */
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = TRUE,
+ GroupId = GID_FORMAT;
+]
+
+//--------------------------------------------------------------------------
SfxVoidItem FormatCellDialog FID_CELL_FORMAT
()
[
diff --git a/sc/source/ui/view/cellsh3.cxx b/sc/source/ui/view/cellsh3.cxx
index 7a2020443149..1b1a1e9392c2 100644
--- a/sc/source/ui/view/cellsh3.cxx
+++ b/sc/source/ui/view/cellsh3.cxx
@@ -52,6 +52,13 @@
#include "markdata.hxx"
#include "scabstdlg.hxx"
+#ifdef ENABLE_TELEPATHY
+#include <tubes/manager.hxx>
+namespace tubes {
+ void createContacts( const TeleManager &rContacts );
+}
+#endif
+
#define IS_EDITMODE() GetViewData()->HasEditView( GetViewData()->GetActivePart() )
using sc::HMMToTwips;
@@ -111,6 +118,12 @@ void ScCellShell::Execute( SfxRequest& rReq )
case SID_ATTR_SIZE://XXX ???
break;
+ case SID_COLLABORATION:
+#ifdef ENABLE_TELEPATHY
+ tubes::createContacts( TeleManager::get( true ) );
+#endif
+ break;
+
case SID_STATUS_SELMODE:
if ( pReqArgs )
{
diff --git a/sc/uiconfig/scalc/menubar/menubar.xml b/sc/uiconfig/scalc/menubar/menubar.xml
index 8feb89ea407d..ac94fa01354e 100644
--- a/sc/uiconfig/scalc/menubar/menubar.xml
+++ b/sc/uiconfig/scalc/menubar/menubar.xml
@@ -16,6 +16,8 @@
<menu:menuitem menu:id=".uno:Reload"/>
<menu:menuitem menu:id=".uno:VersionDialog"/>
<menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:Collaborate"/>
+ <menu:menuseparator/>
<menu:menuitem menu:id=".uno:ExportTo"/>
<menu:menuitem menu:id=".uno:ExportToPDF"/>
<menu:menu menu:id=".uno:SendTo">