diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2013-03-19 16:44:12 +0100 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2013-03-20 11:34:18 +0100 |
| commit | 52f8321c412cad280c9029f10f9aef03f4f20544 (patch) | |
| tree | 9942cfe490f7107177ad69175be3039b0f20b32a /sc/source | |
| parent | 151abb8b2b9d3a22229b98cec12e29484d12109b (diff) | |
use #if instead of #ifdef for testing config_xxx.hxx macros
http://lists.freedesktop.org/archives/libreoffice/2013-March/047769.html
Change-Id: I81ed4500878ff3193e028410a1f0205e28d17fc3
Diffstat (limited to 'sc/source')
| -rw-r--r-- | sc/source/ui/docshell/docsh.cxx | 10 | ||||
| -rw-r--r-- | sc/source/ui/inc/docsh.hxx | 6 | ||||
| -rw-r--r-- | sc/source/ui/view/cellsh3.cxx | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index 67ae652f7d49..deea8594fb9c 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -121,7 +121,7 @@ #include <config_telepathy.h> -#ifdef ENABLE_TELEPATHY +#if ENABLE_TELEPATHY #include "sccollaboration.hxx" #endif @@ -2556,7 +2556,7 @@ sal_Bool ScDocShell::HasAutomaticTableName( const String& rFilter ) || rFilter.EqualsAscii( pFilterRtf ); } -#ifndef ENABLE_TELEPATHY +#if ! ENABLE_TELEPATHY ScDocFunc *ScDocShell::CreateDocFunc() { return new ScDocFuncDirect( *this ); @@ -2592,7 +2592,7 @@ ScDocShell::ScDocShell( const ScDocShell& rShell ) : pSolverSaveData ( NULL ), pSheetSaveData ( NULL ), pModificator ( NULL ) -#ifdef ENABLE_TELEPATHY +#if ENABLE_TELEPATHY , mpCollaboration( new ScCollaboration( this ) ) #endif { @@ -2641,7 +2641,7 @@ ScDocShell::ScDocShell( const sal_uInt64 i_nSfxCreationFlags ) : pSolverSaveData ( NULL ), pSheetSaveData ( NULL ), pModificator ( NULL ) -#ifdef ENABLE_TELEPATHY +#if ENABLE_TELEPATHY , mpCollaboration( new ScCollaboration( this ) ) #endif { @@ -2702,7 +2702,7 @@ ScDocShell::~ScDocShell() OSL_FAIL("The Modificator should not exist"); delete pModificator; } -#ifdef ENABLE_TELEPATHY +#if ENABLE_TELEPATHY delete mpCollaboration; #endif } diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx index 55054f807909..a18f127ef0dd 100644 --- a/sc/source/ui/inc/docsh.hxx +++ b/sc/source/ui/inc/docsh.hxx @@ -63,7 +63,7 @@ class ScOptSolverSave; class ScSheetSaveData; class ScFlatBoolRowSegments; struct ScColWidthParam; -#ifdef ENABLE_TELEPATHY +#if ENABLE_TELEPATHY class ScCollaboration; #endif @@ -111,7 +111,7 @@ class SC_DLLPUBLIC ScDocShell: public SfxObjectShell, public SfxListener ScSheetSaveData* pSheetSaveData; ScDocShellModificator* pModificator; // #109979#; is used to load XML (created in BeforeXMLLoading and destroyed in AfterXMLLoading) -#ifdef ENABLE_TELEPATHY +#if ENABLE_TELEPATHY ScCollaboration* mpCollaboration; #endif @@ -180,7 +180,7 @@ public: using SfxShell::Activate; // with sal_Bool bMDI using SfxShell::Deactivate; // with sal_Bool bMDI -#ifdef ENABLE_TELEPATHY +#if ENABLE_TELEPATHY SC_DLLPRIVATE ScCollaboration* GetCollaboration(); #endif virtual void Activate(); diff --git a/sc/source/ui/view/cellsh3.cxx b/sc/source/ui/view/cellsh3.cxx index 4d16931094ad..4e40e4fbaf8e 100644 --- a/sc/source/ui/view/cellsh3.cxx +++ b/sc/source/ui/view/cellsh3.cxx @@ -45,7 +45,7 @@ #include <config_telepathy.h> -#ifdef ENABLE_TELEPATHY +#if ENABLE_TELEPATHY #include "sccollaboration.hxx" #endif @@ -106,7 +106,7 @@ void ScCellShell::Execute( SfxRequest& rReq ) break; case SID_COLLABORATION: -#ifdef ENABLE_TELEPATHY +#if ENABLE_TELEPATHY GetViewData()->GetDocShell()->GetCollaboration()->DisplayContacts(); #endif break; |