diff options
author | Tor Lillqvist <tml@iki.fi> | 2013-03-27 11:35:40 +0200 |
---|---|---|
committer | Tor Lillqvist <tml@iki.fi> | 2013-03-27 11:36:03 +0200 |
commit | a8c3c673eaec987e9fe47123f60e5f9d34a4e93f (patch) | |
tree | addc0a07ffb5430f6a2c74e4cb599bd1f3de41dd /sc | |
parent | Add config_features.h platform or configurable high-level features (diff) | |
download | core-a8c3c673eaec987e9fe47123f60e5f9d34a4e93f.tar.gz core-a8c3c673eaec987e9fe47123f60e5f9d34a4e93f.zip |
Use <config_features.h> instead of -DLIBO_FEATURE_*
Change-Id: Idc198beb6d759dbe3bad6ea58d896c1555b4cc0f
Diffstat (limited to 'sc')
-rw-r--r-- | sc/source/ui/docshell/docsh.cxx | 8 | ||||
-rw-r--r-- | sc/source/ui/docshell/docsh4.cxx | 10 | ||||
-rw-r--r-- | sc/source/ui/unoobj/confuno.cxx | 6 | ||||
-rw-r--r-- | sc/source/ui/view/viewfunc.cxx | 4 |
4 files changed, 18 insertions, 10 deletions
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index b87bb7b4583b..792c1b746ea9 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_features.h> + #include "docsh.hxx" #include "scitems.hxx" @@ -635,7 +637,7 @@ void ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) { case SFX_EVENT_LOADFINISHED: { -#ifdef LIBO_FEATURE_DESKTOP +#if HAVE_FEATURE_MULTIUSER_ENVIRONMENT // the readonly documents should not be opened in shared mode if ( HasSharedXMLFlagSet() && !SC_MOD()->IsInSharedDocLoading() && !IsReadOnly() ) { @@ -660,7 +662,7 @@ void ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) break; case SFX_EVENT_VIEWCREATED: { -#ifdef LIBO_FEATURE_DESKTOP +#if HAVE_FEATURE_MULTIUSER_ENVIRONMENT if ( IsDocShared() && !SC_MOD()->IsInSharedDocLoading() ) { ScAppOptions aAppOptions = SC_MOD()->GetAppOptions(); @@ -720,7 +722,7 @@ void ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) break; case SFX_EVENT_SAVEDOC: { -#ifdef LIBO_FEATURE_DESKTOP +#if HAVE_FEATURE_MULTIUSER_ENVIRONMENT if ( IsDocShared() && !SC_MOD()->IsInSharedDocSaving() ) { bool bSuccess = false; diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index f9c09dee86e0..70c911d10352 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_features.h> + #include <com/sun/star/embed/XEmbeddedObject.hpp> #include <com/sun/star/frame/Desktop.hpp> #include <com/sun/star/frame/XComponentLoader.hpp> @@ -727,7 +729,7 @@ void ScDocShell::Execute( SfxRequest& rReq ) if ( !pOtherDocSh->GetError() ) // nur Errors { sal_Bool bHadTrack = ( aDocument.GetChangeTrack() != NULL ); -#ifdef LIBO_FEATURE_DESKTOP +#if HAVE_FEATURE_MULTIUSER_ENVIRONMENT sal_uLong nStart = 0; if ( nSlot == SID_DOCUMENT_MERGE && pChangeTrack ) { @@ -767,7 +769,7 @@ void ScDocShell::Execute( SfxRequest& rReq ) aDocument.SetChangeViewSettings(aChangeViewSet); } } -#ifdef LIBO_FEATURE_DESKTOP +#if HAVE_FEATURE_MULTIUSER_ENVIRONMENT else if ( nSlot == SID_DOCUMENT_MERGE && IsDocShared() && pChangeTrack ) { sal_uLong nEnd = pChangeTrack->GetActionMax(); @@ -898,7 +900,7 @@ void ScDocShell::Execute( SfxRequest& rReq ) } break; -#ifdef LIBO_FEATURE_DESKTOP +#if HAVE_FEATURE_MULTIUSER_ENVIRONMENT case SID_SHARE_DOC: { ScViewData* pViewData = GetViewData(); @@ -2301,7 +2303,7 @@ IMPL_LINK( ScDocShell, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg ) return 0; } -#ifdef LIBO_FEATURE_DESKTOP +#if HAVE_FEATURE_MULTIUSER_ENVIRONMENT void ScDocShell::EnableSharedSettings( bool bEnable ) { diff --git a/sc/source/ui/unoobj/confuno.cxx b/sc/source/ui/unoobj/confuno.cxx index 4b4e293b85c1..4c42538adf7c 100644 --- a/sc/source/ui/unoobj/confuno.cxx +++ b/sc/source/ui/unoobj/confuno.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_features.h> + #include "confuno.hxx" #include "unonames.hxx" #include "scdll.hxx" @@ -257,7 +259,7 @@ void SAL_CALL ScDocumentConfiguration::setPropertyValue( } else if ( aPropertyName.compareToAscii( SC_UNO_SHAREDOC ) == 0 ) { -#ifdef LIBO_FEATURE_DESKTOP +#if HAVE_FEATURE_MULTIUSER_ENVIRONMENT sal_Bool bDocShared = false; if ( aValue >>= bDocShared ) { @@ -418,7 +420,7 @@ uno::Any SAL_CALL ScDocumentConfiguration::getPropertyValue( const rtl::OUString aRet <<= pDocShell->IsLoadReadonly(); else if ( aPropertyName.compareToAscii( SC_UNO_SHAREDOC ) == 0 ) { -#ifdef LIBO_FEATURE_DESKTOP +#if HAVE_FEATURE_MULTIUSER_ENVIRONMENT ScUnoHelpFunctions::SetBoolInAny( aRet, pDocShell->HasSharedXMLFlagSet() ); #endif } diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx index 80e9c2f7e856..e46a6bd47f64 100644 --- a/sc/source/ui/view/viewfunc.cxx +++ b/sc/source/ui/view/viewfunc.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_features.h> + #include "scitems.hxx" #include <editeng/eeitem.hxx> @@ -1531,7 +1533,7 @@ void ScViewFunc::DeleteCells( DelCellCmd eCmd, sal_Bool bRecord ) ScDocShell* pDocSh = GetViewData()->GetDocShell(); const ScMarkData& rMark = GetViewData()->GetMarkData(); -#ifdef LIBO_FEATURE_DESKTOP +#if HAVE_FEATURE_MULTIUSER_ENVIRONMENT // #i94841# [Collaboration] if deleting rows is rejected, the content is sometimes wrong if ( pDocSh->IsDocShared() && ( eCmd == DEL_DELROWS || eCmd == DEL_DELCOLS ) ) { |