diff options
Diffstat (limited to 'sc/source')
-rw-r--r-- | sc/source/filter/excel/xiescher.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/drawfunc/fuins2.cxx | 6 | ||||
-rw-r--r-- | sc/source/ui/unoobj/TablePivotCharts.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/unoobj/chartuno.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/view/cellsh2.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/view/tabvwsh2.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/view/tabvwshb.cxx | 6 |
7 files changed, 11 insertions, 11 deletions
diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx index 2f1ceadc0735..81edde0ac3cb 100644 --- a/sc/source/filter/excel/xiescher.cxx +++ b/sc/source/filter/excel/xiescher.cxx @@ -1760,7 +1760,7 @@ rtl::Reference<SdrObject> XclImpChartObj::DoCreateSdrObj( XclImpDffConverter& rD { rtl::Reference<SdrObject> xSdrObj; ScDocShell* pDocShell = GetDocShell(); - if( rDffConv.SupportsOleObjects() && SvtModuleOptions().IsChart() && pDocShell && mxChart && !mxChart->IsPivotChart() ) + if( rDffConv.SupportsOleObjects() && SvtModuleOptions().IsChartInstalled() && pDocShell && mxChart && !mxChart->IsPivotChart() ) { // create embedded chart object OUString aEmbObjName; diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx index a5fb251b7ef0..9705a405b641 100644 --- a/sc/source/ui/drawfunc/fuins2.cxx +++ b/sc/source/ui/drawfunc/fuins2.cxx @@ -243,7 +243,7 @@ FuInsertOLE::FuInsertOLE(ScTabViewShell& rViewSh, vcl::Window* pWin, ScDrawView* } else if ( nSlot == SID_INSERT_SMATH ) { - if ( SvtModuleOptions().IsMath() ) + if ( SvtModuleOptions().IsMathInstalled() ) { xObj = rViewShell.GetViewFrame().GetObjectShell()->GetEmbeddedObjectContainer().CreateEmbeddedObject( SvGlobalName( SO3_SM_CLASSID_60 ).GetByteSequence(), aName ); rReq.AppendItem( SfxGlobalNameItem( SID_INSERT_OBJECT, SvGlobalName( SO3_SM_CLASSID_60 ) ) ); @@ -345,7 +345,7 @@ FuInsertOLE::FuInsertOLE(ScTabViewShell& rViewSh, vcl::Window* pWin, ScDrawView* } // initialize chart ? - if ( SvtModuleOptions().IsChart() && SotExchange::IsChart( SvGlobalName( xObj->getClassID() ) ) ) + if ( SvtModuleOptions().IsChartInstalled() && SotExchange::IsChart( SvGlobalName( xObj->getClassID() ) ) ) lcl_ChartInit(xObj, &rViewSh.GetViewData(), OUString(), false); ScViewData& rData = rViewSh.GetViewData(); @@ -419,7 +419,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell& rViewSh, vcl::Window* pWin, ScDrawV if( ! rReq.IsAPI() ) rReq.Done(); - if (!SvtModuleOptions().IsChart()) + if (!SvtModuleOptions().IsChartInstalled()) return; // BM/IHA -- diff --git a/sc/source/ui/unoobj/TablePivotCharts.cxx b/sc/source/ui/unoobj/TablePivotCharts.cxx index 2142a006e8e1..c08c5aa78bc4 100644 --- a/sc/source/ui/unoobj/TablePivotCharts.cxx +++ b/sc/source/ui/unoobj/TablePivotCharts.cxx @@ -94,7 +94,7 @@ void SAL_CALL TablePivotCharts::addNewByName(OUString const & rName, uno::Reference<embed::XEmbeddedObject> xObject; - if (SvtModuleOptions().IsChart()) + if (SvtModuleOptions().IsChartInstalled()) xObject = m_pDocShell->GetEmbeddedObjectContainer().CreateEmbeddedObject(SvGlobalName(SO3_SCH_CLASSID).GetByteSequence(), aName); if (!xObject.is()) diff --git a/sc/source/ui/unoobj/chartuno.cxx b/sc/source/ui/unoobj/chartuno.cxx index ab5bcb19a12c..c0d88b031789 100644 --- a/sc/source/ui/unoobj/chartuno.cxx +++ b/sc/source/ui/unoobj/chartuno.cxx @@ -172,7 +172,7 @@ void SAL_CALL ScChartsObj::addNewByName( const OUString& rName, ScRangeListRef xNewRanges( pList ); uno::Reference < embed::XEmbeddedObject > xObj; - if ( SvtModuleOptions().IsChart() ) + if ( SvtModuleOptions().IsChartInstalled() ) xObj = pDocShell->GetEmbeddedObjectContainer().CreateEmbeddedObject( SvGlobalName( SO3_SCH_CLASSID ).GetByteSequence(), aName ); if ( !xObj.is() ) return; diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx index 1a3aa891ffde..f6577c7f16b5 100644 --- a/sc/source/ui/view/cellsh2.cxx +++ b/sc/source/ui/view/cellsh2.cxx @@ -1175,7 +1175,7 @@ void ScCellShell::GetDBState( SfxItemSet& rSet ) case SID_VIEW_DATA_SOURCE_BROWSER: { - if (!SvtModuleOptions().IsModuleInstalled(SvtModuleOptions::EModule::DATABASE)) + if (!SvtModuleOptions().IsDataBaseInstalled()) rSet.Put(SfxVisibilityItem(nWhich, false)); else // get state (BoolItem) from SfxViewFrame diff --git a/sc/source/ui/view/tabvwsh2.cxx b/sc/source/ui/view/tabvwsh2.cxx index 8ff41cc374bd..d0bff87ee629 100644 --- a/sc/source/ui/view/tabvwsh2.cxx +++ b/sc/source/ui/view/tabvwsh2.cxx @@ -399,7 +399,7 @@ void ScTabViewShell::GetDrawState(SfxItemSet &rSet) case SID_DRAW_CHART: { bool bOle = GetViewFrame().GetFrame().IsInPlace(); - if ( bOle || !SvtModuleOptions().IsChart() ) + if ( bOle || !SvtModuleOptions().IsChartInstalled() ) rSet.DisableItem( nWhich ); } break; diff --git a/sc/source/ui/view/tabvwshb.cxx b/sc/source/ui/view/tabvwshb.cxx index 3b1bf47dc238..ae82a7b74a9f 100644 --- a/sc/source/ui/view/tabvwshb.cxx +++ b/sc/source/ui/view/tabvwshb.cxx @@ -231,7 +231,7 @@ void ScTabViewShell::ActivateObject(SdrOle2Obj* pObj, sal_Int32 nVerb) // attach listener to selection changes in chart that affect cell // ranges, so those can be highlighted // note: do that after DoVerb, so that the chart controller exists - if ( SvtModuleOptions().IsChart() ) + if ( SvtModuleOptions().IsChartInstalled() ) { SvGlobalName aObjClsId ( xObj->getClassID() ); if (SotExchange::IsChart( aObjClsId )) @@ -603,12 +603,12 @@ void ScTabViewShell::GetDrawInsState(SfxItemSet &rSet) switch ( nWhich ) { case SID_INSERT_DIAGRAM: - if ( bOle || bTabProt || !SvtModuleOptions().IsChart() || bShared ) + if ( bOle || bTabProt || !SvtModuleOptions().IsChartInstalled() || bShared ) rSet.DisableItem( nWhich ); break; case SID_INSERT_SMATH: - if ( bOle || bTabProt || !SvtModuleOptions().IsMath() || bShared ) + if ( bOle || bTabProt || !SvtModuleOptions().IsMathInstalled() || bShared ) rSet.DisableItem( nWhich ); break; |