diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-08-03 22:53:26 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-08-04 01:57:14 +0200 |
| commit | 56977dfaa541dfc06f2cec921a49f5a68a8dbcb9 (patch) | |
| tree | 8beb13123a4b6fe2464188568d84172f415d6519 /sc/source/ui/docshell/docsh.cxx | |
| parent | 0c9aae91bcbd0cb7b0f0f7e8631aa4aeebb20993 (diff) | |
tubes: fix leaking ScCollaboration; add it to ScDocShell
Change-Id: I43c951b5694ad38aa1a2e5da7cc99dfb52685349
Diffstat (limited to 'sc/source/ui/docshell/docsh.cxx')
| -rw-r--r-- | sc/source/ui/docshell/docsh.cxx | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index 2c3d5ac0c445..6bf7aec42875 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -112,6 +112,9 @@ #include "cellsuno.hxx" #include "dpobject.hxx" #include "markdata.hxx" +#ifdef ENABLE_TELEPATHY +#include "sccollaboration.hxx" +#endif #include <vector> #include <boost/shared_ptr.hpp> @@ -2505,6 +2508,11 @@ ScDocFunc *ScDocShell::CreateDocFunc() { return new ScDocFuncDirect( *this ); } +#else +Collaboration* ScDocShell::GetCollaboration() +{ + return mpCollaboration; +} #endif ScDocShell::ScDocShell( const ScDocShell& rShell ) : @@ -2531,6 +2539,9 @@ ScDocShell::ScDocShell( const ScDocShell& rShell ) : pSolverSaveData ( NULL ), pSheetSaveData ( NULL ), pModificator ( NULL ) +#ifdef ENABLE_TELEPATHY + , mpCollaboration( new ScCollaboration() ) +#endif { RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sc", "nn93723", "ScDocShell::ScDocShell" ); @@ -2577,6 +2588,9 @@ ScDocShell::ScDocShell( const sal_uInt64 i_nSfxCreationFlags ) : pSolverSaveData ( NULL ), pSheetSaveData ( NULL ), pModificator ( NULL ) +#ifdef ENABLE_TELEPATHY + , mpCollaboration( new ScCollaboration() ) +#endif { RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sc", "nn93723", "ScDocShell::ScDocShell" ); @@ -2635,6 +2649,9 @@ ScDocShell::~ScDocShell() OSL_FAIL("The Modificator should not exist"); delete pModificator; } +#ifdef ENABLE_TELEPATHY + delete mpCollaboration; +#endif } //------------------------------------------------------------------ |