diff options
255 files changed, 1032 insertions, 1032 deletions
diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.cxx b/chart2/source/controller/dialogs/tp_AxisLabel.cxx index 2c9a4663adbc..9883b6496dca 100644 --- a/chart2/source/controller/dialogs/tp_AxisLabel.cxx +++ b/chart2/source/controller/dialogs/tp_AxisLabel.cxx @@ -135,12 +135,12 @@ bool SchAxisLabelTabPage::FillItemSet( SfxItemSet* rOutAttrs ) return true; } -void SchAxisLabelTabPage::Reset( const SfxItemSet& rInAttrs ) +void SchAxisLabelTabPage::Reset( const SfxItemSet* rInAttrs ) { const SfxPoolItem* pPoolItem = NULL; // show description - SfxItemState aState = rInAttrs.GetItemState( SCHATTR_AXIS_SHOWDESCR, false, &pPoolItem ); + SfxItemState aState = rInAttrs->GetItemState( SCHATTR_AXIS_SHOWDESCR, false, &pPoolItem ); if( aState == SFX_ITEM_DONTCARE ) { m_pCbShowDescription->EnableTriState( true ); @@ -162,7 +162,7 @@ void SchAxisLabelTabPage::Reset( const SfxItemSet& rInAttrs ) // check new degree item m_nInitialDegrees = 0; - aState = rInAttrs.GetItemState( SCHATTR_TEXT_DEGREES, false, &pPoolItem ); + aState = rInAttrs->GetItemState( SCHATTR_TEXT_DEGREES, false, &pPoolItem ); if( aState == SFX_ITEM_SET ) m_nInitialDegrees = static_cast< const SfxInt32Item * >( pPoolItem )->GetValue(); @@ -174,7 +174,7 @@ void SchAxisLabelTabPage::Reset( const SfxItemSet& rInAttrs ) // check stacked item m_bInitialStacking = false; - aState = rInAttrs.GetItemState( SCHATTR_TEXT_STACKED, false, &pPoolItem ); + aState = rInAttrs->GetItemState( SCHATTR_TEXT_STACKED, false, &pPoolItem ); if( aState == SFX_ITEM_SET ) m_bInitialStacking = static_cast< const SfxBoolItem * >( pPoolItem )->GetValue(); @@ -184,11 +184,11 @@ void SchAxisLabelTabPage::Reset( const SfxItemSet& rInAttrs ) else m_pOrientHlp->SetStackedState( TRISTATE_INDET ); - if( rInAttrs.GetItemState( EE_PARA_WRITINGDIR, true, &pPoolItem ) == SFX_ITEM_SET ) + if( rInAttrs->GetItemState( EE_PARA_WRITINGDIR, true, &pPoolItem ) == SFX_ITEM_SET ) m_pLbTextDirection->SelectEntryValue( SvxFrameDirection(((const SvxFrameDirectionItem*)pPoolItem)->GetValue()) ); // Text overlap ---------- - aState = rInAttrs.GetItemState( SCHATTR_AXIS_LABEL_OVERLAP, false, &pPoolItem ); + aState = rInAttrs->GetItemState( SCHATTR_AXIS_LABEL_OVERLAP, false, &pPoolItem ); if( aState == SFX_ITEM_DONTCARE ) { m_pCbTextOverlap->EnableTriState( true ); @@ -207,7 +207,7 @@ void SchAxisLabelTabPage::Reset( const SfxItemSet& rInAttrs ) } // text break ---------- - aState = rInAttrs.GetItemState( SCHATTR_AXIS_LABEL_BREAK, false, &pPoolItem ); + aState = rInAttrs->GetItemState( SCHATTR_AXIS_LABEL_BREAK, false, &pPoolItem ); if( aState == SFX_ITEM_DONTCARE ) { m_pCbTextBreak->EnableTriState( true ); @@ -232,7 +232,7 @@ void SchAxisLabelTabPage::Reset( const SfxItemSet& rInAttrs ) // text order ---------- if( m_bShowStaggeringControls ) { - aState = rInAttrs.GetItemState( SCHATTR_AXIS_LABEL_ORDER, false, &pPoolItem ); + aState = rInAttrs->GetItemState( SCHATTR_AXIS_LABEL_ORDER, false, &pPoolItem ); if( aState == SFX_ITEM_SET ) { SvxChartTextOrder eOrder = static_cast< const SvxChartTextOrderItem * >( pPoolItem )->GetValue(); diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.hxx b/chart2/source/controller/dialogs/tp_AxisLabel.hxx index 115da2737cfc..838ea1bf131a 100644 --- a/chart2/source/controller/dialogs/tp_AxisLabel.hxx +++ b/chart2/source/controller/dialogs/tp_AxisLabel.hxx @@ -76,7 +76,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rInAttrs ); virtual bool FillItemSet( SfxItemSet* rOutAttrs ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rInAttrs ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rInAttrs ) SAL_OVERRIDE; void ShowStaggeringControls( bool bShowStaggeringControls ); void SetComplexCategories( bool bComplexCategories ); diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.cxx b/chart2/source/controller/dialogs/tp_AxisPositions.cxx index 461ba55ab77f..a43a104bdedb 100644 --- a/chart2/source/controller/dialogs/tp_AxisPositions.cxx +++ b/chart2/source/controller/dialogs/tp_AxisPositions.cxx @@ -131,7 +131,7 @@ bool AxisPositionsTabPage::FillItemSet(SfxItemSet* rOutAttrs) return true; } -void AxisPositionsTabPage::Reset(const SfxItemSet& rInAttrs) +void AxisPositionsTabPage::Reset(const SfxItemSet* rInAttrs) { //init and enable controls m_pED_CrossesAt->Show( !m_bCrossingAxisIsCategoryAxis ); @@ -160,7 +160,7 @@ void AxisPositionsTabPage::Reset(const SfxItemSet& rInAttrs) const SfxPoolItem *pPoolItem = NULL; //axis line - if(rInAttrs.GetItemState(SCHATTR_AXIS_POSITION,true, &pPoolItem)== SFX_ITEM_SET) + if(rInAttrs->GetItemState(SCHATTR_AXIS_POSITION,true, &pPoolItem)== SFX_ITEM_SET) { bool bZero = false; sal_Int32 nPos = static_cast< const SfxInt32Item * >( pPoolItem )->GetValue(); @@ -177,7 +177,7 @@ void AxisPositionsTabPage::Reset(const SfxItemSet& rInAttrs) m_pLB_CrossesAt->SelectEntryPos( nPos ); CrossesAtSelectHdl( (void*)0 ); - if( rInAttrs.GetItemState(SCHATTR_AXIS_POSITION_VALUE,true, &pPoolItem)== SFX_ITEM_SET || bZero ) + if( rInAttrs->GetItemState(SCHATTR_AXIS_POSITION_VALUE,true, &pPoolItem)== SFX_ITEM_SET || bZero ) { double fCrossover = 0.0; if( !bZero ) @@ -200,7 +200,7 @@ void AxisPositionsTabPage::Reset(const SfxItemSet& rInAttrs) } // Labels - if( rInAttrs.GetItemState( SCHATTR_AXIS_LABEL_POSITION, false, &pPoolItem ) == SFX_ITEM_SET ) + if( rInAttrs->GetItemState( SCHATTR_AXIS_LABEL_POSITION, false, &pPoolItem ) == SFX_ITEM_SET ) { sal_Int32 nPos = static_cast< const SfxInt32Item * >( pPoolItem )->GetValue(); if( nPos < m_pLB_PlaceLabels->GetEntryCount() ) @@ -212,9 +212,9 @@ void AxisPositionsTabPage::Reset(const SfxItemSet& rInAttrs) // Tick marks long nTicks = 0, nMinorTicks = 0; - if(rInAttrs.GetItemState(SCHATTR_AXIS_TICKS,true, &pPoolItem)== SFX_ITEM_SET) + if(rInAttrs->GetItemState(SCHATTR_AXIS_TICKS,true, &pPoolItem)== SFX_ITEM_SET) nTicks = ((const SfxInt32Item*)pPoolItem)->GetValue(); - if(rInAttrs.GetItemState(SCHATTR_AXIS_HELPTICKS,true, &pPoolItem)== SFX_ITEM_SET) + if(rInAttrs->GetItemState(SCHATTR_AXIS_HELPTICKS,true, &pPoolItem)== SFX_ITEM_SET) nMinorTicks = ((const SfxInt32Item*)pPoolItem)->GetValue(); m_pCB_TicksInner->Check(bool(nTicks&CHAXIS_MARK_INNER)); @@ -223,7 +223,7 @@ void AxisPositionsTabPage::Reset(const SfxItemSet& rInAttrs) m_pCB_MinorOuter->Check(bool(nMinorTicks&CHAXIS_MARK_OUTER)); // Tick position - if( rInAttrs.GetItemState( SCHATTR_AXIS_MARK_POSITION, false, &pPoolItem ) == SFX_ITEM_SET ) + if( rInAttrs->GetItemState( SCHATTR_AXIS_MARK_POSITION, false, &pPoolItem ) == SFX_ITEM_SET ) { sal_Int32 nPos = static_cast< const SfxInt32Item * >( pPoolItem )->GetValue(); if( nPos < m_pLB_PlaceTicks->GetEntryCount() ) diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.hxx b/chart2/source/controller/dialogs/tp_AxisPositions.hxx index d34997b82ca8..d05bbabeed1b 100644 --- a/chart2/source/controller/dialogs/tp_AxisPositions.hxx +++ b/chart2/source/controller/dialogs/tp_AxisPositions.hxx @@ -36,7 +36,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rInAttrs ); virtual bool FillItemSet( SfxItemSet* rOutAttrs ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rInAttrs ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rInAttrs ) SAL_OVERRIDE; using TabPage::DeactivatePage; virtual int DeactivatePage( SfxItemSet* pItemSet = NULL ) SAL_OVERRIDE; diff --git a/chart2/source/controller/dialogs/tp_DataLabel.cxx b/chart2/source/controller/dialogs/tp_DataLabel.cxx index 417544dbc565..5c77535cbe79 100644 --- a/chart2/source/controller/dialogs/tp_DataLabel.cxx +++ b/chart2/source/controller/dialogs/tp_DataLabel.cxx @@ -48,9 +48,9 @@ bool DataLabelsTabPage::FillItemSet(SfxItemSet* rOutAttrs) return m_aDataLabelResources.FillItemSet(rOutAttrs); } -void DataLabelsTabPage::Reset(const SfxItemSet& rInAttrs) +void DataLabelsTabPage::Reset(const SfxItemSet* rInAttrs) { - m_aDataLabelResources.Reset(rInAttrs); + m_aDataLabelResources.Reset(*rInAttrs); } void DataLabelsTabPage::SetNumberFormatter( SvNumberFormatter* pFormatter ) diff --git a/chart2/source/controller/dialogs/tp_DataLabel.hxx b/chart2/source/controller/dialogs/tp_DataLabel.hxx index 74946771c33e..32981ce59a0c 100644 --- a/chart2/source/controller/dialogs/tp_DataLabel.hxx +++ b/chart2/source/controller/dialogs/tp_DataLabel.hxx @@ -40,7 +40,7 @@ public: void SetNumberFormatter( SvNumberFormatter* pFormatter ); - virtual void Reset(const SfxItemSet& rInAttrs) SAL_OVERRIDE; + virtual void Reset(const SfxItemSet* rInAttrs) SAL_OVERRIDE; virtual bool FillItemSet(SfxItemSet* rOutAttrs) SAL_OVERRIDE; private: diff --git a/chart2/source/controller/dialogs/tp_ErrorBars.cxx b/chart2/source/controller/dialogs/tp_ErrorBars.cxx index f0fc68d5d6b1..225c607735b3 100644 --- a/chart2/source/controller/dialogs/tp_ErrorBars.cxx +++ b/chart2/source/controller/dialogs/tp_ErrorBars.cxx @@ -52,9 +52,9 @@ bool ErrorBarsTabPage::FillItemSet( SfxItemSet* rOutAttrs ) return m_aErrorBarResources.FillItemSet( *rOutAttrs ); } -void ErrorBarsTabPage::Reset( const SfxItemSet& rInAttrs ) +void ErrorBarsTabPage::Reset( const SfxItemSet* rInAttrs ) { - m_aErrorBarResources.Reset( rInAttrs ); + m_aErrorBarResources.Reset( *rInAttrs ); } void ErrorBarsTabPage::DataChanged( const DataChangedEvent& rDCEvt ) diff --git a/chart2/source/controller/dialogs/tp_ErrorBars.hxx b/chart2/source/controller/dialogs/tp_ErrorBars.hxx index 838310cd639d..96b14dc0199c 100644 --- a/chart2/source/controller/dialogs/tp_ErrorBars.hxx +++ b/chart2/source/controller/dialogs/tp_ErrorBars.hxx @@ -39,7 +39,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rInAttrs ); virtual bool FillItemSet( SfxItemSet* rOutAttrs ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rInAttrs ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rInAttrs ) SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; diff --git a/chart2/source/controller/dialogs/tp_LegendPosition.cxx b/chart2/source/controller/dialogs/tp_LegendPosition.cxx index eba17ae0ec53..b932a53eca3c 100644 --- a/chart2/source/controller/dialogs/tp_LegendPosition.cxx +++ b/chart2/source/controller/dialogs/tp_LegendPosition.cxx @@ -56,12 +56,12 @@ bool SchLegendPosTabPage::FillItemSet(SfxItemSet* rOutAttrs) return true; } -void SchLegendPosTabPage::Reset(const SfxItemSet& rInAttrs) +void SchLegendPosTabPage::Reset(const SfxItemSet* rInAttrs) { - m_aLegendPositionResources.initFromItemSet(rInAttrs); + m_aLegendPositionResources.initFromItemSet(*rInAttrs); const SfxPoolItem* pPoolItem = 0; - if( rInAttrs.GetItemState( EE_PARA_WRITINGDIR, true, &pPoolItem ) == SFX_ITEM_SET ) + if( rInAttrs->GetItemState( EE_PARA_WRITINGDIR, true, &pPoolItem ) == SFX_ITEM_SET ) m_pLbTextDirection->SelectEntryValue( SvxFrameDirection(((const SvxFrameDirectionItem*)pPoolItem)->GetValue()) ); } diff --git a/chart2/source/controller/dialogs/tp_LegendPosition.hxx b/chart2/source/controller/dialogs/tp_LegendPosition.hxx index 091f639f50dc..2c4a855d539f 100644 --- a/chart2/source/controller/dialogs/tp_LegendPosition.hxx +++ b/chart2/source/controller/dialogs/tp_LegendPosition.hxx @@ -40,7 +40,7 @@ public: static SfxTabPage* Create(Window* pParent, const SfxItemSet& rInAttrs); virtual bool FillItemSet(SfxItemSet* rOutAttrs) SAL_OVERRIDE; - virtual void Reset(const SfxItemSet& rInAttrs) SAL_OVERRIDE; + virtual void Reset(const SfxItemSet* rInAttrs) SAL_OVERRIDE; }; } //namespace chart diff --git a/chart2/source/controller/dialogs/tp_PointGeometry.cxx b/chart2/source/controller/dialogs/tp_PointGeometry.cxx index cbdd53294a65..03b221426ad8 100644 --- a/chart2/source/controller/dialogs/tp_PointGeometry.cxx +++ b/chart2/source/controller/dialogs/tp_PointGeometry.cxx @@ -65,11 +65,11 @@ bool SchLayoutTabPage::FillItemSet(SfxItemSet* rOutAttrs) return true; } -void SchLayoutTabPage::Reset(const SfxItemSet& rInAttrs) +void SchLayoutTabPage::Reset(const SfxItemSet* rInAttrs) { const SfxPoolItem *pPoolItem = NULL; - if (rInAttrs.GetItemState(SCHATTR_STYLE_SHAPE,true, &pPoolItem) == SFX_ITEM_SET) + if (rInAttrs->GetItemState(SCHATTR_STYLE_SHAPE,true, &pPoolItem) == SFX_ITEM_SET) { long nVal=((const SfxInt32Item*)pPoolItem)->GetValue(); if(m_pGeometryResources) diff --git a/chart2/source/controller/dialogs/tp_PointGeometry.hxx b/chart2/source/controller/dialogs/tp_PointGeometry.hxx index 69139520e429..fda04f3c95e1 100644 --- a/chart2/source/controller/dialogs/tp_PointGeometry.hxx +++ b/chart2/source/controller/dialogs/tp_PointGeometry.hxx @@ -33,7 +33,7 @@ public: static SfxTabPage* Create(Window* pParent, const SfxItemSet& rInAttrs); virtual bool FillItemSet(SfxItemSet* rOutAttrs) SAL_OVERRIDE; - virtual void Reset(const SfxItemSet& rInAttrs) SAL_OVERRIDE; + virtual void Reset(const SfxItemSet* rInAttrs) SAL_OVERRIDE; private: BarGeometryResources* m_pGeometryResources; diff --git a/chart2/source/controller/dialogs/tp_PolarOptions.cxx b/chart2/source/controller/dialogs/tp_PolarOptions.cxx index 566ac73f6f56..f2731602d169 100644 --- a/chart2/source/controller/dialogs/tp_PolarOptions.cxx +++ b/chart2/source/controller/dialogs/tp_PolarOptions.cxx @@ -70,11 +70,11 @@ bool PolarOptionsTabPage::FillItemSet( SfxItemSet* rOutAttrs ) return true; } -void PolarOptionsTabPage::Reset(const SfxItemSet& rInAttrs) +void PolarOptionsTabPage::Reset(const SfxItemSet* rInAttrs) { const SfxPoolItem *pPoolItem = NULL; - if (rInAttrs.GetItemState(SCHATTR_STARTING_ANGLE, true, &pPoolItem) == SFX_ITEM_SET) + if (rInAttrs->GetItemState(SCHATTR_STARTING_ANGLE, true, &pPoolItem) == SFX_ITEM_SET) { long nTmp = (long)((const SfxInt32Item*)pPoolItem)->GetValue(); m_pAngleDial->SetRotation( nTmp*100 ); @@ -83,7 +83,7 @@ void PolarOptionsTabPage::Reset(const SfxItemSet& rInAttrs) { m_pFL_StartingAngle->Show(false); } - if (rInAttrs.GetItemState(SCHATTR_CLOCKWISE, true, &pPoolItem) == SFX_ITEM_SET) + if (rInAttrs->GetItemState(SCHATTR_CLOCKWISE, true, &pPoolItem) == SFX_ITEM_SET) { bool bCheck = static_cast< const SfxBoolItem * >( pPoolItem )->GetValue(); m_pCB_Clockwise->Check(bCheck); @@ -92,7 +92,7 @@ void PolarOptionsTabPage::Reset(const SfxItemSet& rInAttrs) { m_pCB_Clockwise->Show(false); } - if (rInAttrs.GetItemState(SCHATTR_INCLUDE_HIDDEN_CELLS, true, &pPoolItem) == SFX_ITEM_SET) + if (rInAttrs->GetItemState(SCHATTR_INCLUDE_HIDDEN_CELLS, true, &pPoolItem) == SFX_ITEM_SET) { bool bVal = static_cast<const SfxBoolItem*>(pPoolItem)->GetValue(); m_pCB_IncludeHiddenCells->Check(bVal); diff --git a/chart2/source/controller/dialogs/tp_PolarOptions.hxx b/chart2/source/controller/dialogs/tp_PolarOptions.hxx index 3af8f463b333..dbdb15795afd 100644 --- a/chart2/source/controller/dialogs/tp_PolarOptions.hxx +++ b/chart2/source/controller/dialogs/tp_PolarOptions.hxx @@ -37,7 +37,7 @@ public: static SfxTabPage* Create(Window* pParent, const SfxItemSet& rInAttrs); virtual bool FillItemSet(SfxItemSet* rOutAttrs) SAL_OVERRIDE; - virtual void Reset(const SfxItemSet& rInAttrs) SAL_OVERRIDE; + virtual void Reset(const SfxItemSet* rInAttrs) SAL_OVERRIDE; private: CheckBox* m_pCB_Clockwise; diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx index 7f4b17ab8387..0f3a8ceeff51 100644 --- a/chart2/source/controller/dialogs/tp_Scale.cxx +++ b/chart2/source/controller/dialogs/tp_Scale.cxx @@ -273,24 +273,24 @@ bool ScaleTabPage::FillItemSet(SfxItemSet* rOutAttrs) return true; } -void ScaleTabPage::Reset(const SfxItemSet& rInAttrs) +void ScaleTabPage::Reset(const SfxItemSet* rInAttrs) { OSL_PRECOND( pNumFormatter, "No NumberFormatter available" ); if(!pNumFormatter) return; const SfxPoolItem *pPoolItem = NULL; - if (rInAttrs.GetItemState(SCHATTR_AXIS_ALLOW_DATEAXIS, true, &pPoolItem) == SFX_ITEM_SET) + if (rInAttrs->GetItemState(SCHATTR_AXIS_ALLOW_DATEAXIS, true, &pPoolItem) == SFX_ITEM_SET) m_bAllowDateAxis = (bool) ((const SfxBoolItem*)pPoolItem)->GetValue(); m_nAxisType=chart2::AxisType::REALNUMBER; - if (rInAttrs.GetItemState(SCHATTR_AXISTYPE, true, &pPoolItem) == SFX_ITEM_SET) + if (rInAttrs->GetItemState(SCHATTR_AXISTYPE, true, &pPoolItem) == SFX_ITEM_SET) m_nAxisType = (int) ((const SfxInt32Item*)pPoolItem)->GetValue(); if( m_nAxisType==chart2::AxisType::DATE && !m_bAllowDateAxis ) m_nAxisType=chart2::AxisType::CATEGORY; if( m_bAllowDateAxis ) { bool bAutoDateAxis = false; - if (rInAttrs.GetItemState(SCHATTR_AXIS_AUTO_DATEAXIS, true, &pPoolItem) == SFX_ITEM_SET) + if (rInAttrs->GetItemState(SCHATTR_AXIS_AUTO_DATEAXIS, true, &pPoolItem) == SFX_ITEM_SET) bAutoDateAxis = (bool) ((const SfxBoolItem*)pPoolItem)->GetValue(); sal_uInt16 nPos = 0; @@ -310,66 +310,66 @@ void ScaleTabPage::Reset(const SfxItemSet& rInAttrs) m_pCbxAutoOrigin->Check( true ); m_pCbx_AutoTimeResolution->Check( true ); - if (rInAttrs.GetItemState(SCHATTR_AXIS_AUTO_MIN,true,&pPoolItem) == SFX_ITEM_SET) + if (rInAttrs->GetItemState(SCHATTR_AXIS_AUTO_MIN,true,&pPoolItem) == SFX_ITEM_SET) m_pCbxAutoMin->Check(((const SfxBoolItem*)pPoolItem)->GetValue()); - if (rInAttrs.GetItemState(SCHATTR_AXIS_MIN,true, &pPoolItem) == SFX_ITEM_SET) + if (rInAttrs->GetItemState(SCHATTR_AXIS_MIN,true, &pPoolItem) == SFX_ITEM_SET) { fMin = ((const SvxDoubleItem*)pPoolItem)->GetValue(); lcl_setValue( *m_pFmtFldMin, fMin ); } - if (rInAttrs.GetItemState(SCHATTR_AXIS_AUTO_MAX,true, &pPoolItem) == SFX_ITEM_SET) + if (rInAttrs->GetItemState(SCHATTR_AXIS_AUTO_MAX,true, &pPoolItem) == SFX_ITEM_SET) m_pCbxAutoMax->Check(((const SfxBoolItem*)pPoolItem)->GetValue()); - if (rInAttrs.GetItemState(SCHATTR_AXIS_MAX,true, &pPoolItem) == SFX_ITEM_SET) + if (rInAttrs->GetItemState(SCHATTR_AXIS_MAX,true, &pPoolItem) == SFX_ITEM_SET) { fMax = ((const SvxDoubleItem*)pPoolItem)->GetValue(); lcl_setValue( *m_pFmtFldMax, fMax ); } - if (rInAttrs.GetItemState(SCHATTR_AXIS_AUTO_STEP_MAIN,true, &pPoolItem) == SFX_ITEM_SET) + if (rInAttrs->GetItemState(SCHATTR_AXIS_AUTO_STEP_MAIN,true, &pPoolItem) == SFX_ITEM_SET) m_pCbxAutoStepMain->Check(((const SfxBoolItem*)pPoolItem)->GetValue()); - if (rInAttrs.GetItemState(SCHATTR_AXIS_STEP_MAIN,true, &pPoolItem) == SFX_ITEM_SET) + if (rInAttrs->GetItemState(SCHATTR_AXIS_STEP_MAIN,true, &pPoolItem) == SFX_ITEM_SET) { fStepMain = ((const SvxDoubleItem*)pPoolItem)->GetValue(); lcl_setValue( *m_pFmtFldStepMain, fStepMain ); m_pMt_MainDateStep->SetValue( static_cast<sal_Int32>(fStepMain) ); } - if (rInAttrs.GetItemState(SCHATTR_AXIS_AUTO_STEP_HELP,true, &pPoolItem) == SFX_ITEM_SET) + if (rInAttrs->GetItemState(SCHATTR_AXIS_AUTO_STEP_HELP,true, &pPoolItem) == SFX_ITEM_SET) m_pCbxAutoStepHelp->Check(((const SfxBoolItem*)pPoolItem)->GetValue()); - if (rInAttrs.GetItemState(SCHATTR_AXIS_LOGARITHM,true, &pPoolItem) == SFX_ITEM_SET) + if (rInAttrs->GetItemState(SCHATTR_AXIS_LOGARITHM,true, &pPoolItem) == SFX_ITEM_SET) m_pCbxLogarithm->Check(((const SfxBoolItem*)pPoolItem)->GetValue()); - if (rInAttrs.GetItemState(SCHATTR_AXIS_REVERSE,true, &pPoolItem) == SFX_ITEM_SET) + if (rInAttrs->GetItemState(SCHATTR_AXIS_REVERSE,true, &pPoolItem) == SFX_ITEM_SET) m_pCbxReverse->Check(((const SfxBoolItem*)pPoolItem)->GetValue()); - if (rInAttrs.GetItemState(SCHATTR_AXIS_STEP_HELP,true, &pPoolItem) == SFX_ITEM_SET) + if (rInAttrs->GetItemState(SCHATTR_AXIS_STEP_HELP,true, &pPoolItem) == SFX_ITEM_SET) { nStepHelp = ((const SfxInt32Item*)pPoolItem)->GetValue(); m_pMtStepHelp->SetValue( nStepHelp ); } - if (rInAttrs.GetItemState(SCHATTR_AXIS_AUTO_ORIGIN,true, &pPoolItem) == SFX_ITEM_SET) + if (rInAttrs->GetItemState(SCHATTR_AXIS_AUTO_ORIGIN,true, &pPoolItem) == SFX_ITEM_SET) m_pCbxAutoOrigin->Check(((const SfxBoolItem*)pPoolItem)->GetValue()); - if (rInAttrs.GetItemState(SCHATTR_AXIS_ORIGIN,true, &pPoolItem) == SFX_ITEM_SET) + if (rInAttrs->GetItemState(SCHATTR_AXIS_ORIGIN,true, &pPoolItem) == SFX_ITEM_SET) { fOrigin = ((const SvxDoubleItem*)pPoolItem)->GetValue(); lcl_setValue( *m_pFmtFldOrigin, fOrigin ); } - if (rInAttrs.GetItemState(SCHATTR_AXIS_AUTO_TIME_RESOLUTION,true, &pPoolItem) == SFX_ITEM_SET) + if (rInAttrs->GetItemState(SCHATTR_AXIS_AUTO_TIME_RESOLUTION,true, &pPoolItem) == SFX_ITEM_SET) m_pCbx_AutoTimeResolution->Check(((const SfxBoolItem*)pPoolItem)->GetValue()); - if (rInAttrs.GetItemState(SCHATTR_AXIS_TIME_RESOLUTION,true, &pPoolItem) == SFX_ITEM_SET) + if (rInAttrs->GetItemState(SCHATTR_AXIS_TIME_RESOLUTION,true, &pPoolItem) == SFX_ITEM_SET) { m_nTimeResolution = ((const SfxInt32Item*)pPoolItem)->GetValue(); m_pLB_TimeResolution->SelectEntryPos( m_nTimeResolution ); } - if (rInAttrs.GetItemState(SCHATTR_AXIS_MAIN_TIME_UNIT,true, &pPoolItem) == SFX_ITEM_SET) + if (rInAttrs->GetItemState(SCHATTR_AXIS_MAIN_TIME_UNIT,true, &pPoolItem) == SFX_ITEM_SET) { m_nMainTimeUnit = ((const SfxInt32Item*)pPoolItem)->GetValue(); m_pLB_MainTimeUnit->SelectEntryPos( m_nMainTimeUnit ); } - if (rInAttrs.GetItemState(SCHATTR_AXIS_HELP_TIME_UNIT,true, &pPoolItem) == SFX_ITEM_SET) + if (rInAttrs->GetItemState(SCHATTR_AXIS_HELP_TIME_UNIT,true, &pPoolItem) == SFX_ITEM_SET) { m_nHelpTimeUnit = ((const SfxInt32Item*)pPoolItem)->GetValue(); m_pLB_HelpTimeUnit->SelectEntryPos( m_nHelpTimeUnit ); diff --git a/chart2/source/controller/dialogs/tp_Scale.hxx b/chart2/source/controller/dialogs/tp_Scale.hxx index b4980c3ca74d..9e754f7456a1 100644 --- a/chart2/source/controller/dialogs/tp_Scale.hxx +++ b/chart2/source/controller/dialogs/tp_Scale.hxx @@ -36,7 +36,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rInAttrs ); virtual bool FillItemSet( SfxItemSet* rOutAttrs ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rInAttrs ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rInAttrs ) SAL_OVERRIDE; using TabPage::DeactivatePage; virtual int DeactivatePage( SfxItemSet* pItemSet = NULL ) SAL_OVERRIDE; diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx index d981cbc7a6be..b2c5cbb73335 100644 --- a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx +++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx @@ -115,13 +115,13 @@ bool SchOptionTabPage::FillItemSet(SfxItemSet* rOutAttrs) return true; } -void SchOptionTabPage::Reset(const SfxItemSet& rInAttrs) +void SchOptionTabPage::Reset(const SfxItemSet* rInAttrs) { const SfxPoolItem *pPoolItem = NULL; m_pRbtAxis1->Check(true); m_pRbtAxis2->Check(false); - if (rInAttrs.GetItemState(SCHATTR_AXIS,true, &pPoolItem) == SFX_ITEM_SET) + if (rInAttrs->GetItemState(SCHATTR_AXIS,true, &pPoolItem) == SFX_ITEM_SET) { long nVal=((const SfxInt32Item*)pPoolItem)->GetValue(); if(nVal==CHART_AXIS_SECONDARY_Y) @@ -132,30 +132,30 @@ void SchOptionTabPage::Reset(const SfxItemSet& rInAttrs) } long nTmp; - if (rInAttrs.GetItemState(SCHATTR_BAR_GAPWIDTH, true, &pPoolItem) == SFX_ITEM_SET) + if (rInAttrs->GetItemState(SCHATTR_BAR_GAPWIDTH, true, &pPoolItem) == SFX_ITEM_SET) { nTmp = (long)((const SfxInt32Item*)pPoolItem)->GetValue(); m_pMTGap->SetValue(nTmp); } - if (rInAttrs.GetItemState(SCHATTR_BAR_OVERLAP, true, &pPoolItem) == SFX_ITEM_SET) + if (rInAttrs->GetItemState(SCHATTR_BAR_OVERLAP, true, &pPoolItem) == SFX_ITEM_SET) { nTmp = (long)((const SfxInt32Item*)pPoolItem)->GetValue(); m_pMTOverlap->SetValue(nTmp); } - if (rInAttrs.GetItemState(SCHATTR_BAR_CONNECT, true, &pPoolItem) == SFX_ITEM_SET) + if (rInAttrs->GetItemState(SCHATTR_BAR_CONNECT, true, &pPoolItem) == SFX_ITEM_SET) { bool bCheck = static_cast< const SfxBoolItem * >( pPoolItem )->GetValue(); m_pCBConnect->Check(bCheck); } - if (rInAttrs.GetItemState(SCHATTR_AXIS_FOR_ALL_SERIES, true, &pPoolItem) == SFX_ITEM_SET) + if (rInAttrs->GetItemState(SCHATTR_AXIS_FOR_ALL_SERIES, true, &pPoolItem) == SFX_ITEM_SET) { m_nAllSeriesAxisIndex = static_cast< const SfxInt32Item * >( pPoolItem )->GetValue(); m_pCBAxisSideBySide->Disable(); } - if (rInAttrs.GetItemState(SCHATTR_GROUP_BARS_PER_AXIS, true, &pPoolItem) == SFX_ITEM_SET) + if (rInAttrs->GetItemState(SCHATTR_GROUP_BARS_PER_AXIS, true, &pPoolItem) == SFX_ITEM_SET) { // model property is "group bars per axis", UI feature is the other way // round: "show bars side by side" @@ -170,10 +170,10 @@ void SchOptionTabPage::Reset(const SfxItemSet& rInAttrs) //missing value treatment { ::com::sun::star::uno::Sequence < sal_Int32 > aMissingValueTreatments; - if( rInAttrs.GetItemState(SCHATTR_AVAILABLE_MISSING_VALUE_TREATMENTS, true, &pPoolItem) == SFX_ITEM_SET ) + if( rInAttrs->GetItemState(SCHATTR_AVAILABLE_MISSING_VALUE_TREATMENTS, true, &pPoolItem) == SFX_ITEM_SET ) aMissingValueTreatments =((const SfxIntegerListItem*)pPoolItem)->GetConstSequence(); - if ( aMissingValueTreatments.getLength()>1 && rInAttrs.GetItemState(SCHATTR_MISSING_VALUE_TREATMENT,true, &pPoolItem) == SFX_ITEM_SET) + if ( aMissingValueTreatments.getLength()>1 && rInAttrs->GetItemState(SCHATTR_MISSING_VALUE_TREATMENT,true, &pPoolItem) == SFX_ITEM_SET) { m_pRB_DontPaint->Enable(false); m_pRB_AssumeZero->Enable(false); @@ -205,7 +205,7 @@ void SchOptionTabPage::Reset(const SfxItemSet& rInAttrs) } // Include hidden cells - if (rInAttrs.GetItemState(SCHATTR_INCLUDE_HIDDEN_CELLS, true, &pPoolItem) == SFX_ITEM_SET) + if (rInAttrs->GetItemState(SCHATTR_INCLUDE_HIDDEN_CELLS, true, &pPoolItem) == SFX_ITEM_SET) { bool bVal = static_cast<const SfxBoolItem*>(pPoolItem)->GetValue(); m_pCBIncludeHiddenCells->Check(bVal); diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx index 04f59dca13db..af969f7164fb 100644 --- a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx +++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx @@ -35,7 +35,7 @@ public: static SfxTabPage* Create(Window* pParent, const SfxItemSet& rInAttrs); virtual bool FillItemSet(SfxItemSet* rOutAttrs) SAL_OVERRIDE; - virtual void Reset(const SfxItemSet& rInAttrs) SAL_OVERRIDE; + virtual void Reset(const SfxItemSet* rInAttrs) SAL_OVERRIDE; void Init( bool bProvidesSecondaryYAxis, bool bProvidesOverlapAndGapWidth, bool bProvidesBarConnectors ); diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.cxx b/chart2/source/controller/dialogs/tp_TitleRotation.cxx index 5b9d4047c780..06e0ba13de09 100644 --- a/chart2/source/controller/dialogs/tp_TitleRotation.cxx +++ b/chart2/source/controller/dialogs/tp_TitleRotation.cxx @@ -87,18 +87,18 @@ bool SchAlignmentTabPage::FillItemSet(SfxItemSet* rOutAttrs) return true; } -void SchAlignmentTabPage::Reset(const SfxItemSet& rInAttrs) +void SchAlignmentTabPage::Reset(const SfxItemSet* rInAttrs) { - const SfxPoolItem* pItem = GetItem( rInAttrs, SCHATTR_TEXT_DEGREES ); + const SfxPoolItem* pItem = GetItem( *rInAttrs, SCHATTR_TEXT_DEGREES ); sal_Int32 nDegrees = pItem ? ((const SfxInt32Item*)pItem)->GetValue() : 0; m_pCtrlDial->SetRotation( nDegrees ); - pItem = GetItem( rInAttrs, SCHATTR_TEXT_STACKED ); + pItem = GetItem( *rInAttrs, SCHATTR_TEXT_STACKED ); bool bStacked = pItem && ((const SfxBoolItem*)pItem)->GetValue(); m_pOrientHlp->SetStackedState( bStacked ? TRISTATE_TRUE : TRISTATE_FALSE ); - if( rInAttrs.GetItemState(EE_PARA_WRITINGDIR, true, &pItem) == SFX_ITEM_SET) + if( rInAttrs->GetItemState(EE_PARA_WRITINGDIR, true, &pItem) == SFX_ITEM_SET) m_pLbTextDirection->SelectEntryValue( SvxFrameDirection(((const SvxFrameDirectionItem*)pItem)->GetValue()) ); } diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.hxx b/chart2/source/controller/dialogs/tp_TitleRotation.hxx index dc468191e9be..4ec390093741 100644 --- a/chart2/source/controller/dialogs/tp_TitleRotation.hxx +++ b/chart2/source/controller/dialogs/tp_TitleRotation.hxx @@ -48,7 +48,7 @@ public: static SfxTabPage* Create(Window* pParent, const SfxItemSet& rInAttrs); static SfxTabPage* CreateWithoutRotation(Window* pParent, const SfxItemSet& rInAttrs); virtual bool FillItemSet(SfxItemSet* rOutAttrs) SAL_OVERRIDE; - virtual void Reset(const SfxItemSet& rInAttrs) SAL_OVERRIDE; + virtual void Reset(const SfxItemSet* rInAttrs) SAL_OVERRIDE; }; } //namespace chart diff --git a/chart2/source/controller/dialogs/tp_Trendline.cxx b/chart2/source/controller/dialogs/tp_Trendline.cxx index b95acf9a14ea..d3753307c2ef 100644 --- a/chart2/source/controller/dialogs/tp_Trendline.cxx +++ b/chart2/source/controller/dialogs/tp_Trendline.cxx @@ -46,9 +46,9 @@ bool TrendlineTabPage::FillItemSet( SfxItemSet* rOutAttrs ) return m_aTrendlineResources.FillItemSet( rOutAttrs ); } -void TrendlineTabPage::Reset( const SfxItemSet& rInAttrs ) +void TrendlineTabPage::Reset( const SfxItemSet* rInAttrs ) { - m_aTrendlineResources.Reset( rInAttrs ); + m_aTrendlineResources.Reset( *rInAttrs ); } void TrendlineTabPage::DataChanged( const DataChangedEvent& rDCEvt ) diff --git a/chart2/source/controller/dialogs/tp_Trendline.hxx b/chart2/source/controller/dialogs/tp_Trendline.hxx index b50a7d03d081..580dcc8fbc23 100644 --- a/chart2/source/controller/dialogs/tp_Trendline.hxx +++ b/chart2/source/controller/dialogs/tp_Trendline.hxx @@ -34,7 +34,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rInAttrs ); virtual bool FillItemSet( SfxItemSet* rOutAttrs ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rInAttrs ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rInAttrs ) SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; void SetNumFormatter( SvNumberFormatter* pFormatter ); diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx index 50519d6666b7..3708c8ce650e 100644 --- a/cui/source/customize/acccfg.cxx +++ b/cui/source/customize/acccfg.cxx @@ -1441,7 +1441,7 @@ bool SfxAcceleratorConfigPage::FillItemSet( SfxItemSet* ) } -void SfxAcceleratorConfigPage::Reset( const SfxItemSet& rSet ) +void SfxAcceleratorConfigPage::Reset( const SfxItemSet* rSet ) { // open accelerator configs // Note: It initialize some other members too, which are needed here ... @@ -1465,7 +1465,7 @@ void SfxAcceleratorConfigPage::Reset( const SfxItemSet& rSet ) RadioHdl(0); const SfxPoolItem* pMacroItem=0; - if( SFX_ITEM_SET == rSet.GetItemState( SID_MACROINFO, true, &pMacroItem ) ) + if( SFX_ITEM_SET == rSet->GetItemState( SID_MACROINFO, true, &pMacroItem ) ) { m_pMacroInfoItem = PTR_CAST( SfxMacroInfoItem, pMacroItem ); m_pGroupLBox->SelectMacro( m_pMacroInfoItem ); @@ -1473,11 +1473,11 @@ void SfxAcceleratorConfigPage::Reset( const SfxItemSet& rSet ) else { const SfxPoolItem* pStringItem=0; - if( SFX_ITEM_SET == rSet.GetItemState( SID_CHARMAP, true, &pStringItem ) ) + if( SFX_ITEM_SET == rSet->GetItemState( SID_CHARMAP, true, &pStringItem ) ) m_pStringItem = PTR_CAST( SfxStringItem, pStringItem ); const SfxPoolItem* pFontItem=0; - if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_SPECIALCHAR, true, &pFontItem ) ) + if( SFX_ITEM_SET == rSet->GetItemState( SID_ATTR_SPECIALCHAR, true, &pFontItem ) ) m_pFontItem = PTR_CAST( SfxStringItem, pFontItem ); } } diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 10bc1347ee31..c8374d704275 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -1545,7 +1545,7 @@ SvxConfigPage::SvxConfigPage(Window *pParent, const SfxItemSet& rSet) m_pDescriptionField->EnableCursor( false ); } -void SvxConfigPage::Reset( const SfxItemSet& ) +void SvxConfigPage::Reset( const SfxItemSet* ) { // If we haven't initialised our XMultiServiceFactory reference // then Reset is being called at the opening of the dialog. diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx index 5f4117b83fbb..0f486d47e5f0 100644 --- a/cui/source/customize/macropg.cxx +++ b/cui/source/customize/macropg.cxx @@ -369,7 +369,7 @@ bool _SvxMacroTabPage::FillItemSet( SfxItemSet* /*rSet*/ ) } // the following method clears the bindings in the hashes for both doc & app -void _SvxMacroTabPage::Reset( const SfxItemSet& ) +void _SvxMacroTabPage::Reset( const SfxItemSet* ) { // called once in creation - don't reset the data this time if(!bInitialized) diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx index db5b54cb43c6..9a3a1a30c128 100644 --- a/cui/source/inc/acccfg.hxx +++ b/cui/source/inc/acccfg.hxx @@ -174,7 +174,7 @@ public: virtual ~SfxAcceleratorConfigPage(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE; void Apply(const css::uno::Reference< css::ui::XAcceleratorConfiguration >& pAccMgr); }; diff --git a/cui/source/inc/align.hxx b/cui/source/inc/align.hxx index 76412fb48911..8ad7b6673d2f 100644 --- a/cui/source/inc/align.hxx +++ b/cui/source/inc/align.hxx @@ -63,7 +63,7 @@ public: static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx index 652328b5d2b5..9644319d3d53 100644 --- a/cui/source/inc/autocdlg.hxx +++ b/cui/source/inc/autocdlg.hxx @@ -114,7 +114,7 @@ public: const SfxItemSet& rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; }; @@ -173,7 +173,7 @@ class OfaSwAutoFmtOptionsPage : public SfxTabPage static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; }; @@ -266,7 +266,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; @@ -325,7 +325,7 @@ public: const SfxItemSet& rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; void SetLanguage(LanguageType eSet); @@ -391,7 +391,7 @@ public: const SfxItemSet& rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; }; @@ -441,7 +441,7 @@ public: const SfxItemSet& rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; void CopyToClipboard() const; @@ -507,7 +507,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; }; diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx index 1fbdb817a0df..f66f5c3553c7 100644 --- a/cui/source/inc/backgrnd.hxx +++ b/cui/source/inc/backgrnd.hxx @@ -50,7 +50,7 @@ public: static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; virtual void FillUserData() SAL_OVERRIDE; virtual void PointChanged( Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx index 47ecbb1a5607..9ec26bd1cb68 100644 --- a/cui/source/inc/border.hxx +++ b/cui/source/inc/border.hxx @@ -48,7 +48,7 @@ public: static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* rCoreAttrs ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE; void HideShadowControls(); virtual void PageCreated(const SfxAllItemSet& aSet) SAL_OVERRIDE; diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx index 3da574f89e3d..529b4ea9ce72 100644 --- a/cui/source/inc/cfg.hxx +++ b/cui/source/inc/cfg.hxx @@ -437,7 +437,7 @@ public: SvTreeListEntry* pTargetEntry ); bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; - void Reset( const SfxItemSet& ) SAL_OVERRIDE; + void Reset( const SfxItemSet* ) SAL_OVERRIDE; virtual bool DeleteSelectedContent() = 0; virtual void DeleteSelectedTopLevel() = 0; diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx index 8bc60fb4b589..39e5557dec5c 100644 --- a/cui/source/inc/chardlg.hxx +++ b/cui/source/inc/chardlg.hxx @@ -155,7 +155,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); static const sal_uInt16* GetRanges(); - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; void SetFontList( const SvxFontListItem& rItem ); @@ -234,7 +234,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); static const sal_uInt16* GetRanges(); - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; void DisableControls( sal_uInt16 nDisable ); @@ -313,7 +313,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); static const sal_uInt16* GetRanges(); - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void FillUserData() SAL_OVERRIDE; /// the writer uses SID_ATTR_BRUSH as font background @@ -356,7 +356,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); static const sal_uInt16* GetRanges(); - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; /// the writer uses SID_ATTR_BRUSH as font background void SetPreviewBackgroundToCharacter(); diff --git a/cui/source/inc/connect.hxx b/cui/source/inc/connect.hxx index c807f21a4ebe..6519ce6b38eb 100644 --- a/cui/source/inc/connect.hxx +++ b/cui/source/inc/connect.hxx @@ -67,7 +67,7 @@ public: static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; void Construct(); void SetView( const SdrView* pSdrView ) { pView = pSdrView; } diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx index af652510faa7..f55c6e26cd25 100644 --- a/cui/source/inc/cuigaldlg.hxx +++ b/cui/source/inc/cuigaldlg.hxx @@ -213,7 +213,7 @@ private: FixedText* m_pFtMSShowChangeDate; ExchangeData* pData; - virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE {} + virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE {} virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; @@ -262,7 +262,7 @@ class TPGalleryThemeProperties : public SfxTabPage ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > xMediaPlayer; ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFolderPicker2 > xFolderPicker; - virtual void Reset( const SfxItemSet& /*rSet*/ ) SAL_OVERRIDE {} + virtual void Reset( const SfxItemSet* /*rSet*/ ) SAL_OVERRIDE {} virtual bool FillItemSet( SfxItemSet* /*rSet*/ ) SAL_OVERRIDE { return true; } OUString addExtension( const OUString&, const OUString& ); void FillFilterList(); diff --git a/cui/source/inc/cuioptgenrl.hxx b/cui/source/inc/cuioptgenrl.hxx index 9149dd2d5253..8db3409108d4 100644 --- a/cui/source/inc/cuioptgenrl.hxx +++ b/cui/source/inc/cuioptgenrl.hxx @@ -70,7 +70,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; }; #endif // INCLUDED_CUI_SOURCE_INC_CUIOPTGENRL_HXX diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx index e8e5fb63a830..0b0dbade29de 100644 --- a/cui/source/inc/cuitabarea.hxx +++ b/cui/source/inc/cuitabarea.hxx @@ -166,7 +166,7 @@ public: static const sal_uInt16* GetRanges(); virtual bool FillItemSet(SfxItemSet*) SAL_OVERRIDE; - virtual void Reset(const SfxItemSet&) SAL_OVERRIDE; + virtual void Reset(const SfxItemSet*) SAL_OVERRIDE; virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet* pSet) SAL_OVERRIDE; virtual void PointChanged(Window* pWindow, RECT_POINT eRP) SAL_OVERRIDE; @@ -296,7 +296,7 @@ public: static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; virtual void PointChanged( Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; @@ -361,7 +361,7 @@ public: static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; virtual void PointChanged( Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; @@ -439,7 +439,7 @@ public: static SfxTabPage* Create( Window*, const SfxItemSet& ); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; @@ -515,7 +515,7 @@ public: static SfxTabPage* Create( Window*, const SfxItemSet& ); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; @@ -601,7 +601,7 @@ public: static SfxTabPage* Create( Window*, const SfxItemSet& ); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; @@ -736,7 +736,7 @@ public: static SfxTabPage* Create( Window*, const SfxItemSet& ); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx index ed3f09c406b8..a6055b3f7b9c 100644 --- a/cui/source/inc/cuitabline.hxx +++ b/cui/source/inc/cuitabline.hxx @@ -211,7 +211,7 @@ public: static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; @@ -307,7 +307,7 @@ public: static SfxTabPage* Create( Window*, const SfxItemSet& ); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; @@ -377,7 +377,7 @@ public: static SfxTabPage* Create( Window*, const SfxItemSet& ); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx index 4c5d0ee0546b..ebfb39099660 100644 --- a/cui/source/inc/dbregister.hxx +++ b/cui/source/inc/dbregister.hxx @@ -96,7 +96,7 @@ namespace svx static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; virtual void FillUserData() SAL_OVERRIDE; }; diff --git a/cui/source/inc/dstribut.hxx b/cui/source/inc/dstribut.hxx index ebc34ee1ba33..ad54f935ff4d 100644 --- a/cui/source/inc/dstribut.hxx +++ b/cui/source/inc/dstribut.hxx @@ -48,7 +48,7 @@ public: static SfxTabPage* Create(Window*, const SfxItemSet&, SvxDistributeHorizontal eHor, SvxDistributeVertical eVer); virtual bool FillItemSet(SfxItemSet*) SAL_OVERRIDE; - virtual void Reset(const SfxItemSet&) SAL_OVERRIDE; + virtual void Reset(const SfxItemSet*) SAL_OVERRIDE; virtual void PointChanged(Window* pWindow, RECT_POINT eRP) SAL_OVERRIDE; SvxDistributeHorizontal GetDistributeHor() const { return m_eDistributeHor; } diff --git a/cui/source/inc/grfpage.hxx b/cui/source/inc/grfpage.hxx index f4290052766f..2fe1d13f54a7 100644 --- a/cui/source/inc/grfpage.hxx +++ b/cui/source/inc/grfpage.hxx @@ -114,7 +114,7 @@ public: static SfxTabPage *Create( Window *pParent, const SfxItemSet &rSet ); virtual bool FillItemSet( SfxItemSet *rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet &rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet *rSet ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet *pSet ) SAL_OVERRIDE; }; diff --git a/cui/source/inc/labdlg.hxx b/cui/source/inc/labdlg.hxx index 633f19a76d35..ccd5d7a543a5 100644 --- a/cui/source/inc/labdlg.hxx +++ b/cui/source/inc/labdlg.hxx @@ -79,7 +79,7 @@ public: static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; void Construct(); void SetView( const SdrView* pSdrView ) { pView = pSdrView; } diff --git a/cui/source/inc/macroass.hxx b/cui/source/inc/macroass.hxx index c5355f2a9f58..bdb5919cba8b 100644 --- a/cui/source/inc/macroass.hxx +++ b/cui/source/inc/macroass.hxx @@ -71,7 +71,7 @@ public: // --------- inherit from the base ------------- virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; bool IsReadOnly() const SAL_OVERRIDE; }; diff --git a/cui/source/inc/macropg.hxx b/cui/source/inc/macropg.hxx index cc59a5c2443c..19ee9d2459f1 100644 --- a/cui/source/inc/macropg.hxx +++ b/cui/source/inc/macropg.hxx @@ -86,7 +86,7 @@ public: void InitAndSetHandler( ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > xAppEvents, ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > xDocEvents, ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifiable > xModifiable ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE; void DisplayAppEvents( bool appEvents); void SetReadOnly( bool bSet ); diff --git a/cui/source/inc/measure.hxx b/cui/source/inc/measure.hxx index 89039461bf6b..f97e026ee3a0 100644 --- a/cui/source/inc/measure.hxx +++ b/cui/source/inc/measure.hxx @@ -71,7 +71,7 @@ public: static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; virtual void PointChanged( Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx index 8520f603e851..2a3a153c1aef 100644 --- a/cui/source/inc/numfmt.hxx +++ b/cui/source/inc/numfmt.hxx @@ -75,7 +75,7 @@ public: static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; virtual int DeactivatePage ( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; void SetInfoItem( const SvxNumberInfoItem& rItem ); diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx index d0fe9418a8b4..7d08a9f617c0 100644 --- a/cui/source/inc/numpages.hxx +++ b/cui/source/inc/numpages.hxx @@ -116,7 +116,7 @@ class SvxSingleNumPickTabPage : public SfxTabPage virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; void SetNumCharFmtName(const OUString& rName){sNumCharFmtName = rName;} }; @@ -152,7 +152,7 @@ class SvxBulletPickTabPage : public SfxTabPage virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; void SetCharFmtName(const OUString& rName){sBulletCharFmtName = rName;} virtual void PageCreated(const SfxAllItemSet& aSet) SAL_OVERRIDE; @@ -195,7 +195,7 @@ class SvxNumPickTabPage : public SfxTabPage virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; void SetCharFmtNames(const OUString& rCharName, const OUString& rBulName) { sNumCharFmtName = rCharName; @@ -240,7 +240,7 @@ class SvxBitmapPickTabPage : public SfxTabPage virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; void SetNumCharFmtName(const OUString& rName){sNumCharFmtName = rName;} }; @@ -352,7 +352,7 @@ class SvxNumOptionsTabPage : public SfxTabPage virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; void SetCharFmts(const OUString& rNumName, const OUString& rBulletName) { @@ -452,7 +452,7 @@ public: virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); diff --git a/cui/source/inc/optasian.hxx b/cui/source/inc/optasian.hxx index 458965ad18b6..ecbfbf2dc499 100644 --- a/cui/source/inc/optasian.hxx +++ b/cui/source/inc/optasian.hxx @@ -60,7 +60,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; }; #endif diff --git a/cui/source/inc/optlingu.hxx b/cui/source/inc/optlingu.hxx index 20846c516ce1..9128931f0543 100644 --- a/cui/source/inc/optlingu.hxx +++ b/cui/source/inc/optlingu.hxx @@ -152,7 +152,7 @@ public: static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; void HideGroups( sal_uInt16 nGrp ); }; diff --git a/cui/source/inc/optpath.hxx b/cui/source/inc/optpath.hxx index d87961f34b9b..7ee28ae13f6e 100644 --- a/cui/source/inc/optpath.hxx +++ b/cui/source/inc/optpath.hxx @@ -76,7 +76,7 @@ public: static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; virtual void FillUserData() SAL_OVERRIDE; }; diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx index 37c54ccc57dc..2d8c72afaacc 100644 --- a/cui/source/inc/page.hxx +++ b/cui/source/inc/page.hxx @@ -181,7 +181,7 @@ public: static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* rOutSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; virtual void FillUserData() SAL_OVERRIDE; virtual ~SvxPageDescPage(); diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx index fa15f7dc0e29..245b10da6013 100644 --- a/cui/source/inc/paragrph.hxx +++ b/cui/source/inc/paragrph.hxx @@ -103,7 +103,7 @@ public: static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; void SetPageWidth( sal_uInt16 nPageWidth ); @@ -164,7 +164,7 @@ public: static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; void EnableJustifyExt(); virtual void PageCreated(const SfxAllItemSet& aSet) SAL_OVERRIDE; @@ -196,7 +196,7 @@ public: static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; void DisablePageBreak(); @@ -276,7 +276,7 @@ public: static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; }; diff --git a/cui/source/inc/swpossizetabpage.hxx b/cui/source/inc/swpossizetabpage.hxx index 03b81ffb9145..95a1b612d3f9 100644 --- a/cui/source/inc/swpossizetabpage.hxx +++ b/cui/source/inc/swpossizetabpage.hxx @@ -129,7 +129,7 @@ public: static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; diff --git a/cui/source/inc/tabstpge.hxx b/cui/source/inc/tabstpge.hxx index 6cf3a1dad283..1a11c865ef59 100644 --- a/cui/source/inc/tabstpge.hxx +++ b/cui/source/inc/tabstpge.hxx @@ -54,7 +54,7 @@ public: static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; void DisableControls( const sal_uInt16 nFlag ); diff --git a/cui/source/inc/textanim.hxx b/cui/source/inc/textanim.hxx index 7a71b1576f12..d584df68a40a 100644 --- a/cui/source/inc/textanim.hxx +++ b/cui/source/inc/textanim.hxx @@ -80,7 +80,7 @@ public: static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; void Construct(); }; diff --git a/cui/source/inc/textattr.hxx b/cui/source/inc/textattr.hxx index fe8eddd5cd63..ad4c45fd7c10 100644 --- a/cui/source/inc/textattr.hxx +++ b/cui/source/inc/textattr.hxx @@ -81,7 +81,7 @@ public: static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; virtual void PointChanged( Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx index 2f44a1552f04..47b8d3340985 100644 --- a/cui/source/inc/transfrm.hxx +++ b/cui/source/inc/transfrm.hxx @@ -151,7 +151,7 @@ public: static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; @@ -206,7 +206,7 @@ public: static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; @@ -250,7 +250,7 @@ public: static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx index 613c8a4e750a..95402c909d7f 100644 --- a/cui/source/options/connpooloptions.cxx +++ b/cui/source/options/connpooloptions.cxx @@ -397,9 +397,9 @@ namespace offapp } - void ConnectionPoolOptionsPage::Reset(const SfxItemSet& _rSet) + void ConnectionPoolOptionsPage::Reset(const SfxItemSet* _rSet) { - implInitControls(_rSet, true); + implInitControls(*_rSet, true); } diff --git a/cui/source/options/connpooloptions.hxx b/cui/source/options/connpooloptions.hxx index 064999cbb121..f65bb8c027ac 100644 --- a/cui/source/options/connpooloptions.hxx +++ b/cui/source/options/connpooloptions.hxx @@ -57,7 +57,7 @@ namespace offapp virtual bool Notify( NotifyEvent& _rNEvt ) SAL_OVERRIDE; virtual bool FillItemSet(SfxItemSet* _rSet) SAL_OVERRIDE; - virtual void Reset(const SfxItemSet& _rSet) SAL_OVERRIDE; + virtual void Reset(const SfxItemSet* _rSet) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& _rSet) SAL_OVERRIDE; protected: diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx index 151d65457314..666d1b9992fc 100644 --- a/cui/source/options/dbregister.cxx +++ b/cui/source/options/dbregister.cxx @@ -210,10 +210,10 @@ bool DbRegistrationOptionsPage::FillItemSet( SfxItemSet* rCoreSet ) -void DbRegistrationOptionsPage::Reset( const SfxItemSet& rSet ) +void DbRegistrationOptionsPage::Reset( const SfxItemSet* rSet ) { // the settings for the single drivers - SFX_ITEMSET_GET( rSet, pRegistrations, DatabaseMapItem, SID_SB_DB_REGISTER, true ); + SFX_ITEMSET_GET( *rSet, pRegistrations, DatabaseMapItem, SID_SB_DB_REGISTER, true ); if ( !pRegistrations ) return; diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx index be2dd1c79481..d140fe876680 100644 --- a/cui/source/options/fontsubs.cxx +++ b/cui/source/options/fontsubs.cxx @@ -192,7 +192,7 @@ bool SvxFontSubstTabPage::FillItemSet( SfxItemSet* ) return false; } -void SvxFontSubstTabPage::Reset( const SfxItemSet& ) +void SvxFontSubstTabPage::Reset( const SfxItemSet* ) { m_pCheckLB->SetUpdateMode(false); m_pCheckLB->Clear(); diff --git a/cui/source/options/fontsubs.hxx b/cui/source/options/fontsubs.hxx index bad9084f829f..b505904f1ffe 100644 --- a/cui/source/options/fontsubs.hxx +++ b/cui/source/options/fontsubs.hxx @@ -97,7 +97,7 @@ class SvxFontSubstTabPage : public SfxTabPage public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; }; diff --git a/cui/source/options/optaccessibility.cxx b/cui/source/options/optaccessibility.cxx index 4b260d36fae1..588d2c9dea73 100644 --- a/cui/source/options/optaccessibility.cxx +++ b/cui/source/options/optaccessibility.cxx @@ -94,7 +94,7 @@ bool SvxAccessibilityOptionsTabPage::FillItemSet( SfxItemSet* ) return false; } -void SvxAccessibilityOptionsTabPage::Reset( const SfxItemSet& ) +void SvxAccessibilityOptionsTabPage::Reset( const SfxItemSet* ) { //set controls from aConfig.Get... diff --git a/cui/source/options/optaccessibility.hxx b/cui/source/options/optaccessibility.hxx index cd65854ed230..5239470d7e43 100644 --- a/cui/source/options/optaccessibility.hxx +++ b/cui/source/options/optaccessibility.hxx @@ -47,7 +47,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; }; #endif diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx index 44d8cbb8dd65..8f578660c00a 100644 --- a/cui/source/options/optasian.cxx +++ b/cui/source/options/optasian.cxx @@ -215,7 +215,7 @@ bool SvxAsianLayoutPage::FillItemSet( SfxItemSet* ) return false; } -void SvxAsianLayoutPage::Reset( const SfxItemSet& ) +void SvxAsianLayoutPage::Reset( const SfxItemSet* ) { SfxViewFrame* pCurFrm = SfxViewFrame::Current(); SfxObjectShell* pDocSh = pCurFrm ? pCurFrm->GetObjectShell() : 0; diff --git a/cui/source/options/optbasic.cxx b/cui/source/options/optbasic.cxx index 317d52666cb5..a3c6f2227837 100644 --- a/cui/source/options/optbasic.cxx +++ b/cui/source/options/optbasic.cxx @@ -120,7 +120,7 @@ bool SvxBasicIDEOptionsPage::FillItemSet( SfxItemSet* /*rCoreSet*/ ) return bModified; } -void SvxBasicIDEOptionsPage::Reset( const SfxItemSet& /*rSet*/ ) +void SvxBasicIDEOptionsPage::Reset( const SfxItemSet* /*rSet*/ ) { LoadConfig(); pCodeCompleteChk->SaveValue(); diff --git a/cui/source/options/optbasic.hxx b/cui/source/options/optbasic.hxx index d065ea6ac006..4727ab72d9f3 100644 --- a/cui/source/options/optbasic.hxx +++ b/cui/source/options/optbasic.hxx @@ -42,7 +42,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; virtual void FillUserData() SAL_OVERRIDE; }; diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx index 74b9b605c55a..799fb0afda25 100644 --- a/cui/source/options/optchart.cxx +++ b/cui/source/options/optchart.cxx @@ -116,7 +116,7 @@ bool SvxDefaultColorOptPage::FillItemSet( SfxItemSet* rOutAttrs ) return true; } -void SvxDefaultColorOptPage::Reset( const SfxItemSet& ) +void SvxDefaultColorOptPage::Reset( const SfxItemSet* ) { m_pLbChartColors->SelectEntryPos( 0 ); ListClickedHdl(m_pLbChartColors); diff --git a/cui/source/options/optchart.hxx b/cui/source/options/optchart.hxx index 7a1bd24337d8..5ec9299deb05 100644 --- a/cui/source/options/optchart.hxx +++ b/cui/source/options/optchart.hxx @@ -60,7 +60,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rInAttrs ); virtual bool FillItemSet( SfxItemSet* rOutAttrs ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rInAttrs ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rInAttrs ) SAL_OVERRIDE; }; #endif // INCLUDED_CUI_SOURCE_OPTIONS_OPTCHART_HXX diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx index 9abfde7728a4..df3755b464aa 100644 --- a/cui/source/options/optcolor.cxx +++ b/cui/source/options/optcolor.cxx @@ -1094,7 +1094,7 @@ bool SvxColorOptionsTabPage::FillItemSet( SfxItemSet* ) return true; } -void SvxColorOptionsTabPage::Reset( const SfxItemSet& ) +void SvxColorOptionsTabPage::Reset( const SfxItemSet* ) { if(pColorConfig) { diff --git a/cui/source/options/optcolor.hxx b/cui/source/options/optcolor.hxx index d3553785a686..7df087f8a304 100644 --- a/cui/source/options/optcolor.hxx +++ b/cui/source/options/optcolor.hxx @@ -53,7 +53,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; virtual void FillUserData() SAL_OVERRIDE; diff --git a/cui/source/options/optctl.cxx b/cui/source/options/optctl.cxx index e5501136c20a..68936978afbf 100644 --- a/cui/source/options/optctl.cxx +++ b/cui/source/options/optctl.cxx @@ -112,7 +112,7 @@ bool SvxCTLOptionsPage::FillItemSet( SfxItemSet* ) return bModified; } -void SvxCTLOptionsPage::Reset( const SfxItemSet& ) +void SvxCTLOptionsPage::Reset( const SfxItemSet* ) { SvtCTLOptions aCTLOptions; diff --git a/cui/source/options/optctl.hxx b/cui/source/options/optctl.hxx index e2396e2e3366..e49a7a1de9a4 100644 --- a/cui/source/options/optctl.hxx +++ b/cui/source/options/optctl.hxx @@ -49,7 +49,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; }; #endif // INCLUDED_CUI_SOURCE_OPTIONS_OPTCTL_HXX diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx index 8c5e47160ff4..391a2427c670 100644 --- a/cui/source/options/optfltr.cxx +++ b/cui/source/options/optfltr.cxx @@ -102,7 +102,7 @@ bool OfaMSFilterTabPage::FillItemSet( SfxItemSet* ) return false; } -void OfaMSFilterTabPage::Reset( const SfxItemSet& ) +void OfaMSFilterTabPage::Reset( const SfxItemSet* ) { const SvtFilterOptions& rOpt = SvtFilterOptions::Get(); @@ -223,7 +223,7 @@ bool OfaMSFilterTabPage2::FillItemSet( SfxItemSet* ) return true; } -void OfaMSFilterTabPage2::Reset( const SfxItemSet& ) +void OfaMSFilterTabPage2::Reset( const SfxItemSet* ) { SvtFilterOptions& rOpt = SvtFilterOptions::Get(); diff --git a/cui/source/options/optfltr.hxx b/cui/source/options/optfltr.hxx index da22fe558f83..71a6204fcf7a 100644 --- a/cui/source/options/optfltr.hxx +++ b/cui/source/options/optfltr.hxx @@ -47,7 +47,7 @@ public: const SfxItemSet& rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; }; class OfaMSFilterTabPage2 : public SfxTabPage @@ -96,7 +96,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; }; diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index 6bb145a60b57..980bfa8d0e6d 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -296,7 +296,7 @@ bool OfaMiscTabPage::FillItemSet( SfxItemSet* rSet ) -void OfaMiscTabPage::Reset( const SfxItemSet& rSet ) +void OfaMiscTabPage::Reset( const SfxItemSet* rSet ) { SvtHelpOptions aHelpOptions; m_pToolTipsCB->Check( aHelpOptions.IsHelpTips() ); @@ -318,7 +318,7 @@ void OfaMiscTabPage::Reset( const SfxItemSet& rSet ) m_pDocStatusCB->SaveValue(); const SfxPoolItem* pItem = NULL; - if ( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_YEAR2000, false, &pItem ) ) + if ( SFX_ITEM_SET == rSet->GetItemState( SID_ATTR_YEAR2000, false, &pItem ) ) { m_pYearValueField->SetValue( ((SfxUInt16Item*)pItem)->GetValue() ); TwoFigureConfigHdl(m_pYearValueField); @@ -851,7 +851,7 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet* ) return bModified; } -void OfaViewTabPage::Reset( const SfxItemSet& ) +void OfaViewTabPage::Reset( const SfxItemSet* ) { SvtMiscOptions aMiscOptions; @@ -1416,7 +1416,7 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet* rSet ) return false; } -void OfaLanguagesTabPage::Reset( const SfxItemSet& rSet ) +void OfaLanguagesTabPage::Reset( const SfxItemSet* rSet ) { OUString sLang = pLangConfig->aSysLocaleOptions.GetLocaleConfigString(); if ( !sLang.isEmpty() ) @@ -1509,21 +1509,21 @@ void OfaLanguagesTabPage::Reset( const SfxItemSet& rSet ) m_pCurrentDocCB->Enable(true); m_pCurrentDocCB->Check(bLanguageCurrentDoc_Impl); const SfxPoolItem* pLang; - if( SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_LANGUAGE, false, &pLang)) + if( SFX_ITEM_SET == rSet->GetItemState(SID_ATTR_LANGUAGE, false, &pLang)) { LanguageType eTempCurLang = ((const SvxLanguageItem*)pLang)->GetValue(); if (MsLangId::resolveSystemLanguageByScriptType(eCurLang, ::com::sun::star::i18n::ScriptType::LATIN) != eTempCurLang) eCurLang = eTempCurLang; } - if( SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_CHAR_CJK_LANGUAGE, false, &pLang)) + if( SFX_ITEM_SET == rSet->GetItemState(SID_ATTR_CHAR_CJK_LANGUAGE, false, &pLang)) { LanguageType eTempCurLang = ((const SvxLanguageItem*)pLang)->GetValue(); if (MsLangId::resolveSystemLanguageByScriptType(eCurLangCJK, ::com::sun::star::i18n::ScriptType::ASIAN) != eTempCurLang) eCurLangCJK = eTempCurLang; } - if( SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_CHAR_CTL_LANGUAGE, false, &pLang)) + if( SFX_ITEM_SET == rSet->GetItemState(SID_ATTR_CHAR_CTL_LANGUAGE, false, &pLang)) { LanguageType eTempCurLang = ((const SvxLanguageItem*)pLang)->GetValue(); if (MsLangId::resolveSystemLanguageByScriptType(eCurLangCTL, ::com::sun::star::i18n::ScriptType::COMPLEX) != eTempCurLang) @@ -1568,7 +1568,7 @@ void OfaLanguagesTabPage::Reset( const SfxItemSet& rSet ) // check the box "For the current document only" // set the focus to the Western Language box const SfxPoolItem* pLang = 0; - if ( SFX_ITEM_SET == rSet.GetItemState(SID_SET_DOCUMENT_LANGUAGE, false, &pLang ) && ((const SfxBoolItem*)pLang)->GetValue() ) + if ( SFX_ITEM_SET == rSet->GetItemState(SID_SET_DOCUMENT_LANGUAGE, false, &pLang ) && ((const SfxBoolItem*)pLang)->GetValue() ) { m_pWesternLanguageLB->GrabFocus(); m_pCurrentDocCB->Enable(true); diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx index 28a7a581f252..93985aa77d12 100644 --- a/cui/source/options/optgdlg.hxx +++ b/cui/source/options/optgdlg.hxx @@ -71,7 +71,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; }; // class OfaViewTabPage -------------------------------------------------- @@ -126,7 +126,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; }; struct LanguageConfig_Impl; @@ -170,7 +170,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; }; #endif // INCLUDED_CUI_SOURCE_OPTIONS_OPTGDLG_HXX diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx index af517dcdbf17..b3ae874b7134 100644 --- a/cui/source/options/optgenrl.cxx +++ b/cui/source/options/optgenrl.cxx @@ -323,15 +323,15 @@ bool SvxGeneralTabPage::FillItemSet( SfxItemSet* ) -void SvxGeneralTabPage::Reset( const SfxItemSet& rSet ) +void SvxGeneralTabPage::Reset( const SfxItemSet* rSet ) { SetAddress_Impl(); sal_uInt16 const nWhich = GetWhich(SID_FIELD_GRABFOCUS); - if (rSet.GetItemState(nWhich) == SFX_ITEM_SET) + if (rSet->GetItemState(nWhich) == SFX_ITEM_SET) { - if (sal_uInt16 const nField = ((SfxUInt16Item&)rSet.Get(nWhich)).GetValue()) + if (sal_uInt16 const nField = ((SfxUInt16Item&)rSet->Get(nWhich)).GetValue()) { for (unsigned i = 0; i != vFields.size(); ++i) if (nField == vFieldInfo[vFields[i]->iField].nGrabFocusId) diff --git a/cui/source/options/opthtml.cxx b/cui/source/options/opthtml.cxx index a7a4e3388fec..7d5386c50c8b 100644 --- a/cui/source/options/opthtml.cxx +++ b/cui/source/options/opthtml.cxx @@ -142,7 +142,7 @@ bool OfaHtmlTabPage::FillItemSet( SfxItemSet* ) return false; } -void OfaHtmlTabPage::Reset( const SfxItemSet& ) +void OfaHtmlTabPage::Reset( const SfxItemSet* ) { SvxHtmlOptions& rHtmlOpt = SvxHtmlOptions::Get(); aSize1NF->SetValue(rHtmlOpt.GetFontSize(0)); diff --git a/cui/source/options/opthtml.hxx b/cui/source/options/opthtml.hxx index a91a4ed507be..47c8d083ec31 100644 --- a/cui/source/options/opthtml.hxx +++ b/cui/source/options/opthtml.hxx @@ -60,7 +60,7 @@ public: const SfxItemSet& rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; }; diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx index ad94515a8cd9..1d71abeae3a8 100644 --- a/cui/source/options/optinet2.cxx +++ b/cui/source/options/optinet2.cxx @@ -375,7 +375,7 @@ void SvxProxyTabPage::RestoreConfigDefaults_Impl() } } -void SvxProxyTabPage::Reset(const SfxItemSet&) +void SvxProxyTabPage::Reset(const SfxItemSet*) { ReadConfigData_Impl(); @@ -909,7 +909,7 @@ bool SvxSecurityTabPage::FillItemSet( SfxItemSet* ) /*--------------------------------------------------------------------*/ -void SvxSecurityTabPage::Reset( const SfxItemSet& ) +void SvxSecurityTabPage::Reset( const SfxItemSet* ) { } @@ -947,7 +947,7 @@ bool MozPluginTabPage::FillItemSet( SfxItemSet* ) return true; } -void MozPluginTabPage::Reset( const SfxItemSet& ) +void MozPluginTabPage::Reset( const SfxItemSet* ) { m_pWBasicCodeCB->Check( isInstalled()); m_pWBasicCodeCB->SaveValue(); @@ -1248,7 +1248,7 @@ bool SvxEMailTabPage::FillItemSet( SfxItemSet* ) /* -------------------------------------------------------------------------*/ -void SvxEMailTabPage::Reset( const SfxItemSet& ) +void SvxEMailTabPage::Reset( const SfxItemSet* ) { m_pMailerURLED->Enable(true ); m_pMailerURLPB->Enable(true ); diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx index 105bce864705..362f84568b2d 100644 --- a/cui/source/options/optinet2.hxx +++ b/cui/source/options/optinet2.hxx @@ -106,7 +106,7 @@ private: public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; }; // #98647# class SvxScriptExecListBox ------------------------------------ @@ -176,7 +176,7 @@ protected: public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; }; class MozPluginTabPage : public SfxTabPage @@ -196,7 +196,7 @@ public: const SfxItemSet& rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; }; @@ -221,7 +221,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; }; #endif // INCLUDED_CUI_SOURCE_OPTIONS_OPTINET2_HXX diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index 39ec6a3b1f85..15030f1db968 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -749,7 +749,7 @@ bool SvxJavaOptionsPage::FillItemSet( SfxItemSet* /*rCoreSet*/ ) -void SvxJavaOptionsPage::Reset( const SfxItemSet& /*rSet*/ ) +void SvxJavaOptionsPage::Reset( const SfxItemSet* /*rSet*/ ) { ClearJavaInfo(); ClearJavaList(); diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx index 421c1e49067e..6b9bf7a14179 100644 --- a/cui/source/options/optjava.hxx +++ b/cui/source/options/optjava.hxx @@ -110,7 +110,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; virtual void FillUserData() SAL_OVERRIDE; }; diff --git a/cui/source/options/optjsearch.cxx b/cui/source/options/optjsearch.cxx index b3951b850691..b8f68d98e329 100644 --- a/cui/source/options/optjsearch.cxx +++ b/cui/source/options/optjsearch.cxx @@ -160,7 +160,7 @@ sal_Int32 SvxJSearchOptionsPage::GetTransliterationFlags_Impl() } -void SvxJSearchOptionsPage::Reset( const SfxItemSet& ) +void SvxJSearchOptionsPage::Reset( const SfxItemSet* ) { SvtSearchOptions aOpt; diff --git a/cui/source/options/optjsearch.hxx b/cui/source/options/optjsearch.hxx index 9173c24ca156..266790619520 100644 --- a/cui/source/options/optjsearch.hxx +++ b/cui/source/options/optjsearch.hxx @@ -66,7 +66,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; bool IsSaveOptions() const { return bSaveOptions; } diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index 3481b7553fd4..ae66374f4887 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -1406,7 +1406,7 @@ void SvxLinguTabPage::UpdateModulesBox_Impl() -void SvxLinguTabPage::Reset( const SfxItemSet& rSet ) +void SvxLinguTabPage::Reset( const SfxItemSet* rSet ) { // if not HideGroups was called with GROUP_MODULES... if (m_pLinguModulesCLB->IsVisible()) @@ -1435,7 +1435,7 @@ void SvxLinguTabPage::Reset( const SfxItemSet& rSet ) pEntry = CreateEntry( sSpellAuto, CBCOL_FIRST ); aLngCfg.GetProperty( UPN_IS_SPELL_AUTO ) >>= bVal; - const SfxPoolItem* pItem = GetItem( rSet, SID_AUTOSPELL_CHECK ); + const SfxPoolItem* pItem = GetItem( *rSet, SID_AUTOSPELL_CHECK ); if (pItem) bVal = ((SfxBoolItem *) pItem)->GetValue(); nUserData = OptionsUserData( EID_SPELL_AUTO, false, 0, true, bVal).GetUserData(); @@ -1479,8 +1479,8 @@ void SvxLinguTabPage::Reset( const SfxItemSet& rSet ) const SfxHyphenRegionItem *pHyp = NULL; sal_uInt16 nWhich = GetWhich( SID_ATTR_HYPHENREGION ); - if ( rSet.GetItemState( nWhich, false ) == SFX_ITEM_SET ) - pHyp = &( (const SfxHyphenRegionItem &) rSet.Get( nWhich ) ); + if ( rSet->GetItemState( nWhich, false ) == SFX_ITEM_SET ) + pHyp = &( (const SfxHyphenRegionItem &) rSet->Get( nWhich ) ); pEntry = CreateEntry( sNumPreBreak, CBCOL_SECOND ); aLngCfg.GetProperty( UPN_HYPH_MIN_LEADING ) >>= nVal; diff --git a/cui/source/options/optmemory.cxx b/cui/source/options/optmemory.cxx index 1e1a97daa8b0..a3918658d86c 100644 --- a/cui/source/options/optmemory.cxx +++ b/cui/source/options/optmemory.cxx @@ -207,7 +207,7 @@ bool OfaMemoryOptionsPage::FillItemSet( SfxItemSet* rSet ) -void OfaMemoryOptionsPage::Reset( const SfxItemSet& rSet ) +void OfaMemoryOptionsPage::Reset( const SfxItemSet* rSet ) { const SfxPoolItem* pItem; @@ -239,7 +239,7 @@ void OfaMemoryOptionsPage::Reset( const SfxItemSet& rSet ) (officecfg::Office::Common::Cache::DrawingEngine::OLE_Objects:: get()))); - SfxItemState eState = rSet.GetItemState( SID_ATTR_QUICKLAUNCHER, false, &pItem ); + SfxItemState eState = rSet->GetItemState( SID_ATTR_QUICKLAUNCHER, false, &pItem ); if ( SFX_ITEM_SET == eState ) m_pQuickLaunchCB->Check( ( (SfxBoolItem*)pItem )->GetValue() ); else if ( SFX_ITEM_DISABLED == eState ) diff --git a/cui/source/options/optmemory.hxx b/cui/source/options/optmemory.hxx index b1564fbaa5f6..327cc541b682 100644 --- a/cui/source/options/optmemory.hxx +++ b/cui/source/options/optmemory.hxx @@ -62,7 +62,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; }; diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx index 5b44550ba650..de014e756eb2 100644 --- a/cui/source/options/optpath.cxx +++ b/cui/source/options/optpath.cxx @@ -278,7 +278,7 @@ bool SvxPathTabPage::FillItemSet( SfxItemSet* ) -void SvxPathTabPage::Reset( const SfxItemSet& ) +void SvxPathTabPage::Reset( const SfxItemSet* ) { pPathBox->Clear(); diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx index 42e744fe62fb..9c27762b7fa7 100644 --- a/cui/source/options/optsave.cxx +++ b/cui/source/options/optsave.cxx @@ -379,7 +379,7 @@ bool isODFFormat( const OUString& sFilter ) return bRet; } -void SfxSaveTabPage::Reset( const SfxItemSet& ) +void SfxSaveTabPage::Reset( const SfxItemSet* ) { SvtSaveOptions aSaveOpt; aLoadUserSettingsCB->Check(aSaveOpt.IsLoadUserSettings()); diff --git a/cui/source/options/optsave.hxx b/cui/source/options/optsave.hxx index 189240ca7ad0..7b5158f9e672 100644 --- a/cui/source/options/optsave.hxx +++ b/cui/source/options/optsave.hxx @@ -77,7 +77,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; }; #endif // INCLUDED_CUI_SOURCE_OPTIONS_OPTSAVE_HXX diff --git a/cui/source/options/optupdt.cxx b/cui/source/options/optupdt.cxx index 2ac7d83986bd..a8ab4c63a7d5 100644 --- a/cui/source/options/optupdt.cxx +++ b/cui/source/options/optupdt.cxx @@ -220,7 +220,7 @@ bool SvxOnlineUpdateTabPage::FillItemSet( SfxItemSet* ) -void SvxOnlineUpdateTabPage::Reset( const SfxItemSet& ) +void SvxOnlineUpdateTabPage::Reset( const SfxItemSet* ) { bool bValue = false; m_xUpdateAccess->getByName( "AutoCheckEnabled" ) >>= bValue; diff --git a/cui/source/options/optupdt.hxx b/cui/source/options/optupdt.hxx index 525fbcad56f5..996d1b261094 100644 --- a/cui/source/options/optupdt.hxx +++ b/cui/source/options/optupdt.hxx @@ -57,7 +57,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; virtual void FillUserData() SAL_OVERRIDE; }; diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx index 57cffe7e2d29..60a77453e386 100644 --- a/cui/source/options/personalization.cxx +++ b/cui/source/options/personalization.cxx @@ -144,7 +144,7 @@ bool SvxPersonalizationTabPage::FillItemSet( SfxItemSet * ) return bModified; } -void SvxPersonalizationTabPage::Reset( const SfxItemSet & ) +void SvxPersonalizationTabPage::Reset( const SfxItemSet * ) { uno::Reference< uno::XComponentContext > xContext( comphelper::getProcessComponentContext() ); diff --git a/cui/source/options/personalization.hxx b/cui/source/options/personalization.hxx index b41beca5155a..66d94f262143 100644 --- a/cui/source/options/personalization.hxx +++ b/cui/source/options/personalization.hxx @@ -35,7 +35,7 @@ public: virtual bool FillItemSet( SfxItemSet *rSet ) SAL_OVERRIDE; /// Reset to default settings ([Revert] button). - virtual void Reset( const SfxItemSet &rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet *rSet ) SAL_OVERRIDE; private: /// Handle the Persona selection diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index 95bd35308fc8..23979b4235ff 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -651,9 +651,9 @@ IMPL_LINK_NOARG(OfaTreeOptionsDialog, BackHdl_Impl) OptionsGroupInfo* pGroupInfo = (OptionsGroupInfo*)aTreeLB.GetParent( pCurrentPageEntry )->GetUserData(); if ( RID_SVXPAGE_COLOR == pPageInfo->m_nPageId ) - pPageInfo->m_pPage->Reset( *pColorPageItemSet ); + pPageInfo->m_pPage->Reset( pColorPageItemSet ); else - pPageInfo->m_pPage->Reset( *pGroupInfo->m_pInItemSet ); + pPageInfo->m_pPage->Reset( pGroupInfo->m_pInItemSet ); } else if ( pPageInfo->m_pExtPage ) pPageInfo->m_pExtPage->ResetPage(); @@ -1117,12 +1117,12 @@ void OfaTreeOptionsDialog::SelectHdl_Impl() pPageInfo->m_pPage->SetPosPixel( aPagePos ); if ( RID_SVXPAGE_COLOR == pPageInfo->m_nPageId ) { - pPageInfo->m_pPage->Reset( *pColorPageItemSet ); + pPageInfo->m_pPage->Reset( pColorPageItemSet ); pPageInfo->m_pPage->ActivatePage( *pColorPageItemSet ); } else { - pPageInfo->m_pPage->Reset( *pGroupInfo->m_pInItemSet ); + pPageInfo->m_pPage->Reset( pGroupInfo->m_pInItemSet ); } if (::isLayoutEnabled(pPageInfo->m_pPage)) SetPaneSize(pPageInfo->m_pPage); diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx index c7063342ff0a..ecf544d1c318 100644 --- a/cui/source/tabpages/align.cxx +++ b/cui/source/tabpages/align.cxx @@ -285,7 +285,7 @@ bool AlignmentTabPage::FillItemSet( SfxItemSet* rSet ) return bChanged; } -void AlignmentTabPage::Reset( const SfxItemSet& rCoreAttrs ) +void AlignmentTabPage::Reset( const SfxItemSet* rCoreAttrs ) { SfxTabPage::Reset( rCoreAttrs ); @@ -293,12 +293,12 @@ void AlignmentTabPage::Reset( const SfxItemSet& rCoreAttrs ) // method to 'distribute' to distinguish from the normal justification. lcl_MaybeResetAlignToDistro<SvxCellHorJustify, SvxCellHorJustify>( - *m_pLbHorAlign, ALIGNDLG_HORALIGN_DISTRIBUTED, rCoreAttrs, + *m_pLbHorAlign, ALIGNDLG_HORALIGN_DISTRIBUTED, *rCoreAttrs, GetWhich(SID_ATTR_ALIGN_HOR_JUSTIFY), GetWhich(SID_ATTR_ALIGN_HOR_JUSTIFY_METHOD), SVX_HOR_JUSTIFY_BLOCK); lcl_MaybeResetAlignToDistro<SvxCellVerJustify, SvxCellVerJustify>( - *m_pLbVerAlign, ALIGNDLG_VERALIGN_DISTRIBUTED, rCoreAttrs, + *m_pLbVerAlign, ALIGNDLG_VERALIGN_DISTRIBUTED, *rCoreAttrs, GetWhich(SID_ATTR_ALIGN_VER_JUSTIFY), GetWhich(SID_ATTR_ALIGN_VER_JUSTIFY_METHOD), SVX_VER_JUSTIFY_BLOCK); diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index 4b4c816303fd..4d42674dc8f0 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -227,7 +227,7 @@ void OfaAutocorrOptionsPage::ActivatePage( const SfxItemSet& ) ((OfaAutoCorrDlg*)GetTabDialog())->EnableLanguage(false); } -void OfaAutocorrOptionsPage::Reset( const SfxItemSet& ) +void OfaAutocorrOptionsPage::Reset( const SfxItemSet* ) { SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect(); const long nFlags = pAutoCorrect->GetFlags(); @@ -602,7 +602,7 @@ void OfaSwAutoFmtOptionsPage::ActivatePage( const SfxItemSet& ) ((OfaAutoCorrDlg*)GetTabDialog())->EnableLanguage(false); } -void OfaSwAutoFmtOptionsPage::Reset( const SfxItemSet& ) +void OfaSwAutoFmtOptionsPage::Reset( const SfxItemSet* ) { SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect(); SvxSwAutoFmtFlags *pOpt = &pAutoCorrect->GetSwFlags(); @@ -1073,7 +1073,7 @@ void OfaAutocorrReplacePage::RefillReplaceBox(bool bFromReset, } } -void OfaAutocorrReplacePage::Reset( const SfxItemSet& ) +void OfaAutocorrReplacePage::Reset( const SfxItemSet* ) { RefillReplaceBox(true, eLang, eLang); m_pShortED->GrabFocus(); @@ -1606,7 +1606,7 @@ void OfaAutocorrExceptPage::RefillReplaceBoxes(bool bFromReset, } } -void OfaAutocorrExceptPage::Reset( const SfxItemSet& ) +void OfaAutocorrExceptPage::Reset( const SfxItemSet* ) { SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect(); RefillReplaceBoxes(true, eLang, eLang); @@ -1900,7 +1900,7 @@ void OfaQuoteTabPage::ActivatePage( const SfxItemSet& ) ((OfaAutoCorrDlg*)GetTabDialog())->EnableLanguage(false); } -void OfaQuoteTabPage::Reset( const SfxItemSet& ) +void OfaQuoteTabPage::Reset( const SfxItemSet* ) { SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect(); const long nFlags = pAutoCorrect->GetFlags(); @@ -2205,7 +2205,7 @@ bool OfaAutoCompleteTabPage::FillItemSet( SfxItemSet* ) return true; } -void OfaAutoCompleteTabPage::Reset( const SfxItemSet& ) +void OfaAutoCompleteTabPage::Reset( const SfxItemSet* ) { SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect(); SvxSwAutoFmtFlags *pOpt = &pAutoCorrect->GetSwFlags(); @@ -2566,7 +2566,7 @@ bool OfaSmartTagOptionsTabPage::FillItemSet( SfxItemSet* ) /** Sets the controls based on the current settings at SmartTagMgr. */ -void OfaSmartTagOptionsTabPage::Reset( const SfxItemSet& ) +void OfaSmartTagOptionsTabPage::Reset( const SfxItemSet* ) { SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect(); SvxSwAutoFmtFlags *pOpt = &pAutoCorrect->GetSwFlags(); diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index 58a60f2c4334..1b2314defdd7 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -468,15 +468,15 @@ SfxTabPage* SvxBackgroundTabPage::Create( Window* pParent, -void SvxBackgroundTabPage::Reset( const SfxItemSet& rSet ) +void SvxBackgroundTabPage::Reset( const SfxItemSet* rSet ) { // os: Such a nonsense! One will always find such an item somewhere, // but it must be existing in the rSet! // const SfxPoolItem* pX = GetOldItem( rSet, SID_VIEW_FLD_PIC ); // if( pX && pX->ISA(SfxWallpaperItem)) - if(SFX_ITEM_AVAILABLE <= rSet.GetItemState(GetWhich(SID_VIEW_FLD_PIC), false)) + if(SFX_ITEM_AVAILABLE <= rSet->GetItemState(GetWhich(SID_VIEW_FLD_PIC), false)) { - ResetFromWallpaperItem( rSet ); + ResetFromWallpaperItem( *rSet ); return; } @@ -494,7 +494,7 @@ void SvxBackgroundTabPage::Reset( const SfxItemSet& rSet ) const SfxPoolItem* pItem; sal_uInt16 nDestValue = USHRT_MAX; - if ( SFX_ITEM_SET == rSet.GetItemState( SID_BACKGRND_DESTINATION, + if ( SFX_ITEM_SET == rSet->GetItemState( SID_BACKGRND_DESTINATION, false, &pItem ) ) { nDestValue = ((const SfxUInt16Item*)pItem)->GetValue(); @@ -513,7 +513,7 @@ void SvxBackgroundTabPage::Reset( const SfxItemSet& rSet ) break; } } - else if( SFX_ITEM_SET == rSet.GetItemState( + else if( SFX_ITEM_SET == rSet->GetItemState( SID_PARA_BACKGRND_DESTINATION, false, &pItem ) ) { nDestValue = ((const SfxUInt16Item*)pItem)->GetValue(); @@ -541,8 +541,8 @@ void SvxBackgroundTabPage::Reset( const SfxItemSet& rSet ) nDestValue = 0; sal_uInt16 nWhich = GetWhich( nSlot ); - if ( rSet.GetItemState( nWhich, false ) >= SFX_ITEM_AVAILABLE ) - pBgdAttr = (const SvxBrushItem*)&( rSet.Get( nWhich ) ); + if ( rSet->GetItemState( nWhich, false ) >= SFX_ITEM_AVAILABLE ) + pBgdAttr = (const SvxBrushItem*)&( rSet->Get( nWhich ) ); m_pBtnTile->Check(); @@ -558,7 +558,7 @@ void SvxBackgroundTabPage::Reset( const SfxItemSet& rSet ) lcl_setFillStyle(m_pLbSelect, XFILL_SOLID); ShowColorUI_Impl(); - const SfxPoolItem* pOld = GetOldItem( rSet, SID_ATTR_BRUSH ); + const SfxPoolItem* pOld = GetOldItem( *rSet, SID_ATTR_BRUSH ); if ( pOld ) aBgdColor = ( (SvxBrushItem*)pOld )->GetColor(); @@ -582,23 +582,23 @@ void SvxBackgroundTabPage::Reset( const SfxItemSet& rSet ) pTableBck_Impl->nActPos = nValue; nWhich = GetWhich( SID_ATTR_BRUSH ); - if ( rSet.GetItemState( nWhich, false ) >= SFX_ITEM_AVAILABLE ) + if ( rSet->GetItemState( nWhich, false ) >= SFX_ITEM_AVAILABLE ) { - pBgdAttr = (const SvxBrushItem*)&( rSet.Get( nWhich ) ); + pBgdAttr = (const SvxBrushItem*)&( rSet->Get( nWhich ) ); pTableBck_Impl->pCellBrush = new SvxBrushItem(*pBgdAttr); } pTableBck_Impl->nCellWhich = nWhich; - if ( rSet.GetItemState( SID_ATTR_BRUSH_ROW, false ) >= SFX_ITEM_AVAILABLE ) + if ( rSet->GetItemState( SID_ATTR_BRUSH_ROW, false ) >= SFX_ITEM_AVAILABLE ) { - pBgdAttr = (const SvxBrushItem*)&( rSet.Get( SID_ATTR_BRUSH_ROW ) ); + pBgdAttr = (const SvxBrushItem*)&( rSet->Get( SID_ATTR_BRUSH_ROW ) ); pTableBck_Impl->pRowBrush = new SvxBrushItem(*pBgdAttr); } pTableBck_Impl->nRowWhich = SID_ATTR_BRUSH_ROW; - if ( rSet.GetItemState( SID_ATTR_BRUSH_TABLE, false ) >= SFX_ITEM_AVAILABLE ) + if ( rSet->GetItemState( SID_ATTR_BRUSH_TABLE, false ) >= SFX_ITEM_AVAILABLE ) { - pBgdAttr = (const SvxBrushItem*)&( rSet.Get( SID_ATTR_BRUSH_TABLE ) ); + pBgdAttr = (const SvxBrushItem*)&( rSet->Get( SID_ATTR_BRUSH_TABLE ) ); pTableBck_Impl->pTableBrush = new SvxBrushItem(*pBgdAttr); } pTableBck_Impl->nTableWhich = SID_ATTR_BRUSH_TABLE; @@ -621,18 +621,18 @@ void SvxBackgroundTabPage::Reset( const SfxItemSet& rSet ) pParaBck_Impl->nActPos = nValue; nWhich = GetWhich( SID_ATTR_BRUSH ); - if ( rSet.GetItemState( nWhich, false ) >= SFX_ITEM_AVAILABLE ) + if ( rSet->GetItemState( nWhich, false ) >= SFX_ITEM_AVAILABLE ) { - pBgdAttr = (const SvxBrushItem*)&( rSet.Get( nWhich ) ); + pBgdAttr = (const SvxBrushItem*)&( rSet->Get( nWhich ) ); pParaBck_Impl->pParaBrush = new SvxBrushItem(*pBgdAttr); } nWhich = GetWhich( SID_ATTR_BRUSH_CHAR ); - rSet.GetItemState( nWhich, true ); - rSet.GetItemState( nWhich, false ); - if ( rSet.GetItemState( nWhich, true ) > SFX_ITEM_AVAILABLE ) + rSet->GetItemState( nWhich, true ); + rSet->GetItemState( nWhich, false ); + if ( rSet->GetItemState( nWhich, true ) > SFX_ITEM_AVAILABLE ) { - pBgdAttr = (const SvxBrushItem*)&( rSet.Get( nWhich ) ); + pBgdAttr = (const SvxBrushItem*)&( rSet->Get( nWhich ) ); pParaBck_Impl->pCharBrush = new SvxBrushItem(*pBgdAttr); } else diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx index 184b72093ff4..120b554bc21d 100644 --- a/cui/source/tabpages/border.cxx +++ b/cui/source/tabpages/border.cxx @@ -379,7 +379,7 @@ bool SvxBorderTabPage::IsBorderLineStyleAllowed( sal_Int16 nStyle ) const -void SvxBorderTabPage::Reset( const SfxItemSet& rSet ) +void SvxBorderTabPage::Reset( const SfxItemSet* rSet ) { SfxTabPage::Reset( rSet ); @@ -388,11 +388,11 @@ void SvxBorderTabPage::Reset( const SfxItemSet& rSet ) sal_uInt16 nWhichBox = GetWhich(SID_ATTR_BORDER_OUTER); SfxMapUnit eCoreUnit; - pBoxItem = (const SvxBoxItem*)GetItem( rSet, SID_ATTR_BORDER_OUTER ); + pBoxItem = (const SvxBoxItem*)GetItem( *rSet, SID_ATTR_BORDER_OUTER ); - pBoxInfoItem = (const SvxBoxInfoItem*)GetItem( rSet, SID_ATTR_BORDER_INNER, false ); + pBoxInfoItem = (const SvxBoxInfoItem*)GetItem( *rSet, SID_ATTR_BORDER_INNER, false ); - eCoreUnit = rSet.GetPool()->GetMetric( nWhichBox ); + eCoreUnit = rSet->GetPool()->GetMetric( nWhichBox ); if ( pBoxItem && pBoxInfoItem ) // -> Don't Care { @@ -427,7 +427,7 @@ void SvxBorderTabPage::Reset( const SfxItemSet& rSet ) if ( pBoxInfoItem->IsDist() ) { - if( rSet.GetItemState( nWhichBox, true ) >= SFX_ITEM_DEFAULT ) + if( rSet->GetItemState( nWhichBox, true ) >= SFX_ITEM_DEFAULT ) { bool bIsAnyBorderVisible = m_pFrameSel->IsAnyBorderVisible(); if( !bIsAnyBorderVisible || !pBoxInfoItem->IsMinDist() ) @@ -552,7 +552,7 @@ void SvxBorderTabPage::Reset( const SfxItemSet& rSet ) const SfxPoolItem* pItem; SfxObjectShell* pShell; - if(SFX_ITEM_SET == rSet.GetItemState(SID_HTML_MODE, false, &pItem) || + if(SFX_ITEM_SET == rSet->GetItemState(SID_HTML_MODE, false, &pItem) || ( 0 != (pShell = SfxObjectShell::Current()) && 0 != (pItem = pShell->GetItem(SID_HTML_MODE)))) { diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index fc53366be96a..92e8141303ed 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -1191,13 +1191,13 @@ const sal_uInt16* SvxCharNamePage::GetRanges() -void SvxCharNamePage::Reset( const SfxItemSet& rSet ) +void SvxCharNamePage::Reset( const SfxItemSet* rSet ) { - Reset_Impl( rSet, Western ); - Reset_Impl( rSet, Asian ); - Reset_Impl( rSet, Ctl ); + Reset_Impl( *rSet, Western ); + Reset_Impl( *rSet, Asian ); + Reset_Impl( *rSet, Ctl ); - SetPrevFontWidthScale( rSet ); + SetPrevFontWidthScale( *rSet ); UpdatePreview_Impl(); } @@ -1738,7 +1738,7 @@ const sal_uInt16* SvxCharEffectsPage::GetRanges() -void SvxCharEffectsPage::Reset( const SfxItemSet& rSet ) +void SvxCharEffectsPage::Reset( const SfxItemSet* rSet ) { SvxFont& rFont = GetPreviewFont(); SvxFont& rCJKFont = GetPreviewCJKFont(); @@ -1753,7 +1753,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet& rSet ) rCTLFont.SetUnderline( UNDERLINE_NONE ); m_pUnderlineLB->SelectEntryPos( 0 ); - SfxItemState eState = rSet.GetItemState( nWhich ); + SfxItemState eState = rSet->GetItemState( nWhich ); if ( eState >= SFX_ITEM_DONTCARE ) { @@ -1761,7 +1761,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet& rSet ) m_pUnderlineLB->SetNoSelection(); else { - const SvxUnderlineItem& rItem = (SvxUnderlineItem&)rSet.Get( nWhich ); + const SvxUnderlineItem& rItem = (SvxUnderlineItem&)rSet->Get( nWhich ); FontUnderline eUnderline = (FontUnderline)rItem.GetValue(); rFont.SetUnderline( eUnderline ); rCJKFont.SetUnderline( eUnderline ); @@ -1810,7 +1810,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet& rSet ) rCTLFont.SetOverline( UNDERLINE_NONE ); m_pOverlineLB->SelectEntryPos( 0 ); - eState = rSet.GetItemState( nWhich ); + eState = rSet->GetItemState( nWhich ); if ( eState >= SFX_ITEM_DONTCARE ) { @@ -1818,7 +1818,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet& rSet ) m_pOverlineLB->SetNoSelection(); else { - const SvxOverlineItem& rItem = (SvxOverlineItem&)rSet.Get( nWhich ); + const SvxOverlineItem& rItem = (SvxOverlineItem&)rSet->Get( nWhich ); FontUnderline eOverline = (FontUnderline)rItem.GetValue(); rFont.SetOverline( eOverline ); rCJKFont.SetOverline( eOverline ); @@ -1867,7 +1867,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet& rSet ) rCTLFont.SetStrikeout( STRIKEOUT_NONE ); m_pStrikeoutLB->SelectEntryPos( 0 ); - eState = rSet.GetItemState( nWhich ); + eState = rSet->GetItemState( nWhich ); if ( eState >= SFX_ITEM_DONTCARE ) { @@ -1875,7 +1875,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet& rSet ) m_pStrikeoutLB->SetNoSelection(); else { - const SvxCrossedOutItem& rItem = (SvxCrossedOutItem&)rSet.Get( nWhich ); + const SvxCrossedOutItem& rItem = (SvxCrossedOutItem&)rSet->Get( nWhich ); FontStrikeout eStrikeout = (FontStrikeout)rItem.GetValue(); rFont.SetStrikeout( eStrikeout ); rCJKFont.SetStrikeout( eStrikeout ); @@ -1916,7 +1916,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet& rSet ) case SFX_ITEM_DEFAULT: case SFX_ITEM_SET: { - const SvxWordLineModeItem& rItem = (SvxWordLineModeItem&)rSet.Get( nWhich ); + const SvxWordLineModeItem& rItem = (SvxWordLineModeItem&)rSet->Get( nWhich ); rFont.SetWordLineMode( rItem.GetValue() ); rCJKFont.SetWordLineMode( rItem.GetValue() ); rCTLFont.SetWordLineMode( rItem.GetValue() ); @@ -1929,11 +1929,11 @@ void SvxCharEffectsPage::Reset( const SfxItemSet& rSet ) // Emphasis nWhich = GetWhich( SID_ATTR_CHAR_EMPHASISMARK ); - eState = rSet.GetItemState( nWhich ); + eState = rSet->GetItemState( nWhich ); if ( eState >= SFX_ITEM_DEFAULT ) { - const SvxEmphasisMarkItem& rItem = (SvxEmphasisMarkItem&)rSet.Get( nWhich ); + const SvxEmphasisMarkItem& rItem = (SvxEmphasisMarkItem&)rSet->Get( nWhich ); FontEmphasisMark eMark = rItem.GetEmphasisMark(); rFont.SetEmphasisMark( eMark ); rCJKFont.SetEmphasisMark( eMark ); @@ -1987,7 +1987,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet& rSet ) // Effects SvxCaseMap eCaseMap = SVX_CASEMAP_END; nWhich = GetWhich( SID_ATTR_CHAR_CASEMAP ); - eState = rSet.GetItemState( nWhich ); + eState = rSet->GetItemState( nWhich ); switch ( eState ) { case SFX_ITEM_UNKNOWN: @@ -2008,7 +2008,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet& rSet ) case SFX_ITEM_DEFAULT: case SFX_ITEM_SET: { - const SvxCaseMapItem& rItem = (const SvxCaseMapItem&)rSet.Get( nWhich ); + const SvxCaseMapItem& rItem = (const SvxCaseMapItem&)rSet->Get( nWhich ); eCaseMap = (SvxCaseMap)rItem.GetValue(); break; } @@ -2017,7 +2017,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet& rSet ) //Relief nWhich = GetWhich(SID_ATTR_CHAR_RELIEF); - eState = rSet.GetItemState( nWhich ); + eState = rSet->GetItemState( nWhich ); switch ( eState ) { case SFX_ITEM_UNKNOWN: @@ -2038,7 +2038,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet& rSet ) case SFX_ITEM_DEFAULT: case SFX_ITEM_SET: { - const SvxCharReliefItem& rItem = (const SvxCharReliefItem&)rSet.Get( nWhich ); + const SvxCharReliefItem& rItem = (const SvxCharReliefItem&)rSet->Get( nWhich ); m_pReliefLB->SelectEntryPos(rItem.GetValue()); SelectHdl_Impl(m_pReliefLB); break; @@ -2047,7 +2047,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet& rSet ) // Outline nWhich = GetWhich( SID_ATTR_CHAR_CONTOUR ); - eState = rSet.GetItemState( nWhich ); + eState = rSet->GetItemState( nWhich ); switch ( eState ) { case SFX_ITEM_UNKNOWN: @@ -2066,7 +2066,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet& rSet ) case SFX_ITEM_DEFAULT: case SFX_ITEM_SET: { - const SvxContourItem& rItem = (SvxContourItem&)rSet.Get( nWhich ); + const SvxContourItem& rItem = (SvxContourItem&)rSet->Get( nWhich ); m_pOutlineBtn->SetState( (TriState)rItem.GetValue() ); m_pOutlineBtn->EnableTriState( false ); break; @@ -2075,7 +2075,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet& rSet ) // Shadow nWhich = GetWhich( SID_ATTR_CHAR_SHADOWED ); - eState = rSet.GetItemState( nWhich ); + eState = rSet->GetItemState( nWhich ); switch ( eState ) { @@ -2095,7 +2095,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet& rSet ) case SFX_ITEM_DEFAULT: case SFX_ITEM_SET: { - const SvxShadowedItem& rItem = (SvxShadowedItem&)rSet.Get( nWhich ); + const SvxShadowedItem& rItem = (SvxShadowedItem&)rSet->Get( nWhich ); m_pShadowBtn->SetState( (TriState)rItem.GetValue() ); m_pShadowBtn->EnableTriState( false ); break; @@ -2104,7 +2104,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet& rSet ) // Blinking nWhich = GetWhich( SID_ATTR_FLASH ); - eState = rSet.GetItemState( nWhich ); + eState = rSet->GetItemState( nWhich ); switch ( eState ) { @@ -2124,7 +2124,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet& rSet ) case SFX_ITEM_DEFAULT: case SFX_ITEM_SET: { - const SvxBlinkItem& rItem = (SvxBlinkItem&)rSet.Get( nWhich ); + const SvxBlinkItem& rItem = (SvxBlinkItem&)rSet->Get( nWhich ); m_pBlinkingBtn->SetState( (TriState)rItem.GetValue() ); m_pBlinkingBtn->EnableTriState( false ); break; @@ -2132,7 +2132,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet& rSet ) } // Hidden nWhich = GetWhich( SID_ATTR_CHAR_HIDDEN ); - eState = rSet.GetItemState( nWhich ); + eState = rSet->GetItemState( nWhich ); switch ( eState ) { @@ -2152,15 +2152,15 @@ void SvxCharEffectsPage::Reset( const SfxItemSet& rSet ) case SFX_ITEM_DEFAULT: case SFX_ITEM_SET: { - const SvxCharHiddenItem& rItem = (SvxCharHiddenItem&)rSet.Get( nWhich ); + const SvxCharHiddenItem& rItem = (SvxCharHiddenItem&)rSet->Get( nWhich ); m_pHiddenBtn->SetState( (TriState)rItem.GetValue() ); m_pHiddenBtn->EnableTriState( false ); break; } } - SetPrevFontWidthScale( rSet ); - ResetColor_Impl( rSet ); + SetPrevFontWidthScale( *rSet ); + ResetColor_Impl( *rSet ); // preview update m_pPreviewWin->Invalidate(); @@ -2911,7 +2911,7 @@ const sal_uInt16* SvxCharPositionPage::GetRanges() } -void SvxCharPositionPage::Reset( const SfxItemSet& rSet ) +void SvxCharPositionPage::Reset( const SfxItemSet* rSet ) { OUString sUser = GetUserData(); @@ -2957,9 +2957,9 @@ void SvxCharPositionPage::Reset( const SfxItemSet& rSet ) SvxFont& rCTLFont = GetPreviewCTLFont(); sal_uInt16 nWhich = GetWhich( SID_ATTR_CHAR_ESCAPEMENT ); - if ( rSet.GetItemState( nWhich ) >= SFX_ITEM_DEFAULT ) + if ( rSet->GetItemState( nWhich ) >= SFX_ITEM_DEFAULT ) { - const SvxEscapementItem& rItem = (SvxEscapementItem&)rSet.Get( nWhich ); + const SvxEscapementItem& rItem = (SvxEscapementItem&)rSet->Get( nWhich ); nEsc = rItem.GetEsc(); nEscProp = rItem.GetProp(); @@ -3028,10 +3028,10 @@ void SvxCharPositionPage::Reset( const SfxItemSet& rSet ) // Kerning nWhich = GetWhich( SID_ATTR_CHAR_KERNING ); - if ( rSet.GetItemState( nWhich ) >= SFX_ITEM_DEFAULT ) + if ( rSet->GetItemState( nWhich ) >= SFX_ITEM_DEFAULT ) { - const SvxKerningItem& rItem = (SvxKerningItem&)rSet.Get( nWhich ); - SfxMapUnit eUnit = rSet.GetPool()->GetMetric( nWhich ); + const SvxKerningItem& rItem = (SvxKerningItem&)rSet->Get( nWhich ); + SfxMapUnit eUnit = rSet->GetPool()->GetMetric( nWhich ); MapUnit eOrgUnit = (MapUnit)eUnit; MapUnit ePntUnit( MAP_POINT ); long nBig = static_cast<long>(m_pKerningMF->Normalize( static_cast<long>(rItem.GetValue()) )); @@ -3071,9 +3071,9 @@ void SvxCharPositionPage::Reset( const SfxItemSet& rSet ) // Pair kerning nWhich = GetWhich( SID_ATTR_CHAR_AUTOKERN ); - if ( rSet.GetItemState( nWhich ) >= SFX_ITEM_DEFAULT ) + if ( rSet->GetItemState( nWhich ) >= SFX_ITEM_DEFAULT ) { - const SvxAutoKernItem& rItem = (SvxAutoKernItem&)rSet.Get( nWhich ); + const SvxAutoKernItem& rItem = (SvxAutoKernItem&)rSet->Get( nWhich ); m_pPairKerningBtn->Check( rItem.GetValue() ); } else @@ -3081,9 +3081,9 @@ void SvxCharPositionPage::Reset( const SfxItemSet& rSet ) // Scale Width nWhich = GetWhich( SID_ATTR_CHAR_SCALEWIDTH ); - if ( rSet.GetItemState( nWhich ) >= SFX_ITEM_DEFAULT ) + if ( rSet->GetItemState( nWhich ) >= SFX_ITEM_DEFAULT ) { - const SvxCharScaleWidthItem& rItem = ( SvxCharScaleWidthItem& ) rSet.Get( nWhich ); + const SvxCharScaleWidthItem& rItem = ( SvxCharScaleWidthItem& ) rSet->Get( nWhich ); m_nScaleWidthInitialVal = rItem.GetValue(); m_pScaleWidthMF->SetValue( m_nScaleWidthInitialVal ); } @@ -3091,12 +3091,12 @@ void SvxCharPositionPage::Reset( const SfxItemSet& rSet ) m_pScaleWidthMF->SetValue( 100 ); nWhich = GetWhich( SID_ATTR_CHAR_WIDTH_FIT_TO_LINE ); - if ( rSet.GetItemState( nWhich ) >= SFX_ITEM_DEFAULT ) - m_nScaleWidthItemSetVal = ((SfxUInt16Item&) rSet.Get( nWhich )).GetValue(); + if ( rSet->GetItemState( nWhich ) >= SFX_ITEM_DEFAULT ) + m_nScaleWidthItemSetVal = ((SfxUInt16Item&) rSet->Get( nWhich )).GetValue(); // Rotation nWhich = GetWhich( SID_ATTR_CHAR_ROTATED ); - SfxItemState eState = rSet.GetItemState( nWhich ); + SfxItemState eState = rSet->GetItemState( nWhich ); if( SFX_ITEM_UNKNOWN == eState ) { m_pRotationContainer->Hide(); @@ -3114,7 +3114,7 @@ void SvxCharPositionPage::Reset( const SfxItemSet& rSet ) if( eState >= SFX_ITEM_DEFAULT ) { const SvxCharRotateItem& rItem = - (SvxCharRotateItem&) rSet.Get( nWhich ); + (SvxCharRotateItem&) rSet->Get( nWhich ); if (rItem.IsBottomToTop()) m_p90degRB->Check( true ); else if (rItem.IsTopToBotton()) @@ -3143,7 +3143,7 @@ void SvxCharPositionPage::Reset( const SfxItemSet& rSet ) m_pFitToLineCB->Enable( !m_p0degRB->IsChecked() ); // is this value set? - if( SFX_ITEM_UNKNOWN == rSet.GetItemState( GetWhich( + if( SFX_ITEM_UNKNOWN == rSet->GetItemState( GetWhich( SID_ATTR_CHAR_WIDTH_FIT_TO_LINE ) )) m_pFitToLineCB->Hide(); } @@ -3485,15 +3485,15 @@ const sal_uInt16* SvxCharTwoLinesPage::GetRanges() -void SvxCharTwoLinesPage::Reset( const SfxItemSet& rSet ) +void SvxCharTwoLinesPage::Reset( const SfxItemSet* rSet ) { m_pTwoLinesBtn->Check( false ); sal_uInt16 nWhich = GetWhich( SID_ATTR_CHAR_TWO_LINES ); - SfxItemState eState = rSet.GetItemState( nWhich ); + SfxItemState eState = rSet->GetItemState( nWhich ); if ( eState >= SFX_ITEM_DONTCARE ) { - const SvxTwoLinesItem& rItem = (SvxTwoLinesItem&)rSet.Get( nWhich ); + const SvxTwoLinesItem& rItem = (SvxTwoLinesItem&)rSet->Get( nWhich ); m_pTwoLinesBtn->Check( rItem.GetValue() ); if ( rItem.GetValue() ) @@ -3504,7 +3504,7 @@ void SvxCharTwoLinesPage::Reset( const SfxItemSet& rSet ) } TwoLinesHdl_Impl( NULL ); - SetPrevFontWidthScale( rSet ); + SetPrevFontWidthScale( *rSet ); } diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx index fcbb583ad32c..8569410eebc0 100644 --- a/cui/source/tabpages/connect.cxx +++ b/cui/source/tabpages/connect.cxx @@ -158,10 +158,10 @@ SvxConnectionPage::~SvxConnectionPage() |* \************************************************************************/ -void SvxConnectionPage::Reset( const SfxItemSet& rAttrs ) +void SvxConnectionPage::Reset( const SfxItemSet* rAttrs ) { - const SfxPoolItem* pItem = GetItem( rAttrs, SDRATTR_EDGENODE1HORZDIST ); - const SfxItemPool* pPool = rAttrs.GetPool(); + const SfxPoolItem* pItem = GetItem( *rAttrs, SDRATTR_EDGENODE1HORZDIST ); + const SfxItemPool* pPool = rAttrs->GetPool(); // SdrEdgeNode1HorzDistItem if( !pItem ) @@ -177,7 +177,7 @@ void SvxConnectionPage::Reset( const SfxItemSet& rAttrs ) m_pMtrFldHorz1->SaveValue(); // SdrEdgeNode2HorzDistItem - pItem = GetItem( rAttrs, SDRATTR_EDGENODE2HORZDIST ); + pItem = GetItem( *rAttrs, SDRATTR_EDGENODE2HORZDIST ); if( !pItem ) pItem = &pPool->GetDefaultItem( SDRATTR_EDGENODE2HORZDIST ); if( pItem ) @@ -191,7 +191,7 @@ void SvxConnectionPage::Reset( const SfxItemSet& rAttrs ) m_pMtrFldHorz2->SaveValue(); // SdrEdgeNode1VertDistItem - pItem = GetItem( rAttrs, SDRATTR_EDGENODE1VERTDIST ); + pItem = GetItem( *rAttrs, SDRATTR_EDGENODE1VERTDIST ); if( !pItem ) pItem = &pPool->GetDefaultItem( SDRATTR_EDGENODE1VERTDIST ); if( pItem ) @@ -205,7 +205,7 @@ void SvxConnectionPage::Reset( const SfxItemSet& rAttrs ) m_pMtrFldVert1->SaveValue(); // SdrEdgeNode2VertDistItem - pItem = GetItem( rAttrs, SDRATTR_EDGENODE2VERTDIST ); + pItem = GetItem( *rAttrs, SDRATTR_EDGENODE2VERTDIST ); if( !pItem ) pItem = &pPool->GetDefaultItem( SDRATTR_EDGENODE2VERTDIST ); if( pItem ) @@ -219,7 +219,7 @@ void SvxConnectionPage::Reset( const SfxItemSet& rAttrs ) m_pMtrFldVert2->SaveValue(); // SdrEdgeLine1DeltaItem - pItem = GetItem( rAttrs, SDRATTR_EDGELINE1DELTA ); + pItem = GetItem( *rAttrs, SDRATTR_EDGELINE1DELTA ); if( !pItem ) pItem = &pPool->GetDefaultItem( SDRATTR_EDGELINE1DELTA ); if( pItem ) @@ -233,7 +233,7 @@ void SvxConnectionPage::Reset( const SfxItemSet& rAttrs ) m_pMtrFldLine1->SaveValue(); // SdrEdgeLine2DeltaItem - pItem = GetItem( rAttrs, SDRATTR_EDGELINE2DELTA ); + pItem = GetItem( *rAttrs, SDRATTR_EDGELINE2DELTA ); if( !pItem ) pItem = &pPool->GetDefaultItem( SDRATTR_EDGELINE2DELTA ); if( pItem ) @@ -247,7 +247,7 @@ void SvxConnectionPage::Reset( const SfxItemSet& rAttrs ) m_pMtrFldLine2->SaveValue(); // SdrEdgeLine3DeltaItem - pItem = GetItem( rAttrs, SDRATTR_EDGELINE3DELTA ); + pItem = GetItem( *rAttrs, SDRATTR_EDGELINE3DELTA ); if( !pItem ) pItem = &pPool->GetDefaultItem( SDRATTR_EDGELINE3DELTA ); if( pItem ) @@ -261,7 +261,7 @@ void SvxConnectionPage::Reset( const SfxItemSet& rAttrs ) m_pMtrFldLine3->SaveValue(); // SdrEdgeLineDeltaAnzItem - pItem = GetItem( rAttrs, SDRATTR_EDGELINEDELTAANZ ); + pItem = GetItem( *rAttrs, SDRATTR_EDGELINEDELTAANZ ); if( !pItem ) pItem = &pPool->GetDefaultItem( SDRATTR_EDGELINEDELTAANZ ); if( pItem ) @@ -288,7 +288,7 @@ void SvxConnectionPage::Reset( const SfxItemSet& rAttrs ) } // SdrEdgeKindItem - pItem = GetItem( rAttrs, SDRATTR_EDGEKIND ); + pItem = GetItem( *rAttrs, SDRATTR_EDGEKIND ); if( !pItem ) pItem = &pPool->GetDefaultItem( SDRATTR_EDGEKIND ); if( pItem ) diff --git a/cui/source/tabpages/dstribut.cxx b/cui/source/tabpages/dstribut.cxx index 530da67ed7c8..8a4819652a42 100644 --- a/cui/source/tabpages/dstribut.cxx +++ b/cui/source/tabpages/dstribut.cxx @@ -91,7 +91,7 @@ void SvxDistributePage::PointChanged(Window* /*pWindow*/, RECT_POINT /*eRP*/) |* \************************************************************************/ -void SvxDistributePage::Reset(const SfxItemSet& ) +void SvxDistributePage::Reset(const SfxItemSet* ) { m_pBtnHorNone->SetState(false); m_pBtnHorLeft->SetState(false); diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx index 898315fdbb6f..283d08278c32 100644 --- a/cui/source/tabpages/grfpage.cxx +++ b/cui/source/tabpages/grfpage.cxx @@ -134,12 +134,12 @@ SfxTabPage* SvxGrfCropPage::Create(Window *pParent, const SfxItemSet &rSet) return new SvxGrfCropPage( pParent, rSet ); } -void SvxGrfCropPage::Reset( const SfxItemSet &rSet ) +void SvxGrfCropPage::Reset( const SfxItemSet *rSet ) { const SfxPoolItem* pItem; - const SfxItemPool& rPool = *rSet.GetPool(); + const SfxItemPool& rPool = *rSet->GetPool(); - if(SFX_ITEM_SET == rSet.GetItemState( rPool.GetWhich( + if(SFX_ITEM_SET == rSet->GetItemState( rPool.GetWhich( SID_ATTR_GRAF_KEEP_ZOOM ), true, &pItem )) { if( ((const SfxBoolItem*)pItem)->GetValue() ) @@ -150,9 +150,9 @@ void SvxGrfCropPage::Reset( const SfxItemSet &rSet ) } sal_uInt16 nW = rPool.GetWhich( SID_ATTR_GRAF_CROP ); - if( SFX_ITEM_SET == rSet.GetItemState( nW, true, &pItem)) + if( SFX_ITEM_SET == rSet->GetItemState( nW, true, &pItem)) { - FieldUnit eUnit = MapToFieldUnit( rSet.GetPool()->GetMetric( nW )); + FieldUnit eUnit = MapToFieldUnit( rSet->GetPool()->GetMetric( nW )); SvxGrfCrop* pCrop = (SvxGrfCrop*)pItem; @@ -175,10 +175,10 @@ void SvxGrfCropPage::Reset( const SfxItemSet &rSet ) } nW = rPool.GetWhich( SID_ATTR_PAGE_SIZE ); - if ( SFX_ITEM_SET == rSet.GetItemState( nW, false, &pItem ) ) + if ( SFX_ITEM_SET == rSet->GetItemState( nW, false, &pItem ) ) { // orientation and size from the PageItem - FieldUnit eUnit = MapToFieldUnit( rSet.GetPool()->GetMetric( nW )); + FieldUnit eUnit = MapToFieldUnit( rSet->GetPool()->GetMetric( nW )); aPageSize = ((const SvxSizeItem*)pItem)->GetSize(); @@ -195,15 +195,15 @@ void SvxGrfCropPage::Reset( const SfxItemSet &rSet ) aPageSize = OutputDevice::LogicToLogic( Size( CM_1_TO_TWIP, CM_1_TO_TWIP ), MapMode( MAP_TWIP ), - MapMode( (MapUnit)rSet.GetPool()->GetMetric( nW ) ) ); + MapMode( (MapUnit)rSet->GetPool()->GetMetric( nW ) ) ); } bool bFound = false; - if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_GRAF_GRAPHIC, false, &pItem ) ) + if( SFX_ITEM_SET == rSet->GetItemState( SID_ATTR_GRAF_GRAPHIC, false, &pItem ) ) { OUString referer; SfxStringItem const * it = static_cast<SfxStringItem const *>( - rSet.GetItem(SID_REFERER)); + rSet->GetItem(SID_REFERER)); if (it != 0) { referer = it->GetValue(); } @@ -232,7 +232,7 @@ void SvxGrfCropPage::Reset( const SfxItemSet &rSet ) GraphicHasChanged( bFound ); bReset = true; - ActivatePage( rSet ); + ActivatePage( *rSet ); bReset = false; } diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx index 024fdc70f5b5..57921b5ab6f2 100644 --- a/cui/source/tabpages/labdlg.cxx +++ b/cui/source/tabpages/labdlg.cxx @@ -219,7 +219,7 @@ bool SvxCaptionTabPage::FillItemSet( SfxItemSet* _rOutAttrs) -void SvxCaptionTabPage::Reset( const SfxItemSet& ) +void SvxCaptionTabPage::Reset( const SfxItemSet* ) { //------------set metric----------------------------- diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx index 3178ee8be057..d8b02d3f8d13 100644 --- a/cui/source/tabpages/macroass.cxx +++ b/cui/source/tabpages/macroass.cxx @@ -224,14 +224,14 @@ void _SfxMacroTabPage::PageCreated(const SfxAllItemSet& aSet) } } -void _SfxMacroTabPage::Reset( const SfxItemSet& rSet ) +void _SfxMacroTabPage::Reset( const SfxItemSet* rSet ) { const SfxPoolItem* pItem; - if( SFX_ITEM_SET == rSet.GetItemState( GetWhich( aPageRg[0] ), true, &pItem )) + if( SFX_ITEM_SET == rSet->GetItemState( GetWhich( aPageRg[0] ), true, &pItem )) aTbl = ((SvxMacroItem*)pItem)->GetMacroTable(); const SfxPoolItem* pEventsItem; - if( !mpImpl->bGotEvents && SFX_ITEM_SET == rSet.GetItemState( SID_EVENTCONFIG, true, &pEventsItem ) ) + if( !mpImpl->bGotEvents && SFX_ITEM_SET == rSet->GetItemState( SID_EVENTCONFIG, true, &pEventsItem ) ) { mpImpl->bGotEvents = true; const SfxEventNamesList& rList = ((SfxEventNamesItem*)pEventsItem)->GetEvents(); diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx index 1d6884608d54..2a629cd5ddd5 100644 --- a/cui/source/tabpages/measure.cxx +++ b/cui/source/tabpages/measure.cxx @@ -165,13 +165,13 @@ SvxMeasurePage::~SvxMeasurePage() |* \************************************************************************/ -void SvxMeasurePage::Reset( const SfxItemSet& rAttrs ) +void SvxMeasurePage::Reset( const SfxItemSet* rAttrs ) { - SfxItemPool* pPool = rAttrs.GetPool(); + SfxItemPool* pPool = rAttrs->GetPool(); DBG_ASSERT( pPool, "Wo ist der Pool" ); eUnit = pPool->GetMetric( SDRATTR_MEASURELINEDIST ); - const SfxPoolItem* pItem = GetItem( rAttrs, SDRATTR_MEASURELINEDIST ); + const SfxPoolItem* pItem = GetItem( *rAttrs, SDRATTR_MEASURELINEDIST ); // SdrMeasureLineDistItem if( pItem == NULL ) @@ -188,7 +188,7 @@ void SvxMeasurePage::Reset( const SfxItemSet& rAttrs ) m_pMtrFldLineDist->SaveValue(); // SdrMeasureHelplineOverhangItem - pItem = GetItem( rAttrs, SDRATTR_MEASUREHELPLINEOVERHANG ); + pItem = GetItem( *rAttrs, SDRATTR_MEASUREHELPLINEOVERHANG ); if( pItem == NULL ) pItem = &pPool->GetDefaultItem( SDRATTR_MEASUREHELPLINEOVERHANG ); if( pItem ) @@ -203,7 +203,7 @@ void SvxMeasurePage::Reset( const SfxItemSet& rAttrs ) m_pMtrFldHelplineOverhang->SaveValue(); // SdrMeasureHelplineDistItem - pItem = GetItem( rAttrs, SDRATTR_MEASUREHELPLINEDIST ); + pItem = GetItem( *rAttrs, SDRATTR_MEASUREHELPLINEDIST ); if( pItem == NULL ) pItem = &pPool->GetDefaultItem( SDRATTR_MEASUREHELPLINEDIST ); if( pItem ) @@ -218,7 +218,7 @@ void SvxMeasurePage::Reset( const SfxItemSet& rAttrs ) m_pMtrFldHelplineDist->SaveValue(); // SdrMeasureHelpline1LenItem - pItem = GetItem( rAttrs, SDRATTR_MEASUREHELPLINE1LEN ); + pItem = GetItem( *rAttrs, SDRATTR_MEASUREHELPLINE1LEN ); if( pItem == NULL ) pItem = &pPool->GetDefaultItem( SDRATTR_MEASUREHELPLINE1LEN ); if( pItem ) @@ -233,7 +233,7 @@ void SvxMeasurePage::Reset( const SfxItemSet& rAttrs ) m_pMtrFldHelpline1Len->SaveValue(); // SdrMeasureHelpline2LenItem - pItem = GetItem( rAttrs, SDRATTR_MEASUREHELPLINE2LEN ); + pItem = GetItem( *rAttrs, SDRATTR_MEASUREHELPLINE2LEN ); if( pItem == NULL ) pItem = &pPool->GetDefaultItem( SDRATTR_MEASUREHELPLINE2LEN ); if( pItem ) @@ -248,9 +248,9 @@ void SvxMeasurePage::Reset( const SfxItemSet& rAttrs ) m_pMtrFldHelpline2Len->SaveValue(); // SdrMeasureBelowRefEdgeItem - if( rAttrs.GetItemState( SDRATTR_MEASUREBELOWREFEDGE ) != SFX_ITEM_DONTCARE ) + if( rAttrs->GetItemState( SDRATTR_MEASUREBELOWREFEDGE ) != SFX_ITEM_DONTCARE ) { - m_pTsbBelowRefEdge->SetState( ( ( const SdrMeasureBelowRefEdgeItem& )rAttrs.Get( SDRATTR_MEASUREBELOWREFEDGE ) ). + m_pTsbBelowRefEdge->SetState( ( ( const SdrMeasureBelowRefEdgeItem& )rAttrs->Get( SDRATTR_MEASUREBELOWREFEDGE ) ). GetValue() ? TRISTATE_TRUE : TRISTATE_FALSE ); m_pTsbBelowRefEdge->EnableTriState( false ); } @@ -261,7 +261,7 @@ void SvxMeasurePage::Reset( const SfxItemSet& rAttrs ) m_pTsbBelowRefEdge->SaveValue(); // SdrMeasureDecimalPlacesItem - pItem = GetItem( rAttrs, SDRATTR_MEASUREDECIMALPLACES ); + pItem = GetItem( *rAttrs, SDRATTR_MEASUREDECIMALPLACES ); if( pItem == NULL ) pItem = &pPool->GetDefaultItem( SDRATTR_MEASUREDECIMALPLACES ); if( pItem ) @@ -277,9 +277,9 @@ void SvxMeasurePage::Reset( const SfxItemSet& rAttrs ) // SdrMeasureTextRota90Item // Attention: negate ! - if( rAttrs.GetItemState( SDRATTR_MEASURETEXTROTA90 ) != SFX_ITEM_DONTCARE ) + if( rAttrs->GetItemState( SDRATTR_MEASURETEXTROTA90 ) != SFX_ITEM_DONTCARE ) { - m_pTsbParallel->SetState( ( ( const SdrMeasureTextRota90Item& )rAttrs.Get( SDRATTR_MEASURETEXTROTA90 ) ). + m_pTsbParallel->SetState( ( ( const SdrMeasureTextRota90Item& )rAttrs->Get( SDRATTR_MEASURETEXTROTA90 ) ). GetValue() ? TRISTATE_FALSE : TRISTATE_TRUE ); m_pTsbParallel->EnableTriState( false ); } @@ -290,9 +290,9 @@ void SvxMeasurePage::Reset( const SfxItemSet& rAttrs ) m_pTsbParallel->SaveValue(); // SdrMeasureShowUnitItem - if( rAttrs.GetItemState( SDRATTR_MEASURESHOWUNIT ) != SFX_ITEM_DONTCARE ) + if( rAttrs->GetItemState( SDRATTR_MEASURESHOWUNIT ) != SFX_ITEM_DONTCARE ) { - m_pTsbShowUnit->SetState( ( ( const SdrMeasureShowUnitItem& )rAttrs.Get( SDRATTR_MEASURESHOWUNIT ) ). + m_pTsbShowUnit->SetState( ( ( const SdrMeasureShowUnitItem& )rAttrs->Get( SDRATTR_MEASURESHOWUNIT ) ). GetValue() ? TRISTATE_TRUE : TRISTATE_FALSE ); m_pTsbShowUnit->EnableTriState( false ); } @@ -303,9 +303,9 @@ void SvxMeasurePage::Reset( const SfxItemSet& rAttrs ) m_pTsbShowUnit->SaveValue(); // SdrMeasureUnitItem - if( rAttrs.GetItemState( SDRATTR_MEASUREUNIT ) != SFX_ITEM_DONTCARE ) + if( rAttrs->GetItemState( SDRATTR_MEASUREUNIT ) != SFX_ITEM_DONTCARE ) { - long nFieldUnit = (long) ( ( const SdrMeasureUnitItem& )rAttrs. + long nFieldUnit = (long) ( ( const SdrMeasureUnitItem& )rAttrs-> Get( SDRATTR_MEASUREUNIT ) ).GetValue(); for( sal_Int32 i = 0; i < m_pLbUnit->GetEntryCount(); ++i ) @@ -324,18 +324,18 @@ void SvxMeasurePage::Reset( const SfxItemSet& rAttrs ) m_pLbUnit->SaveValue(); // Position - if ( rAttrs.GetItemState( SDRATTR_MEASURETEXTVPOS ) != SFX_ITEM_DONTCARE ) + if ( rAttrs->GetItemState( SDRATTR_MEASURETEXTVPOS ) != SFX_ITEM_DONTCARE ) { SdrMeasureTextVPos eVPos = (SdrMeasureTextVPos) - ( ( const SdrMeasureTextVPosItem& )rAttrs.Get( SDRATTR_MEASURETEXTVPOS ) ).GetValue(); + ( ( const SdrMeasureTextVPosItem& )rAttrs->Get( SDRATTR_MEASURETEXTVPOS ) ).GetValue(); { - if ( rAttrs.GetItemState( SDRATTR_MEASURETEXTHPOS ) != SFX_ITEM_DONTCARE ) + if ( rAttrs->GetItemState( SDRATTR_MEASURETEXTHPOS ) != SFX_ITEM_DONTCARE ) { m_pTsbAutoPosV->EnableTriState( false ); m_pTsbAutoPosH->EnableTriState( false ); SdrMeasureTextHPos eHPos = (SdrMeasureTextHPos) - ( ( const SdrMeasureTextHPosItem& )rAttrs.Get( SDRATTR_MEASURETEXTHPOS ) ).GetValue(); + ( ( const SdrMeasureTextHPosItem& )rAttrs->Get( SDRATTR_MEASURETEXTHPOS ) ).GetValue(); RECT_POINT eRP = RP_MM; switch( eVPos ) { @@ -408,7 +408,7 @@ void SvxMeasurePage::Reset( const SfxItemSet& rAttrs ) // otherwise the control don't know about // the settings of the dialog (#67930) ChangeAttrHdl_Impl( m_pTsbShowUnit ); - m_pCtlPreview->SetAttributes( rAttrs ); + m_pCtlPreview->SetAttributes( *rAttrs ); bPositionModified = false; } diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index 3c706b0d5cd7..3b75d596159b 100644 --- a/cui/source/tabpages/numfmt.cxx +++ b/cui/source/tabpages/numfmt.cxx @@ -378,7 +378,7 @@ SfxTabPage* SvxNumberFormatTabPage::Create( Window* pParent, #* #************************************************************************/ -void SvxNumberFormatTabPage::Reset( const SfxItemSet& rSet ) +void SvxNumberFormatTabPage::Reset( const SfxItemSet* rSet ) { const SfxUInt32Item* pValFmtAttr = NULL; const SfxPoolItem* pItem = NULL; @@ -392,12 +392,12 @@ void SvxNumberFormatTabPage::Reset( const SfxItemSet& rSet ) double nValDouble = 0; OUString aValString; - SfxItemState eState = rSet.GetItemState( GetWhich( SID_ATTR_NUMBERFORMAT_NOLANGUAGE ),true,&pItem); + SfxItemState eState = rSet->GetItemState( GetWhich( SID_ATTR_NUMBERFORMAT_NOLANGUAGE ),true,&pItem); if(eState==SFX_ITEM_SET) { const SfxBoolItem* pBoolLangItem = (const SfxBoolItem*) - GetItem( rSet, SID_ATTR_NUMBERFORMAT_NOLANGUAGE); + GetItem( *rSet, SID_ATTR_NUMBERFORMAT_NOLANGUAGE); if(pBoolLangItem!=NULL && pBoolLangItem->GetValue()) { @@ -410,7 +410,7 @@ void SvxNumberFormatTabPage::Reset( const SfxItemSet& rSet ) } - eState = rSet.GetItemState( GetWhich( SID_ATTR_NUMBERFORMAT_INFO ),true,&pItem); + eState = rSet->GetItemState( GetWhich( SID_ATTR_NUMBERFORMAT_INFO ),true,&pItem); if(eState==SFX_ITEM_SET) { @@ -430,12 +430,12 @@ void SvxNumberFormatTabPage::Reset( const SfxItemSet& rSet ) } - eState = rSet.GetItemState( GetWhich( SID_ATTR_NUMBERFORMAT_ONE_AREA )); + eState = rSet->GetItemState( GetWhich( SID_ATTR_NUMBERFORMAT_ONE_AREA )); if(eState==SFX_ITEM_SET) { const SfxBoolItem* pBoolItem = (const SfxBoolItem*) - GetItem( rSet, SID_ATTR_NUMBERFORMAT_ONE_AREA); + GetItem( *rSet, SID_ATTR_NUMBERFORMAT_ONE_AREA); if(pBoolItem!=NULL) { @@ -443,12 +443,12 @@ void SvxNumberFormatTabPage::Reset( const SfxItemSet& rSet ) } } - eState = rSet.GetItemState( GetWhich( SID_ATTR_NUMBERFORMAT_SOURCE ) ); + eState = rSet->GetItemState( GetWhich( SID_ATTR_NUMBERFORMAT_SOURCE ) ); if ( eState == SFX_ITEM_SET ) { const SfxBoolItem* pBoolItem = (const SfxBoolItem*) - GetItem( rSet, SID_ATTR_NUMBERFORMAT_SOURCE ); + GetItem( *rSet, SID_ATTR_NUMBERFORMAT_SOURCE ); if ( pBoolItem ) m_pCbSourceFormat->Check( pBoolItem->GetValue() ); else @@ -467,11 +467,11 @@ void SvxNumberFormatTabPage::Reset( const SfxItemSet& rSet ) // pNumItem must have been set from outside! DBG_ASSERT( pNumItem, "No NumberInfo, no NumberFormatter, good bye.CRASH. :-(" ); - eState = rSet.GetItemState( GetWhich( SID_ATTR_NUMBERFORMAT_VALUE ) ); + eState = rSet->GetItemState( GetWhich( SID_ATTR_NUMBERFORMAT_VALUE ) ); if ( SFX_ITEM_DONTCARE != eState ) pValFmtAttr = (const SfxUInt32Item*) - GetItem( rSet, SID_ATTR_NUMBERFORMAT_VALUE ); + GetItem( *rSet, SID_ATTR_NUMBERFORMAT_VALUE ); eValType = pNumItem->GetValueType(); @@ -545,10 +545,10 @@ void SvxNumberFormatTabPage::Reset( const SfxItemSet& rSet ) { SetCategory(nCatLbSelPos ); } - eState = rSet.GetItemState( GetWhich( SID_ATTR_NUMBERFORMAT_ADD_AUTO ) ); + eState = rSet->GetItemState( GetWhich( SID_ATTR_NUMBERFORMAT_ADD_AUTO ) ); if(SFX_ITEM_SET == eState) pAutoEntryAttr = (const SfxBoolItem*) - GetItem( rSet, SID_ATTR_NUMBERFORMAT_ADD_AUTO ); + GetItem( *rSet, SID_ATTR_NUMBERFORMAT_ADD_AUTO ); // no_NO is an alias for nb_NO and normally isn't listed, we need it for // backwards compatibility, but only if the format passed is of // LanguageType no_NO. diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index c42888c48a88..71be499b17fe 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -283,20 +283,20 @@ int SvxSingleNumPickTabPage::DeactivatePage(SfxItemSet *_pSet) return sal_True; } -void SvxSingleNumPickTabPage::Reset( const SfxItemSet& rSet ) +void SvxSingleNumPickTabPage::Reset( const SfxItemSet* rSet ) { const SfxPoolItem* pItem; // in Draw the item exists as WhichId, in Writer only as SlotId - SfxItemState eState = rSet.GetItemState(SID_ATTR_NUMBERING_RULE, false, &pItem); + SfxItemState eState = rSet->GetItemState(SID_ATTR_NUMBERING_RULE, false, &pItem); if(eState != SFX_ITEM_SET) { - nNumItemId = rSet.GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE); - eState = rSet.GetItemState(nNumItemId, false, &pItem); + nNumItemId = rSet->GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE); + eState = rSet->GetItemState(nNumItemId, false, &pItem); if( eState != SFX_ITEM_SET ) { - pItem = &static_cast< const SvxNumBulletItem& >( rSet.Get( nNumItemId, true ) ); + pItem = &static_cast< const SvxNumBulletItem& >( rSet->Get( nNumItemId, true ) ); eState = SFX_ITEM_SET; } } @@ -442,19 +442,19 @@ int SvxBulletPickTabPage::DeactivatePage(SfxItemSet *_pSet) return sal_True; } -void SvxBulletPickTabPage::Reset( const SfxItemSet& rSet ) +void SvxBulletPickTabPage::Reset( const SfxItemSet* rSet ) { const SfxPoolItem* pItem; // in Draw the item exists as WhichId, in Writer only as SlotId - SfxItemState eState = rSet.GetItemState(SID_ATTR_NUMBERING_RULE, false, &pItem); + SfxItemState eState = rSet->GetItemState(SID_ATTR_NUMBERING_RULE, false, &pItem); if(eState != SFX_ITEM_SET) { - nNumItemId = rSet.GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE); - eState = rSet.GetItemState(nNumItemId, false, &pItem); + nNumItemId = rSet->GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE); + eState = rSet->GetItemState(nNumItemId, false, &pItem); if( eState != SFX_ITEM_SET ) { - pItem = &static_cast< const SvxNumBulletItem& >( rSet.Get( nNumItemId, true ) ); + pItem = &static_cast< const SvxNumBulletItem& >( rSet->Get( nNumItemId, true ) ); eState = SFX_ITEM_SET; } @@ -639,19 +639,19 @@ int SvxNumPickTabPage::DeactivatePage(SfxItemSet *_pSet) return sal_True; } -void SvxNumPickTabPage::Reset( const SfxItemSet& rSet ) +void SvxNumPickTabPage::Reset( const SfxItemSet* rSet ) { const SfxPoolItem* pItem; // in Draw the item exists as WhichId, in Writer only as SlotId - SfxItemState eState = rSet.GetItemState(SID_ATTR_NUMBERING_RULE, false, &pItem); + SfxItemState eState = rSet->GetItemState(SID_ATTR_NUMBERING_RULE, false, &pItem); if(eState != SFX_ITEM_SET) { - nNumItemId = rSet.GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE); - eState = rSet.GetItemState(nNumItemId, false, &pItem); + nNumItemId = rSet->GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE); + eState = rSet->GetItemState(nNumItemId, false, &pItem); if( eState != SFX_ITEM_SET ) { - pItem = &static_cast< const SvxNumBulletItem& >( rSet.Get( nNumItemId, true ) ); + pItem = &static_cast< const SvxNumBulletItem& >( rSet->Get( nNumItemId, true ) ); eState = SFX_ITEM_SET; } @@ -886,19 +886,19 @@ bool SvxBitmapPickTabPage::FillItemSet( SfxItemSet* rSet ) return bModified; } -void SvxBitmapPickTabPage::Reset( const SfxItemSet& rSet ) +void SvxBitmapPickTabPage::Reset( const SfxItemSet* rSet ) { const SfxPoolItem* pItem; // in Draw the item exists as WhichId, in Writer only as SlotId - SfxItemState eState = rSet.GetItemState(SID_ATTR_NUMBERING_RULE, false, &pItem); + SfxItemState eState = rSet->GetItemState(SID_ATTR_NUMBERING_RULE, false, &pItem); if(eState != SFX_ITEM_SET) { - nNumItemId = rSet.GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE); - eState = rSet.GetItemState(nNumItemId, false, &pItem); + nNumItemId = rSet->GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE); + eState = rSet->GetItemState(nNumItemId, false, &pItem); if( eState != SFX_ITEM_SET ) { - pItem = &static_cast< const SvxNumBulletItem& >( rSet.Get( nNumItemId, true ) ); + pItem = &static_cast< const SvxNumBulletItem& >( rSet->Get( nNumItemId, true ) ); eState = SFX_ITEM_SET; } @@ -1207,19 +1207,19 @@ bool SvxNumOptionsTabPage::FillItemSet( SfxItemSet* rSet ) return bModified; }; -void SvxNumOptionsTabPage::Reset( const SfxItemSet& rSet ) +void SvxNumOptionsTabPage::Reset( const SfxItemSet* rSet ) { const SfxPoolItem* pItem; // in Draw the item exists as WhichId, in Writer only as SlotId - SfxItemState eState = rSet.GetItemState(SID_ATTR_NUMBERING_RULE, false, &pItem); + SfxItemState eState = rSet->GetItemState(SID_ATTR_NUMBERING_RULE, false, &pItem); if(eState != SFX_ITEM_SET) { - nNumItemId = rSet.GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE); - eState = rSet.GetItemState(nNumItemId, false, &pItem); + nNumItemId = rSet->GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE); + eState = rSet->GetItemState(nNumItemId, false, &pItem); if( eState != SFX_ITEM_SET ) { - pItem = &static_cast< const SvxNumBulletItem& >( rSet.Get( nNumItemId, true ) ); + pItem = &static_cast< const SvxNumBulletItem& >( rSet->Get( nNumItemId, true ) ); eState = SFX_ITEM_SET; } @@ -1295,7 +1295,7 @@ void SvxNumOptionsTabPage::Reset( const SfxItemSet& rSet ) } SfxObjectShell* pShell; - if ( SFX_ITEM_SET == rSet.GetItemState( SID_HTML_MODE, false, &pItem ) + if ( SFX_ITEM_SET == rSet->GetItemState( SID_HTML_MODE, false, &pItem ) || ( 0 != ( pShell = SfxObjectShell::Current()) && 0 != ( pItem = pShell->GetItem( SID_HTML_MODE ) ) ) ) { @@ -2971,19 +2971,19 @@ bool SvxNumPositionTabPage::FillItemSet( SfxItemSet* rSet ) return bModified; } -void SvxNumPositionTabPage::Reset( const SfxItemSet& rSet ) +void SvxNumPositionTabPage::Reset( const SfxItemSet* rSet ) { const SfxPoolItem* pItem; // in Draw the item exists as WhichId, in Writer only as SlotId - SfxItemState eState = rSet.GetItemState(SID_ATTR_NUMBERING_RULE, false, &pItem); + SfxItemState eState = rSet->GetItemState(SID_ATTR_NUMBERING_RULE, false, &pItem); if(eState != SFX_ITEM_SET) { - nNumItemId = rSet.GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE); - eState = rSet.GetItemState(nNumItemId, false, &pItem); + nNumItemId = rSet->GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE); + eState = rSet->GetItemState(nNumItemId, false, &pItem); if( eState != SFX_ITEM_SET ) { - pItem = &static_cast< const SvxNumBulletItem& >( rSet.Get( nNumItemId, true ) ); + pItem = &static_cast< const SvxNumBulletItem& >( rSet->Get( nNumItemId, true ) ); eState = SFX_ITEM_SET; } diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx index 1ee2803d319e..bb72fcac935b 100644 --- a/cui/source/tabpages/page.cxx +++ b/cui/source/tabpages/page.cxx @@ -398,14 +398,14 @@ void SvxPageDescPage::Init_Impl() -void SvxPageDescPage::Reset( const SfxItemSet& rSet ) +void SvxPageDescPage::Reset( const SfxItemSet* rSet ) { - SfxItemPool* pPool = rSet.GetPool(); + SfxItemPool* pPool = rSet->GetPool(); DBG_ASSERT( pPool, "Wo ist der Pool" ); SfxMapUnit eUnit = pPool->GetMetric( GetWhich( SID_ATTR_LRSPACE ) ); // adjust margins (right/left) - const SfxPoolItem* pItem = GetItem( rSet, SID_ATTR_LRSPACE ); + const SfxPoolItem* pItem = GetItem( *rSet, SID_ATTR_LRSPACE ); if ( pItem ) { @@ -419,7 +419,7 @@ void SvxPageDescPage::Reset( const SfxItemSet& rSet ) } // adjust margins (top/bottom) - pItem = GetItem( rSet, SID_ATTR_ULSPACE ); + pItem = GetItem( *rSet, SID_ATTR_ULSPACE ); if ( pItem ) { @@ -436,7 +436,7 @@ void SvxPageDescPage::Reset( const SfxItemSet& rSet ) SvxNumType eNumType = SVX_ARABIC; bLandscape = ( pImpl->mpDefPrinter->GetOrientation() == ORIENTATION_LANDSCAPE ); sal_uInt16 nUse = (sal_uInt16)SVX_PAGE_ALL; - pItem = GetItem( rSet, SID_ATTR_PAGE ); + pItem = GetItem( *rSet, SID_ATTR_PAGE ); if ( pItem ) { @@ -461,7 +461,7 @@ void SvxPageDescPage::Reset( const SfxItemSet& rSet ) m_pPaperTrayBox->Clear(); sal_uInt8 nPaperBin = PAPERBIN_PRINTER_SETTINGS; - pItem = GetItem( rSet, SID_ATTR_PAGE_PAPERBIN ); + pItem = GetItem( *rSet, SID_ATTR_PAGE_PAPERBIN ); if ( pItem ) { @@ -483,7 +483,7 @@ void SvxPageDescPage::Reset( const SfxItemSet& rSet ) m_pPaperTrayBox->SelectEntry( aBinName ); Size aPaperSize = SvxPaperInfo::GetPaperSize( pImpl->mpDefPrinter ); - pItem = GetItem( rSet, SID_ATTR_PAGE_SIZE ); + pItem = GetItem( *rSet, SID_ATTR_PAGE_SIZE ); if ( pItem ) aPaperSize = ( (const SvxSizeItem*)pItem )->GetSize(); @@ -555,12 +555,12 @@ void SvxPageDescPage::Reset( const SfxItemSet& rSet ) DisableVerticalPageDir(); // horizontal alignment - pItem = GetItem( rSet, SID_ATTR_PAGE_EXT1 ); + pItem = GetItem( *rSet, SID_ATTR_PAGE_EXT1 ); m_pHorzBox->Check( pItem ? ( (const SfxBoolItem*)pItem )->GetValue() : sal_False ); // vertical alignment - pItem = GetItem( rSet, SID_ATTR_PAGE_EXT2 ); + pItem = GetItem( *rSet, SID_ATTR_PAGE_EXT2 ); m_pVertBox->Check( pItem ? ( (const SfxBoolItem*)pItem )->GetValue() : sal_False ); @@ -576,7 +576,7 @@ void SvxPageDescPage::Reset( const SfxItemSet& rSet ) { DisableVerticalPageDir(); m_pAdaptBox->Show(); - pItem = GetItem( rSet, SID_ATTR_PAGE_EXT1 ); + pItem = GetItem( *rSet, SID_ATTR_PAGE_EXT1 ); m_pAdaptBox->Check( pItem ? ( (const SfxBoolItem*)pItem )->GetValue() : sal_False ); @@ -591,11 +591,11 @@ void SvxPageDescPage::Reset( const SfxItemSet& rSet ) // display background and border in the example - ResetBackground_Impl( rSet ); + ResetBackground_Impl( *rSet ); //! UpdateExample_Impl(); RangeHdl_Impl( 0 ); - InitHeadFoot_Impl( rSet ); + InitHeadFoot_Impl( *rSet ); bBorderModified = false; SwapFirstValues_Impl( false ); @@ -620,21 +620,21 @@ void SvxPageDescPage::Reset( const SfxItemSet& rSet ) CheckMarginEdits( true ); - if(SFX_ITEM_SET == rSet.GetItemState(SID_SWREGISTER_MODE)) + if(SFX_ITEM_SET == rSet->GetItemState(SID_SWREGISTER_MODE)) { - m_pRegisterCB->Check(((const SfxBoolItem&)rSet.Get( + m_pRegisterCB->Check(((const SfxBoolItem&)rSet->Get( SID_SWREGISTER_MODE)).GetValue()); m_pRegisterCB->SaveValue(); RegisterModify(m_pRegisterCB); } - if(SFX_ITEM_SET == rSet.GetItemState(SID_SWREGISTER_COLLECTION)) + if(SFX_ITEM_SET == rSet->GetItemState(SID_SWREGISTER_COLLECTION)) { m_pRegisterLB->SelectEntry( - ((const SfxStringItem&)rSet.Get(SID_SWREGISTER_COLLECTION)).GetValue()); + ((const SfxStringItem&)rSet->Get(SID_SWREGISTER_COLLECTION)).GetValue()); m_pRegisterLB->SaveValue(); } - SfxItemState eState = rSet.GetItemState( GetWhich( SID_ATTR_FRAMEDIRECTION ), + SfxItemState eState = rSet->GetItemState( GetWhich( SID_ATTR_FRAMEDIRECTION ), true, &pItem ); if( SFX_ITEM_UNKNOWN != eState ) { diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx index 45e3c7d29ecf..9e7302970d1e 100644 --- a/cui/source/tabpages/paragrph.cxx +++ b/cui/source/tabpages/paragrph.cxx @@ -401,15 +401,15 @@ bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet* rOutSet ) return bModified; } -void SvxStdParagraphTabPage::Reset( const SfxItemSet& rSet ) +void SvxStdParagraphTabPage::Reset( const SfxItemSet* rSet ) { - SfxItemPool* pPool = rSet.GetPool(); + SfxItemPool* pPool = rSet->GetPool(); DBG_ASSERT( pPool, "Wo ist der Pool?" ); // adjust metric - FieldUnit eFUnit = GetModuleFieldUnit( rSet ); + FieldUnit eFUnit = GetModuleFieldUnit( *rSet ); - bool bApplyCharUnit = GetApplyCharUnit( rSet ); + bool bApplyCharUnit = GetApplyCharUnit( *rSet ); SvtCJKOptions aCJKOptions; if(aCJKOptions.IsAsianTypographyEnabled() && bApplyCharUnit ) @@ -432,7 +432,7 @@ void SvxStdParagraphTabPage::Reset( const SfxItemSet& rSet ) } sal_uInt16 _nWhich = GetWhich( SID_ATTR_LRSPACE ); - SfxItemState eItemState = rSet.GetItemState( _nWhich ); + SfxItemState eItemState = rSet->GetItemState( _nWhich ); if ( eItemState >= SFX_ITEM_AVAILABLE ) { @@ -441,7 +441,7 @@ void SvxStdParagraphTabPage::Reset( const SfxItemSet& rSet ) if ( bRelativeMode ) { const SvxLRSpaceItem& rOldItem = - (const SvxLRSpaceItem&)rSet.Get( _nWhich ); + (const SvxLRSpaceItem&)rSet->Get( _nWhich ); if ( rOldItem.GetPropLeft() != 100 ) { @@ -485,7 +485,7 @@ void SvxStdParagraphTabPage::Reset( const SfxItemSet& rSet ) else { const SvxLRSpaceItem& rSpace = - (const SvxLRSpaceItem&)rSet.Get( _nWhich ); + (const SvxLRSpaceItem&)rSet->Get( _nWhich ); SetMetricValue( *m_pLeftIndent, rSpace.GetTxtLeft(), eUnit ); SetMetricValue( *m_pRightIndent, rSpace.GetRight(), eUnit ); @@ -502,14 +502,14 @@ void SvxStdParagraphTabPage::Reset( const SfxItemSet& rSet ) } _nWhich = GetWhich( SID_ATTR_ULSPACE ); - eItemState = rSet.GetItemState( _nWhich ); + eItemState = rSet->GetItemState( _nWhich ); if ( eItemState >= SFX_ITEM_AVAILABLE ) { SfxMapUnit eUnit = pPool->GetMetric( _nWhich ); const SvxULSpaceItem& rOldItem = - (const SvxULSpaceItem&)rSet.Get( _nWhich ); + (const SvxULSpaceItem&)rSet->Get( _nWhich ); if ( bRelativeMode ) { @@ -557,20 +557,20 @@ void SvxStdParagraphTabPage::Reset( const SfxItemSet& rSet ) } _nWhich = GetWhich( SID_ATTR_PARA_LINESPACE ); - eItemState = rSet.GetItemState( _nWhich ); + eItemState = rSet->GetItemState( _nWhich ); if ( eItemState >= SFX_ITEM_AVAILABLE ) - SetLineSpacing_Impl( (const SvxLineSpacingItem &)rSet.Get( _nWhich ) ); + SetLineSpacing_Impl( (const SvxLineSpacingItem &)rSet->Get( _nWhich ) ); else m_pLineDist->SetNoSelection(); _nWhich = GetWhich( SID_ATTR_PARA_REGISTER ); - eItemState = rSet.GetItemState( _nWhich ); + eItemState = rSet->GetItemState( _nWhich ); if ( eItemState >= SFX_ITEM_AVAILABLE ) - m_pRegisterCB->Check( ((const SfxBoolItem &)rSet.Get( _nWhich )).GetValue()); + m_pRegisterCB->Check( ((const SfxBoolItem &)rSet->Get( _nWhich )).GetValue()); m_pRegisterCB->SaveValue(); - sal_uInt16 nHtmlMode = GetHtmlMode_Impl(rSet); + sal_uInt16 nHtmlMode = GetHtmlMode_Impl(*rSet); if(nHtmlMode & HTMLMODE_ON) { m_pRegisterFL->Hide(); @@ -1147,15 +1147,15 @@ bool SvxParaAlignTabPage::FillItemSet( SfxItemSet* rOutSet ) return bModified; } -void SvxParaAlignTabPage::Reset( const SfxItemSet& rSet ) +void SvxParaAlignTabPage::Reset( const SfxItemSet* rSet ) { sal_uInt16 _nWhich = GetWhich( SID_ATTR_PARA_ADJUST ); - SfxItemState eItemState = rSet.GetItemState( _nWhich ); + SfxItemState eItemState = rSet->GetItemState( _nWhich ); sal_Int32 nLBSelect = 0; if ( eItemState >= SFX_ITEM_AVAILABLE ) { - const SvxAdjustItem& rAdj = (const SvxAdjustItem&)rSet.Get( _nWhich ); + const SvxAdjustItem& rAdj = (const SvxAdjustItem&)rSet->Get( _nWhich ); switch ( rAdj.GetAdjust() /*!!! ask VB rAdj.GetLastBlock()*/ ) { @@ -1193,7 +1193,7 @@ void SvxParaAlignTabPage::Reset( const SfxItemSet& rSet ) } m_pLastLineLB->SelectEntryPos(nLBSelect); - sal_uInt16 nHtmlMode = GetHtmlMode_Impl(rSet); + sal_uInt16 nHtmlMode = GetHtmlMode_Impl(*rSet); if(nHtmlMode & HTMLMODE_ON) { m_pLastLineLB->Hide(); @@ -1204,30 +1204,30 @@ void SvxParaAlignTabPage::Reset( const SfxItemSet& rSet ) m_pSnapToGridCB->Show(false); } _nWhich = GetWhich(SID_ATTR_PARA_SNAPTOGRID); - eItemState = rSet.GetItemState( _nWhich ); + eItemState = rSet->GetItemState( _nWhich ); if ( eItemState >= SFX_ITEM_AVAILABLE ) { - const SvxParaGridItem& rSnap = (const SvxParaGridItem&)rSet.Get( _nWhich ); + const SvxParaGridItem& rSnap = (const SvxParaGridItem&)rSet->Get( _nWhich ); m_pSnapToGridCB->Check(rSnap.GetValue()); } _nWhich = GetWhich( SID_PARA_VERTALIGN ); - eItemState = rSet.GetItemState( _nWhich ); + eItemState = rSet->GetItemState( _nWhich ); if ( eItemState >= SFX_ITEM_AVAILABLE ) { m_pVertAlignFL->Show(); - const SvxParaVertAlignItem& rAlign = (const SvxParaVertAlignItem&)rSet.Get( _nWhich ); + const SvxParaVertAlignItem& rAlign = (const SvxParaVertAlignItem&)rSet->Get( _nWhich ); m_pVertAlignLB->SelectEntryPos(rAlign.GetValue()); } _nWhich = GetWhich( SID_ATTR_FRAMEDIRECTION ); //text direction - if( SFX_ITEM_AVAILABLE <= rSet.GetItemState( _nWhich ) ) + if( SFX_ITEM_AVAILABLE <= rSet->GetItemState( _nWhich ) ) { - const SvxFrameDirectionItem& rFrameDirItem = ( const SvxFrameDirectionItem& ) rSet.Get( _nWhich ); + const SvxFrameDirectionItem& rFrameDirItem = ( const SvxFrameDirectionItem& ) rSet->Get( _nWhich ); m_pTextDirectionLB->SelectEntryValue( (SvxFrameDirection)rFrameDirItem.GetValue() ); m_pTextDirectionLB->SaveValue(); } @@ -1528,17 +1528,17 @@ bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet* rOutSet ) return bModified; } -void SvxExtParagraphTabPage::Reset( const SfxItemSet& rSet ) +void SvxExtParagraphTabPage::Reset( const SfxItemSet* rSet ) { sal_uInt16 _nWhich = GetWhich( SID_ATTR_PARA_HYPHENZONE ); - SfxItemState eItemState = rSet.GetItemState( _nWhich ); + SfxItemState eItemState = rSet->GetItemState( _nWhich ); bool bItemAvailable = eItemState >= SFX_ITEM_AVAILABLE; bool bIsHyphen = false; if( !bHtmlMode && bItemAvailable ) { const SvxHyphenZoneItem& rHyphen = - (const SvxHyphenZoneItem&)rSet.Get( _nWhich ); + (const SvxHyphenZoneItem&)rSet->Get( _nWhich ); m_pHyphenBox->EnableTriState( false ); bIsHyphen = rHyphen.IsHyphen(); @@ -1562,10 +1562,10 @@ void SvxExtParagraphTabPage::Reset( const SfxItemSet& rSet ) _nWhich = GetWhich( SID_ATTR_PARA_PAGENUM ); - if ( rSet.GetItemState(_nWhich) >= SFX_ITEM_AVAILABLE ) + if ( rSet->GetItemState(_nWhich) >= SFX_ITEM_AVAILABLE ) { const sal_uInt16 nPageNum = - ( (const SfxUInt16Item&)rSet.Get( _nWhich ) ).GetValue(); + ( (const SfxUInt16Item&)rSet->Get( _nWhich ) ).GetValue(); m_pPagenumEdit->SetValue( nPageNum ); } @@ -1574,14 +1574,14 @@ void SvxExtParagraphTabPage::Reset( const SfxItemSet& rSet ) // first handle PageModel _nWhich = GetWhich( SID_ATTR_PARA_MODEL ); bool bIsPageModel = false; - eItemState = rSet.GetItemState( _nWhich ); + eItemState = rSet->GetItemState( _nWhich ); if ( eItemState >= SFX_ITEM_SET ) { m_pApplyCollBtn->EnableTriState( false ); const SvxPageModelItem& rModel = - (const SvxPageModelItem&)rSet.Get( _nWhich ); + (const SvxPageModelItem&)rSet->Get( _nWhich ); OUString aStr( rModel.GetValue() ); if ( !aStr.isEmpty() && @@ -1628,12 +1628,12 @@ void SvxExtParagraphTabPage::Reset( const SfxItemSet& rSet ) if ( !bIsPageModel ) { _nWhich = GetWhich( SID_ATTR_PARA_PAGEBREAK ); - eItemState = rSet.GetItemState( _nWhich ); + eItemState = rSet->GetItemState( _nWhich ); if ( eItemState >= SFX_ITEM_AVAILABLE ) { const SvxFmtBreakItem& rPageBreak = - (const SvxFmtBreakItem&)rSet.Get( _nWhich ); + (const SvxFmtBreakItem&)rSet->Get( _nWhich ); SvxBreak eBreak = (SvxBreak)rPageBreak.GetValue(); @@ -1699,13 +1699,13 @@ void SvxExtParagraphTabPage::Reset( const SfxItemSet& rSet ) } _nWhich = GetWhich( SID_ATTR_PARA_KEEP ); - eItemState = rSet.GetItemState( _nWhich ); + eItemState = rSet->GetItemState( _nWhich ); if ( eItemState >= SFX_ITEM_AVAILABLE ) { m_pKeepParaBox->EnableTriState( false ); const SvxFmtKeepItem& rKeep = - (const SvxFmtKeepItem&)rSet.Get( _nWhich ); + (const SvxFmtKeepItem&)rSet->Get( _nWhich ); if ( rKeep.GetValue() ) m_pKeepParaBox->SetState( TRISTATE_TRUE ); @@ -1718,12 +1718,12 @@ void SvxExtParagraphTabPage::Reset( const SfxItemSet& rSet ) m_pKeepParaBox->Enable(false); _nWhich = GetWhich( SID_ATTR_PARA_SPLIT ); - eItemState = rSet.GetItemState( _nWhich ); + eItemState = rSet->GetItemState( _nWhich ); if ( eItemState >= SFX_ITEM_AVAILABLE ) { const SvxFmtSplitItem& rSplit = - (const SvxFmtSplitItem&)rSet.Get( _nWhich ); + (const SvxFmtSplitItem&)rSet->Get( _nWhich ); m_pKeepTogetherBox->EnableTriState( false ); if ( !rSplit.GetValue() ) @@ -1735,12 +1735,12 @@ void SvxExtParagraphTabPage::Reset( const SfxItemSet& rSet ) // widows and orphans m_pWidowBox->Enable(); _nWhich = GetWhich( SID_ATTR_PARA_WIDOWS ); - SfxItemState eTmpState = rSet.GetItemState( _nWhich ); + SfxItemState eTmpState = rSet->GetItemState( _nWhich ); if ( eTmpState >= SFX_ITEM_AVAILABLE ) { const SvxWidowsItem& rWidow = - (const SvxWidowsItem&)rSet.Get( _nWhich ); + (const SvxWidowsItem&)rSet->Get( _nWhich ); m_pWidowBox->EnableTriState( false ); const sal_uInt16 nLines = rWidow.GetValue(); @@ -1758,12 +1758,12 @@ void SvxExtParagraphTabPage::Reset( const SfxItemSet& rSet ) m_pOrphanBox->Enable(); _nWhich = GetWhich( SID_ATTR_PARA_ORPHANS ); - eTmpState = rSet.GetItemState( _nWhich ); + eTmpState = rSet->GetItemState( _nWhich ); if ( eTmpState >= SFX_ITEM_AVAILABLE ) { const SvxOrphansItem& rOrphan = - (const SvxOrphansItem&)rSet.Get( _nWhich ); + (const SvxOrphansItem&)rSet->Get( _nWhich ); const sal_uInt16 nLines = rOrphan.GetValue(); m_pOrphanBox->EnableTriState( false ); @@ -2199,13 +2199,13 @@ static void lcl_SetBox(const SfxItemSet& rSet, sal_uInt16 nSlotId, CheckBox& rBo rBox.SaveValue(); } -void SvxAsianTabPage::Reset( const SfxItemSet& rSet ) +void SvxAsianTabPage::Reset( const SfxItemSet* rSet ) { - lcl_SetBox(rSet, SID_ATTR_PARA_FORBIDDEN_RULES, *m_pForbiddenRulesCB ); - lcl_SetBox(rSet, SID_ATTR_PARA_HANGPUNCTUATION, *m_pHangingPunctCB ); + lcl_SetBox(*rSet, SID_ATTR_PARA_FORBIDDEN_RULES, *m_pForbiddenRulesCB ); + lcl_SetBox(*rSet, SID_ATTR_PARA_HANGPUNCTUATION, *m_pHangingPunctCB ); //character distance not yet available - lcl_SetBox(rSet, SID_ATTR_PARA_SCRIPTSPACE, *m_pScriptSpaceCB ); + lcl_SetBox(*rSet, SID_ATTR_PARA_SCRIPTSPACE, *m_pScriptSpaceCB ); } IMPL_LINK( SvxAsianTabPage, ClickHdl_Impl, CheckBox*, pBox ) diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx index 5e34fbf34467..3f93aecc0588 100644 --- a/cui/source/tabpages/swpossizetabpage.cxx +++ b/cui/source/tabpages/swpossizetabpage.cxx @@ -882,9 +882,9 @@ bool SvxSwPosSizeTabPage::FillItemSet( SfxItemSet* rSet) return bModified; } -void SvxSwPosSizeTabPage::Reset( const SfxItemSet& rSet) +void SvxSwPosSizeTabPage::Reset( const SfxItemSet* rSet) { - const SfxPoolItem* pItem = GetItem( rSet, SID_ATTR_TRANSFORM_ANCHOR ); + const SfxPoolItem* pItem = GetItem( *rSet, SID_ATTR_TRANSFORM_ANCHOR ); bool bInvalidateAnchor = false; short nAnchorType = TextContentAnchorType_AT_PARAGRAPH; if(pItem) @@ -914,7 +914,7 @@ void SvxSwPosSizeTabPage::Reset( const SfxItemSet& rSet) m_pToFrameRB->Enable( false ); } - pItem = GetItem( rSet, SID_ATTR_TRANSFORM_PROTECT_POS ); + pItem = GetItem( *rSet, SID_ATTR_TRANSFORM_PROTECT_POS ); if ( pItem ) { bool bProtected = ( ( const SfxBoolItem* )pItem )->GetValue(); @@ -929,7 +929,7 @@ void SvxSwPosSizeTabPage::Reset( const SfxItemSet& rSet) m_pPositionCB->SaveValue(); - pItem = GetItem( rSet, SID_ATTR_TRANSFORM_PROTECT_SIZE ); + pItem = GetItem( *rSet, SID_ATTR_TRANSFORM_PROTECT_SIZE ); if ( pItem ) { @@ -941,7 +941,7 @@ void SvxSwPosSizeTabPage::Reset( const SfxItemSet& rSet) m_pSizeCB->SetState( TRISTATE_INDET ); m_pSizeCB->SaveValue(); - pItem = GetItem( rSet, SID_HTML_MODE ); + pItem = GetItem( *rSet, SID_HTML_MODE ); if(pItem) { m_bHtmlMode = @@ -949,7 +949,7 @@ void SvxSwPosSizeTabPage::Reset( const SfxItemSet& rSet) != 0; } - pItem = GetItem( rSet, SID_ATTR_TRANSFORM_IN_VERTICAL_TEXT ); + pItem = GetItem( *rSet, SID_ATTR_TRANSFORM_IN_VERTICAL_TEXT ); if(pItem && static_cast<const SfxBoolItem*>(pItem)->GetValue()) { OUString sHLabel = m_pHoriFT->GetText(); @@ -957,11 +957,11 @@ void SvxSwPosSizeTabPage::Reset( const SfxItemSet& rSet) m_pVertFT->SetText(sHLabel); m_bIsVerticalFrame = true; } - pItem = GetItem( rSet, SID_ATTR_TRANSFORM_IN_RTL_TEXT); + pItem = GetItem( *rSet, SID_ATTR_TRANSFORM_IN_RTL_TEXT); if(pItem) m_bIsInRightToLeft = static_cast<const SfxBoolItem*>(pItem)->GetValue(); - pItem = GetItem( rSet, SID_SW_FOLLOW_TEXT_FLOW); + pItem = GetItem( *rSet, SID_SW_FOLLOW_TEXT_FLOW); if(pItem) { const bool bFollowTextFlow = @@ -987,52 +987,52 @@ void SvxSwPosSizeTabPage::Reset( const SfxItemSet& rSet) m_pToCharRB->IsChecked() ); } - pItem = GetItem( rSet, SID_ATTR_TRANSFORM_WIDTH ); + pItem = GetItem( *rSet, SID_ATTR_TRANSFORM_WIDTH ); sal_Int32 nWidth = std::max( pItem ? ( static_cast<const SfxUInt32Item*>(pItem)->GetValue()) : 0, (sal_uInt32)1 ); m_pWidthMF->SetValue(m_pWidthMF->Normalize(nWidth), FUNIT_TWIP); - pItem = GetItem( rSet, SID_ATTR_TRANSFORM_HEIGHT ); + pItem = GetItem( *rSet, SID_ATTR_TRANSFORM_HEIGHT ); sal_Int32 nHeight = std::max( pItem ? ( static_cast<const SfxUInt32Item*>(pItem)->GetValue()) : 0, (sal_uInt32)1 ); m_pHeightMF->SetValue(m_pHeightMF->Normalize(nHeight), FUNIT_TWIP); m_fWidthHeightRatio = nHeight ? double(nWidth) / double(nHeight) : 1.0; if(!m_bPositioningDisabled) { - pItem = GetItem( rSet, SID_ATTR_TRANSFORM_HORI_ORIENT); + pItem = GetItem( *rSet, SID_ATTR_TRANSFORM_HORI_ORIENT); if(pItem) { short nHoriOrientation = static_cast< const SfxInt16Item*>(pItem)->GetValue(); m_nOldH = nHoriOrientation; } - pItem = GetItem( rSet, SID_ATTR_TRANSFORM_VERT_ORIENT); + pItem = GetItem( *rSet, SID_ATTR_TRANSFORM_VERT_ORIENT); if(pItem) { short nVertOrientation = static_cast< const SfxInt16Item*>(pItem)->GetValue(); m_nOldV = nVertOrientation; } - pItem = GetItem( rSet, SID_ATTR_TRANSFORM_HORI_RELATION); + pItem = GetItem( *rSet, SID_ATTR_TRANSFORM_HORI_RELATION); if(pItem) { m_nOldHRel = static_cast< const SfxInt16Item*>(pItem)->GetValue(); } - pItem = GetItem( rSet, SID_ATTR_TRANSFORM_VERT_RELATION); + pItem = GetItem( *rSet, SID_ATTR_TRANSFORM_VERT_RELATION); if(pItem) { m_nOldVRel = static_cast< const SfxInt16Item*>(pItem)->GetValue(); } - pItem = GetItem( rSet, SID_ATTR_TRANSFORM_HORI_MIRROR); + pItem = GetItem( *rSet, SID_ATTR_TRANSFORM_HORI_MIRROR); if(pItem) m_pHoriMirrorCB->Check(static_cast<const SfxBoolItem*>(pItem)->GetValue()); m_pHoriMirrorCB->SaveValue(); sal_Int32 nHoriPos = 0; sal_Int32 nVertPos = 0; - pItem = GetItem( rSet, SID_ATTR_TRANSFORM_HORI_POSITION); + pItem = GetItem( *rSet, SID_ATTR_TRANSFORM_HORI_POSITION); if(pItem) nHoriPos = static_cast<const SfxInt32Item*>(pItem)->GetValue(); - pItem = GetItem( rSet, SID_ATTR_TRANSFORM_VERT_POSITION); + pItem = GetItem( *rSet, SID_ATTR_TRANSFORM_VERT_POSITION); if(pItem) nVertPos = static_cast<const SfxInt32Item*>(pItem)->GetValue(); diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx index d904bca24e00..518e7203a737 100644 --- a/cui/source/tabpages/tabstpge.cxx +++ b/cui/source/tabpages/tabstpge.cxx @@ -268,13 +268,13 @@ SfxTabPage* SvxTabulatorTabPage::Create( Window* pParent, -void SvxTabulatorTabPage::Reset( const SfxItemSet& rSet ) +void SvxTabulatorTabPage::Reset( const SfxItemSet* rSet ) { - SfxItemPool* pPool = rSet.GetPool(); + SfxItemPool* pPool = rSet->GetPool(); MapUnit eUnit = (MapUnit)pPool->GetMetric( GetWhich( SID_ATTR_TABSTOP ) ); // Current tabs - const SfxPoolItem* pItem = GetItem( rSet, SID_ATTR_TABSTOP ); + const SfxPoolItem* pItem = GetItem( *rSet, SID_ATTR_TABSTOP ); if ( pItem ) { @@ -298,7 +298,7 @@ void SvxTabulatorTabPage::Reset( const SfxItemSet& rSet ) // Defaul tab distance nDefDist = SVX_TAB_DEFDIST; - pItem = GetItem( rSet, SID_ATTR_TABSTOP_DEFAULTS ); + pItem = GetItem( *rSet, SID_ATTR_TABSTOP_DEFAULTS ); if ( pItem ) nDefDist = LogicToLogic( @@ -306,7 +306,7 @@ void SvxTabulatorTabPage::Reset( const SfxItemSet& rSet ) // Tab pos currently selected sal_uInt16 nTabPos = 0; - pItem = GetItem( rSet, SID_ATTR_TABSTOP_POS ); + pItem = GetItem( *rSet, SID_ATTR_TABSTOP_POS ); if ( pItem ) nTabPos = ( (const SfxUInt16Item*)pItem )->GetValue(); diff --git a/cui/source/tabpages/textanim.cxx b/cui/source/tabpages/textanim.cxx index 63da943c8071..b3734cf696e7 100644 --- a/cui/source/tabpages/textanim.cxx +++ b/cui/source/tabpages/textanim.cxx @@ -139,12 +139,12 @@ SvxTextAnimationPage::~SvxTextAnimationPage() |* \************************************************************************/ -void SvxTextAnimationPage::Reset( const SfxItemSet& rAttrs ) +void SvxTextAnimationPage::Reset( const SfxItemSet* rAttrs ) { - const SfxItemPool* pPool = rAttrs.GetPool(); + const SfxItemPool* pPool = rAttrs->GetPool(); // animation type - const SfxPoolItem* pItem = GetItem( rAttrs, SDRATTR_TEXT_ANIKIND ); + const SfxPoolItem* pItem = GetItem( *rAttrs, SDRATTR_TEXT_ANIKIND ); if( !pItem ) pItem = &pPool->GetDefaultItem( SDRATTR_TEXT_ANIKIND ); @@ -158,7 +158,7 @@ void SvxTextAnimationPage::Reset( const SfxItemSet& rAttrs ) m_pLbEffect->SaveValue(); // animation direction - pItem = GetItem( rAttrs, SDRATTR_TEXT_ANIDIRECTION ); + pItem = GetItem( *rAttrs, SDRATTR_TEXT_ANIDIRECTION ); if( !pItem ) pItem = &pPool->GetDefaultItem( SDRATTR_TEXT_ANIDIRECTION ); if( pItem ) @@ -179,7 +179,7 @@ void SvxTextAnimationPage::Reset( const SfxItemSet& rAttrs ) m_pBtnDown->SaveValue(); // Start inside - pItem = GetItem( rAttrs, SDRATTR_TEXT_ANISTARTINSIDE ); + pItem = GetItem( *rAttrs, SDRATTR_TEXT_ANISTARTINSIDE ); if( !pItem ) pItem = &pPool->GetDefaultItem( SDRATTR_TEXT_ANISTARTINSIDE ); if( pItem ) @@ -196,7 +196,7 @@ void SvxTextAnimationPage::Reset( const SfxItemSet& rAttrs ) m_pTsbStartInside->SaveValue(); // Stop inside - pItem = GetItem( rAttrs, SDRATTR_TEXT_ANISTOPINSIDE ); + pItem = GetItem( *rAttrs, SDRATTR_TEXT_ANISTOPINSIDE ); if( !pItem ) pItem = &pPool->GetDefaultItem( SDRATTR_TEXT_ANISTOPINSIDE ); if( pItem ) @@ -213,7 +213,7 @@ void SvxTextAnimationPage::Reset( const SfxItemSet& rAttrs ) m_pTsbStopInside->SaveValue(); // quantity - pItem = GetItem( rAttrs, SDRATTR_TEXT_ANICOUNT ); + pItem = GetItem( *rAttrs, SDRATTR_TEXT_ANICOUNT ); if( !pItem ) pItem = &pPool->GetDefaultItem( SDRATTR_TEXT_ANICOUNT ); if( pItem ) @@ -246,7 +246,7 @@ void SvxTextAnimationPage::Reset( const SfxItemSet& rAttrs ) m_pNumFldCount->SaveValue(); // delay - pItem = GetItem( rAttrs, SDRATTR_TEXT_ANIDELAY ); + pItem = GetItem( *rAttrs, SDRATTR_TEXT_ANIDELAY ); if( !pItem ) pItem = &pPool->GetDefaultItem( SDRATTR_TEXT_ANIDELAY ); if( pItem ) @@ -271,7 +271,7 @@ void SvxTextAnimationPage::Reset( const SfxItemSet& rAttrs ) m_pMtrFldDelay->SaveValue(); // step size - pItem = GetItem( rAttrs, SDRATTR_TEXT_ANIAMOUNT ); + pItem = GetItem( *rAttrs, SDRATTR_TEXT_ANIAMOUNT ); if( !pItem ) pItem = &pPool->GetDefaultItem( SDRATTR_TEXT_ANIAMOUNT ); if( pItem ) diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx index 4a80ba77d147..5fd1c77a0364 100644 --- a/cui/source/tabpages/textattr.cxx +++ b/cui/source/tabpages/textattr.cxx @@ -112,13 +112,13 @@ SvxTextAttrPage::~SvxTextAttrPage() |* \************************************************************************/ -void SvxTextAttrPage::Reset( const SfxItemSet& rAttrs ) +void SvxTextAttrPage::Reset( const SfxItemSet* rAttrs ) { - SfxItemPool* pPool = rAttrs.GetPool(); + SfxItemPool* pPool = rAttrs->GetPool(); DBG_ASSERT( pPool, "Wo ist der Pool" ); SfxMapUnit eUnit = pPool->GetMetric( SDRATTR_TEXT_LEFTDIST ); - const SfxPoolItem* pItem = GetItem( rAttrs, SDRATTR_TEXT_LEFTDIST ); + const SfxPoolItem* pItem = GetItem( *rAttrs, SDRATTR_TEXT_LEFTDIST ); if( !pItem ) pItem = &pPool->GetDefaultItem( SDRATTR_TEXT_LEFTDIST ); @@ -131,7 +131,7 @@ void SvxTextAttrPage::Reset( const SfxItemSet& rAttrs ) m_pMtrFldLeft->SetText( "" ); m_pMtrFldLeft->SaveValue(); - pItem = GetItem( rAttrs, SDRATTR_TEXT_RIGHTDIST ); + pItem = GetItem( *rAttrs, SDRATTR_TEXT_RIGHTDIST ); if( !pItem ) pItem = &pPool->GetDefaultItem( SDRATTR_TEXT_RIGHTDIST ); if( pItem ) @@ -143,7 +143,7 @@ void SvxTextAttrPage::Reset( const SfxItemSet& rAttrs ) m_pMtrFldRight->SetText( "" ); m_pMtrFldRight->SaveValue(); - pItem = GetItem( rAttrs, SDRATTR_TEXT_UPPERDIST ); + pItem = GetItem( *rAttrs, SDRATTR_TEXT_UPPERDIST ); if( !pItem ) pItem = &pPool->GetDefaultItem( SDRATTR_TEXT_UPPERDIST ); if( pItem ) @@ -155,7 +155,7 @@ void SvxTextAttrPage::Reset( const SfxItemSet& rAttrs ) m_pMtrFldTop->SetText( "" ); m_pMtrFldTop->SaveValue(); - pItem = GetItem( rAttrs, SDRATTR_TEXT_LOWERDIST ); + pItem = GetItem( *rAttrs, SDRATTR_TEXT_LOWERDIST ); if( !pItem ) pItem = &pPool->GetDefaultItem( SDRATTR_TEXT_LOWERDIST ); if( pItem ) @@ -168,9 +168,9 @@ void SvxTextAttrPage::Reset( const SfxItemSet& rAttrs ) m_pMtrFldBottom->SaveValue(); // adjust to height - if ( rAttrs.GetItemState( SDRATTR_TEXT_AUTOGROWHEIGHT ) != SFX_ITEM_DONTCARE ) + if ( rAttrs->GetItemState( SDRATTR_TEXT_AUTOGROWHEIGHT ) != SFX_ITEM_DONTCARE ) { - m_pTsbAutoGrowHeight->SetState( ( ( const SdrTextAutoGrowHeightItem& )rAttrs.Get( SDRATTR_TEXT_AUTOGROWHEIGHT ) ). + m_pTsbAutoGrowHeight->SetState( ( ( const SdrTextAutoGrowHeightItem& )rAttrs->Get( SDRATTR_TEXT_AUTOGROWHEIGHT ) ). GetValue() ? TRISTATE_TRUE : TRISTATE_FALSE ); m_pTsbAutoGrowHeight->EnableTriState( false ); } @@ -179,9 +179,9 @@ void SvxTextAttrPage::Reset( const SfxItemSet& rAttrs ) m_pTsbAutoGrowHeight->SaveValue(); // adjust to width - if ( rAttrs.GetItemState( SDRATTR_TEXT_AUTOGROWWIDTH ) != SFX_ITEM_DONTCARE ) + if ( rAttrs->GetItemState( SDRATTR_TEXT_AUTOGROWWIDTH ) != SFX_ITEM_DONTCARE ) { - m_pTsbAutoGrowWidth->SetState( ( ( const SdrTextAutoGrowWidthItem& )rAttrs.Get( SDRATTR_TEXT_AUTOGROWWIDTH ) ). + m_pTsbAutoGrowWidth->SetState( ( ( const SdrTextAutoGrowWidthItem& )rAttrs->Get( SDRATTR_TEXT_AUTOGROWWIDTH ) ). GetValue() ? TRISTATE_TRUE : TRISTATE_FALSE ); m_pTsbAutoGrowWidth->EnableTriState( false ); } @@ -190,9 +190,9 @@ void SvxTextAttrPage::Reset( const SfxItemSet& rAttrs ) m_pTsbAutoGrowWidth->SaveValue(); // autogrowsize - if ( rAttrs.GetItemState( SDRATTR_TEXT_AUTOGROWSIZE ) != SFX_ITEM_DONTCARE ) + if ( rAttrs->GetItemState( SDRATTR_TEXT_AUTOGROWSIZE ) != SFX_ITEM_DONTCARE ) { - m_pTsbAutoGrowSize->SetState( ( ( const SdrTextAutoGrowHeightItem& )rAttrs.Get( SDRATTR_TEXT_AUTOGROWHEIGHT ) ). + m_pTsbAutoGrowSize->SetState( ( ( const SdrTextAutoGrowHeightItem& )rAttrs->Get( SDRATTR_TEXT_AUTOGROWHEIGHT ) ). GetValue() ? TRISTATE_TRUE : TRISTATE_FALSE ); m_pTsbAutoGrowSize->EnableTriState( false ); } @@ -201,9 +201,9 @@ void SvxTextAttrPage::Reset( const SfxItemSet& rAttrs ) m_pTsbAutoGrowSize->SaveValue(); // wordwrap text - if ( rAttrs.GetItemState( SDRATTR_TEXT_WORDWRAP ) != SFX_ITEM_DONTCARE ) + if ( rAttrs->GetItemState( SDRATTR_TEXT_WORDWRAP ) != SFX_ITEM_DONTCARE ) { - m_pTsbWordWrapText->SetState( ( ( const SdrTextWordWrapItem& )rAttrs.Get( SDRATTR_TEXT_WORDWRAP ) ). + m_pTsbWordWrapText->SetState( ( ( const SdrTextWordWrapItem& )rAttrs->Get( SDRATTR_TEXT_WORDWRAP ) ). GetValue() ? TRISTATE_TRUE : TRISTATE_FALSE ); m_pTsbWordWrapText->EnableTriState( false ); } @@ -214,14 +214,14 @@ void SvxTextAttrPage::Reset( const SfxItemSet& rAttrs ) // #103516# Do the setup based on states of hor/ver adjust // Setup center field and FullWidth - SfxItemState eVState = rAttrs.GetItemState( SDRATTR_TEXT_VERTADJUST ); - SfxItemState eHState = rAttrs.GetItemState( SDRATTR_TEXT_HORZADJUST ); + SfxItemState eVState = rAttrs->GetItemState( SDRATTR_TEXT_VERTADJUST ); + SfxItemState eHState = rAttrs->GetItemState( SDRATTR_TEXT_HORZADJUST ); if(SFX_ITEM_DONTCARE != eVState && SFX_ITEM_DONTCARE != eHState) { // VertAdjust and HorAdjust are unequivocal, thus - SdrTextVertAdjust eTVA = (SdrTextVertAdjust)((const SdrTextVertAdjustItem&)rAttrs.Get(SDRATTR_TEXT_VERTADJUST)).GetValue(); - SdrTextHorzAdjust eTHA = (SdrTextHorzAdjust)((const SdrTextHorzAdjustItem&)rAttrs.Get(SDRATTR_TEXT_HORZADJUST)).GetValue(); + SdrTextVertAdjust eTVA = (SdrTextVertAdjust)((const SdrTextVertAdjustItem&)rAttrs->Get(SDRATTR_TEXT_VERTADJUST)).GetValue(); + SdrTextHorzAdjust eTHA = (SdrTextHorzAdjust)((const SdrTextHorzAdjustItem&)rAttrs->Get(SDRATTR_TEXT_HORZADJUST)).GetValue(); RECT_POINT eRP = RP_LB; m_pTsbFullWidth->EnableTriState( false ); @@ -292,10 +292,10 @@ void SvxTextAttrPage::Reset( const SfxItemSet& rAttrs ) } // adjust to border - if ( rAttrs.GetItemState( SDRATTR_TEXT_FITTOSIZE ) != SFX_ITEM_DONTCARE ) + if ( rAttrs->GetItemState( SDRATTR_TEXT_FITTOSIZE ) != SFX_ITEM_DONTCARE ) { SdrFitToSizeType eFTS = (SdrFitToSizeType) - ( ( const SdrTextFitToSizeTypeItem& )rAttrs.Get( SDRATTR_TEXT_FITTOSIZE ) ).GetValue(); + ( ( const SdrTextFitToSizeTypeItem& )rAttrs->Get( SDRATTR_TEXT_FITTOSIZE ) ).GetValue(); m_pTsbFitToSize->SetState( eFTS == SDRTEXTFIT_NONE ? TRISTATE_FALSE : TRISTATE_TRUE ); m_pTsbFitToSize->EnableTriState( false ); } @@ -303,9 +303,9 @@ void SvxTextAttrPage::Reset( const SfxItemSet& rAttrs ) m_pTsbFitToSize->SetState( TRISTATE_INDET ); m_pTsbFitToSize->SaveValue(); - if( rAttrs.GetItemState( SDRATTR_TEXT_CONTOURFRAME ) != SFX_ITEM_DONTCARE ) + if( rAttrs->GetItemState( SDRATTR_TEXT_CONTOURFRAME ) != SFX_ITEM_DONTCARE ) { - bool bContour = ( ( const SdrTextContourFrameItem& )rAttrs.Get( SDRATTR_TEXT_CONTOURFRAME ) ).GetValue(); + bool bContour = ( ( const SdrTextContourFrameItem& )rAttrs->Get( SDRATTR_TEXT_CONTOURFRAME ) ).GetValue(); m_pTsbContour->SetState( bContour ? TRISTATE_TRUE : TRISTATE_FALSE ); m_pTsbContour->EnableTriState( false ); } diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx index 0084f4c6e853..4bd39942b3d8 100644 --- a/cui/source/tabpages/tparea.cxx +++ b/cui/source/tabpages/tparea.cxx @@ -400,18 +400,18 @@ bool SvxTransparenceTabPage::FillItemSet(SfxItemSet* rAttrs) return bModified; } -void SvxTransparenceTabPage::Reset(const SfxItemSet& rAttrs) +void SvxTransparenceTabPage::Reset(const SfxItemSet* rAttrs) { const SfxPoolItem* pGradientItem = NULL; - SfxItemState eStateGradient(rAttrs.GetItemState(XATTR_FILLFLOATTRANSPARENCE, true, &pGradientItem)); + SfxItemState eStateGradient(rAttrs->GetItemState(XATTR_FILLFLOATTRANSPARENCE, true, &pGradientItem)); if(!pGradientItem) - pGradientItem = &rAttrs.Get(XATTR_FILLFLOATTRANSPARENCE); + pGradientItem = &rAttrs->Get(XATTR_FILLFLOATTRANSPARENCE); bool bGradActive = (eStateGradient == SFX_ITEM_SET && ((XFillFloatTransparenceItem*)pGradientItem)->IsEnabled()); const SfxPoolItem* pLinearItem = NULL; - SfxItemState eStateLinear(rAttrs.GetItemState(XATTR_FILLTRANSPARENCE, true, &pLinearItem)); + SfxItemState eStateLinear(rAttrs->GetItemState(XATTR_FILLTRANSPARENCE, true, &pLinearItem)); if(!pLinearItem) - pLinearItem = &rAttrs.Get(XATTR_FILLTRANSPARENCE); + pLinearItem = &rAttrs->Get(XATTR_FILLTRANSPARENCE); bool bLinearActive = (eStateLinear == SFX_ITEM_SET && ((XFillTransparenceItem*)pLinearItem)->GetValue() != 0); // transparence gradient @@ -461,7 +461,7 @@ void SvxTransparenceTabPage::Reset(const SfxItemSet& rAttrs) m_pMtrTrgrStartValue->SaveValue(); m_pMtrTrgrEndValue->SaveValue(); - bool bActive = InitPreview ( rAttrs ); + bool bActive = InitPreview ( *rAttrs ); InvalidatePreview ( bActive ); } @@ -1435,31 +1435,31 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet* rAttrs ) -void SvxAreaTabPage::Reset( const SfxItemSet& rAttrs ) +void SvxAreaTabPage::Reset( const SfxItemSet* rAttrs ) { bool isMissingHatching(false); bool isMissingGradient(false); bool isMissingBitmap(false); XFillStyle eXFS; - if( rAttrs.GetItemState( XATTR_FILLSTYLE ) != SFX_ITEM_DONTCARE ) + if( rAttrs->GetItemState( XATTR_FILLSTYLE ) != SFX_ITEM_DONTCARE ) { - eXFS = (XFillStyle) ( ( ( const XFillStyleItem& ) rAttrs. + eXFS = (XFillStyle) ( ( ( const XFillStyleItem& ) rAttrs-> Get( GetWhich( XATTR_FILLSTYLE ) ) ).GetValue() ); m_pTypeLB->SelectEntryPos( sal::static_int_cast< sal_Int32 >( eXFS ) ); - if (SFX_ITEM_DONTCARE != rAttrs.GetItemState(XATTR_FILLCOLOR)) + if (SFX_ITEM_DONTCARE != rAttrs->GetItemState(XATTR_FILLCOLOR)) { XFillColorItem const& rColorItem(static_cast<const XFillColorItem&>( - rAttrs.Get(XATTR_FILLCOLOR)) ); + rAttrs->Get(XATTR_FILLCOLOR)) ); m_pLbColor->SelectEntry( rColorItem.GetColorValue() ); m_pLbHatchBckgrdColor->SelectEntry( rColorItem.GetColorValue() ); } - if (SFX_ITEM_DONTCARE != rAttrs.GetItemState(XATTR_FILLGRADIENT)) + if (SFX_ITEM_DONTCARE != rAttrs->GetItemState(XATTR_FILLGRADIENT)) { XFillGradientItem const& rGradientItem( static_cast<const XFillGradientItem&>( - rAttrs.Get(XATTR_FILLGRADIENT)) ); + rAttrs->Get(XATTR_FILLGRADIENT)) ); OUString const aString( rGradientItem.GetName() ); XGradient const aGradient( rGradientItem.GetGradientValue() ); @@ -1471,27 +1471,27 @@ void SvxAreaTabPage::Reset( const SfxItemSet& rAttrs ) isMissingGradient = true; } - if (SFX_ITEM_DONTCARE != rAttrs.GetItemState(XATTR_FILLHATCH)) + if (SFX_ITEM_DONTCARE != rAttrs->GetItemState(XATTR_FILLHATCH)) { m_pLbHatching->SelectEntry( static_cast<const XFillHatchItem&>( - rAttrs.Get(XATTR_FILLHATCH)).GetName() ); + rAttrs->Get(XATTR_FILLHATCH)).GetName() ); } if (!m_pLbHatching->GetSelectEntryCount()) { // avoid relying on pool default - cannot export that m_pLbHatching->SelectEntryPos(0); // anything better than nothing isMissingHatching = true; } - if (SFX_ITEM_DONTCARE != rAttrs.GetItemState(XATTR_FILLBACKGROUND)) + if (SFX_ITEM_DONTCARE != rAttrs->GetItemState(XATTR_FILLBACKGROUND)) { m_pCbxHatchBckgrd->Check( static_cast<const XFillBackgroundItem&>( - rAttrs.Get(XATTR_FILLBACKGROUND)).GetValue() ); + rAttrs->Get(XATTR_FILLBACKGROUND)).GetValue() ); } - if (SFX_ITEM_DONTCARE != rAttrs.GetItemState(XATTR_FILLBITMAP)) + if (SFX_ITEM_DONTCARE != rAttrs->GetItemState(XATTR_FILLBITMAP)) { XFillBitmapItem const& rBitmapItem( static_cast<const XFillBitmapItem&>( - rAttrs.Get(XATTR_FILLBITMAP))); + rAttrs->Get(XATTR_FILLBITMAP))); m_pLbBitmap->SelectEntry(rBitmapItem.GetName()); } if (!m_pLbBitmap->GetSelectEntryCount()) @@ -1544,11 +1544,11 @@ void SvxAreaTabPage::Reset( const SfxItemSet& rAttrs ) } // step size - if( ( rAttrs.GetItemState( XATTR_GRADIENTSTEPCOUNT ) != SFX_ITEM_DONTCARE ) || - ( rAttrs.GetItemState( XATTR_FILLSTYLE ) != SFX_ITEM_DONTCARE ) ) + if( ( rAttrs->GetItemState( XATTR_GRADIENTSTEPCOUNT ) != SFX_ITEM_DONTCARE ) || + ( rAttrs->GetItemState( XATTR_FILLSTYLE ) != SFX_ITEM_DONTCARE ) ) { m_pTsbStepCount->EnableTriState( false ); - sal_uInt16 nValue = ( ( const XGradientStepCountItem& ) rAttrs.Get( XATTR_GRADIENTSTEPCOUNT ) ).GetValue(); + sal_uInt16 nValue = ( ( const XGradientStepCountItem& ) rAttrs->Get( XATTR_GRADIENTSTEPCOUNT ) ).GetValue(); if( nValue == 0 ) { m_pTsbStepCount->SetState( TRISTATE_TRUE ); @@ -1569,11 +1569,11 @@ void SvxAreaTabPage::Reset( const SfxItemSet& rAttrs ) // attributes for the bitmap filling - if( rAttrs.GetItemState( XATTR_FILLBMP_TILE ) != SFX_ITEM_DONTCARE ) + if( rAttrs->GetItemState( XATTR_FILLBMP_TILE ) != SFX_ITEM_DONTCARE ) { m_pTsbTile->EnableTriState( false ); - if( ( ( const XFillBmpTileItem& ) rAttrs.Get( XATTR_FILLBMP_TILE ) ).GetValue() ) + if( ( ( const XFillBmpTileItem& ) rAttrs->Get( XATTR_FILLBMP_TILE ) ).GetValue() ) m_pTsbTile->SetState( TRISTATE_TRUE ); else m_pTsbTile->SetState( TRISTATE_FALSE ); @@ -1581,11 +1581,11 @@ void SvxAreaTabPage::Reset( const SfxItemSet& rAttrs ) else m_pTsbTile->SetState( TRISTATE_INDET ); - if( rAttrs.GetItemState( XATTR_FILLBMP_STRETCH ) != SFX_ITEM_DONTCARE ) + if( rAttrs->GetItemState( XATTR_FILLBMP_STRETCH ) != SFX_ITEM_DONTCARE ) { m_pTsbStretch->EnableTriState( false ); - if( ( ( const XFillBmpStretchItem& ) rAttrs.Get( XATTR_FILLBMP_STRETCH ) ).GetValue() ) + if( ( ( const XFillBmpStretchItem& ) rAttrs->Get( XATTR_FILLBMP_STRETCH ) ).GetValue() ) m_pTsbStretch->SetState( TRISTATE_TRUE ); else m_pTsbStretch->SetState( TRISTATE_FALSE ); @@ -1595,11 +1595,11 @@ void SvxAreaTabPage::Reset( const SfxItemSet& rAttrs ) //aTsbScale - if( rAttrs.GetItemState( XATTR_FILLBMP_SIZELOG ) != SFX_ITEM_DONTCARE ) + if( rAttrs->GetItemState( XATTR_FILLBMP_SIZELOG ) != SFX_ITEM_DONTCARE ) { m_pTsbScale->EnableTriState( false ); - if( ( ( const XFillBmpSizeLogItem& ) rAttrs.Get( XATTR_FILLBMP_SIZELOG ) ).GetValue() ) + if( ( ( const XFillBmpSizeLogItem& ) rAttrs->Get( XATTR_FILLBMP_SIZELOG ) ).GetValue() ) m_pTsbScale->SetState( TRISTATE_FALSE ); else m_pTsbScale->SetState( TRISTATE_TRUE ); @@ -1614,9 +1614,9 @@ void SvxAreaTabPage::Reset( const SfxItemSet& rAttrs ) TriState eOriginal = TRISTATE_FALSE; //aMtrFldXSize - if( rAttrs.GetItemState( XATTR_FILLBMP_SIZEX ) != SFX_ITEM_DONTCARE ) + if( rAttrs->GetItemState( XATTR_FILLBMP_SIZEX ) != SFX_ITEM_DONTCARE ) { - sal_Int32 nValue = ( ( const XFillBmpSizeXItem& ) rAttrs.Get( XATTR_FILLBMP_SIZEX ) ).GetValue(); + sal_Int32 nValue = ( ( const XFillBmpSizeXItem& ) rAttrs->Get( XATTR_FILLBMP_SIZEX ) ).GetValue(); if( m_pTsbScale->GetState() == TRISTATE_TRUE ) { // If there's a percentage value in the item, @@ -1642,9 +1642,9 @@ void SvxAreaTabPage::Reset( const SfxItemSet& rAttrs ) } //aMtrFldYSize - if( rAttrs.GetItemState( XATTR_FILLBMP_SIZEY ) != SFX_ITEM_DONTCARE ) + if( rAttrs->GetItemState( XATTR_FILLBMP_SIZEY ) != SFX_ITEM_DONTCARE ) { - sal_Int32 nValue = ( ( const XFillBmpSizeYItem& ) rAttrs.Get( XATTR_FILLBMP_SIZEY ) ).GetValue(); + sal_Int32 nValue = ( ( const XFillBmpSizeYItem& ) rAttrs->Get( XATTR_FILLBMP_SIZEY ) ).GetValue(); if( m_pTsbScale->GetState() == TRISTATE_TRUE ) { // If there's a percentage value in the item, @@ -1676,17 +1676,17 @@ void SvxAreaTabPage::Reset( const SfxItemSet& rAttrs ) //aRbtRow //aRbtColumn //aMtrFldOffset - if( rAttrs.GetItemState( XATTR_FILLBMP_TILEOFFSETX ) != SFX_ITEM_DONTCARE ) + if( rAttrs->GetItemState( XATTR_FILLBMP_TILEOFFSETX ) != SFX_ITEM_DONTCARE ) { - sal_uInt16 nValue = ( ( const XFillBmpTileOffsetXItem& ) rAttrs.Get( XATTR_FILLBMP_TILEOFFSETX ) ).GetValue(); + sal_uInt16 nValue = ( ( const XFillBmpTileOffsetXItem& ) rAttrs->Get( XATTR_FILLBMP_TILEOFFSETX ) ).GetValue(); if( nValue > 0 ) { m_pMtrFldOffset->SetValue( nValue ); m_pRbtRow->Check(); } - else if( rAttrs.GetItemState( XATTR_FILLBMP_TILEOFFSETY ) != SFX_ITEM_DONTCARE ) + else if( rAttrs->GetItemState( XATTR_FILLBMP_TILEOFFSETY ) != SFX_ITEM_DONTCARE ) { - nValue = ( ( const XFillBmpTileOffsetYItem& ) rAttrs.Get( XATTR_FILLBMP_TILEOFFSETY ) ).GetValue(); + nValue = ( ( const XFillBmpTileOffsetYItem& ) rAttrs->Get( XATTR_FILLBMP_TILEOFFSETY ) ).GetValue(); if( nValue > 0 ) { m_pMtrFldOffset->SetValue( nValue ); @@ -1701,27 +1701,27 @@ void SvxAreaTabPage::Reset( const SfxItemSet& rAttrs ) //aCtlPosition - if( rAttrs.GetItemState( XATTR_FILLBMP_POS ) != SFX_ITEM_DONTCARE ) + if( rAttrs->GetItemState( XATTR_FILLBMP_POS ) != SFX_ITEM_DONTCARE ) { - RECT_POINT eValue = ( ( const XFillBmpPosItem& ) rAttrs.Get( XATTR_FILLBMP_POS ) ).GetValue(); + RECT_POINT eValue = ( ( const XFillBmpPosItem& ) rAttrs->Get( XATTR_FILLBMP_POS ) ).GetValue(); m_pCtlPosition->SetActualRP( eValue ); } else m_pCtlPosition->Reset(); //aMtrFldXOffset - if( rAttrs.GetItemState( XATTR_FILLBMP_POSOFFSETX ) != SFX_ITEM_DONTCARE ) + if( rAttrs->GetItemState( XATTR_FILLBMP_POSOFFSETX ) != SFX_ITEM_DONTCARE ) { - sal_Int32 nValue = ( ( const XFillBmpPosOffsetXItem& ) rAttrs.Get( XATTR_FILLBMP_POSOFFSETX ) ).GetValue(); + sal_Int32 nValue = ( ( const XFillBmpPosOffsetXItem& ) rAttrs->Get( XATTR_FILLBMP_POSOFFSETX ) ).GetValue(); m_pMtrFldXOffset->SetValue( nValue ); } else m_pMtrFldXOffset->SetText( "" ); //aMtrFldYOffset - if( rAttrs.GetItemState( XATTR_FILLBMP_POSOFFSETY ) != SFX_ITEM_DONTCARE ) + if( rAttrs->GetItemState( XATTR_FILLBMP_POSOFFSETY ) != SFX_ITEM_DONTCARE ) { - sal_Int32 nValue = ( ( const XFillBmpPosOffsetYItem& ) rAttrs.Get( XATTR_FILLBMP_POSOFFSETY ) ).GetValue(); + sal_Int32 nValue = ( ( const XFillBmpPosOffsetYItem& ) rAttrs->Get( XATTR_FILLBMP_POSOFFSETY ) ).GetValue(); m_pMtrFldYOffset->SetValue( nValue ); } else diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index 3c488e0f47fb..9fa0db1a9175 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -254,7 +254,7 @@ bool SvxBitmapTabPage::FillItemSet( SfxItemSet* _rOutAttrs ) -void SvxBitmapTabPage::Reset( const SfxItemSet& ) +void SvxBitmapTabPage::Reset( const SfxItemSet* ) { // aLbBitmaps.SelectEntryPos( 0 ); @@ -801,7 +801,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickLoadHdl_Impl) m_pLbBitmaps->Clear(); m_pLbBitmaps->Fill( pBitmapList ); - Reset( rOutAttrs ); + Reset( &rOutAttrs ); pBitmapList->SetName( aURL.getName() ); diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index a81af85dca67..e6dcab28d8ce 100644 --- a/cui/source/tabpages/tpcolor.cxx +++ b/cui/source/tabpages/tpcolor.cxx @@ -257,7 +257,7 @@ void SvxColorTabPage::Update(bool bLoaded) m_pLbColor->Clear(); m_pValSetColorList->Clear(); Construct(); - Reset( rOutAttrs ); + Reset( &rOutAttrs ); if( m_pLbColor->GetSelectEntryPos() == LISTBOX_ENTRY_NOTFOUND ) m_pLbColor->SelectEntryPos( 0 ); @@ -592,15 +592,15 @@ void SvxColorTabPage::UpdateModified() -void SvxColorTabPage::Reset( const SfxItemSet& rSet ) +void SvxColorTabPage::Reset( const SfxItemSet* rSet ) { - sal_uInt16 nState = rSet.GetItemState( XATTR_FILLCOLOR ); + sal_uInt16 nState = rSet->GetItemState( XATTR_FILLCOLOR ); Color aNewColor; if ( nState >= SFX_ITEM_DEFAULT ) { - XFillColorItem aColorItem( (const XFillColorItem&)rSet.Get( XATTR_FILLCOLOR ) ); + XFillColorItem aColorItem( (const XFillColorItem&)rSet->Get( XATTR_FILLCOLOR ) ); aNewColor = aColorItem.GetColorValue(); m_pLbColor->SelectEntry(aNewColor); m_pValSetColorList->SelectItem( m_pLbColor->GetSelectEntryPos() + 1 ); diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx index eba96ba2dae0..92caa87ad7b1 100644 --- a/cui/source/tabpages/tpgradnt.cxx +++ b/cui/source/tabpages/tpgradnt.cxx @@ -345,7 +345,7 @@ bool SvxGradientTabPage::FillItemSet( SfxItemSet* rSet ) -void SvxGradientTabPage::Reset( const SfxItemSet& ) +void SvxGradientTabPage::Reset( const SfxItemSet* ) { // m_pLbGradients->SelectEntryPos( 0 ); ChangeGradientHdl_Impl( this ); @@ -656,7 +656,7 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickLoadHdl_Impl) m_pLbGradients->Clear(); m_pLbGradients->Fill( pGradientList ); - Reset( rOutAttrs ); + Reset( &rOutAttrs ); pGradientList->SetName( aURL.getName() ); diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx index 8524a6c4f4de..23fb66f2082e 100644 --- a/cui/source/tabpages/tphatch.cxx +++ b/cui/source/tabpages/tphatch.cxx @@ -314,7 +314,7 @@ bool SvxHatchTabPage::FillItemSet( SfxItemSet* rSet ) -void SvxHatchTabPage::Reset( const SfxItemSet& rSet ) +void SvxHatchTabPage::Reset( const SfxItemSet* rSet ) { ChangeHatchHdl_Impl( this ); @@ -332,8 +332,8 @@ void SvxHatchTabPage::Reset( const SfxItemSet& rSet ) m_pBtnSave->Disable(); } - rXFSet.Put ( ( XFillColorItem& ) rSet.Get(XATTR_FILLCOLOR) ); - rXFSet.Put ( ( XFillBackgroundItem&)rSet.Get(XATTR_FILLBACKGROUND) ); + rXFSet.Put ( ( XFillColorItem& ) rSet->Get(XATTR_FILLCOLOR) ); + rXFSet.Put ( ( XFillBackgroundItem&)rSet->Get(XATTR_FILLBACKGROUND) ); m_pCtlPreview->SetAttributes( aXFillAttr.GetItemSet() ); m_pCtlPreview->Invalidate(); } @@ -695,7 +695,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickLoadHdl_Impl) m_pLbHatchings->Clear(); m_pLbHatchings->Fill( pHatchingList ); - Reset( rOutAttrs ); + Reset( &rOutAttrs ); pHatchingList->SetName( aURL.getName() ); diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index 1ac752934993..08db5d41c402 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -1086,7 +1086,7 @@ bool SvxLineTabPage::FillXLSet_Impl() -void SvxLineTabPage::Reset( const SfxItemSet& rAttrs ) +void SvxLineTabPage::Reset( const SfxItemSet* rAttrs ) { XLineStyle eXLS; // XLINE_NONE, XLINE_SOLID, XLINE_DASH @@ -1097,7 +1097,7 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs ) bool bEnable=true; bool bIgnoreGraphic=false; bool bIgnoreSize=false; - if(rAttrs.GetItemState(rAttrs.GetPool()->GetWhich(SID_ATTR_SYMBOLTYPE),true,&pPoolItem) == SFX_ITEM_SET) + if(rAttrs->GetItemState(rAttrs->GetPool()->GetWhich(SID_ATTR_SYMBOLTYPE),true,&pPoolItem) == SFX_ITEM_SET) { nSymType=((const SfxInt32Item *)pPoolItem)->GetValue(); } @@ -1179,7 +1179,7 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs ) delete pView; delete pModel; } - if(rAttrs.GetItemState(rAttrs.GetPool()->GetWhich(SID_ATTR_BRUSH),true,&pPoolItem) == SFX_ITEM_SET) + if(rAttrs->GetItemState(rAttrs->GetPool()->GetWhich(SID_ATTR_BRUSH),true,&pPoolItem) == SFX_ITEM_SET) { const Graphic* pGraphic = ((const SvxBrushItem *)pPoolItem)->GetGraphic(); if( pGraphic ) @@ -1198,7 +1198,7 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs ) } } - if(rAttrs.GetItemState(rAttrs.GetPool()->GetWhich(SID_ATTR_SYMBOLSIZE),true,&pPoolItem) == SFX_ITEM_SET) + if(rAttrs->GetItemState(rAttrs->GetPool()->GetWhich(SID_ATTR_SYMBOLSIZE),true,&pPoolItem) == SFX_ITEM_SET) { aSymbolSize = ((const SvxSizeItem *)pPoolItem)->GetSize(); } @@ -1213,9 +1213,9 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs ) aSymbolLastSize=aSymbolSize; } - if( rAttrs.GetItemState( XATTR_LINESTYLE ) != SFX_ITEM_DONTCARE ) + if( rAttrs->GetItemState( XATTR_LINESTYLE ) != SFX_ITEM_DONTCARE ) { - eXLS = (XLineStyle) ( ( const XLineStyleItem& ) rAttrs.Get( XATTR_LINESTYLE ) ).GetValue(); + eXLS = (XLineStyle) ( ( const XLineStyleItem& ) rAttrs->Get( XATTR_LINESTYLE ) ).GetValue(); switch( eXLS ) { @@ -1228,7 +1228,7 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs ) case XLINE_DASH: m_pLbLineStyle->SetNoSelection(); - m_pLbLineStyle->SelectEntry( ( ( const XLineDashItem& ) rAttrs.Get( XATTR_LINEDASH ) ).GetName() ); + m_pLbLineStyle->SelectEntry( ( ( const XLineDashItem& ) rAttrs->Get( XATTR_LINEDASH ) ).GetName() ); break; default: @@ -1241,9 +1241,9 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs ) } // Line strength - if( rAttrs.GetItemState( XATTR_LINEWIDTH ) != SFX_ITEM_DONTCARE ) + if( rAttrs->GetItemState( XATTR_LINEWIDTH ) != SFX_ITEM_DONTCARE ) { - SetMetricValue( *m_pMtrLineWidth, ( ( const XLineWidthItem& ) rAttrs.Get( XATTR_LINEWIDTH ) ).GetValue(), ePoolUnit ); + SetMetricValue( *m_pMtrLineWidth, ( ( const XLineWidthItem& ) rAttrs->Get( XATTR_LINEWIDTH ) ).GetValue(), ePoolUnit ); } else m_pMtrLineWidth->SetText( "" ); @@ -1251,9 +1251,9 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs ) // Line color m_pLbColor->SetNoSelection(); - if ( rAttrs.GetItemState( XATTR_LINECOLOR ) != SFX_ITEM_DONTCARE ) + if ( rAttrs->GetItemState( XATTR_LINECOLOR ) != SFX_ITEM_DONTCARE ) { - Color aCol = ( ( const XLineColorItem& ) rAttrs.Get( XATTR_LINECOLOR ) ).GetColorValue(); + Color aCol = ( ( const XLineColorItem& ) rAttrs->Get( XATTR_LINECOLOR ) ).GetColorValue(); m_pLbColor->SelectEntry( aCol ); if( m_pLbColor->GetSelectEntryCount() == 0 ) { @@ -1263,15 +1263,15 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs ) } // Line start - if( bObjSelected && rAttrs.GetItemState( XATTR_LINESTART ) == SFX_ITEM_DEFAULT ) + if( bObjSelected && rAttrs->GetItemState( XATTR_LINESTART ) == SFX_ITEM_DEFAULT ) { m_pLbStartStyle->Disable(); } - else if( rAttrs.GetItemState( XATTR_LINESTART ) != SFX_ITEM_DONTCARE ) + else if( rAttrs->GetItemState( XATTR_LINESTART ) != SFX_ITEM_DONTCARE ) { // #86265# select entry using list and polygon, not string bool bSelected(false); - const basegfx::B2DPolyPolygon& rItemPolygon = ((const XLineStartItem&)rAttrs.Get(XATTR_LINESTART)).GetLineStartValue(); + const basegfx::B2DPolyPolygon& rItemPolygon = ((const XLineStartItem&)rAttrs->Get(XATTR_LINESTART)).GetLineStartValue(); for(sal_Int32 a(0);!bSelected && a < pLineEndList->Count(); a++) { @@ -1295,15 +1295,15 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs ) } // Line end - if( bObjSelected && rAttrs.GetItemState( XATTR_LINEEND ) == SFX_ITEM_DEFAULT ) + if( bObjSelected && rAttrs->GetItemState( XATTR_LINEEND ) == SFX_ITEM_DEFAULT ) { m_pLbEndStyle->Disable(); } - else if( rAttrs.GetItemState( XATTR_LINEEND ) != SFX_ITEM_DONTCARE ) + else if( rAttrs->GetItemState( XATTR_LINEEND ) != SFX_ITEM_DONTCARE ) { // #86265# select entry using list and polygon, not string bool bSelected(false); - const basegfx::B2DPolyPolygon& rItemPolygon = ((const XLineEndItem&)rAttrs.Get(XATTR_LINEEND)).GetLineEndValue(); + const basegfx::B2DPolyPolygon& rItemPolygon = ((const XLineEndItem&)rAttrs->Get(XATTR_LINEEND)).GetLineEndValue(); for(sal_Int32 a(0);!bSelected && a < pLineEndList->Count(); a++) { @@ -1327,43 +1327,43 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs ) } // Line start strength - if( bObjSelected && rAttrs.GetItemState( XATTR_LINESTARTWIDTH ) == SFX_ITEM_DEFAULT ) + if( bObjSelected && rAttrs->GetItemState( XATTR_LINESTARTWIDTH ) == SFX_ITEM_DEFAULT ) { m_pMtrStartWidth->Disable(); } - else if( rAttrs.GetItemState( XATTR_LINESTARTWIDTH ) != SFX_ITEM_DONTCARE ) + else if( rAttrs->GetItemState( XATTR_LINESTARTWIDTH ) != SFX_ITEM_DONTCARE ) { SetMetricValue( *m_pMtrStartWidth, - ( ( const XLineStartWidthItem& ) rAttrs.Get( XATTR_LINESTARTWIDTH ) ).GetValue(), + ( ( const XLineStartWidthItem& ) rAttrs->Get( XATTR_LINESTARTWIDTH ) ).GetValue(), ePoolUnit ); } else m_pMtrStartWidth->SetText( "" ); // Line end strength - if( bObjSelected && rAttrs.GetItemState( XATTR_LINEENDWIDTH ) == SFX_ITEM_DEFAULT ) + if( bObjSelected && rAttrs->GetItemState( XATTR_LINEENDWIDTH ) == SFX_ITEM_DEFAULT ) { m_pMtrEndWidth->Disable(); } - else if( rAttrs.GetItemState( XATTR_LINEENDWIDTH ) != SFX_ITEM_DONTCARE ) + else if( rAttrs->GetItemState( XATTR_LINEENDWIDTH ) != SFX_ITEM_DONTCARE ) { SetMetricValue( *m_pMtrEndWidth, - ( ( const XLineEndWidthItem& ) rAttrs.Get( XATTR_LINEENDWIDTH ) ).GetValue(), + ( ( const XLineEndWidthItem& ) rAttrs->Get( XATTR_LINEENDWIDTH ) ).GetValue(), ePoolUnit ); } else m_pMtrEndWidth->SetText( "" ); // Centered line end (start) - if( bObjSelected && rAttrs.GetItemState( XATTR_LINESTARTCENTER ) == SFX_ITEM_DEFAULT ) + if( bObjSelected && rAttrs->GetItemState( XATTR_LINESTARTCENTER ) == SFX_ITEM_DEFAULT ) { m_pTsbCenterStart->Disable(); } - else if( rAttrs.GetItemState( XATTR_LINESTARTCENTER ) != SFX_ITEM_DONTCARE ) + else if( rAttrs->GetItemState( XATTR_LINESTARTCENTER ) != SFX_ITEM_DONTCARE ) { m_pTsbCenterStart->EnableTriState( false ); - if( ( ( const XLineStartCenterItem& ) rAttrs.Get( XATTR_LINESTARTCENTER ) ).GetValue() ) + if( ( ( const XLineStartCenterItem& ) rAttrs->Get( XATTR_LINESTARTCENTER ) ).GetValue() ) m_pTsbCenterStart->SetState( TRISTATE_TRUE ); else m_pTsbCenterStart->SetState( TRISTATE_FALSE ); @@ -1374,15 +1374,15 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs ) } // Centered line end (end) - if( bObjSelected && rAttrs.GetItemState( XATTR_LINEENDCENTER ) == SFX_ITEM_DEFAULT ) + if( bObjSelected && rAttrs->GetItemState( XATTR_LINEENDCENTER ) == SFX_ITEM_DEFAULT ) { m_pTsbCenterEnd->Disable(); } - else if( rAttrs.GetItemState( XATTR_LINEENDCENTER ) != SFX_ITEM_DONTCARE ) + else if( rAttrs->GetItemState( XATTR_LINEENDCENTER ) != SFX_ITEM_DONTCARE ) { m_pTsbCenterEnd->EnableTriState( false ); - if( ( ( const XLineEndCenterItem& ) rAttrs.Get( XATTR_LINEENDCENTER ) ).GetValue() ) + if( ( ( const XLineEndCenterItem& ) rAttrs->Get( XATTR_LINEENDCENTER ) ).GetValue() ) m_pTsbCenterEnd->SetState( TRISTATE_TRUE ); else m_pTsbCenterEnd->SetState( TRISTATE_FALSE ); @@ -1393,9 +1393,9 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs ) } // Transparency - if( rAttrs.GetItemState( XATTR_LINETRANSPARENCE ) != SFX_ITEM_DONTCARE ) + if( rAttrs->GetItemState( XATTR_LINETRANSPARENCE ) != SFX_ITEM_DONTCARE ) { - sal_uInt16 nTransp = ( ( const XLineTransparenceItem& ) rAttrs.Get( XATTR_LINETRANSPARENCE ) ).GetValue(); + sal_uInt16 nTransp = ( ( const XLineTransparenceItem& ) rAttrs->Get( XATTR_LINETRANSPARENCE ) ).GetValue(); m_pMtrTransparent->SetValue( nTransp ); ChangeTransparentHdl_Impl( NULL ); } @@ -1419,14 +1419,14 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs ) m_pCbxSynchronize->Check( aStr.toInt32() != 0 ); // #116827# - if(bObjSelected && SFX_ITEM_DEFAULT == rAttrs.GetItemState(XATTR_LINEJOINT)) + if(bObjSelected && SFX_ITEM_DEFAULT == rAttrs->GetItemState(XATTR_LINEJOINT)) { // maFTEdgeStyle.Disable(); m_pLBEdgeStyle->Disable(); } - else if(SFX_ITEM_DONTCARE != rAttrs.GetItemState(XATTR_LINEJOINT)) + else if(SFX_ITEM_DONTCARE != rAttrs->GetItemState(XATTR_LINEJOINT)) { - const com::sun::star::drawing::LineJoint eLineJoint = ((const XLineJointItem&)(rAttrs.Get(XATTR_LINEJOINT))).GetValue(); + const com::sun::star::drawing::LineJoint eLineJoint = ((const XLineJointItem&)(rAttrs->Get(XATTR_LINEJOINT))).GetValue(); switch(eLineJoint) { @@ -1444,14 +1444,14 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs ) } // fdo#43209 - if(bObjSelected && SFX_ITEM_DEFAULT == rAttrs.GetItemState(XATTR_LINECAP)) + if(bObjSelected && SFX_ITEM_DEFAULT == rAttrs->GetItemState(XATTR_LINECAP)) { // maFTCapStyle.Disable(); m_pLBCapStyle->Disable(); } - else if(SFX_ITEM_DONTCARE != rAttrs.GetItemState(XATTR_LINECAP)) + else if(SFX_ITEM_DONTCARE != rAttrs->GetItemState(XATTR_LINECAP)) { - const com::sun::star::drawing::LineCap eLineCap(((const XLineCapItem&)(rAttrs.Get(XATTR_LINECAP))).GetValue()); + const com::sun::star::drawing::LineCap eLineCap(((const XLineCapItem&)(rAttrs->Get(XATTR_LINECAP))).GetValue()); switch(eLineCap) { diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx index 2365b0cb2808..96ee9dcb3e44 100644 --- a/cui/source/tabpages/tplnedef.cxx +++ b/cui/source/tabpages/tplnedef.cxx @@ -275,11 +275,11 @@ bool SvxLineDefTabPage::FillItemSet( SfxItemSet* rAttrs ) -void SvxLineDefTabPage::Reset( const SfxItemSet& rAttrs ) +void SvxLineDefTabPage::Reset( const SfxItemSet* rAttrs ) { - if( rAttrs.GetItemState( GetWhich( XATTR_LINESTYLE ) ) != SFX_ITEM_DONTCARE ) + if( rAttrs->GetItemState( GetWhich( XATTR_LINESTYLE ) ) != SFX_ITEM_DONTCARE ) { - XLineStyle eXLS = (XLineStyle) ( ( const XLineStyleItem& ) rAttrs.Get( GetWhich( XATTR_LINESTYLE ) ) ).GetValue(); + XLineStyle eXLS = (XLineStyle) ( ( const XLineStyleItem& ) rAttrs->Get( GetWhich( XATTR_LINESTYLE ) ) ).GetValue(); switch( eXLS ) { @@ -290,7 +290,7 @@ void SvxLineDefTabPage::Reset( const SfxItemSet& rAttrs ) case XLINE_DASH: { - const XLineDashItem& rDashItem = ( const XLineDashItem& ) rAttrs.Get( XATTR_LINEDASH ); + const XLineDashItem& rDashItem = ( const XLineDashItem& ) rAttrs->Get( XATTR_LINEDASH ); aDash = rDashItem.GetDashValue(); m_pLbLineStyles->SetNoSelection(); @@ -759,7 +759,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickLoadHdl_Impl) m_pLbLineStyles->Clear(); m_pLbLineStyles->Fill( pDashList ); - Reset( rOutAttrs ); + Reset( &rOutAttrs ); pDashList->SetName( aURL.getName() ); diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx index 243f43ed73d5..e973209f8e24 100644 --- a/cui/source/tabpages/tplneend.cxx +++ b/cui/source/tabpages/tplneend.cxx @@ -225,7 +225,7 @@ bool SvxLineEndDefTabPage::FillItemSet( SfxItemSet* rSet ) -void SvxLineEndDefTabPage::Reset( const SfxItemSet& ) +void SvxLineEndDefTabPage::Reset( const SfxItemSet* ) { m_pLbLineEnds->SelectEntryPos( 0 ); @@ -578,7 +578,7 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickLoadHdl_Impl) ( (SvxLineTabDialog*) GetParentDialog() )->SetNewLineEndList( pLineEndList ); m_pLbLineEnds->Clear(); m_pLbLineEnds->Fill( pLineEndList ); - Reset( rOutAttrs ); + Reset( &rOutAttrs ); pLineEndList->SetName( aURL.getName() ); diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx index 68119d537025..a2ff8285b09f 100644 --- a/cui/source/tabpages/tpshadow.cxx +++ b/cui/source/tabpages/tpshadow.cxx @@ -353,7 +353,7 @@ bool SvxShadowTabPage::FillItemSet( SfxItemSet* rAttrs ) -void SvxShadowTabPage::Reset( const SfxItemSet& rAttrs ) +void SvxShadowTabPage::Reset( const SfxItemSet* rAttrs ) { if( !bDisable ) { @@ -361,11 +361,11 @@ void SvxShadowTabPage::Reset( const SfxItemSet& rAttrs ) // at the moment there are only 8 possible positions where a shadow can be set // has a shadow been set? - if( rAttrs.GetItemState( SDRATTR_SHADOW ) != SFX_ITEM_DONTCARE ) + if( rAttrs->GetItemState( SDRATTR_SHADOW ) != SFX_ITEM_DONTCARE ) { m_pTsbShowShadow->EnableTriState( false ); - if( ( ( const SdrShadowItem& ) rAttrs.Get( SDRATTR_SHADOW ) ).GetValue() ) + if( ( ( const SdrShadowItem& ) rAttrs->Get( SDRATTR_SHADOW ) ).GetValue() ) m_pTsbShowShadow->SetState( TRISTATE_TRUE ); else { @@ -378,11 +378,11 @@ void SvxShadowTabPage::Reset( const SfxItemSet& rAttrs ) // distance (only 8 possible positions), // so there is only one item evaluated - if( rAttrs.GetItemState( SDRATTR_SHADOWXDIST ) != SFX_ITEM_DONTCARE && - rAttrs.GetItemState( SDRATTR_SHADOWYDIST ) != SFX_ITEM_DONTCARE ) + if( rAttrs->GetItemState( SDRATTR_SHADOWXDIST ) != SFX_ITEM_DONTCARE && + rAttrs->GetItemState( SDRATTR_SHADOWYDIST ) != SFX_ITEM_DONTCARE ) { - sal_Int32 nX = ( ( const SdrShadowXDistItem& ) rAttrs.Get( SDRATTR_SHADOWXDIST ) ).GetValue(); - sal_Int32 nY = ( ( const SdrShadowYDistItem& ) rAttrs.Get( SDRATTR_SHADOWYDIST ) ).GetValue(); + sal_Int32 nX = ( ( const SdrShadowXDistItem& ) rAttrs->Get( SDRATTR_SHADOWXDIST ) ).GetValue(); + sal_Int32 nY = ( ( const SdrShadowYDistItem& ) rAttrs->Get( SDRATTR_SHADOWYDIST ) ).GetValue(); if( nX != 0 ) SetMetricValue( *m_pMtrDistance, nX < 0L ? -nX : nX, ePoolUnit ); @@ -424,16 +424,16 @@ void SvxShadowTabPage::Reset( const SfxItemSet& rAttrs ) m_pCtlPosition->SetActualRP( RP_MM ); } - if( rAttrs.GetItemState( SDRATTR_SHADOWCOLOR ) != SFX_ITEM_DONTCARE ) + if( rAttrs->GetItemState( SDRATTR_SHADOWCOLOR ) != SFX_ITEM_DONTCARE ) { - m_pLbShadowColor->SelectEntry( ( ( const SdrShadowColorItem& ) rAttrs.Get( SDRATTR_SHADOWCOLOR ) ).GetColorValue() ); + m_pLbShadowColor->SelectEntry( ( ( const SdrShadowColorItem& ) rAttrs->Get( SDRATTR_SHADOWCOLOR ) ).GetColorValue() ); } else m_pLbShadowColor->SetNoSelection(); - if( rAttrs.GetItemState( SDRATTR_SHADOWTRANSPARENCE ) != SFX_ITEM_DONTCARE ) + if( rAttrs->GetItemState( SDRATTR_SHADOWTRANSPARENCE ) != SFX_ITEM_DONTCARE ) { - sal_uInt16 nTransp = ( ( const SdrShadowTransparenceItem& ) rAttrs.Get( SDRATTR_SHADOWTRANSPARENCE ) ).GetValue(); + sal_uInt16 nTransp = ( ( const SdrShadowTransparenceItem& ) rAttrs->Get( SDRATTR_SHADOWTRANSPARENCE ) ).GetValue(); m_pMtrTransparent->SetValue( nTransp ); } else diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx index 6f680cccc34a..c11f012dcd83 100644 --- a/cui/source/tabpages/transfrm.cxx +++ b/cui/source/tabpages/transfrm.cxx @@ -291,11 +291,11 @@ bool SvxAngleTabPage::FillItemSet(SfxItemSet* rSet) -void SvxAngleTabPage::Reset(const SfxItemSet& rAttrs) +void SvxAngleTabPage::Reset(const SfxItemSet* rAttrs) { const double fUIScale(double(pView->GetModel()->GetUIScale())); - const SfxPoolItem* pItem = GetItem( rAttrs, SID_ATTR_TRANSFORM_ROT_X ); + const SfxPoolItem* pItem = GetItem( *rAttrs, SID_ATTR_TRANSFORM_ROT_X ); if(pItem) { const double fTmp(((double)((const SfxInt32Item*)pItem)->GetValue() - maAnchor.getX()) / fUIScale); @@ -306,7 +306,7 @@ void SvxAngleTabPage::Reset(const SfxItemSet& rAttrs) m_pMtrPosX->SetText( OUString() ); } - pItem = GetItem(rAttrs, SID_ATTR_TRANSFORM_ROT_Y); + pItem = GetItem(*rAttrs, SID_ATTR_TRANSFORM_ROT_Y); if(pItem) { const double fTmp(((double)((const SfxInt32Item*)pItem)->GetValue() - maAnchor.getY()) / fUIScale); @@ -317,7 +317,7 @@ void SvxAngleTabPage::Reset(const SfxItemSet& rAttrs) m_pMtrPosY->SetText( OUString() ); } - pItem = GetItem( rAttrs, SID_ATTR_TRANSFORM_ANGLE ); + pItem = GetItem( *rAttrs, SID_ATTR_TRANSFORM_ANGLE ); if(pItem) { m_pCtlAngle->SetRotation(((const SfxInt32Item*)pItem)->GetValue()); @@ -511,7 +511,7 @@ bool SvxSlantTabPage::FillItemSet(SfxItemSet* rAttrs) -void SvxSlantTabPage::Reset(const SfxItemSet& rAttrs) +void SvxSlantTabPage::Reset(const SfxItemSet* rAttrs) { // if the view has selected objects, items with SFX_ITEM_DEFAULT need to be disabled const SfxPoolItem* pItem; @@ -524,7 +524,7 @@ void SvxSlantTabPage::Reset(const SfxItemSet& rAttrs) } else { - pItem = GetItem( rAttrs, SDRATTR_ECKENRADIUS ); + pItem = GetItem( *rAttrs, SDRATTR_ECKENRADIUS ); if( pItem ) { @@ -548,7 +548,7 @@ void SvxSlantTabPage::Reset(const SfxItemSet& rAttrs) } else { - pItem = GetItem( rAttrs, SID_ATTR_TRANSFORM_SHEAR ); + pItem = GetItem( *rAttrs, SID_ATTR_TRANSFORM_SHEAR ); if( pItem ) { @@ -897,7 +897,7 @@ bool SvxPositionSizeTabPage::FillItemSet( SfxItemSet* rOutAttrs ) -void SvxPositionSizeTabPage::Reset( const SfxItemSet& ) +void SvxPositionSizeTabPage::Reset( const SfxItemSet* ) { const SfxPoolItem* pItem; const double fUIScale(double(mpView->GetModel()->GetUIScale())); diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx index 5f62953bb30d..238c7fc29bd7 100644 --- a/dbaccess/source/ui/dlg/adminpages.cxx +++ b/dbaccess/source/ui/dlg/adminpages.cxx @@ -98,9 +98,9 @@ namespace dbaui return LEAVE_PAGE; } - void OGenericAdministrationPage::Reset(const SfxItemSet& _rCoreAttrs) + void OGenericAdministrationPage::Reset(const SfxItemSet* _rCoreAttrs) { - implInitControls(_rCoreAttrs, false); + implInitControls(*_rCoreAttrs, false); } void OGenericAdministrationPage::ActivatePage() { @@ -181,7 +181,7 @@ namespace dbaui { OSL_ENSURE(m_pItemSetHelper,"NO ItemSetHelper set!"); if ( m_pItemSetHelper ) - Reset(*m_pItemSetHelper->getOutputSet()); + Reset(m_pItemSetHelper->getOutputSet()); } bool OGenericAdministrationPage::commitPage( ::svt::WizardTypes::CommitPageReason ) { diff --git a/dbaccess/source/ui/dlg/adminpages.hxx b/dbaccess/source/ui/dlg/adminpages.hxx index 667a7a4683e0..846c0286dbab 100644 --- a/dbaccess/source/ui/dlg/adminpages.hxx +++ b/dbaccess/source/ui/dlg/adminpages.hxx @@ -156,7 +156,7 @@ namespace dbaui virtual int DeactivatePage(SfxItemSet* pSet) SAL_OVERRIDE; using SfxTabPage::DeactivatePage; /// default implementation: call implInitControls with the given item set and _bSaveValue = sal_False - virtual void Reset(const SfxItemSet& _rCoreAttrs) SAL_OVERRIDE; + virtual void Reset(const SfxItemSet* _rCoreAttrs) SAL_OVERRIDE; /// default implementation: call implInitControls with the given item set and _bSaveValue = sal_True virtual void ActivatePage(const SfxItemSet& _rSet) SAL_OVERRIDE; diff --git a/dbaccess/source/ui/dlg/dbadmin.cxx b/dbaccess/source/ui/dlg/dbadmin.cxx index 4c38561879f6..773a86d577dd 100644 --- a/dbaccess/source/ui/dlg/dbadmin.cxx +++ b/dbaccess/source/ui/dlg/dbadmin.cxx @@ -209,7 +209,7 @@ void ODbAdminDialog::impl_resetPages(const Reference< XPropertySet >& _rxDatasou ShowPage( m_nMainPageID ); SfxTabPage* pConnectionPage = GetTabPage( m_nMainPageID ); if ( pConnectionPage ) - pConnectionPage->Reset(*GetInputSetImpl()); + pConnectionPage->Reset(GetInputSetImpl()); // if this is NULL, the page has not been created yet, which means we're called before the // dialog was displayed (probably from inside the ctor) diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx index b4b24832b61c..704c503efa65 100644 --- a/dbaccess/source/ui/dlg/generalpage.cxx +++ b/dbaccess/source/ui/dlg/generalpage.cxx @@ -390,7 +390,7 @@ namespace dbaui m_eCurrentSelection = _eType; } - void OGeneralPage::Reset(const SfxItemSet& _rCoreAttrs) + void OGeneralPage::Reset(const SfxItemSet* _rCoreAttrs) { // reset all locale data implSetCurrentType( OUString() ); diff --git a/dbaccess/source/ui/dlg/generalpage.hxx b/dbaccess/source/ui/dlg/generalpage.hxx index 48f5b6d01741..9060a3b3a417 100644 --- a/dbaccess/source/ui/dlg/generalpage.hxx +++ b/dbaccess/source/ui/dlg/generalpage.hxx @@ -74,7 +74,7 @@ namespace dbaui protected: // SfxTabPage overridables - virtual void Reset( const SfxItemSet& _rCoreAttrs ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; virtual void implInitControls( const SfxItemSet& _rSet, bool _bSaveValue ) SAL_OVERRIDE; virtual OUString getDatasourceName( const SfxItemSet& _rSet ); diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx index a2af178fb6c6..932b0c2486e9 100644 --- a/include/sfx2/dinfdlg.hxx +++ b/include/sfx2/dinfdlg.hxx @@ -220,7 +220,7 @@ protected: SfxDocumentPage( Window* pParent, const SfxItemSet& ); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE; public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& ); @@ -243,7 +243,7 @@ protected: SfxDocumentDescPage( Window* pParent, const SfxItemSet& ); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE; public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& ); @@ -507,7 +507,7 @@ protected: SfxCustomPropertiesPage( Window* pParent, const SfxItemSet& ); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; public: @@ -629,7 +629,7 @@ protected: SfxCmisPropertiesPage( Window* pParent, const SfxItemSet& ); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; public: diff --git a/include/sfx2/mgetempl.hxx b/include/sfx2/mgetempl.hxx index 66d1cd2773d3..4cbbfaf2825e 100644 --- a/include/sfx2/mgetempl.hxx +++ b/include/sfx2/mgetempl.hxx @@ -80,7 +80,7 @@ friend class SfxStyleDialog; protected: virtual bool FillItemSet(SfxItemSet *) SAL_OVERRIDE; - virtual void Reset(const SfxItemSet &) SAL_OVERRIDE; + virtual void Reset(const SfxItemSet *) SAL_OVERRIDE; using TabPage::ActivatePage; virtual void ActivatePage(const SfxItemSet &) SAL_OVERRIDE; diff --git a/include/sfx2/printopt.hxx b/include/sfx2/printopt.hxx index 629b5ad080ee..3678d7bced67 100644 --- a/include/sfx2/printopt.hxx +++ b/include/sfx2/printopt.hxx @@ -97,7 +97,7 @@ public: virtual ~SfxCommonPrintOptionsTabPage(); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; virtual Window* GetParentLabeledBy( const Window* pLabel ) const SAL_OVERRIDE; virtual Window* GetParentLabelFor( const Window* pLabel ) const SAL_OVERRIDE; diff --git a/include/sfx2/securitypage.hxx b/include/sfx2/securitypage.hxx index aeac0ee6a541..5544b9f932a4 100644 --- a/include/sfx2/securitypage.hxx +++ b/include/sfx2/securitypage.hxx @@ -37,7 +37,7 @@ protected: virtual ~SfxSecurityPage(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE; public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& ); diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx index 34f5ef02a50a..118698991285 100644 --- a/include/sfx2/tabdlg.hxx +++ b/include/sfx2/tabdlg.hxx @@ -259,7 +259,7 @@ public: const SfxItemSet& GetItemSet() const { return *pSet; } virtual bool FillItemSet( SfxItemSet* ); - virtual void Reset( const SfxItemSet& ); + virtual void Reset( const SfxItemSet* ); bool HasExchangeSupport() const { return bHasExchangeSupport; } diff --git a/include/svx/hdft.hxx b/include/svx/hdft.hxx index 632b64c1d779..5333af98a717 100644 --- a/include/svx/hdft.hxx +++ b/include/svx/hdft.hxx @@ -45,7 +45,7 @@ class SVX_DLLPUBLIC SvxHFPage: public SfxTabPage public: virtual bool FillItemSet( SfxItemSet* rOutSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; virtual ~SvxHFPage(); diff --git a/include/svx/optgrid.hxx b/include/svx/optgrid.hxx index aad434ba93cb..0d15690f0ee9 100644 --- a/include/svx/optgrid.hxx +++ b/include/svx/optgrid.hxx @@ -105,7 +105,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; diff --git a/sc/source/ui/attrdlg/tabpages.cxx b/sc/source/ui/attrdlg/tabpages.cxx index d03198ad899c..2df9dedf9e06 100644 --- a/sc/source/ui/attrdlg/tabpages.cxx +++ b/sc/source/ui/attrdlg/tabpages.cxx @@ -73,18 +73,18 @@ SfxTabPage* ScTabPageProtection::Create( Window* pParent, const SfxItemSet& rAtt return ( new ScTabPageProtection( pParent, rAttrSet ) ); } -void ScTabPageProtection::Reset( const SfxItemSet& rCoreAttrs ) +void ScTabPageProtection::Reset( const SfxItemSet* rCoreAttrs ) { // Initialize variables sal_uInt16 nWhich = GetWhich( SID_SCATTR_PROTECTION ); const ScProtectionAttr* pProtAttr = NULL; - SfxItemState eItemState = rCoreAttrs.GetItemState( nWhich, false, + SfxItemState eItemState = rCoreAttrs->GetItemState( nWhich, false, (const SfxPoolItem**)&pProtAttr ); // Is this a Default-Item? if ( eItemState == SFX_ITEM_DEFAULT ) - pProtAttr = (const ScProtectionAttr*)&(rCoreAttrs.Get(nWhich)); + pProtAttr = (const ScProtectionAttr*)&(rCoreAttrs->Get(nWhich)); // At SFX_ITEM_DONTCARE let to 0 bTriEnabled = ( pProtAttr == NULL ); // TriState, when DontCare diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx index d87aa1a81185..aec819c06a9e 100644 --- a/sc/source/ui/dbgui/tpsort.cxx +++ b/sc/source/ui/dbgui/tpsort.cxx @@ -142,7 +142,7 @@ SfxTabPage* ScTabPageSortFields::Create( Window* pParent, return ( new ScTabPageSortFields( pParent, rArgSet ) ); } -void ScTabPageSortFields::Reset( const SfxItemSet& /* rArgSet */ ) +void ScTabPageSortFields::Reset( const SfxItemSet* /* rArgSet */ ) { bSortByRows = aSortData.bByRow; bHasHeader = aSortData.bHasHeader; @@ -621,7 +621,7 @@ SfxTabPage* ScTabPageSortOptions::Create( return ( new ScTabPageSortOptions( pParent, rArgSet ) ); } -void ScTabPageSortOptions::Reset( const SfxItemSet& /* rArgSet */ ) +void ScTabPageSortOptions::Reset( const SfxItemSet* /* rArgSet */ ) { if ( aSortData.bUserDef ) { diff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxx index d76bc51992a2..086c3c794eb4 100644 --- a/sc/source/ui/dbgui/tpsubt.cxx +++ b/sc/source/ui/dbgui/tpsubt.cxx @@ -407,10 +407,10 @@ ScTpSubTotalGroup3::ScTpSubTotalGroup3( Window* pParent, const SfxItemSet& rArgS {} -#define RESET(i) (ScTpSubTotalGroup::DoReset( (i), rArgSet )) -void ScTpSubTotalGroup1::Reset( const SfxItemSet& rArgSet ) { RESET(1); } -void ScTpSubTotalGroup2::Reset( const SfxItemSet& rArgSet ) { RESET(2); } -void ScTpSubTotalGroup3::Reset( const SfxItemSet& rArgSet ) { RESET(3); } +#define RESET(i) (ScTpSubTotalGroup::DoReset( (i), *rArgSet )) +void ScTpSubTotalGroup1::Reset( const SfxItemSet* rArgSet ) { RESET(1); } +void ScTpSubTotalGroup2::Reset( const SfxItemSet* rArgSet ) { RESET(2); } +void ScTpSubTotalGroup3::Reset( const SfxItemSet* rArgSet ) { RESET(3); } #undef RESET #define FILLSET(i) (ScTpSubTotalGroup::DoFillItemSet( (i), *rArgSet )) @@ -474,7 +474,7 @@ SfxTabPage* ScTpSubTotalOptions::Create( Window* pParent, return ( new ScTpSubTotalOptions( pParent, rArgSet ) ); } -void ScTpSubTotalOptions::Reset( const SfxItemSet& /* rArgSet */ ) +void ScTpSubTotalOptions::Reset( const SfxItemSet* /* rArgSet */ ) { pBtnPagebreak->Check ( rSubTotalData.bPagebreak ); pBtnCase->Check ( rSubTotalData.bCaseSens ); diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx index 19708bff48b7..c59155ec8e66 100644 --- a/sc/source/ui/dbgui/validate.cxx +++ b/sc/source/ui/dbgui/validate.cxx @@ -385,42 +385,42 @@ const sal_uInt16* ScTPValidationValue::GetRanges() return pValueRanges; } -void ScTPValidationValue::Reset( const SfxItemSet& rArgSet ) +void ScTPValidationValue::Reset( const SfxItemSet* rArgSet ) { const SfxPoolItem* pItem; sal_uInt16 nLbPos = SC_VALIDDLG_ALLOW_ANY; - if( rArgSet.GetItemState( FID_VALID_MODE, true, &pItem ) == SFX_ITEM_SET ) + if( rArgSet->GetItemState( FID_VALID_MODE, true, &pItem ) == SFX_ITEM_SET ) nLbPos = lclGetPosFromValMode( static_cast< ScValidationMode >( static_cast< const SfxAllEnumItem* >( pItem )->GetValue() ) ); m_pLbAllow->SelectEntryPos( nLbPos ); nLbPos = SC_VALIDDLG_DATA_EQUAL; - if( rArgSet.GetItemState( FID_VALID_CONDMODE, true, &pItem ) == SFX_ITEM_SET ) + if( rArgSet->GetItemState( FID_VALID_CONDMODE, true, &pItem ) == SFX_ITEM_SET ) nLbPos = lclGetPosFromCondMode( static_cast< ScConditionMode >( static_cast< const SfxAllEnumItem* >( pItem )->GetValue() ) ); m_pLbValue->SelectEntryPos( nLbPos ); // *** check boxes *** bool bCheck = true; - if( rArgSet.GetItemState( FID_VALID_BLANK, true, &pItem ) == SFX_ITEM_SET ) + if( rArgSet->GetItemState( FID_VALID_BLANK, true, &pItem ) == SFX_ITEM_SET ) bCheck = static_cast< const SfxBoolItem* >( pItem )->GetValue(); m_pCbAllow->Check( bCheck ); sal_Int32 nListType = ValidListType::UNSORTED; - if( rArgSet.GetItemState( FID_VALID_LISTTYPE, true, &pItem ) == SFX_ITEM_SET ) + if( rArgSet->GetItemState( FID_VALID_LISTTYPE, true, &pItem ) == SFX_ITEM_SET ) nListType = static_cast< const SfxInt16Item* >( pItem )->GetValue(); m_pCbShow->Check( nListType != ValidListType::INVISIBLE ); m_pCbSort->Check( nListType == ValidListType::SORTEDASCENDING ); // *** formulas *** OUString aFmlaStr; - if ( rArgSet.GetItemState( FID_VALID_VALUE1, true, &pItem ) == SFX_ITEM_SET ) + if ( rArgSet->GetItemState( FID_VALID_VALUE1, true, &pItem ) == SFX_ITEM_SET ) aFmlaStr = static_cast< const SfxStringItem* >( pItem )->GetValue(); SetFirstFormula( aFmlaStr ); aFmlaStr= ""; - if ( rArgSet.GetItemState( FID_VALID_VALUE2, true, &pItem ) == SFX_ITEM_SET ) + if ( rArgSet->GetItemState( FID_VALID_VALUE2, true, &pItem ) == SFX_ITEM_SET ) aFmlaStr = static_cast< const SfxStringItem* >( pItem )->GetValue(); SetSecondFormula( aFmlaStr ); @@ -677,21 +677,21 @@ SfxTabPage* ScTPValidationHelp::Create( Window* pParent, return ( new ScTPValidationHelp( pParent, rArgSet ) ); } -void ScTPValidationHelp::Reset( const SfxItemSet& rArgSet ) +void ScTPValidationHelp::Reset( const SfxItemSet* rArgSet ) { const SfxPoolItem* pItem; - if ( rArgSet.GetItemState( FID_VALID_SHOWHELP, true, &pItem ) == SFX_ITEM_SET ) + if ( rArgSet->GetItemState( FID_VALID_SHOWHELP, true, &pItem ) == SFX_ITEM_SET ) pTsbHelp->SetState( ((const SfxBoolItem*)pItem)->GetValue() ? TRISTATE_TRUE : TRISTATE_FALSE ); else pTsbHelp->SetState( TRISTATE_FALSE ); - if ( rArgSet.GetItemState( FID_VALID_HELPTITLE, true, &pItem ) == SFX_ITEM_SET ) + if ( rArgSet->GetItemState( FID_VALID_HELPTITLE, true, &pItem ) == SFX_ITEM_SET ) pEdtTitle->SetText( ((const SfxStringItem*)pItem)->GetValue() ); else pEdtTitle->SetText( EMPTY_OUSTRING ); - if ( rArgSet.GetItemState( FID_VALID_HELPTEXT, true, &pItem ) == SFX_ITEM_SET ) + if ( rArgSet->GetItemState( FID_VALID_HELPTEXT, true, &pItem ) == SFX_ITEM_SET ) pEdInputHelp->SetText( ((const SfxStringItem*)pItem)->GetValue() ); else pEdInputHelp->SetText( EMPTY_OUSTRING ); @@ -747,26 +747,26 @@ SfxTabPage* ScTPValidationError::Create( Window* pParent, return ( new ScTPValidationError( pParent, rArgSet ) ); } -void ScTPValidationError::Reset( const SfxItemSet& rArgSet ) +void ScTPValidationError::Reset( const SfxItemSet* rArgSet ) { const SfxPoolItem* pItem; - if ( rArgSet.GetItemState( FID_VALID_SHOWERR, true, &pItem ) == SFX_ITEM_SET ) + if ( rArgSet->GetItemState( FID_VALID_SHOWERR, true, &pItem ) == SFX_ITEM_SET ) m_pTsbShow->SetState( ((const SfxBoolItem*)pItem)->GetValue() ? TRISTATE_TRUE : TRISTATE_FALSE ); else m_pTsbShow->SetState( TRISTATE_TRUE ); // check by default - if ( rArgSet.GetItemState( FID_VALID_ERRSTYLE, true, &pItem ) == SFX_ITEM_SET ) + if ( rArgSet->GetItemState( FID_VALID_ERRSTYLE, true, &pItem ) == SFX_ITEM_SET ) m_pLbAction->SelectEntryPos( ((const SfxAllEnumItem*)pItem)->GetValue() ); else m_pLbAction->SelectEntryPos( 0 ); - if ( rArgSet.GetItemState( FID_VALID_ERRTITLE, true, &pItem ) == SFX_ITEM_SET ) + if ( rArgSet->GetItemState( FID_VALID_ERRTITLE, true, &pItem ) == SFX_ITEM_SET ) m_pEdtTitle->SetText( ((const SfxStringItem*)pItem)->GetValue() ); else m_pEdtTitle->SetText( EMPTY_OUSTRING ); - if ( rArgSet.GetItemState( FID_VALID_ERRTEXT, true, &pItem ) == SFX_ITEM_SET ) + if ( rArgSet->GetItemState( FID_VALID_ERRTEXT, true, &pItem ) == SFX_ITEM_SET ) m_pEdError->SetText( ((const SfxStringItem*)pItem)->GetValue() ); else m_pEdError->SetText( EMPTY_OUSTRING ); diff --git a/sc/source/ui/docshell/tpstat.cxx b/sc/source/ui/docshell/tpstat.cxx index 1602531b7b36..35c28f8dcef7 100644 --- a/sc/source/ui/docshell/tpstat.cxx +++ b/sc/source/ui/docshell/tpstat.cxx @@ -65,7 +65,7 @@ bool ScDocStatPage::FillItemSet( SfxItemSet* /* rSet */ ) return false; } -void ScDocStatPage::Reset( const SfxItemSet& /* rSet */ ) +void ScDocStatPage::Reset( const SfxItemSet* /* rSet */ ) { } diff --git a/sc/source/ui/inc/opredlin.hxx b/sc/source/ui/inc/opredlin.hxx index 04da009d50cb..95eebca67341 100644 --- a/sc/source/ui/inc/opredlin.hxx +++ b/sc/source/ui/inc/opredlin.hxx @@ -52,7 +52,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; }; #endif diff --git a/sc/source/ui/inc/scuitphfedit.hxx b/sc/source/ui/inc/scuitphfedit.hxx index 758915aa2d15..58f6eab58a84 100644 --- a/sc/source/ui/inc/scuitphfedit.hxx +++ b/sc/source/ui/inc/scuitphfedit.hxx @@ -47,7 +47,7 @@ class ScHFEditPage : public SfxTabPage { public: virtual bool FillItemSet ( SfxItemSet* rCoreSet ) SAL_OVERRIDE; - virtual void Reset ( const SfxItemSet& rCoreSet ) SAL_OVERRIDE; + virtual void Reset ( const SfxItemSet* rCoreSet ) SAL_OVERRIDE; void SetNumType(SvxNumType eNumType); void ClearTextAreas(); diff --git a/sc/source/ui/inc/tabpages.hxx b/sc/source/ui/inc/tabpages.hxx index eed164d10da4..346489ffb056 100644 --- a/sc/source/ui/inc/tabpages.hxx +++ b/sc/source/ui/inc/tabpages.hxx @@ -31,7 +31,7 @@ public: const SfxItemSet& rAttrSet ); static const sal_uInt16* GetRanges (); virtual bool FillItemSet ( SfxItemSet* rCoreAttrs ) SAL_OVERRIDE; - virtual void Reset ( const SfxItemSet& ) SAL_OVERRIDE; + virtual void Reset ( const SfxItemSet* ) SAL_OVERRIDE; protected: using SfxTabPage::DeactivatePage; diff --git a/sc/source/ui/inc/tpcalc.hxx b/sc/source/ui/inc/tpcalc.hxx index fbc56eaf8159..9ddab8887fc8 100644 --- a/sc/source/ui/inc/tpcalc.hxx +++ b/sc/source/ui/inc/tpcalc.hxx @@ -36,7 +36,7 @@ public: static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rCoreSet ); virtual bool FillItemSet ( SfxItemSet* rCoreSet ) SAL_OVERRIDE; - virtual void Reset ( const SfxItemSet& rCoreSet ) SAL_OVERRIDE; + virtual void Reset ( const SfxItemSet* rCoreSet ) SAL_OVERRIDE; using SfxTabPage::DeactivatePage; virtual int DeactivatePage ( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; diff --git a/sc/source/ui/inc/tpcompatibility.hxx b/sc/source/ui/inc/tpcompatibility.hxx index f4ed342c43ef..9f594a1348d6 100644 --- a/sc/source/ui/inc/tpcompatibility.hxx +++ b/sc/source/ui/inc/tpcompatibility.hxx @@ -22,7 +22,7 @@ public: static SfxTabPage* Create (Window* pParent, const SfxItemSet& rCoreAttrs); virtual bool FillItemSet(SfxItemSet* rCoreAttrs) SAL_OVERRIDE; - virtual void Reset(const SfxItemSet& rCoreAttrs) SAL_OVERRIDE; + virtual void Reset(const SfxItemSet* rCoreAttrs) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet* pSet = NULL) SAL_OVERRIDE; private: diff --git a/sc/source/ui/inc/tpdefaults.hxx b/sc/source/ui/inc/tpdefaults.hxx index 7122263428d5..13340e5edd4d 100644 --- a/sc/source/ui/inc/tpdefaults.hxx +++ b/sc/source/ui/inc/tpdefaults.hxx @@ -22,7 +22,7 @@ public: static SfxTabPage* Create (Window* pParent, const SfxItemSet& rCoreSet); virtual bool FillItemSet(SfxItemSet* rCoreSet) SAL_OVERRIDE; - virtual void Reset(const SfxItemSet& rCoreSet) SAL_OVERRIDE; + virtual void Reset(const SfxItemSet* rCoreSet) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet* pSet = NULL) SAL_OVERRIDE; private: diff --git a/sc/source/ui/inc/tpformula.hxx b/sc/source/ui/inc/tpformula.hxx index 15352a5b6fce..e30c268d5ede 100644 --- a/sc/source/ui/inc/tpformula.hxx +++ b/sc/source/ui/inc/tpformula.hxx @@ -36,7 +36,7 @@ public: static SfxTabPage* Create (Window* pParent, const SfxItemSet& rCoreSet); virtual bool FillItemSet(SfxItemSet* rCoreSet) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rCoreSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rCoreSet ) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet* pSet = NULL) SAL_OVERRIDE; private: diff --git a/sc/source/ui/inc/tphf.hxx b/sc/source/ui/inc/tphf.hxx index 1061e4139128..7469cf52a852 100644 --- a/sc/source/ui/inc/tphf.hxx +++ b/sc/source/ui/inc/tphf.hxx @@ -29,7 +29,7 @@ class ScHFPage : public SvxHFPage public: virtual ~ScHFPage(); - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; virtual bool FillItemSet( SfxItemSet* rOutSet ) SAL_OVERRIDE; void SetPageStyle( const OUString& rName ) { aStrPageStyle = rName; } diff --git a/sc/source/ui/inc/tpprint.hxx b/sc/source/ui/inc/tpprint.hxx index 24ca945c5c35..c99f7b032b32 100644 --- a/sc/source/ui/inc/tpprint.hxx +++ b/sc/source/ui/inc/tpprint.hxx @@ -35,7 +35,7 @@ class ScTpPrintOptions : public SfxTabPage public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rCoreSet ); virtual bool FillItemSet( SfxItemSet* rCoreSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rCoreSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rCoreSet ) SAL_OVERRIDE; using SfxTabPage::DeactivatePage; virtual int DeactivatePage( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; }; diff --git a/sc/source/ui/inc/tpsort.hxx b/sc/source/ui/inc/tpsort.hxx index f654a88e4509..77533f8712d2 100644 --- a/sc/source/ui/inc/tpsort.hxx +++ b/sc/source/ui/inc/tpsort.hxx @@ -55,7 +55,7 @@ public: static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rArgSet ); virtual bool FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE; - virtual void Reset ( const SfxItemSet& rArgSet ) SAL_OVERRIDE; + virtual void Reset ( const SfxItemSet* rArgSet ) SAL_OVERRIDE; virtual void SetPosSizePixel(const Point& rAllocPos, const Size& rAllocation) SAL_OVERRIDE; virtual void SetSizePixel(const Size& rAllocation) SAL_OVERRIDE; @@ -117,7 +117,7 @@ public: static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rArgSet ); virtual bool FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE; - virtual void Reset ( const SfxItemSet& rArgSet ) SAL_OVERRIDE; + virtual void Reset ( const SfxItemSet* rArgSet ) SAL_OVERRIDE; protected: virtual void ActivatePage ( const SfxItemSet& rSet ) SAL_OVERRIDE; diff --git a/sc/source/ui/inc/tpstat.hxx b/sc/source/ui/inc/tpstat.hxx index 6b2c18fd0fcb..fb1fa0d3a011 100644 --- a/sc/source/ui/inc/tpstat.hxx +++ b/sc/source/ui/inc/tpstat.hxx @@ -38,7 +38,7 @@ private: protected: virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset ( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset ( const SfxItemSet* rSet ) SAL_OVERRIDE; private: FixedText* m_pFtTables; diff --git a/sc/source/ui/inc/tpsubt.hxx b/sc/source/ui/inc/tpsubt.hxx index f6d48d5b5d03..794cb9f7786c 100644 --- a/sc/source/ui/inc/tpsubt.hxx +++ b/sc/source/ui/inc/tpsubt.hxx @@ -85,7 +85,7 @@ public: static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rArgSet ); virtual bool FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE; - virtual void Reset ( const SfxItemSet& rArgSet ) SAL_OVERRIDE; + virtual void Reset ( const SfxItemSet* rArgSet ) SAL_OVERRIDE; }; class ScTpSubTotalGroup2 : public ScTpSubTotalGroup @@ -100,7 +100,7 @@ public: static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rArgSet ); virtual bool FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE; - virtual void Reset ( const SfxItemSet& rArgSet ) SAL_OVERRIDE; + virtual void Reset ( const SfxItemSet* rArgSet ) SAL_OVERRIDE; }; class ScTpSubTotalGroup3 : public ScTpSubTotalGroup @@ -115,7 +115,7 @@ public: static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rArgSet ); virtual bool FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE; - virtual void Reset ( const SfxItemSet& rArgSet ) SAL_OVERRIDE; + virtual void Reset ( const SfxItemSet* rArgSet ) SAL_OVERRIDE; }; class ScTpSubTotalOptions : public SfxTabPage @@ -130,7 +130,7 @@ public: static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rArgSet ); virtual bool FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE; - virtual void Reset ( const SfxItemSet& rArgSet ) SAL_OVERRIDE; + virtual void Reset ( const SfxItemSet* rArgSet ) SAL_OVERRIDE; private: CheckBox* pBtnPagebreak; diff --git a/sc/source/ui/inc/tptable.hxx b/sc/source/ui/inc/tptable.hxx index 9ea189edd6fb..d342b00e8d47 100644 --- a/sc/source/ui/inc/tptable.hxx +++ b/sc/source/ui/inc/tptable.hxx @@ -32,7 +32,7 @@ public: const SfxItemSet& rCoreSet ); static const sal_uInt16* GetRanges (); virtual bool FillItemSet ( SfxItemSet* rCoreSet ) SAL_OVERRIDE; - virtual void Reset ( const SfxItemSet& rCoreSet ) SAL_OVERRIDE; + virtual void Reset ( const SfxItemSet* rCoreSet ) SAL_OVERRIDE; using SfxTabPage::DeactivatePage; virtual int DeactivatePage ( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; virtual void DataChanged ( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; diff --git a/sc/source/ui/inc/tpusrlst.hxx b/sc/source/ui/inc/tpusrlst.hxx index 3c82200eb610..e5d2aff788d8 100644 --- a/sc/source/ui/inc/tpusrlst.hxx +++ b/sc/source/ui/inc/tpusrlst.hxx @@ -36,7 +36,7 @@ public: static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rAttrSet ); virtual bool FillItemSet ( SfxItemSet* rCoreAttrs ) SAL_OVERRIDE; - virtual void Reset ( const SfxItemSet& rCoreAttrs ) SAL_OVERRIDE; + virtual void Reset ( const SfxItemSet* rCoreAttrs ) SAL_OVERRIDE; using SfxTabPage::DeactivatePage; virtual int DeactivatePage ( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; diff --git a/sc/source/ui/inc/tpview.hxx b/sc/source/ui/inc/tpview.hxx index 02a6c6a5ba78..8f115e3c5f1d 100644 --- a/sc/source/ui/inc/tpview.hxx +++ b/sc/source/ui/inc/tpview.hxx @@ -72,7 +72,7 @@ public: static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rCoreSet ); virtual bool FillItemSet ( SfxItemSet* rCoreSet ) SAL_OVERRIDE; - virtual void Reset ( const SfxItemSet& rCoreSet ) SAL_OVERRIDE; + virtual void Reset ( const SfxItemSet* rCoreSet ) SAL_OVERRIDE; using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; @@ -120,7 +120,7 @@ public: static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rCoreSet ); virtual bool FillItemSet ( SfxItemSet* rCoreSet ) SAL_OVERRIDE; - virtual void Reset ( const SfxItemSet& rCoreSet ) SAL_OVERRIDE; + virtual void Reset ( const SfxItemSet* rCoreSet ) SAL_OVERRIDE; using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx index 183cf00a1e59..e496d779e771 100644 --- a/sc/source/ui/inc/validate.hxx +++ b/sc/source/ui/inc/validate.hxx @@ -183,7 +183,7 @@ public: static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* rArgSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rArgSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rArgSet ) SAL_OVERRIDE; private: void Init(); @@ -277,7 +277,7 @@ public: static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rArgSet ); virtual bool FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE; - virtual void Reset ( const SfxItemSet& rArgSet ) SAL_OVERRIDE; + virtual void Reset ( const SfxItemSet* rArgSet ) SAL_OVERRIDE; }; class ScTPValidationError : public SfxTabPage @@ -302,7 +302,7 @@ public: static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rArgSet ); virtual bool FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE; - virtual void Reset ( const SfxItemSet& rArgSet ) SAL_OVERRIDE; + virtual void Reset ( const SfxItemSet* rArgSet ) SAL_OVERRIDE; }; #endif // INCLUDED_SC_SOURCE_UI_INC_VALIDATE_HXX diff --git a/sc/source/ui/optdlg/opredlin.cxx b/sc/source/ui/optdlg/opredlin.cxx index 9caa442e2edf..7bf8636ffbc6 100644 --- a/sc/source/ui/optdlg/opredlin.cxx +++ b/sc/source/ui/optdlg/opredlin.cxx @@ -128,7 +128,7 @@ bool ScRedlineOptionsTabPage::FillItemSet( SfxItemSet* /* rSet */ ) return false; } -void ScRedlineOptionsTabPage::Reset( const SfxItemSet& /* rSet */ ) +void ScRedlineOptionsTabPage::Reset( const SfxItemSet* /* rSet */ ) { m_pContentColorLB->InsertEntry(aAuthorStr); m_pMoveColorLB->InsertEntry(aAuthorStr); diff --git a/sc/source/ui/optdlg/tpcalc.cxx b/sc/source/ui/optdlg/tpcalc.cxx index cff06b6995c7..27337df0a914 100644 --- a/sc/source/ui/optdlg/tpcalc.cxx +++ b/sc/source/ui/optdlg/tpcalc.cxx @@ -84,7 +84,7 @@ SfxTabPage* ScTpCalcOptions::Create( Window* pParent, const SfxItemSet& rAttrSet return ( new ScTpCalcOptions( pParent, rAttrSet ) ); } -void ScTpCalcOptions::Reset( const SfxItemSet& /* rCoreAttrs */ ) +void ScTpCalcOptions::Reset( const SfxItemSet* /* rCoreAttrs */ ) { sal_uInt16 d,m,y; diff --git a/sc/source/ui/optdlg/tpcompatibility.cxx b/sc/source/ui/optdlg/tpcompatibility.cxx index 2c6dfdf1d6a1..709faaddc696 100644 --- a/sc/source/ui/optdlg/tpcompatibility.cxx +++ b/sc/source/ui/optdlg/tpcompatibility.cxx @@ -43,10 +43,10 @@ bool ScTpCompatOptions::FillItemSet(SfxItemSet *rCoreAttrs) return bRet; } -void ScTpCompatOptions::Reset(const SfxItemSet &rCoreAttrs) +void ScTpCompatOptions::Reset(const SfxItemSet *rCoreAttrs) { const SfxPoolItem* pItem; - if (rCoreAttrs.HasItem(SID_SC_OPT_KEY_BINDING_COMPAT, &pItem)) + if (rCoreAttrs->HasItem(SID_SC_OPT_KEY_BINDING_COMPAT, &pItem)) { const SfxUInt16Item* p16Item = static_cast<const SfxUInt16Item*>(pItem); ScOptionsUtil::KeyBindingType eKeyB = diff --git a/sc/source/ui/optdlg/tpdefaults.cxx b/sc/source/ui/optdlg/tpdefaults.cxx index f68ee2f79046..a20f1c21e24b 100644 --- a/sc/source/ui/optdlg/tpdefaults.cxx +++ b/sc/source/ui/optdlg/tpdefaults.cxx @@ -60,12 +60,12 @@ bool ScTpDefaultsOptions::FillItemSet(SfxItemSet *rCoreSet) return bRet; } -void ScTpDefaultsOptions::Reset(const SfxItemSet& rCoreSet) +void ScTpDefaultsOptions::Reset(const SfxItemSet* rCoreSet) { ScDefaultsOptions aOpt; const SfxPoolItem* pItem = NULL; - if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SCDEFAULTSOPTIONS, false , &pItem)) + if(SFX_ITEM_SET == rCoreSet->GetItemState(SID_SCDEFAULTSOPTIONS, false , &pItem)) aOpt = ((const ScTpDefaultsItem*)pItem)->GetDefaultsOptions(); m_pEdNSheets->SetValue( static_cast<sal_uInt16>( aOpt.GetInitTabCount()) ); diff --git a/sc/source/ui/optdlg/tpformula.cxx b/sc/source/ui/optdlg/tpformula.cxx index 587928018961..b2aaff2aa24c 100644 --- a/sc/source/ui/optdlg/tpformula.cxx +++ b/sc/source/ui/optdlg/tpformula.cxx @@ -285,12 +285,12 @@ bool ScTpFormulaOptions::FillItemSet(SfxItemSet* rCoreSet) return bRet; } -void ScTpFormulaOptions::Reset(const SfxItemSet& rCoreSet) +void ScTpFormulaOptions::Reset(const SfxItemSet* rCoreSet) { ScFormulaOptions aOpt; const SfxPoolItem* pItem = NULL; - if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SCFORMULAOPTIONS, false , &pItem)) + if(SFX_ITEM_SET == rCoreSet->GetItemState(SID_SCFORMULAOPTIONS, false , &pItem)) aOpt = ((const ScTpFormulaItem*)pItem)->GetFormulaOptions(); // formula grammar. diff --git a/sc/source/ui/optdlg/tpprint.cxx b/sc/source/ui/optdlg/tpprint.cxx index eb49658e800d..f96e88b3fcb9 100644 --- a/sc/source/ui/optdlg/tpprint.cxx +++ b/sc/source/ui/optdlg/tpprint.cxx @@ -57,12 +57,12 @@ int ScTpPrintOptions::DeactivatePage( SfxItemSet* pSetP ) return LEAVE_PAGE; } -void ScTpPrintOptions::Reset( const SfxItemSet& rCoreSet ) +void ScTpPrintOptions::Reset( const SfxItemSet* rCoreSet ) { ScPrintOptions aOptions; const SfxPoolItem* pItem; - if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SCPRINTOPTIONS, false , &pItem)) + if(SFX_ITEM_SET == rCoreSet->GetItemState(SID_SCPRINTOPTIONS, false , &pItem)) aOptions = ((const ScTpPrintItem*)pItem)->GetPrintOptions(); else { @@ -70,7 +70,7 @@ void ScTpPrintOptions::Reset( const SfxItemSet& rCoreSet ) aOptions = SC_MOD()->GetPrintOptions(); } - if ( SFX_ITEM_SET == rCoreSet.GetItemState( SID_PRINT_SELECTEDSHEET, false , &pItem ) ) + if ( SFX_ITEM_SET == rCoreSet->GetItemState( SID_PRINT_SELECTEDSHEET, false , &pItem ) ) { bool bChecked = ( (const SfxBoolItem*)pItem )->GetValue(); m_pSelectedSheetsCB->Check( bChecked ); diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx index 06abb7ae9d53..dd8bb5070793 100644 --- a/sc/source/ui/optdlg/tpusrlst.cxx +++ b/sc/source/ui/optdlg/tpusrlst.cxx @@ -81,7 +81,7 @@ ScTpUserLists::ScTpUserLists( Window* pParent, SetExchangeSupport(); Init(); - Reset(rCoreAttrs); + Reset(&rCoreAttrs); } ScTpUserLists::~ScTpUserLists() @@ -142,10 +142,10 @@ SfxTabPage* ScTpUserLists::Create( Window* pParent, const SfxItemSet& rAttrSet ) return ( new ScTpUserLists( pParent, rAttrSet ) ); } -void ScTpUserLists::Reset( const SfxItemSet& rCoreAttrs ) +void ScTpUserLists::Reset( const SfxItemSet* rCoreAttrs ) { const ScUserListItem& rUserListItem = (const ScUserListItem&) - rCoreAttrs.Get( nWhichUserLists ); + rCoreAttrs->Get( nWhichUserLists ); const ScUserList* pCoreList = rUserListItem.GetUserList(); OSL_ENSURE( pCoreList, "UserList not found :-/" ); diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx index 2bf7d4d62f28..1c0b23a862e7 100644 --- a/sc/source/ui/optdlg/tpview.cxx +++ b/sc/source/ui/optdlg/tpview.cxx @@ -148,10 +148,10 @@ bool ScTpContentOptions::FillItemSet( SfxItemSet* rCoreSet ) return bRet; } -void ScTpContentOptions::Reset( const SfxItemSet& rCoreSet ) +void ScTpContentOptions::Reset( const SfxItemSet* rCoreSet ) { const SfxPoolItem* pItem; - if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SCVIEWOPTIONS, false , &pItem)) + if(SFX_ITEM_SET == rCoreSet->GetItemState(SID_SCVIEWOPTIONS, false , &pItem)) pLocalOptions = new ScViewOptions( ((const ScTpViewItem*)pItem)->GetViewOptions() ); else @@ -178,9 +178,9 @@ void ScTpContentOptions::Reset( const SfxItemSet& rCoreSet ) pBreakCB->Check( pLocalOptions->GetOption(VOPT_PAGEBREAKS) ); pGuideLineCB->Check( pLocalOptions->GetOption(VOPT_HELPLINES) ); - if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_INPUT_RANGEFINDER, false, &pItem)) + if(SFX_ITEM_SET == rCoreSet->GetItemState(SID_SC_INPUT_RANGEFINDER, false, &pItem)) pRangeFindCB->Check(((const SfxBoolItem*)pItem)->GetValue()); - if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_OPT_SYNCZOOM, false, &pItem)) + if(SFX_ITEM_SET == rCoreSet->GetItemState(SID_SC_OPT_SYNCZOOM, false, &pItem)) pSyncZoomCB->Check(((const SfxBoolItem*)pItem)->GetValue()); pRangeFindCB->SaveValue(); @@ -521,12 +521,12 @@ bool ScTpLayoutOptions::FillItemSet( SfxItemSet* rCoreSet ) return bRet; } -void ScTpLayoutOptions::Reset( const SfxItemSet& rCoreSet ) +void ScTpLayoutOptions::Reset( const SfxItemSet* rCoreSet ) { m_pUnitLB->SetNoSelection(); - if ( rCoreSet.GetItemState( SID_ATTR_METRIC ) >= SFX_ITEM_AVAILABLE ) + if ( rCoreSet->GetItemState( SID_ATTR_METRIC ) >= SFX_ITEM_AVAILABLE ) { - const SfxUInt16Item& rItem = (SfxUInt16Item&)rCoreSet.Get( SID_ATTR_METRIC ); + const SfxUInt16Item& rItem = (SfxUInt16Item&)rCoreSet->Get( SID_ATTR_METRIC ); FieldUnit eFieldUnit = (FieldUnit)rItem.GetValue(); for ( sal_Int32 i = 0; i < m_pUnitLB->GetEntryCount(); ++i ) @@ -542,7 +542,7 @@ void ScTpLayoutOptions::Reset( const SfxItemSet& rCoreSet ) m_pUnitLB->SaveValue(); const SfxPoolItem* pItem; - if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_ATTR_DEFTABSTOP, false, &pItem)) + if(SFX_ITEM_SET == rCoreSet->GetItemState(SID_ATTR_DEFTABSTOP, false, &pItem)) m_pTabMF->SetValue(m_pTabMF->Normalize(((SfxUInt16Item*)pItem)->GetValue()), FUNIT_TWIP); m_pTabMF->SaveValue(); @@ -572,32 +572,32 @@ void ScTpLayoutOptions::Reset( const SfxItemSet& rCoreSet ) // added to avoid warnings } } - if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_INPUT_SELECTION, false, &pItem)) + if(SFX_ITEM_SET == rCoreSet->GetItemState(SID_SC_INPUT_SELECTION, false, &pItem)) m_pAlignCB->Check(((const SfxBoolItem*)pItem)->GetValue()); - if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_INPUT_SELECTIONPOS, false, &pItem)) + if(SFX_ITEM_SET == rCoreSet->GetItemState(SID_SC_INPUT_SELECTIONPOS, false, &pItem)) m_pAlignLB->SelectEntryPos(((const SfxUInt16Item*)pItem)->GetValue()); - if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_INPUT_EDITMODE, false, &pItem)) + if(SFX_ITEM_SET == rCoreSet->GetItemState(SID_SC_INPUT_EDITMODE, false, &pItem)) m_pEditModeCB->Check(((const SfxBoolItem*)pItem)->GetValue()); - if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_INPUT_FMT_EXPAND, false, &pItem)) + if(SFX_ITEM_SET == rCoreSet->GetItemState(SID_SC_INPUT_FMT_EXPAND, false, &pItem)) m_pFormatCB->Check(((const SfxBoolItem*)pItem)->GetValue()); - if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_INPUT_REF_EXPAND, false, &pItem)) + if(SFX_ITEM_SET == rCoreSet->GetItemState(SID_SC_INPUT_REF_EXPAND, false, &pItem)) m_pExpRefCB->Check(((const SfxBoolItem*)pItem)->GetValue()); - if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_INPUT_MARK_HEADER, false, &pItem)) + if(SFX_ITEM_SET == rCoreSet->GetItemState(SID_SC_INPUT_MARK_HEADER, false, &pItem)) m_pMarkHdrCB->Check(((const SfxBoolItem*)pItem)->GetValue()); - if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_INPUT_TEXTWYSIWYG, false, &pItem)) + if(SFX_ITEM_SET == rCoreSet->GetItemState(SID_SC_INPUT_TEXTWYSIWYG, false, &pItem)) m_pTextFmtCB->Check(((const SfxBoolItem*)pItem)->GetValue()); - if( SFX_ITEM_SET == rCoreSet.GetItemState( SID_SC_INPUT_REPLCELLSWARN, false, &pItem ) ) + if( SFX_ITEM_SET == rCoreSet->GetItemState( SID_SC_INPUT_REPLCELLSWARN, false, &pItem ) ) m_pReplWarnCB->Check( ( (const SfxBoolItem*)pItem)->GetValue() ); - if( SFX_ITEM_SET == rCoreSet.GetItemState( SID_SC_INPUT_LEGACY_CELL_SELECTION, false, &pItem ) ) + if( SFX_ITEM_SET == rCoreSet->GetItemState( SID_SC_INPUT_LEGACY_CELL_SELECTION, false, &pItem ) ) m_pLegacyCellSelectionCB->Check( ( (const SfxBoolItem*)pItem)->GetValue() ); diff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx b/sc/source/ui/pagedlg/scuitphfedit.cxx index 1ffa69423c1d..8cd771a35fd3 100644 --- a/sc/source/ui/pagedlg/scuitphfedit.cxx +++ b/sc/source/ui/pagedlg/scuitphfedit.cxx @@ -165,10 +165,10 @@ void ScHFEditPage::SetNumType(SvxNumType eNumType) m_pWndRight->SetNumType(eNumType); } -void ScHFEditPage::Reset( const SfxItemSet& rCoreSet ) +void ScHFEditPage::Reset( const SfxItemSet* rCoreSet ) { const SfxPoolItem* pItem = NULL; - if ( rCoreSet.HasItem(nWhich, &pItem) ) + if ( rCoreSet->HasItem(nWhich, &pItem) ) { const ScPageHFItem& rItem = static_cast<const ScPageHFItem&>(*pItem); diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx index e1cf1d5d994c..d0a0af54cd45 100644 --- a/sc/source/ui/pagedlg/tphf.cxx +++ b/sc/source/ui/pagedlg/tphf.cxx @@ -81,7 +81,7 @@ ScHFPage::~ScHFPage() { } -void ScHFPage::Reset( const SfxItemSet& rSet ) +void ScHFPage::Reset( const SfxItemSet* rSet ) { SvxHFPage::Reset( rSet ); TurnOnHdl( 0 ); diff --git a/sc/source/ui/pagedlg/tptable.cxx b/sc/source/ui/pagedlg/tptable.cxx index ac2453831436..227e07979b1a 100644 --- a/sc/source/ui/pagedlg/tptable.cxx +++ b/sc/source/ui/pagedlg/tptable.cxx @@ -140,45 +140,45 @@ SfxTabPage* ScTablePage::Create( Window* pParent, const SfxItemSet& rCoreSet ) return ( new ScTablePage( pParent, rCoreSet ) ); } -void ScTablePage::Reset( const SfxItemSet& rCoreSet ) +void ScTablePage::Reset( const SfxItemSet* rCoreSet ) { - bool bTopDown = GET_BOOL( SID_SCATTR_PAGE_TOPDOWN, rCoreSet ); + bool bTopDown = GET_BOOL( SID_SCATTR_PAGE_TOPDOWN, *rCoreSet ); sal_uInt16 nWhich = 0; // sal_Bool flags - m_pBtnNotes->Check( GET_BOOL(SID_SCATTR_PAGE_NOTES,rCoreSet) ); - m_pBtnGrid->Check( GET_BOOL(SID_SCATTR_PAGE_GRID,rCoreSet) ); - m_pBtnHeaders->Check( GET_BOOL(SID_SCATTR_PAGE_HEADERS,rCoreSet) ); - m_pBtnFormulas->Check( GET_BOOL(SID_SCATTR_PAGE_FORMULAS,rCoreSet) ); - m_pBtnNullVals->Check( GET_BOOL(SID_SCATTR_PAGE_NULLVALS,rCoreSet) ); + m_pBtnNotes->Check( GET_BOOL(SID_SCATTR_PAGE_NOTES,*rCoreSet) ); + m_pBtnGrid->Check( GET_BOOL(SID_SCATTR_PAGE_GRID,*rCoreSet) ); + m_pBtnHeaders->Check( GET_BOOL(SID_SCATTR_PAGE_HEADERS,*rCoreSet) ); + m_pBtnFormulas->Check( GET_BOOL(SID_SCATTR_PAGE_FORMULAS,*rCoreSet) ); + m_pBtnNullVals->Check( GET_BOOL(SID_SCATTR_PAGE_NULLVALS,*rCoreSet) ); m_pBtnTopDown->Check( bTopDown ); m_pBtnLeftRight->Check( !bTopDown ); // first printed page: - sal_uInt16 nPage = GET_USHORT(SID_SCATTR_PAGE_FIRSTPAGENO,rCoreSet); + sal_uInt16 nPage = GET_USHORT(SID_SCATTR_PAGE_FIRSTPAGENO,*rCoreSet); m_pBtnPageNo->Check( nPage != 0 ); m_pEdPageNo->SetValue( (nPage != 0) ? nPage : 1 ); PageNoHdl( NULL ); // object representation: - m_pBtnCharts->Check( GET_SHOW( SID_SCATTR_PAGE_CHARTS, rCoreSet ) ); - m_pBtnObjects->Check( GET_SHOW( SID_SCATTR_PAGE_OBJECTS, rCoreSet ) ); - m_pBtnDrawings->Check( GET_SHOW( SID_SCATTR_PAGE_DRAWINGS, rCoreSet ) ); + m_pBtnCharts->Check( GET_SHOW( SID_SCATTR_PAGE_CHARTS, *rCoreSet ) ); + m_pBtnObjects->Check( GET_SHOW( SID_SCATTR_PAGE_OBJECTS, *rCoreSet ) ); + m_pBtnDrawings->Check( GET_SHOW( SID_SCATTR_PAGE_DRAWINGS, *rCoreSet ) ); // scaling: nWhich = GetWhich(SID_SCATTR_PAGE_SCALE); - if ( rCoreSet.GetItemState( nWhich, true ) >= SFX_ITEM_AVAILABLE ) + if ( rCoreSet->GetItemState( nWhich, true ) >= SFX_ITEM_AVAILABLE ) { - sal_uInt16 nScale = ((const SfxUInt16Item&)rCoreSet.Get(nWhich)).GetValue(); + sal_uInt16 nScale = ((const SfxUInt16Item&)rCoreSet->Get(nWhich)).GetValue(); if( nScale > 0 ) m_pLbScaleMode->SelectEntryPos( SC_TPTABLE_SCALE_PERCENT ); m_pEdScaleAll->SetValue( (nScale > 0) ? nScale : 100 ); } nWhich = GetWhich(SID_SCATTR_PAGE_SCALETO); - if ( rCoreSet.GetItemState( nWhich, true ) >= SFX_ITEM_AVAILABLE ) + if ( rCoreSet->GetItemState( nWhich, true ) >= SFX_ITEM_AVAILABLE ) { - const ScPageScaleToItem& rItem = static_cast< const ScPageScaleToItem& >( rCoreSet.Get( nWhich ) ); + const ScPageScaleToItem& rItem = static_cast< const ScPageScaleToItem& >( rCoreSet->Get( nWhich ) ); sal_uInt16 nWidth = rItem.GetWidth(); sal_uInt16 nHeight = rItem.GetHeight(); @@ -192,9 +192,9 @@ void ScTablePage::Reset( const SfxItemSet& rCoreSet ) } nWhich = GetWhich(SID_SCATTR_PAGE_SCALETOPAGES); - if ( rCoreSet.GetItemState( nWhich, true ) >= SFX_ITEM_AVAILABLE ) + if ( rCoreSet->GetItemState( nWhich, true ) >= SFX_ITEM_AVAILABLE ) { - sal_uInt16 nPages = ((const SfxUInt16Item&)rCoreSet.Get(nWhich)).GetValue(); + sal_uInt16 nPages = ((const SfxUInt16Item&)rCoreSet->Get(nWhich)).GetValue(); if( nPages > 0 ) m_pLbScaleMode->SelectEntryPos( SC_TPTABLE_SCALE_TO_PAGES ); m_pEdScalePageNum->SetValue( (nPages > 0) ? nPages : 1 ); diff --git a/sd/source/ui/dlg/paragr.cxx b/sd/source/ui/dlg/paragr.cxx index d438f3f75cdc..c6642099c98c 100644 --- a/sd/source/ui/dlg/paragr.cxx +++ b/sd/source/ui/dlg/paragr.cxx @@ -44,7 +44,7 @@ public: static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; private: TriStateBox* m_pNewStartCB; @@ -108,12 +108,12 @@ bool SdParagraphNumTabPage::FillItemSet( SfxItemSet* rSet ) return mbModified; } -void SdParagraphNumTabPage::Reset( const SfxItemSet& rSet ) +void SdParagraphNumTabPage::Reset( const SfxItemSet* rSet ) { - SfxItemState eItemState = rSet.GetItemState( ATTR_NUMBER_NEWSTART ); + SfxItemState eItemState = rSet->GetItemState( ATTR_NUMBER_NEWSTART ); if(eItemState > SFX_ITEM_AVAILABLE ) { - const SfxBoolItem& rStart = (const SfxBoolItem&)rSet.Get(ATTR_NUMBER_NEWSTART); + const SfxBoolItem& rStart = (const SfxBoolItem&)rSet->Get(ATTR_NUMBER_NEWSTART); m_pNewStartCB->SetState( rStart.GetValue() ? TRISTATE_TRUE : TRISTATE_FALSE ); m_pNewStartCB->EnableTriState(false); } @@ -124,10 +124,10 @@ void SdParagraphNumTabPage::Reset( const SfxItemSet& rSet ) } m_pNewStartCB->SaveValue(); - eItemState = rSet.GetItemState( ATTR_NUMBER_NEWSTART_AT); + eItemState = rSet->GetItemState( ATTR_NUMBER_NEWSTART_AT); if( eItemState > SFX_ITEM_AVAILABLE ) { - sal_Int16 nNewStart = ((const SfxInt16Item&)rSet.Get(ATTR_NUMBER_NEWSTART_AT)).GetValue(); + sal_Int16 nNewStart = ((const SfxInt16Item&)rSet->Get(ATTR_NUMBER_NEWSTART_AT)).GetValue(); m_pNewStartNumberCB->Check(-1 != nNewStart); if(-1 == nNewStart) nNewStart = 1; diff --git a/sd/source/ui/dlg/prntopts.cxx b/sd/source/ui/dlg/prntopts.cxx index 9a0167324a1f..e54400c1dac2 100644 --- a/sd/source/ui/dlg/prntopts.cxx +++ b/sd/source/ui/dlg/prntopts.cxx @@ -133,10 +133,10 @@ bool SdPrintOptions::FillItemSet( SfxItemSet* rAttrs ) -void SdPrintOptions::Reset( const SfxItemSet& rAttrs ) +void SdPrintOptions::Reset( const SfxItemSet* rAttrs ) { const SdOptionsPrintItem* pPrintOpts = NULL; - if( SFX_ITEM_SET == rAttrs.GetItemState( ATTR_OPTIONS_PRINT, false, + if( SFX_ITEM_SET == rAttrs->GetItemState( ATTR_OPTIONS_PRINT, false, (const SfxPoolItem**) &pPrintOpts ) ) { m_pCbxDraw->Check( pPrintOpts->GetOptionsPrint().IsDraw() ); diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx index f08751c5363a..2c4084aca333 100644 --- a/sd/source/ui/dlg/tpaction.cxx +++ b/sd/source/ui/dlg/tpaction.cxx @@ -310,15 +310,15 @@ bool SdTPAction::FillItemSet( SfxItemSet* rAttrs ) -void SdTPAction::Reset( const SfxItemSet& rAttrs ) +void SdTPAction::Reset( const SfxItemSet* rAttrs ) { presentation::ClickAction eCA = presentation::ClickAction_NONE; OUString aFileName; // m_pLbAction - if( rAttrs.GetItemState( ATTR_ACTION ) != SFX_ITEM_DONTCARE ) + if( rAttrs->GetItemState( ATTR_ACTION ) != SFX_ITEM_DONTCARE ) { - eCA = (presentation::ClickAction) ( ( const SfxAllEnumItem& ) rAttrs. + eCA = (presentation::ClickAction) ( ( const SfxAllEnumItem& ) rAttrs-> Get( ATTR_ACTION ) ).GetValue(); SetActualClickAction( eCA ); } @@ -326,9 +326,9 @@ void SdTPAction::Reset( const SfxItemSet& rAttrs ) m_pLbAction->SetNoSelection(); // m_pEdtSound - if( rAttrs.GetItemState( ATTR_ACTION_FILENAME ) != SFX_ITEM_DONTCARE ) + if( rAttrs->GetItemState( ATTR_ACTION_FILENAME ) != SFX_ITEM_DONTCARE ) { - aFileName = ( ( const SfxStringItem& ) rAttrs.Get( ATTR_ACTION_FILENAME ) ).GetValue(); + aFileName = ( ( const SfxStringItem& ) rAttrs->Get( ATTR_ACTION_FILENAME ) ).GetValue(); SetEditText( aFileName ); } diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx index 8cdbfbc55c58..44aced815aeb 100644 --- a/sd/source/ui/dlg/tpoption.cxx +++ b/sd/source/ui/dlg/tpoption.cxx @@ -84,11 +84,11 @@ bool SdTpOptionsSnap::FillItemSet( SfxItemSet* rAttrs ) -void SdTpOptionsSnap::Reset( const SfxItemSet& rAttrs ) +void SdTpOptionsSnap::Reset( const SfxItemSet* rAttrs ) { SvxGridTabPage::Reset(rAttrs); - SdOptionsSnapItem aOptsItem( (const SdOptionsSnapItem&) rAttrs. + SdOptionsSnapItem aOptsItem( (const SdOptionsSnapItem&) rAttrs-> Get( ATTR_OPTIONS_SNAP ) ); pCbxSnapHelplines->Check( aOptsItem.GetOptionsSnap().IsSnapHelplines() ); @@ -160,12 +160,12 @@ bool SdTpOptionsContents::FillItemSet( SfxItemSet* rAttrs ) -void SdTpOptionsContents::Reset( const SfxItemSet& rAttrs ) +void SdTpOptionsContents::Reset( const SfxItemSet* rAttrs ) { - SdOptionsContentsItem aOptsItem( (const SdOptionsContentsItem&) rAttrs. + SdOptionsContentsItem aOptsItem( (const SdOptionsContentsItem&) rAttrs-> Get( ATTR_OPTIONS_CONTENTS ) ); - SdOptionsLayoutItem aLayoutItem( (const SdOptionsLayoutItem&) rAttrs. + SdOptionsLayoutItem aLayoutItem( (const SdOptionsLayoutItem&) rAttrs-> Get( ATTR_OPTIONS_LAYOUT ) ); m_pCbxRuler->Check( aLayoutItem.GetOptionsLayout().IsRulerVisible() ); @@ -433,9 +433,9 @@ bool SdTpOptionsMisc::FillItemSet( SfxItemSet* rAttrs ) -void SdTpOptionsMisc::Reset( const SfxItemSet& rAttrs ) +void SdTpOptionsMisc::Reset( const SfxItemSet* rAttrs ) { - SdOptionsMiscItem aOptsItem( (const SdOptionsMiscItem&) rAttrs. + SdOptionsMiscItem aOptsItem( (const SdOptionsMiscItem&) rAttrs-> Get( ATTR_OPTIONS_MISC ) ); m_pCbxStartWithTemplate->Check( aOptsItem.GetOptionsMisc().IsStartWithTemplate() ); @@ -464,9 +464,9 @@ void SdTpOptionsMisc::Reset( const SfxItemSet& rAttrs ) sal_uInt16 nWhich = GetWhich( SID_ATTR_METRIC ); m_pLbMetric->SetNoSelection(); - if ( rAttrs.GetItemState( nWhich ) >= SFX_ITEM_AVAILABLE ) + if ( rAttrs->GetItemState( nWhich ) >= SFX_ITEM_AVAILABLE ) { - const SfxUInt16Item& rItem = (SfxUInt16Item&)rAttrs.Get( nWhich ); + const SfxUInt16Item& rItem = (SfxUInt16Item&)rAttrs->Get( nWhich ); long nFieldUnit = (long)rItem.GetValue(); for ( sal_Int32 i = 0; i < m_pLbMetric->GetEntryCount(); ++i ) @@ -481,22 +481,22 @@ void SdTpOptionsMisc::Reset( const SfxItemSet& rAttrs ) // tabulator space nWhich = GetWhich( SID_ATTR_DEFTABSTOP ); - if( rAttrs.GetItemState( nWhich ) >= SFX_ITEM_AVAILABLE ) + if( rAttrs->GetItemState( nWhich ) >= SFX_ITEM_AVAILABLE ) { - SfxMapUnit eUnit = rAttrs.GetPool()->GetMetric( nWhich ); - const SfxUInt16Item& rItem = (SfxUInt16Item&)rAttrs.Get( nWhich ); + SfxMapUnit eUnit = rAttrs->GetPool()->GetMetric( nWhich ); + const SfxUInt16Item& rItem = (SfxUInt16Item&)rAttrs->Get( nWhich ); SetMetricValue( *m_pMtrFldTabstop, rItem.GetValue(), eUnit ); } m_pLbMetric->SaveValue(); m_pMtrFldTabstop->SaveValue(); //Scale - sal_Int32 nX = ( (const SfxInt32Item&) rAttrs. + sal_Int32 nX = ( (const SfxInt32Item&) rAttrs-> Get( ATTR_OPTIONS_SCALE_X ) ).GetValue(); - sal_Int32 nY = ( (const SfxInt32Item&) rAttrs. + sal_Int32 nY = ( (const SfxInt32Item&) rAttrs-> Get( ATTR_OPTIONS_SCALE_Y ) ).GetValue(); - nWidth = ( (const SfxUInt32Item&) rAttrs. + nWidth = ( (const SfxUInt32Item&) rAttrs-> Get( ATTR_OPTIONS_SCALE_WIDTH ) ).GetValue(); - nHeight = ( (const SfxUInt32Item&) rAttrs. + nHeight = ( (const SfxUInt32Item&) rAttrs-> Get( ATTR_OPTIONS_SCALE_HEIGHT ) ).GetValue(); m_pCbScale->SetText( GetScale( nX, nY ) ); diff --git a/sd/source/ui/inc/prntopts.hxx b/sd/source/ui/inc/prntopts.hxx index bca0debb02f0..550a0a4efc36 100644 --- a/sd/source/ui/inc/prntopts.hxx +++ b/sd/source/ui/inc/prntopts.hxx @@ -67,7 +67,7 @@ public: static SfxTabPage* Create( Window*, const SfxItemSet& ); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; void SetDrawMode(); virtual void PageCreated(const SfxAllItemSet& aSet) SAL_OVERRIDE; diff --git a/sd/source/ui/inc/tpaction.hxx b/sd/source/ui/inc/tpaction.hxx index 91275a0347c1..4839b2090987 100644 --- a/sd/source/ui/inc/tpaction.hxx +++ b/sd/source/ui/inc/tpaction.hxx @@ -104,7 +104,7 @@ public: static SfxTabPage* Create( Window*, const SfxItemSet& ); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; diff --git a/sd/source/ui/inc/tpoption.hxx b/sd/source/ui/inc/tpoption.hxx index 0ae5b87e41a2..f94b06a99483 100644 --- a/sd/source/ui/inc/tpoption.hxx +++ b/sd/source/ui/inc/tpoption.hxx @@ -41,7 +41,7 @@ public: static SfxTabPage* Create( Window*, const SfxItemSet& ); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; }; @@ -63,7 +63,7 @@ public: static SfxTabPage* Create( Window*, const SfxItemSet& ); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; }; /** @@ -136,7 +136,7 @@ public: static SfxTabPage* Create( Window*, const SfxItemSet& ); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; /** Hide Impress specific controls, make Draw specific controls visible and arrange the visible controls. Do not call this method or the diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx index 026ee868a9ba..e464e61a6406 100644 --- a/sfx2/source/dialog/basedlgs.cxx +++ b/sfx2/source/dialog/basedlgs.cxx @@ -771,7 +771,7 @@ void SfxSingleTabDialog::SetTabPage(SfxTabPage* pTabPage, OUString sUserData; aUserItem >>= sUserData; pImpl->m_pSfxPage->SetUserData(sUserData); - pImpl->m_pSfxPage->Reset( *GetInputItemSet() ); + pImpl->m_pSfxPage->Reset( GetInputItemSet() ); pImpl->m_pSfxPage->Show(); pHelpBtn->Show(Help::IsContextHelpEnabled()); diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index 65c1a87cc36b..fbfe1211394d 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -695,16 +695,16 @@ bool SfxDocumentDescPage::FillItemSet(SfxItemSet *rSet) } -void SfxDocumentDescPage::Reset(const SfxItemSet &rSet) +void SfxDocumentDescPage::Reset(const SfxItemSet *rSet) { - m_pInfoItem = &(SfxDocumentInfoItem &)rSet.Get(SID_DOCINFO); + m_pInfoItem = &(SfxDocumentInfoItem &)rSet->Get(SID_DOCINFO); m_pTitleEd->SetText( m_pInfoItem->getTitle() ); m_pThemaEd->SetText( m_pInfoItem->getSubject() ); m_pKeywordsEd->SetText( m_pInfoItem->getKeywords() ); m_pCommentEd->SetText( m_pInfoItem->getDescription() ); - SFX_ITEMSET_ARG( &rSet, pROItem, SfxBoolItem, SID_DOC_READONLY, false ); + SFX_ITEMSET_ARG( rSet, pROItem, SfxBoolItem, SID_DOC_READONLY, false ); if ( pROItem && pROItem->GetValue() ) { m_pTitleEd->SetReadOnly( true ); @@ -987,11 +987,11 @@ bool SfxDocumentPage::FillItemSet( SfxItemSet* rSet ) -void SfxDocumentPage::Reset( const SfxItemSet& rSet ) +void SfxDocumentPage::Reset( const SfxItemSet* rSet ) { // Determine the document information const SfxDocumentInfoItem *m_pInfoItem = - &(const SfxDocumentInfoItem &)rSet.Get(SID_DOCINFO); + &(const SfxDocumentInfoItem &)rSet->Get(SID_DOCINFO); // template data if ( m_pInfoItem->HasTemplate() ) @@ -1015,7 +1015,7 @@ void SfxDocumentPage::Reset( const SfxItemSet& rSet ) // determine name OUString aName; const SfxPoolItem* pItem = 0; - if ( SFX_ITEM_SET != rSet.GetItemState( ID_FILETP_TITLE, false, &pItem ) ) + if ( SFX_ITEM_SET != rSet->GetItemState( ID_FILETP_TITLE, false, &pItem ) ) { INetURLObject aURL(aFile); aName = aURL.GetName( INetURLObject::DECODE_WITH_CHARSET ); @@ -1032,7 +1032,7 @@ void SfxDocumentPage::Reset( const SfxItemSet& rSet ) m_pNameED->ClearModifyFlag(); // determine RO-Flag - if ( SFX_ITEM_UNKNOWN == rSet.GetItemState( ID_FILETP_READONLY, false, &pItem ) + if ( SFX_ITEM_UNKNOWN == rSet->GetItemState( ID_FILETP_READONLY, false, &pItem ) || !pItem ) m_pReadOnlyCB->Hide(); else @@ -2094,10 +2094,10 @@ bool SfxCustomPropertiesPage::FillItemSet( SfxItemSet* rSet ) return bModified; } -void SfxCustomPropertiesPage::Reset( const SfxItemSet& rItemSet ) +void SfxCustomPropertiesPage::Reset( const SfxItemSet* rItemSet ) { m_pPropertiesCtrl->ClearAllLines(); - const SfxDocumentInfoItem* m_pInfoItem = &(const SfxDocumentInfoItem &)rItemSet.Get(SID_DOCINFO); + const SfxDocumentInfoItem* m_pInfoItem = &(const SfxDocumentInfoItem &)rItemSet->Get(SID_DOCINFO); std::vector< CustomProperty* > aCustomProps = m_pInfoItem->GetCustomProperties(); for ( sal_uInt32 i = 0; i < aCustomProps.size(); i++ ) { @@ -2585,10 +2585,10 @@ bool SfxCmisPropertiesPage::FillItemSet( SfxItemSet* rSet ) return modifiedNum; } -void SfxCmisPropertiesPage::Reset( const SfxItemSet& rItemSet ) +void SfxCmisPropertiesPage::Reset( const SfxItemSet* rItemSet ) { m_pPropertiesCtrl.ClearAllLines(); - const SfxDocumentInfoItem* m_pInfoItem = &(const SfxDocumentInfoItem &)rItemSet.Get(SID_DOCINFO); + const SfxDocumentInfoItem* m_pInfoItem = &(const SfxDocumentInfoItem &)rItemSet->Get(SID_DOCINFO); uno::Sequence< document::CmisProperty > aCmisProps = m_pInfoItem->GetCmisProperties(); for ( sal_Int32 i = 0; i < aCmisProps.getLength(); i++ ) { diff --git a/sfx2/source/dialog/documentfontsdialog.cxx b/sfx2/source/dialog/documentfontsdialog.cxx index 7bf4d3993175..20b4a8fb3cd5 100644 --- a/sfx2/source/dialog/documentfontsdialog.cxx +++ b/sfx2/source/dialog/documentfontsdialog.cxx @@ -34,7 +34,7 @@ SfxDocumentFontsPage::SfxDocumentFontsPage( Window* parent, const SfxItemSet& se get( embedFontsCheckbox, "embedFonts" ); } -void SfxDocumentFontsPage::Reset( const SfxItemSet& ) +void SfxDocumentFontsPage::Reset( const SfxItemSet* ) { bool bVal = false; SfxObjectShell* pDocSh = SfxObjectShell::Current(); diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx index 6855e62ecb27..abfccc64c087 100644 --- a/sfx2/source/dialog/mgetempl.cxx +++ b/sfx2/source/dialog/mgetempl.cxx @@ -399,7 +399,7 @@ bool SfxManageStyleSheetPage::FillItemSet( SfxItemSet* rSet ) -void SfxManageStyleSheetPage::Reset( const SfxItemSet& /*rAttrSet*/ ) +void SfxManageStyleSheetPage::Reset( const SfxItemSet* /*rAttrSet*/ ) /* [Description] diff --git a/sfx2/source/dialog/printopt.cxx b/sfx2/source/dialog/printopt.cxx index 792401c3ccf9..5f7a87b164e7 100644 --- a/sfx2/source/dialog/printopt.cxx +++ b/sfx2/source/dialog/printopt.cxx @@ -138,7 +138,7 @@ bool SfxCommonPrintOptionsTabPage::FillItemSet( SfxItemSet* /*rSet*/ ) return bModified; } -void SfxCommonPrintOptionsTabPage::Reset( const SfxItemSet& /*rSet*/ ) +void SfxCommonPrintOptionsTabPage::Reset( const SfxItemSet* /*rSet*/ ) { SvtPrintWarningOptions aWarnOptions; SvtPrinterOptions aPrinterOptions; diff --git a/sfx2/source/dialog/securitypage.cxx b/sfx2/source/dialog/securitypage.cxx index ea2515d5675f..e75f88dedd1b 100644 --- a/sfx2/source/dialog/securitypage.cxx +++ b/sfx2/source/dialog/securitypage.cxx @@ -449,11 +449,11 @@ bool SfxSecurityPage::FillItemSet( SfxItemSet * rItemSet ) } -void SfxSecurityPage::Reset( const SfxItemSet & rItemSet ) +void SfxSecurityPage::Reset( const SfxItemSet * rItemSet ) { DBG_ASSERT( m_pImpl.get(), "implementation pointer is 0. Still in c-tor?" ); if (m_pImpl.get() != 0) - m_pImpl->Reset_Impl( rItemSet ); + m_pImpl->Reset_Impl( *rItemSet ); } diff --git a/sfx2/source/dialog/styledlg.cxx b/sfx2/source/dialog/styledlg.cxx index 73cd4255dbc3..c9231d4549c9 100644 --- a/sfx2/source/dialog/styledlg.cxx +++ b/sfx2/source/dialog/styledlg.cxx @@ -142,7 +142,7 @@ IMPL_LINK( SfxStyleDialog, CancelHdl, Button *, pButton ) } if ( pPage ) - pPage->Reset( *GetInputSetImpl() ); + pPage->Reset( GetInputSetImpl() ); EndDialog( RET_CANCEL ); return 0; } diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index 98a9adc87251..55483d81192b 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -211,10 +211,10 @@ bool SfxTabPage::FillItemSet( SfxItemSet* rSet ) -void SfxTabPage::Reset( const SfxItemSet& rSet ) +void SfxTabPage::Reset( const SfxItemSet* rSet ) { - pImpl->maItemConn.DoApplyFlags( rSet ); - pImpl->maItemConn.DoReset( rSet ); + pImpl->maItemConn.DoApplyFlags( *rSet ); + pImpl->maItemConn.DoReset( *rSet ); } @@ -1060,10 +1060,10 @@ IMPL_LINK_NOARG(SfxTabDialog, ResetHdl) { // CSet on AIS has problems here, thus separated const SfxItemSet* pItemSet = &pDataObject->pTabPage->GetItemSet(); - pDataObject->pTabPage->Reset( *(SfxItemSet*)pItemSet ); + pDataObject->pTabPage->Reset( pItemSet ); } else - pDataObject->pTabPage->Reset( *pSet ); + pDataObject->pTabPage->Reset( pSet ); return 0; } @@ -1139,7 +1139,7 @@ IMPL_LINK_NOARG(SfxTabDialog, BaseFmtHdl) } // Set all Items as new -> the call the current Page Reset() DBG_ASSERT( pDataObject->pTabPage, "the Page is gone" ); - pDataObject->pTabPage->Reset( aTmpSet ); + pDataObject->pTabPage->Reset( &aTmpSet ); pDataObject->pTabPage->pImpl->mbStandard = true; } return 1; @@ -1228,14 +1228,14 @@ IMPL_LINK( SfxTabDialog, ActivatePageHdl, TabControl *, pTabCtrl ) PageCreated( nId, *pTabPage ); if ( pDataObject->bOnDemand ) - pTabPage->Reset( (SfxItemSet &)pTabPage->GetItemSet() ); + pTabPage->Reset( &pTabPage->GetItemSet() ); else - pTabPage->Reset( *pSet ); + pTabPage->Reset( pSet ); pTabCtrl->SetTabPage( nId, pTabPage ); } else if ( pDataObject->bRefresh ) - pTabPage->Reset( *pSet ); + pTabPage->Reset( pSet ); pDataObject->bRefresh = false; if ( pExampleSet ) diff --git a/sfx2/source/inc/documentfontsdialog.hxx b/sfx2/source/inc/documentfontsdialog.hxx index 847baa6bbd22..0264b97772c8 100644 --- a/sfx2/source/inc/documentfontsdialog.hxx +++ b/sfx2/source/inc/documentfontsdialog.hxx @@ -34,7 +34,7 @@ public: static SfxTabPage* Create( Window* parent, const SfxItemSet& set ); protected: virtual bool FillItemSet( SfxItemSet* set ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& set ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* set ) SAL_OVERRIDE; private: CheckBox* embedFontsCheckbox; }; diff --git a/sfx2/source/view/printer.cxx b/sfx2/source/view/printer.cxx index f37cc45672f3..ba4f4ebc3a31 100644 --- a/sfx2/source/view/printer.cxx +++ b/sfx2/source/view/printer.cxx @@ -215,7 +215,7 @@ SfxPrintOptionsDialog::SfxPrintOptionsDialog(Window *pParent, DBG_ASSERT( pPage, "CreatePrintOptions != SFX_VIEW_HAS_PRINTOPTIONS" ); if( pPage ) { - pPage->Reset( *pOptions ); + pPage->Reset( pOptions ); SetHelpId( pPage->GetHelpId() ); pPage->Show(); } @@ -241,7 +241,7 @@ short SfxPrintOptionsDialog::Execute() if ( nRet == RET_OK ) pPage->FillItemSet( pOptions ); else - pPage->Reset( *pOptions ); + pPage->Reset( pOptions ); return nRet; } diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx index 7c1a2b9689c6..24b563092aa2 100644 --- a/starmath/inc/dialog.hxx +++ b/starmath/inc/dialog.hxx @@ -64,7 +64,7 @@ class SmPrintOptionsTabPage : public SfxTabPage DECL_LINK(SizeButtonClickHdl, Button *); virtual bool FillItemSet(SfxItemSet* rSet) SAL_OVERRIDE; - virtual void Reset(const SfxItemSet& rSet) SAL_OVERRIDE; + virtual void Reset(const SfxItemSet* rSet) SAL_OVERRIDE; public: static SfxTabPage* Create(Window *pWindow, const SfxItemSet &rSet); diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx index 99a8dc9c93b6..97ec16baef16 100644 --- a/starmath/source/dialog.cxx +++ b/starmath/source/dialog.cxx @@ -174,7 +174,7 @@ SmPrintOptionsTabPage::SmPrintOptionsTabPage(Window *pParent, const SfxItemSet & m_pSizeScaled->SetClickHdl(LINK(this, SmPrintOptionsTabPage, SizeButtonClickHdl)); m_pSizeZoomed->SetClickHdl(LINK(this, SmPrintOptionsTabPage, SizeButtonClickHdl)); - Reset(rOptions); + Reset(&rOptions); } @@ -200,9 +200,9 @@ bool SmPrintOptionsTabPage::FillItemSet(SfxItemSet* rSet) } -void SmPrintOptionsTabPage::Reset(const SfxItemSet& rSet) +void SmPrintOptionsTabPage::Reset(const SfxItemSet* rSet) { - SmPrintSize ePrintSize = (SmPrintSize)((const SfxUInt16Item &)rSet.Get(GetWhich(SID_PRINTSIZE))).GetValue(); + SmPrintSize ePrintSize = (SmPrintSize)((const SfxUInt16Item &)rSet->Get(GetWhich(SID_PRINTSIZE))).GetValue(); m_pSizeNormal->Check(ePrintSize == PRINT_SIZE_NORMAL); m_pSizeScaled->Check(ePrintSize == PRINT_SIZE_SCALED); @@ -210,13 +210,13 @@ void SmPrintOptionsTabPage::Reset(const SfxItemSet& rSet) m_pZoom->Enable(m_pSizeZoomed->IsChecked()); - m_pZoom->SetValue(((const SfxUInt16Item &)rSet.Get(GetWhich(SID_PRINTZOOM))).GetValue()); + m_pZoom->SetValue(((const SfxUInt16Item &)rSet->Get(GetWhich(SID_PRINTZOOM))).GetValue()); - m_pTitle->Check(((const SfxBoolItem &)rSet.Get(GetWhich(SID_PRINTTITLE))).GetValue()); - m_pText->Check(((const SfxBoolItem &)rSet.Get(GetWhich(SID_PRINTTEXT))).GetValue()); - m_pFrame->Check(((const SfxBoolItem &)rSet.Get(GetWhich(SID_PRINTFRAME))).GetValue()); - m_pNoRightSpaces->Check(((const SfxBoolItem &)rSet.Get(GetWhich(SID_NO_RIGHT_SPACES))).GetValue()); - m_pSaveOnlyUsedSymbols->Check(((const SfxBoolItem &)rSet.Get(GetWhich(SID_SAVE_ONLY_USED_SYMBOLS))).GetValue()); + m_pTitle->Check(((const SfxBoolItem &)rSet->Get(GetWhich(SID_PRINTTITLE))).GetValue()); + m_pText->Check(((const SfxBoolItem &)rSet->Get(GetWhich(SID_PRINTTEXT))).GetValue()); + m_pFrame->Check(((const SfxBoolItem &)rSet->Get(GetWhich(SID_PRINTFRAME))).GetValue()); + m_pNoRightSpaces->Check(((const SfxBoolItem &)rSet->Get(GetWhich(SID_NO_RIGHT_SPACES))).GetValue()); + m_pSaveOnlyUsedSymbols->Check(((const SfxBoolItem &)rSet->Get(GetWhich(SID_SAVE_ONLY_USED_SYMBOLS))).GetValue()); } diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx index 99ddba702096..dd67155f5233 100644 --- a/svx/source/dialog/hdft.cxx +++ b/svx/source/dialog/hdft.cxx @@ -319,10 +319,10 @@ bool SvxHFPage::FillItemSet( SfxItemSet* rSet ) } -void SvxHFPage::Reset( const SfxItemSet& rSet ) +void SvxHFPage::Reset( const SfxItemSet* rSet ) { - ActivatePage( rSet ); - ResetBackground_Impl( rSet ); + ActivatePage( *rSet ); + ResetBackground_Impl( *rSet ); SfxItemPool* pPool = GetItemSet().GetPool(); DBG_ASSERT( pPool, "Where is the pool" ); @@ -330,8 +330,8 @@ void SvxHFPage::Reset( const SfxItemSet& rSet ) //hide "same content on first page when this is calc bool bIsCalc = false; - const SfxPoolItem* pExt1 = GetItem(rSet, SID_ATTR_PAGE_EXT1); - const SfxPoolItem* pExt2 = GetItem(rSet, SID_ATTR_PAGE_EXT2); + const SfxPoolItem* pExt1 = GetItem(*rSet, SID_ATTR_PAGE_EXT1); + const SfxPoolItem* pExt2 = GetItem(*rSet, SID_ATTR_PAGE_EXT2); if (pExt1 && pExt1->ISA(SfxBoolItem) && pExt2 && pExt2->ISA(SfxBoolItem)) bIsCalc = true; m_pCntSharedFirstBox->Show(!bIsCalc); @@ -339,7 +339,7 @@ void SvxHFPage::Reset( const SfxItemSet& rSet ) // Evaluate header-/footer- attributes const SvxSetItem* pSetItem = 0; - if ( SFX_ITEM_SET == rSet.GetItemState( GetWhich(nId), false, + if ( SFX_ITEM_SET == rSet->GetItemState( GetWhich(nId), false, (const SfxPoolItem**)&pSetItem ) ) { const SfxItemSet& rHeaderSet = pSetItem->GetItemSet(); @@ -423,7 +423,7 @@ void SvxHFPage::Reset( const SfxItemSet& rSet ) const SfxPoolItem* pItem = 0; SfxObjectShell* pShell; - if(SFX_ITEM_SET == rSet.GetItemState(SID_HTML_MODE, false, &pItem) || + if(SFX_ITEM_SET == rSet->GetItemState(SID_HTML_MODE, false, &pItem) || ( 0 != (pShell = SfxObjectShell::Current()) && 0 != (pItem = pShell->GetItem(SID_HTML_MODE)))) { diff --git a/svx/source/dialog/optgrid.cxx b/svx/source/dialog/optgrid.cxx index 2ab8df62cd36..86cbc461809b 100644 --- a/svx/source/dialog/optgrid.cxx +++ b/svx/source/dialog/optgrid.cxx @@ -218,11 +218,11 @@ bool SvxGridTabPage::FillItemSet( SfxItemSet* rCoreSet ) -void SvxGridTabPage::Reset( const SfxItemSet& rSet ) +void SvxGridTabPage::Reset( const SfxItemSet* rSet ) { const SfxPoolItem* pAttr = 0; - if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_GRID_OPTIONS , false, + if( SFX_ITEM_SET == rSet->GetItemState( SID_ATTR_GRID_OPTIONS , false, (const SfxPoolItem**)&pAttr )) { const SvxGridItem* pGridAttr = (SvxGridItem*)pAttr; @@ -231,7 +231,7 @@ void SvxGridTabPage::Reset( const SfxItemSet& rSet ) pCbxGridVisible->Check( pGridAttr->bGridVisible ); SfxMapUnit eUnit = - rSet.GetPool()->GetMetric( GetWhich( SID_ATTR_GRID_OPTIONS ) ); + rSet->GetPool()->GetMetric( GetWhich( SID_ATTR_GRID_OPTIONS ) ); SetMetricValue( *pMtrFldDrawX , pGridAttr->nFldDrawX, eUnit ); SetMetricValue( *pMtrFldDrawY , pGridAttr->nFldDrawY, eUnit ); diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx index 8797e1ca133c..bd03f177cfc0 100644 --- a/sw/source/ui/chrdlg/chardlg.cxx +++ b/sw/source/ui/chrdlg/chardlg.cxx @@ -188,10 +188,10 @@ SwCharURLPage::~SwCharURLPage() delete pINetItem; } -void SwCharURLPage::Reset(const SfxItemSet& rSet) +void SwCharURLPage::Reset(const SfxItemSet* rSet) { const SfxPoolItem* pItem; - if ( SFX_ITEM_SET == rSet.GetItemState( RES_TXTATR_INETFMT, false, &pItem ) ) + if ( SFX_ITEM_SET == rSet->GetItemState( RES_TXTATR_INETFMT, false, &pItem ) ) { const SwFmtINetFmt* pINetFmt = (const SwFmtINetFmt*) pItem; m_pURLED->SetText(INetURLObject::decode(pINetFmt->GetValue(), @@ -225,7 +225,7 @@ void SwCharURLPage::Reset(const SfxItemSet& rSet) if( pINetFmt->GetMacroTbl() ) pINetItem->SetMacroTable( *pINetFmt->GetMacroTbl() ); } - if(SFX_ITEM_SET == rSet.GetItemState(FN_PARAM_SELECTION, false, &pItem)) + if(SFX_ITEM_SET == rSet->GetItemState(FN_PARAM_SELECTION, false, &pItem)) { m_pTextED->SetText(((const SfxStringItem*)pItem)->GetValue()); m_pTextFT->Enable( false ); diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx index adf11c0a13af..8b986aee7b44 100644 --- a/sw/source/ui/chrdlg/drpcps.cxx +++ b/sw/source/ui/chrdlg/drpcps.cxx @@ -588,10 +588,10 @@ bool SwDropCapsPage::FillItemSet(SfxItemSet *rSet) return bModified; } -void SwDropCapsPage::Reset(const SfxItemSet &rSet) +void SwDropCapsPage::Reset(const SfxItemSet *rSet) { // Characters, lines, gap and text - SwFmtDrop aFmtDrop((SwFmtDrop &) rSet.Get(RES_PARATR_DROP)); + SwFmtDrop aFmtDrop((SwFmtDrop &) rSet->Get(RES_PARATR_DROP)); if (aFmtDrop.GetLines() > 1) { m_pDropCapsField->SetValue(aFmtDrop.GetChars()); diff --git a/sw/source/ui/chrdlg/numpara.cxx b/sw/source/ui/chrdlg/numpara.cxx index 8dfdcb9b8b92..b4bcde7e5776 100644 --- a/sw/source/ui/chrdlg/numpara.cxx +++ b/sw/source/ui/chrdlg/numpara.cxx @@ -158,16 +158,16 @@ bool SwParagraphNumTabPage::FillItemSet( SfxItemSet* rSet ) return bModified; } -void SwParagraphNumTabPage::Reset( const SfxItemSet& rSet ) +void SwParagraphNumTabPage::Reset( const SfxItemSet* rSet ) { bool bHasNumberStyle = false; - SfxItemState eItemState = rSet.GetItemState( GetWhich(SID_ATTR_PARA_OUTLINE_LEVEL) ); + SfxItemState eItemState = rSet->GetItemState( GetWhich(SID_ATTR_PARA_OUTLINE_LEVEL) ); sal_Int16 nOutlineLv; if( eItemState >= SFX_ITEM_AVAILABLE ) { - nOutlineLv = ((const SfxUInt16Item &)rSet.Get( GetWhich(SID_ATTR_PARA_OUTLINE_LEVEL) )).GetValue(); + nOutlineLv = ((const SfxUInt16Item &)rSet->Get( GetWhich(SID_ATTR_PARA_OUTLINE_LEVEL) )).GetValue(); m_pOutlineLvLB->SelectEntryPos( nOutlineLv ) ; } else @@ -176,11 +176,11 @@ void SwParagraphNumTabPage::Reset( const SfxItemSet& rSet ) } m_pOutlineLvLB->SaveValue(); - eItemState = rSet.GetItemState( GetWhich(SID_ATTR_PARA_NUMRULE) ); + eItemState = rSet->GetItemState( GetWhich(SID_ATTR_PARA_NUMRULE) ); if( eItemState >= SFX_ITEM_AVAILABLE ) { - OUString aStyle = ((const SfxStringItem &)rSet.Get( GetWhich(SID_ATTR_PARA_NUMRULE) )).GetValue(); + OUString aStyle = ((const SfxStringItem &)rSet->Get( GetWhich(SID_ATTR_PARA_NUMRULE) )).GetValue(); if(aStyle.isEmpty()) aStyle = m_pNumberStyleLB->GetEntry(0); @@ -203,11 +203,11 @@ void SwParagraphNumTabPage::Reset( const SfxItemSet& rSet ) m_pNumberStyleLB->SaveValue(); - eItemState = rSet.GetItemState( FN_NUMBER_NEWSTART ); + eItemState = rSet->GetItemState( FN_NUMBER_NEWSTART ); if(eItemState > SFX_ITEM_AVAILABLE ) { bCurNumrule = true; - const SfxBoolItem& rStart = (const SfxBoolItem&)rSet.Get(FN_NUMBER_NEWSTART); + const SfxBoolItem& rStart = (const SfxBoolItem&)rSet->Get(FN_NUMBER_NEWSTART); m_pNewStartCB->SetState(rStart.GetValue() ? TRISTATE_TRUE : TRISTATE_FALSE ); @@ -218,10 +218,10 @@ void SwParagraphNumTabPage::Reset( const SfxItemSet& rSet ) m_pNewStartCB->SaveValue(); - eItemState = rSet.GetItemState( FN_NUMBER_NEWSTART_AT); + eItemState = rSet->GetItemState( FN_NUMBER_NEWSTART_AT); if( eItemState > SFX_ITEM_AVAILABLE ) { - const sal_uInt16 nNewStart = ((const SfxUInt16Item&)rSet.Get(FN_NUMBER_NEWSTART_AT)).GetValue(); + const sal_uInt16 nNewStart = ((const SfxUInt16Item&)rSet->Get(FN_NUMBER_NEWSTART_AT)).GetValue(); const bool bNotMax = USHRT_MAX != nNewStart; m_pNewStartNumberCB->Check(bNotMax); m_pNewStartNF->SetValue(bNotMax ? nNewStart : 1); @@ -233,9 +233,9 @@ void SwParagraphNumTabPage::Reset( const SfxItemSet& rSet ) m_pNewStartNF->SaveValue(); m_pNewStartNumberCB->SaveValue(); StyleHdl_Impl(m_pNumberStyleLB); - if( SFX_ITEM_AVAILABLE <= rSet.GetItemState(RES_LINENUMBER)) + if( SFX_ITEM_AVAILABLE <= rSet->GetItemState(RES_LINENUMBER)) { - SwFmtLineNumber& rNum = (SwFmtLineNumber&)rSet.Get(RES_LINENUMBER); + SwFmtLineNumber& rNum = (SwFmtLineNumber&)rSet->Get(RES_LINENUMBER); sal_uLong nStartValue = rNum.GetStartValue(); bool bCount = rNum.IsCount(); m_pCountParaCB->SetState( bCount ? TRISTATE_TRUE : TRISTATE_FALSE ); diff --git a/sw/source/ui/chrdlg/swuiccoll.cxx b/sw/source/ui/chrdlg/swuiccoll.cxx index da29f85c9c8c..0f80203c7dc2 100644 --- a/sw/source/ui/chrdlg/swuiccoll.cxx +++ b/sw/source/ui/chrdlg/swuiccoll.cxx @@ -155,7 +155,7 @@ bool SwCondCollPage::FillItemSet(SfxItemSet *rSet) return bModified; } -void SwCondCollPage::Reset(const SfxItemSet &/*rSet*/) +void SwCondCollPage::Reset(const SfxItemSet */*rSet*/) { if(bNewTemplate) m_pConditionCB->Enable(); diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx index 5bf65b411cf3..75402da0d1af 100644 --- a/sw/source/ui/config/mailconfigpage.cxx +++ b/sw/source/ui/config/mailconfigpage.cxx @@ -165,7 +165,7 @@ bool SwMailConfigPage::FillItemSet( SfxItemSet* /*rSet*/ ) return true; } -void SwMailConfigPage::Reset( const SfxItemSet& /*rSet*/ ) +void SwMailConfigPage::Reset( const SfxItemSet* /*rSet*/ ) { m_pDisplayNameED->SetText(m_pConfigItem->GetMailDisplayName()); m_pAddressED->SetText(m_pConfigItem->GetMailAddress()); diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx index 9dd4105dca11..ce537458eea5 100644 --- a/sw/source/ui/config/optcomp.cxx +++ b/sw/source/ui/config/optcomp.cxx @@ -489,7 +489,7 @@ bool SwCompatibilityOptPage::FillItemSet( SfxItemSet* ) return bModified; } -void SwCompatibilityOptPage::Reset( const SfxItemSet& ) +void SwCompatibilityOptPage::Reset( const SfxItemSet* ) { m_pOptionsLB->SelectEntryPos( 0 ); diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx index dcfa398966f5..cf592b71ba7f 100644 --- a/sw/source/ui/config/optload.cxx +++ b/sw/source/ui/config/optload.cxx @@ -247,12 +247,12 @@ bool SwLoadOptPage::FillItemSet( SfxItemSet* rSet ) return bRet; } -void SwLoadOptPage::Reset( const SfxItemSet& rSet) +void SwLoadOptPage::Reset( const SfxItemSet* rSet) { const SwMasterUsrPref* pUsrPref = SW_MOD()->GetUsrPref(false); const SfxPoolItem* pItem; - if(SFX_ITEM_SET == rSet.GetItemState(FN_PARAM_WRTSHELL, false, &pItem)) + if(SFX_ITEM_SET == rSet->GetItemState(FN_PARAM_WRTSHELL, false, &pItem)) m_pWrtShell = (SwWrtShell*)((const SwPtrItem*)pItem)->GetValue(); SwFldUpdateFlags eFldFlags = AUTOUPD_GLOBALSETTING; @@ -280,9 +280,9 @@ void SwLoadOptPage::Reset( const SfxItemSet& rSet) m_pAutoUpdateFields->SaveValue(); m_pAutoUpdateCharts->SaveValue(); m_pMetricLB->SetNoSelection(); - if ( rSet.GetItemState( SID_ATTR_METRIC ) >= SFX_ITEM_AVAILABLE ) + if ( rSet->GetItemState( SID_ATTR_METRIC ) >= SFX_ITEM_AVAILABLE ) { - const SfxUInt16Item& rItem = (SfxUInt16Item&)rSet.Get( SID_ATTR_METRIC ); + const SfxUInt16Item& rItem = (SfxUInt16Item&)rSet->Get( SID_ATTR_METRIC ); FieldUnit eFieldUnit = (FieldUnit)rItem.GetValue(); for ( sal_Int32 i = 0; i < m_pMetricLB->GetEntryCount(); ++i ) @@ -296,7 +296,7 @@ void SwLoadOptPage::Reset( const SfxItemSet& rSet) ::SetFieldUnit(*m_pTabMF, eFieldUnit); } m_pMetricLB->SaveValue(); - if(SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_DEFTABSTOP, false, &pItem)) + if(SFX_ITEM_SET == rSet->GetItemState(SID_ATTR_DEFTABSTOP, false, &pItem)) { m_nLastTab = ((SfxUInt16Item*)pItem)->GetValue(); m_pTabMF->SetValue(m_pTabMF->Normalize(m_nLastTab), FUNIT_TWIP); @@ -311,7 +311,7 @@ void SwLoadOptPage::Reset( const SfxItemSet& rSet) m_pUseSquaredPageMode->SaveValue(); } - if(SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_APPLYCHARUNIT, false, &pItem)) + if(SFX_ITEM_SET == rSet->GetItemState(SID_ATTR_APPLYCHARUNIT, false, &pItem)) { bool bUseCharUnit = ((const SfxBoolItem*)pItem)->GetValue(); m_pUseCharUnit->Check(bUseCharUnit); @@ -554,10 +554,10 @@ bool SwCaptionOptPage::FillItemSet( SfxItemSet* ) return bRet; } -void SwCaptionOptPage::Reset( const SfxItemSet& rSet) +void SwCaptionOptPage::Reset( const SfxItemSet* rSet) { const SfxPoolItem* pItem; - if(SFX_ITEM_SET == rSet.GetItemState(SID_HTML_MODE, false, &pItem)) + if(SFX_ITEM_SET == rSet->GetItemState(SID_HTML_MODE, false, &pItem)) { bHTMLMode = 0 != (((const SfxUInt16Item*)pItem)->GetValue() & HTMLMODE_ON); } diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index 460846e4b220..03ec363a2df0 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -182,11 +182,11 @@ static void lcl_SelectMetricLB(ListBox* rMetric, sal_uInt16 nSID, const SfxItemS rMetric->SaveValue(); } -void SwContentOptPage::Reset(const SfxItemSet& rSet) +void SwContentOptPage::Reset(const SfxItemSet* rSet) { const SwElemItem* pElemAttr = 0; - rSet.GetItemState( FN_PARAM_ELEM , false, + rSet->GetItemState( FN_PARAM_ELEM , false, (const SfxPoolItem**)&pElemAttr ); if(pElemAttr) { @@ -205,9 +205,9 @@ void SwContentOptPage::Reset(const SfxItemSet& rSet) m_pSmoothCBox->Check (pElemAttr->bSmoothScroll); } m_pMetricLB->SetNoSelection(); - lcl_SelectMetricLB(m_pMetricLB, SID_ATTR_METRIC, rSet); - lcl_SelectMetricLB(m_pHMetric, FN_HSCROLL_METRIC, rSet); - lcl_SelectMetricLB(m_pVMetric, FN_VSCROLL_METRIC, rSet); + lcl_SelectMetricLB(m_pMetricLB, SID_ATTR_METRIC, *rSet); + lcl_SelectMetricLB(m_pHMetric, FN_HSCROLL_METRIC, *rSet); + lcl_SelectMetricLB(m_pVMetric, FN_VSCROLL_METRIC, *rSet); AnyRulerHdl(m_pAnyRulerCB); } @@ -408,7 +408,7 @@ bool SwAddPrinterTabPage::FillItemSet( SfxItemSet* rCoreSet ) return bAttrModified; } -void SwAddPrinterTabPage::Reset( const SfxItemSet& ) +void SwAddPrinterTabPage::Reset( const SfxItemSet* ) { const SfxItemSet& rSet = GetItemSet(); const SwAddPrinterItem* pAddPrinterAttr = 0; @@ -493,7 +493,7 @@ void SwAddPrinterTabPage::PageCreated( const SfxAllItemSet& aSet) if (pPreviewItem) { SetPreview(pPreviewItem->GetValue()); - Reset(aSet); + Reset(&aSet); } if (pListItem && pListItem->GetValue()) { @@ -745,13 +745,13 @@ bool SwStdFontTabPage::FillItemSet( SfxItemSet* ) return false; } -void SwStdFontTabPage::Reset( const SfxItemSet& rSet) +void SwStdFontTabPage::Reset( const SfxItemSet* rSet) { const SfxPoolItem* pLang; const sal_uInt16 nLangSlot = nFontGroup == FONT_GROUP_DEFAULT ? SID_ATTR_LANGUAGE : FONT_GROUP_CJK == nFontGroup ? SID_ATTR_CHAR_CJK_LANGUAGE : SID_ATTR_CHAR_CTL_LANGUAGE; - if( SFX_ITEM_SET == rSet.GetItemState(nLangSlot, false, &pLang)) + if( SFX_ITEM_SET == rSet->GetItemState(nLangSlot, false, &pLang)) eLanguage = ((const SvxLanguageItem*)pLang)->GetValue(); OUString sToReplace = sScriptWestern; @@ -768,13 +768,13 @@ void SwStdFontTabPage::Reset( const SfxItemSet& rSet) delete pPrt; } - if(SFX_ITEM_SET == rSet.GetItemState(FN_PARAM_PRINTER, false, &pItem)) + if(SFX_ITEM_SET == rSet->GetItemState(FN_PARAM_PRINTER, false, &pItem)) { pPrt = (SfxPrinter*)((const SwPtrItem*)pItem)->GetValue(); } else { - SfxItemSet* pPrinterSet = new SfxItemSet( *rSet.GetPool(), + SfxItemSet* pPrinterSet = new SfxItemSet( *rSet->GetPool(), SID_PRINTER_NOTFOUND_WARN, SID_PRINTER_NOTFOUND_WARN, SID_PRINTER_CHANGESTODOC, SID_PRINTER_CHANGESTODOC, 0 ); @@ -805,12 +805,12 @@ void SwStdFontTabPage::Reset( const SfxItemSet& rSet) pIdxBox->InsertEntry( *it ); } } - if(SFX_ITEM_SET == rSet.GetItemState(FN_PARAM_STDFONTS, false, &pItem)) + if(SFX_ITEM_SET == rSet->GetItemState(FN_PARAM_STDFONTS, false, &pItem)) { pFontConfig = (SwStdFontConfig*)((const SwPtrItem*)pItem)->GetValue(); } - if(SFX_ITEM_SET == rSet.GetItemState(FN_PARAM_WRTSHELL, false, &pItem)) + if(SFX_ITEM_SET == rSet->GetItemState(FN_PARAM_WRTSHELL, false, &pItem)) { pWrtShell = (SwWrtShell*)((const SwPtrItem*)pItem)->GetValue(); } @@ -1184,12 +1184,12 @@ bool SwTableOptionsTabPage::FillItemSet( SfxItemSet* ) return bRet; } -void SwTableOptionsTabPage::Reset( const SfxItemSet& rSet) +void SwTableOptionsTabPage::Reset( const SfxItemSet* rSet) { const SwModuleOptions* pModOpt = SW_MOD()->GetModuleConfig(); - if ( rSet.GetItemState( SID_ATTR_METRIC ) >= SFX_ITEM_AVAILABLE ) + if ( rSet->GetItemState( SID_ATTR_METRIC ) >= SFX_ITEM_AVAILABLE ) { - const SfxUInt16Item& rItem = (SfxUInt16Item&)rSet.Get( SID_ATTR_METRIC ); + const SfxUInt16Item& rItem = (SfxUInt16Item&)rSet->Get( SID_ATTR_METRIC ); FieldUnit eFieldUnit = (FieldUnit)rItem.GetValue(); ::SetFieldUnit( *pRowMoveMF, eFieldUnit ); ::SetFieldUnit( *pColMoveMF, eFieldUnit ); @@ -1209,7 +1209,7 @@ void SwTableOptionsTabPage::Reset( const SfxItemSet& rSet) case TBLVAR_CHGABS: pVarRB->Check(); break; } const SfxPoolItem* pItem; - if(SFX_ITEM_SET == rSet.GetItemState(SID_HTML_MODE, false, &pItem)) + if(SFX_ITEM_SET == rSet->GetItemState(SID_HTML_MODE, false, &pItem)) { bHTMLMode = 0 != (((const SfxUInt16Item*)pItem)->GetValue() & HTMLMODE_ON); } @@ -1398,12 +1398,12 @@ bool SwShdwCrsrOptionsTabPage::FillItemSet( SfxItemSet* rSet ) return bRet; } -void SwShdwCrsrOptionsTabPage::Reset( const SfxItemSet& rSet ) +void SwShdwCrsrOptionsTabPage::Reset( const SfxItemSet* rSet ) { const SfxPoolItem* pItem = 0; SwShadowCursorItem aOpt; - if( SFX_ITEM_SET == rSet.GetItemState( FN_PARAM_SHADOWCURSOR, false, &pItem )) + if( SFX_ITEM_SET == rSet->GetItemState( FN_PARAM_SHADOWCURSOR, false, &pItem )) aOpt = *(SwShadowCursorItem*)pItem; m_pOnOffCB->Check( aOpt.IsOn() ); @@ -1420,13 +1420,13 @@ void SwShdwCrsrOptionsTabPage::Reset( const SfxItemSet& rSet ) m_pMathBaselineAlignmentCB->Hide(); } - if( SFX_ITEM_SET == rSet.GetItemState( FN_PARAM_CRSR_IN_PROTECTED, false, &pItem )) + if( SFX_ITEM_SET == rSet->GetItemState( FN_PARAM_CRSR_IN_PROTECTED, false, &pItem )) m_pCrsrInProtCB->Check(((const SfxBoolItem*)pItem)->GetValue()); m_pCrsrInProtCB->SaveValue(); const SwDocDisplayItem* pDocDisplayAttr = 0; - rSet.GetItemState( FN_PARAM_DOCDISP, false, + rSet->GetItemState( FN_PARAM_DOCDISP, false, (const SfxPoolItem**)&pDocDisplayAttr ); if(pDocDisplayAttr) { @@ -1860,7 +1860,7 @@ bool SwRedlineOptionsTabPage::FillItemSet( SfxItemSet* ) return false; } -void SwRedlineOptionsTabPage::Reset( const SfxItemSet& ) +void SwRedlineOptionsTabPage::Reset( const SfxItemSet* ) { const SwModuleOptions *pOpt = SW_MOD()->GetModuleConfig(); @@ -2273,7 +2273,7 @@ bool SwCompareOptionsTabPage::FillItemSet( SfxItemSet* ) return bRet; } -void SwCompareOptionsTabPage::Reset( const SfxItemSet& ) +void SwCompareOptionsTabPage::Reset( const SfxItemSet* ) { SwModuleOptions *pOpt = SW_MOD()->GetModuleConfig(); @@ -2379,7 +2379,7 @@ bool SwTestTabPage::FillItemSet( SfxItemSet* rCoreSet ) return bAttrModified; } -void SwTestTabPage::Reset( const SfxItemSet& ) +void SwTestTabPage::Reset( const SfxItemSet* ) { const SfxItemSet& rSet = GetItemSet(); const SwTestItem* pTestAttr = 0; diff --git a/sw/source/ui/dialog/docstdlg.cxx b/sw/source/ui/dialog/docstdlg.cxx index 4d237209aeef..15fd2dc931bf 100644 --- a/sw/source/ui/dialog/docstdlg.cxx +++ b/sw/source/ui/dialog/docstdlg.cxx @@ -82,7 +82,7 @@ bool SwDocStatPage::FillItemSet(SfxItemSet * /*rSet*/) return false; } -void SwDocStatPage::Reset(const SfxItemSet &/*rSet*/) +void SwDocStatPage::Reset(const SfxItemSet */*rSet*/) { } diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index a43d048545aa..4c4216788f28 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -1631,7 +1631,7 @@ bool SwInsertSectionTabPage::FillItemSet( SfxItemSet* ) return true; } -void SwInsertSectionTabPage::Reset( const SfxItemSet& ) +void SwInsertSectionTabPage::Reset( const SfxItemSet* ) { } @@ -1967,11 +1967,11 @@ void SwSectionFtnEndTabPage::ResetState( bool bFtn, } } -void SwSectionFtnEndTabPage::Reset( const SfxItemSet& rSet ) +void SwSectionFtnEndTabPage::Reset( const SfxItemSet* rSet ) { - ResetState( true, (const SwFmtFtnAtTxtEnd&)rSet.Get( + ResetState( true, (const SwFmtFtnAtTxtEnd&)rSet->Get( RES_FTN_AT_TXTEND, false )); - ResetState( false, (const SwFmtEndAtTxtEnd&)rSet.Get( + ResetState( false, (const SwFmtEndAtTxtEnd&)rSet->Get( RES_END_AT_TXTEND, false )); } @@ -2111,18 +2111,18 @@ bool SwSectionIndentTabPage::FillItemSet( SfxItemSet* rSet) return true; } -void SwSectionIndentTabPage::Reset( const SfxItemSet& rSet) +void SwSectionIndentTabPage::Reset( const SfxItemSet* rSet) { //this page doesn't show up in HTML mode FieldUnit aMetric = ::GetDfltMetric(false); SetMetric(*m_pBeforeMF, aMetric); SetMetric(*m_pAfterMF , aMetric); - SfxItemState eItemState = rSet.GetItemState( RES_LR_SPACE ); + SfxItemState eItemState = rSet->GetItemState( RES_LR_SPACE ); if ( eItemState >= SFX_ITEM_AVAILABLE ) { const SvxLRSpaceItem& rSpace = - (const SvxLRSpaceItem&)rSet.Get( RES_LR_SPACE ); + (const SvxLRSpaceItem&)rSet->Get( RES_LR_SPACE ); m_pBeforeMF->SetValue( m_pBeforeMF->Normalize(rSpace.GetLeft()), FUNIT_TWIP ); m_pAfterMF->SetValue( m_pAfterMF->Normalize(rSpace.GetRight()), FUNIT_TWIP ); diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx index 6ec8cab83818..c2c547cde2fe 100644 --- a/sw/source/ui/envelp/envfmt.cxx +++ b/sw/source/ui/envelp/envfmt.cxx @@ -451,7 +451,7 @@ void SwEnvFmtPage::ActivatePage(const SfxItemSet& rSet) { SfxItemSet aSet(rSet); aSet.Put(GetParentSwEnvDlg()->aEnvItem); - Reset(aSet); + Reset(&aSet); } int SwEnvFmtPage::DeactivatePage(SfxItemSet* _pSet) @@ -492,9 +492,9 @@ bool SwEnvFmtPage::FillItemSet(SfxItemSet* rSet) return true; } -void SwEnvFmtPage::Reset(const SfxItemSet& rSet) +void SwEnvFmtPage::Reset(const SfxItemSet* rSet) { - const SwEnvItem& rItem = (const SwEnvItem&) rSet.Get(FN_ENVELOP); + const SwEnvItem& rItem = (const SwEnvItem&) rSet->Get(FN_ENVELOP); Paper ePaper = SvxPaperInfo::GetSvxPaper( Size( std::min(rItem.lWidth, rItem.lHeight), diff --git a/sw/source/ui/envelp/envfmt.hxx b/sw/source/ui/envelp/envfmt.hxx index 28cc5cd395b7..fa2eabec5d32 100644 --- a/sw/source/ui/envelp/envfmt.hxx +++ b/sw/source/ui/envelp/envfmt.hxx @@ -66,7 +66,7 @@ public: virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; void FillItem(SwEnvItem& rItem); virtual bool FillItemSet(SfxItemSet* rSet) SAL_OVERRIDE; - virtual void Reset(const SfxItemSet& rSet) SAL_OVERRIDE; + virtual void Reset(const SfxItemSet* rSet) SAL_OVERRIDE; }; #endif diff --git a/sw/source/ui/envelp/envlop1.cxx b/sw/source/ui/envelp/envlop1.cxx index 4e56860cfa4d..9982d5eaa842 100644 --- a/sw/source/ui/envelp/envlop1.cxx +++ b/sw/source/ui/envelp/envlop1.cxx @@ -316,7 +316,7 @@ void SwEnvPage::ActivatePage(const SfxItemSet& rSet) { SfxItemSet aSet(rSet); aSet.Put(GetParentSwEnvDlg()->aEnvItem); - Reset(aSet); + Reset(&aSet); } int SwEnvPage::DeactivatePage(SfxItemSet* _pSet) @@ -341,9 +341,9 @@ bool SwEnvPage::FillItemSet(SfxItemSet* rSet) return true; } -void SwEnvPage::Reset(const SfxItemSet& rSet) +void SwEnvPage::Reset(const SfxItemSet* rSet) { - SwEnvItem aItem = (const SwEnvItem&) rSet.Get(FN_ENVELOP); + SwEnvItem aItem = (const SwEnvItem&) rSet->Get(FN_ENVELOP); m_pAddrEdit->SetText(convertLineEnd(aItem.aAddrText, GetSystemLineEnd())); m_pSenderEdit->SetText(convertLineEnd(aItem.aSendText, GetSystemLineEnd())); m_pSenderBox->Check (aItem.bSend); diff --git a/sw/source/ui/envelp/envprt.cxx b/sw/source/ui/envelp/envprt.cxx index 304737608b33..246b2692a39c 100644 --- a/sw/source/ui/envelp/envprt.cxx +++ b/sw/source/ui/envelp/envprt.cxx @@ -170,10 +170,10 @@ bool SwEnvPrtPage::FillItemSet(SfxItemSet* rSet) return true; } -void SwEnvPrtPage::Reset(const SfxItemSet& rSet) +void SwEnvPrtPage::Reset(const SfxItemSet* rSet) { // Read item - const SwEnvItem& rItem = (const SwEnvItem&) rSet.Get(FN_ENVELOP); + const SwEnvItem& rItem = (const SwEnvItem&) rSet->Get(FN_ENVELOP); m_pAlignBox->CheckItem(m_aIds[rItem.eAlign]); if (rItem.bPrintFromAbove) @@ -184,7 +184,7 @@ void SwEnvPrtPage::Reset(const SfxItemSet& rSet) SetFldVal(*m_pRightField, rItem.lShiftRight); SetFldVal(*m_pDownField , rItem.lShiftDown ); - ActivatePage(rSet); + ActivatePage(*rSet); ClickHdl(m_pTopButton); } diff --git a/sw/source/ui/envelp/envprt.hxx b/sw/source/ui/envelp/envprt.hxx index 9c937b75adbe..5fa702e218ca 100644 --- a/sw/source/ui/envelp/envprt.hxx +++ b/sw/source/ui/envelp/envprt.hxx @@ -65,7 +65,7 @@ public: virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; void FillItem(SwEnvItem& rItem); virtual bool FillItemSet(SfxItemSet* rSet) SAL_OVERRIDE; - virtual void Reset(const SfxItemSet& rSet) SAL_OVERRIDE; + virtual void Reset(const SfxItemSet* rSet) SAL_OVERRIDE; inline void SetPrt(Printer* pPrinter) { pPrt = pPrinter; } }; diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx index 7efb173754f5..184cb15296d1 100644 --- a/sw/source/ui/envelp/label1.cxx +++ b/sw/source/ui/envelp/label1.cxx @@ -467,7 +467,7 @@ SfxTabPage* SwLabPage::Create(Window* pParent, const SfxItemSet& rSet) void SwLabPage::ActivatePage(const SfxItemSet& rSet) { - Reset( rSet ); + Reset( &rSet ); } int SwLabPage::DeactivatePage(SfxItemSet* _pSet) @@ -502,9 +502,9 @@ bool SwLabPage::FillItemSet(SfxItemSet* rSet) return true; } -void SwLabPage::Reset(const SfxItemSet& rSet) +void SwLabPage::Reset(const SfxItemSet* rSet) { - aItem = (const SwLabItem&) rSet.Get(FN_LABEL); + aItem = (const SwLabItem&) rSet->Get(FN_LABEL); OUString sDBName = aItem.sDBName; OUString aWriting(convertLineEnd(aItem.aWriting, GetSystemLineEnd())); @@ -603,7 +603,7 @@ SfxTabPage* SwVisitingCardPage::Create(Window* pParent, const SfxItemSet& rSet) void SwVisitingCardPage::ActivatePage(const SfxItemSet& rSet) { - Reset( rSet ); + Reset( &rSet ); UpdateFields(); } @@ -660,9 +660,9 @@ static bool lcl_FindBlock(SvTreeListBox& rAutoTextLB, const OUString& rBlockName return false; } -void SwVisitingCardPage::Reset(const SfxItemSet& rSet) +void SwVisitingCardPage::Reset(const SfxItemSet* rSet) { - aLabItem = (const SwLabItem&) rSet.Get(FN_LABEL); + aLabItem = (const SwLabItem&) rSet->Get(FN_LABEL); bool bFound = false; sal_Int32 i; @@ -737,7 +737,7 @@ SfxTabPage* SwPrivateDataPage::Create(Window* pParent, const SfxItemSet& rSet) void SwPrivateDataPage::ActivatePage(const SfxItemSet& rSet) { - Reset(rSet); + Reset(&rSet); } int SwPrivateDataPage::DeactivatePage(SfxItemSet* _pSet) @@ -774,9 +774,9 @@ bool SwPrivateDataPage::FillItemSet(SfxItemSet* rSet) return true; } -void SwPrivateDataPage::Reset(const SfxItemSet& rSet) +void SwPrivateDataPage::Reset(const SfxItemSet* rSet) { - const SwLabItem& aItem = (const SwLabItem&) rSet.Get(FN_LABEL); + const SwLabItem& aItem = (const SwLabItem&) rSet->Get(FN_LABEL); m_pFirstNameED->SetText(aItem.aPrivFirstName); m_pNameED->SetText(aItem.aPrivName); m_pShortCutED->SetText(aItem.aPrivShortCut); @@ -825,7 +825,7 @@ SfxTabPage* SwBusinessDataPage::Create(Window* pParent, const SfxItemSet& rSet) void SwBusinessDataPage::ActivatePage(const SfxItemSet& rSet) { - Reset(rSet); + Reset(&rSet); } int SwBusinessDataPage::DeactivatePage(SfxItemSet* _pSet) @@ -858,9 +858,9 @@ bool SwBusinessDataPage::FillItemSet(SfxItemSet* rSet) return true; } -void SwBusinessDataPage::Reset(const SfxItemSet& rSet) +void SwBusinessDataPage::Reset(const SfxItemSet* rSet) { - const SwLabItem& aItem = (const SwLabItem&) rSet.Get(FN_LABEL); + const SwLabItem& aItem = (const SwLabItem&) rSet->Get(FN_LABEL); m_pCompanyED->SetText(aItem.aCompCompany); m_pCompanyExtED->SetText(aItem.aCompCompanyExt); m_pSloganED->SetText(aItem.aCompSlogan); diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx index d2cb08201325..6af0e42121b7 100644 --- a/sw/source/ui/envelp/labfmt.cxx +++ b/sw/source/ui/envelp/labfmt.cxx @@ -472,7 +472,7 @@ SfxTabPage* SwLabFmtPage::Create(Window* pParent, const SfxItemSet& rSet) void SwLabFmtPage::ActivatePage(const SfxItemSet& rSet) { SfxItemSet aSet(rSet); - Reset(aSet); + Reset(&aSet); } int SwLabFmtPage::DeactivatePage(SfxItemSet* _pSet) @@ -511,7 +511,7 @@ bool SwLabFmtPage::FillItemSet(SfxItemSet* rSet) return true; } -void SwLabFmtPage::Reset(const SfxItemSet& ) +void SwLabFmtPage::Reset(const SfxItemSet* ) { // Initialise fields GetParentSwLabDlg()->GetLabItem(aItem); diff --git a/sw/source/ui/envelp/labfmt.hxx b/sw/source/ui/envelp/labfmt.hxx index d84ffc03c1f6..547efa5d40c7 100644 --- a/sw/source/ui/envelp/labfmt.hxx +++ b/sw/source/ui/envelp/labfmt.hxx @@ -109,7 +109,7 @@ public: virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; void FillItem(SwLabItem& rItem); virtual bool FillItemSet(SfxItemSet* rSet) SAL_OVERRIDE; - virtual void Reset(const SfxItemSet& rSet) SAL_OVERRIDE; + virtual void Reset(const SfxItemSet* rSet) SAL_OVERRIDE; SwLabDlg* GetParentSwLabDlg() {return (SwLabDlg*)GetParentDialog();} }; diff --git a/sw/source/ui/envelp/labprt.cxx b/sw/source/ui/envelp/labprt.cxx index 65ddb7ebc746..d0fb4fbb961c 100644 --- a/sw/source/ui/envelp/labprt.cxx +++ b/sw/source/ui/envelp/labprt.cxx @@ -101,7 +101,7 @@ SfxTabPage* SwLabPrtPage::Create(Window* pParent, const SfxItemSet& rSet) void SwLabPrtPage::ActivatePage( const SfxItemSet& rSet ) { - Reset(rSet); + Reset(&rSet); } int SwLabPrtPage::DeactivatePage(SfxItemSet* _pSet) @@ -130,7 +130,7 @@ bool SwLabPrtPage::FillItemSet(SfxItemSet* rSet) return true; } -void SwLabPrtPage::Reset(const SfxItemSet& ) +void SwLabPrtPage::Reset(const SfxItemSet* ) { SwLabItem aItem; GetParentSwLabDlg()->GetLabItem(aItem); diff --git a/sw/source/ui/envelp/labprt.hxx b/sw/source/ui/envelp/labprt.hxx index 011ccea625ff..258cdfeb2f56 100644 --- a/sw/source/ui/envelp/labprt.hxx +++ b/sw/source/ui/envelp/labprt.hxx @@ -62,7 +62,7 @@ public: virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; void FillItem(SwLabItem& rItem); virtual bool FillItemSet(SfxItemSet* rSet) SAL_OVERRIDE; - virtual void Reset(const SfxItemSet& rSet) SAL_OVERRIDE; + virtual void Reset(const SfxItemSet* rSet) SAL_OVERRIDE; inline Printer* GetPrt() { return (pPrinter); } }; diff --git a/sw/source/ui/envelp/swuilabimp.hxx b/sw/source/ui/envelp/swuilabimp.hxx index 62436bd6bdc5..806d302164df 100644 --- a/sw/source/ui/envelp/swuilabimp.hxx +++ b/sw/source/ui/envelp/swuilabimp.hxx @@ -70,7 +70,7 @@ public: virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; void FillItem(SwLabItem& rItem); virtual bool FillItemSet(SfxItemSet* rSet) SAL_OVERRIDE; - virtual void Reset(const SfxItemSet& rSet) SAL_OVERRIDE; + virtual void Reset(const SfxItemSet* rSet) SAL_OVERRIDE; SwLabDlg* GetParentSwLabDlg() {return (SwLabDlg*) GetParentDialog();} @@ -121,7 +121,7 @@ public: virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; virtual bool FillItemSet(SfxItemSet* rSet) SAL_OVERRIDE; - virtual void Reset(const SfxItemSet& rSet) SAL_OVERRIDE; + virtual void Reset(const SfxItemSet* rSet) SAL_OVERRIDE; }; class SwPrivateDataPage : public SfxTabPage @@ -159,7 +159,7 @@ public: virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; virtual bool FillItemSet(SfxItemSet* rSet) SAL_OVERRIDE; - virtual void Reset(const SfxItemSet& rSet) SAL_OVERRIDE; + virtual void Reset(const SfxItemSet* rSet) SAL_OVERRIDE; }; class SwBusinessDataPage : public SfxTabPage @@ -195,7 +195,7 @@ public: virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; virtual bool FillItemSet(SfxItemSet* rSet) SAL_OVERRIDE; - virtual void Reset(const SfxItemSet& rSet) SAL_OVERRIDE; + virtual void Reset(const SfxItemSet* rSet) SAL_OVERRIDE; }; #endif diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx index a302e4e8ec0b..7b09a0ac465a 100644 --- a/sw/source/ui/fldui/flddb.cxx +++ b/sw/source/ui/fldui/flddb.cxx @@ -77,7 +77,7 @@ SwFldDBPage::~SwFldDBPage() } // initialise TabPage -void SwFldDBPage::Reset(const SfxItemSet&) +void SwFldDBPage::Reset(const SfxItemSet*) { Init(); // Allgemeine initialisierung diff --git a/sw/source/ui/fldui/flddb.hxx b/sw/source/ui/fldui/flddb.hxx index 90e5311965d4..a1de7421bea6 100644 --- a/sw/source/ui/fldui/flddb.hxx +++ b/sw/source/ui/fldui/flddb.hxx @@ -75,7 +75,7 @@ public: static SfxTabPage* Create(Window* pParent, const SfxItemSet& rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; virtual void FillUserData() SAL_OVERRIDE; void ActivateMailMergeAddress(); diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx index 279dfab73df2..256c1d3deb76 100644 --- a/sw/source/ui/fldui/flddinf.cxx +++ b/sw/source/ui/fldui/flddinf.cxx @@ -91,7 +91,7 @@ SwFldDokInfPage::~SwFldDokInfPage() { } -void SwFldDokInfPage::Reset(const SfxItemSet& ) +void SwFldDokInfPage::Reset(const SfxItemSet* ) { Init(); // general initialisation diff --git a/sw/source/ui/fldui/flddinf.hxx b/sw/source/ui/fldui/flddinf.hxx index 50e49f92aacc..60668fa32063 100644 --- a/sw/source/ui/fldui/flddinf.hxx +++ b/sw/source/ui/fldui/flddinf.hxx @@ -66,7 +66,7 @@ public: static SfxTabPage* Create(Window* pParent, const SfxItemSet& rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; virtual void FillUserData() SAL_OVERRIDE; }; diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx index ab0c365b943b..2ca5876aad56 100644 --- a/sw/source/ui/fldui/flddok.cxx +++ b/sw/source/ui/fldui/flddok.cxx @@ -82,7 +82,7 @@ SwFldDokPage::~SwFldDokPage() { } -void SwFldDokPage::Reset(const SfxItemSet& ) +void SwFldDokPage::Reset(const SfxItemSet* ) { SavePos(m_pTypeLB); Init(); // general initialisation diff --git a/sw/source/ui/fldui/flddok.hxx b/sw/source/ui/fldui/flddok.hxx index 9e549b77d9eb..e89d1484d53a 100644 --- a/sw/source/ui/fldui/flddok.hxx +++ b/sw/source/ui/fldui/flddok.hxx @@ -68,7 +68,7 @@ public: static SfxTabPage* Create(Window* pParent, const SfxItemSet& rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; virtual void FillUserData() SAL_OVERRIDE; }; diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx index 868d72fe6629..8be5ffed1e84 100644 --- a/sw/source/ui/fldui/fldfunc.cxx +++ b/sw/source/ui/fldui/fldfunc.cxx @@ -93,7 +93,7 @@ SwFldFuncPage::~SwFldFuncPage() { } -void SwFldFuncPage::Reset(const SfxItemSet& ) +void SwFldFuncPage::Reset(const SfxItemSet* ) { SavePos(m_pTypeLB); Init(); // general initialisation diff --git a/sw/source/ui/fldui/fldfunc.hxx b/sw/source/ui/fldui/fldfunc.hxx index 434999ebae54..89c5089f39db 100644 --- a/sw/source/ui/fldui/fldfunc.hxx +++ b/sw/source/ui/fldui/fldfunc.hxx @@ -90,7 +90,7 @@ public: static SfxTabPage* Create(Window* pParent, const SfxItemSet& rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; virtual void FillUserData() SAL_OVERRIDE; }; diff --git a/sw/source/ui/fldui/fldpage.cxx b/sw/source/ui/fldui/fldpage.cxx index d9575534024b..108402c47f8b 100644 --- a/sw/source/ui/fldui/fldpage.cxx +++ b/sw/source/ui/fldui/fldpage.cxx @@ -110,7 +110,7 @@ void SwFldPage::EditNewField( bool bOnlyActivate ) } m_nSelectionSel = LISTBOX_ENTRY_NOTFOUND; m_bRefresh = true; - Reset(*(SfxItemSet*)0); + Reset(0); m_bRefresh = false; } diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx index c1ebf3494478..f992ad6e28da 100644 --- a/sw/source/ui/fldui/fldref.cxx +++ b/sw/source/ui/fldui/fldref.cxx @@ -141,7 +141,7 @@ void SwFldRefPage::SaveSelectedTxtNode() } } -void SwFldRefPage::Reset(const SfxItemSet& ) +void SwFldRefPage::Reset(const SfxItemSet* ) { if (!IsFldEdit()) { diff --git a/sw/source/ui/fldui/fldref.hxx b/sw/source/ui/fldui/fldref.hxx index cb4ac98a8dfb..6d736541d244 100644 --- a/sw/source/ui/fldui/fldref.hxx +++ b/sw/source/ui/fldui/fldref.hxx @@ -81,7 +81,7 @@ public: static SfxTabPage* Create(Window* pParent, const SfxItemSet& rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; virtual void FillUserData() SAL_OVERRIDE; }; diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx index f392afc0b88d..8c32b5a15b37 100644 --- a/sw/source/ui/fldui/fldvar.cxx +++ b/sw/source/ui/fldui/fldvar.cxx @@ -88,7 +88,7 @@ SwFldVarPage::~SwFldVarPage() { } -void SwFldVarPage::Reset(const SfxItemSet& ) +void SwFldVarPage::Reset(const SfxItemSet* ) { SavePos(m_pTypeLB); diff --git a/sw/source/ui/fldui/fldvar.hxx b/sw/source/ui/fldui/fldvar.hxx index 203882935813..86fcba3c83af 100644 --- a/sw/source/ui/fldui/fldvar.hxx +++ b/sw/source/ui/fldui/fldvar.hxx @@ -97,7 +97,7 @@ public: static SfxTabPage* Create(Window* pParent, const SfxItemSet& rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; virtual void FillUserData() SAL_OVERRIDE; }; diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx index 2fd3c2beb24f..0e71adf72a2d 100644 --- a/sw/source/ui/frmdlg/column.cxx +++ b/sw/source/ui/frmdlg/column.cxx @@ -279,7 +279,7 @@ IMPL_LINK(SwColumnDlg, ObjectHdl, ListBox*, pBox) pTabPage->SetFrmMode(true); pTabPage->SetPageWidth(nWidth); if( pSet ) - pTabPage->Reset(*pSet); + pTabPage->Reset(pSet); return 0; } @@ -565,7 +565,7 @@ void SwColumnPage::connectPercentField(PercentField &rWrap, const OString &rName m_aPercentFieldsMap[pFld] = &rWrap; } -void SwColumnPage::Reset(const SfxItemSet &rSet) +void SwColumnPage::Reset(const SfxItemSet *rSet) { const sal_uInt16 nHtmlMode = ::GetHtmlMode((const SwDocShell*)SfxObjectShell::Current()); @@ -582,7 +582,7 @@ void SwColumnPage::Reset(const SfxItemSet &rSet) aDistEd2.SetMetric(aMetric); delete pColMgr; - pColMgr = new SwColMgr(rSet); + pColMgr = new SwColMgr(*rSet); nCols = pColMgr->GetCount() ; m_pCLNrEdt->SetMax(std::max((sal_uInt16)m_pCLNrEdt->GetMax(), nCols)); m_pCLNrEdt->SetLast(std::max(nCols,(sal_uInt16)m_pCLNrEdt->GetMax())); @@ -593,24 +593,24 @@ void SwColumnPage::Reset(const SfxItemSet &rSet) pColMgr->SetActualWidth(FRAME_FORMAT_WIDTH); else { - const SwFmtFrmSize& rSize = (const SwFmtFrmSize&)rSet.Get(RES_FRM_SIZE); - const SvxBoxItem& rBox = (const SvxBoxItem&) rSet.Get(RES_BOX); + const SwFmtFrmSize& rSize = (const SwFmtFrmSize&)rSet->Get(RES_FRM_SIZE); + const SvxBoxItem& rBox = (const SvxBoxItem&) rSet->Get(RES_BOX); pColMgr->SetActualWidth((sal_uInt16)rSize.GetSize().Width() - rBox.GetDistance()); } } if(m_pBalanceColsCB->IsVisible()) { const SfxPoolItem* pItem; - if( SFX_ITEM_SET == rSet.GetItemState( RES_COLUMNBALANCE, false, &pItem )) + if( SFX_ITEM_SET == rSet->GetItemState( RES_COLUMNBALANCE, false, &pItem )) m_pBalanceColsCB->Check(!((const SwFmtNoBalancedColumns*)pItem)->GetValue()); else m_pBalanceColsCB->Check( true ); } //text direction - if( SFX_ITEM_AVAILABLE <= rSet.GetItemState( RES_FRAMEDIR ) ) + if( SFX_ITEM_AVAILABLE <= rSet->GetItemState( RES_FRAMEDIR ) ) { - const SvxFrameDirectionItem& rItem = (const SvxFrameDirectionItem&)rSet.Get(RES_FRAMEDIR); + const SvxFrameDirectionItem& rItem = (const SvxFrameDirectionItem&)rSet->Get(RES_FRAMEDIR); sal_uIntPtr nVal = rItem.GetValue(); const sal_Int32 nPos = m_pTextDirectionLB->GetEntryPos( (void*) nVal ); m_pTextDirectionLB->SelectEntryPos( nPos ); @@ -618,7 +618,7 @@ void SwColumnPage::Reset(const SfxItemSet &rSet) } Init(); - ActivatePage( rSet ); + ActivatePage( *rSet ); } // create TabPage diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index 4558f73d8629..30a986b72362 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -848,7 +848,7 @@ SwWrtShell *SwFrmPage::getFrmDlgParentShell() return ((SwFrmDlg*)GetParentDialog())->GetWrtShell(); } -void SwFrmPage::Reset( const SfxItemSet &rSet ) +void SwFrmPage::Reset( const SfxItemSet *rSet ) { SwWrtShell* pSh = bFormat ? ::GetActiveWrtShell() : getFrmDlgParentShell(); @@ -863,11 +863,11 @@ void SwFrmPage::Reset( const SfxItemSet &rSet ) SetMetric( *m_pAtVertPosED, aMetric ); const SfxPoolItem* pItem = NULL; - const SwFmtAnchor& rAnchor = (const SwFmtAnchor&)rSet.Get(RES_ANCHOR); + const SwFmtAnchor& rAnchor = (const SwFmtAnchor&)rSet->Get(RES_ANCHOR); - if (SFX_ITEM_SET == rSet.GetItemState(FN_OLE_IS_MATH, false, &pItem)) + if (SFX_ITEM_SET == rSet->GetItemState(FN_OLE_IS_MATH, false, &pItem)) m_bIsMathOLE = ((const SfxBoolItem*)pItem)->GetValue(); - if (SFX_ITEM_SET == rSet.GetItemState(FN_MATH_BASELINE_ALIGNMENT, false, &pItem)) + if (SFX_ITEM_SET == rSet->GetItemState(FN_MATH_BASELINE_ALIGNMENT, false, &pItem)) m_bIsMathBaselineAlignment = ((const SfxBoolItem*)pItem)->GetValue(); EnableVerticalPositioning( !(m_bIsMathOLE && m_bIsMathBaselineAlignment && FLY_AS_CHAR == rAnchor.GetAnchorId()) ); @@ -897,7 +897,7 @@ void SwFrmPage::Reset( const SfxItemSet &rSet ) { OSL_ENSURE(pSh , "shell not found"); //OS: only for the variant Insert/Graphic/Properties - if(SFX_ITEM_SET == rSet.GetItemState(FN_PARAM_GRF_REALSIZE, false, &pItem)) + if(SFX_ITEM_SET == rSet->GetItemState(FN_PARAM_GRF_REALSIZE, false, &pItem)) aGrfSize = ((const SvxSizeItem*)pItem)->GetSize(); else pSh->GetGrfSize( aGrfSize ); @@ -920,7 +920,7 @@ void SwFrmPage::Reset( const SfxItemSet &rSet ) } else { - aGrfSize = ((const SwFmtFrmSize&)rSet.Get(RES_FRM_SIZE)).GetSize(); + aGrfSize = ((const SwFmtFrmSize&)rSet->Get(RES_FRM_SIZE)).GetSize(); } // entering procent value made possible @@ -929,7 +929,7 @@ void SwFrmPage::Reset( const SfxItemSet &rSet ) //the available space is not yet known so the RefValue has to be calculated from size and relative size values //this is needed only if relative values are already set - const SwFmtFrmSize& rFrmSize = (const SwFmtFrmSize&)rSet.Get(RES_FRM_SIZE); + const SwFmtFrmSize& rFrmSize = (const SwFmtFrmSize&)rSet->Get(RES_FRM_SIZE); m_pRelWidthRelationLB->InsertEntry(aFramePosString.GetString(SwFPos::FRAME)); m_pRelWidthRelationLB->InsertEntry(aFramePosString.GetString(SwFPos::REL_PG_FRAME)); @@ -975,7 +975,7 @@ void SwFrmPage::Reset( const SfxItemSet &rSet ) // i#18732 - init checkbox value { const bool bFollowTextFlow = - static_cast<const SwFmtFollowTextFlow&>(rSet.Get(RES_FOLLOW_TEXT_FLOW)).GetValue(); + static_cast<const SwFmtFollowTextFlow&>(rSet->Get(RES_FOLLOW_TEXT_FLOW)).GetValue(); m_pFollowTextFlowCB->Check( bFollowTextFlow ); } @@ -1002,7 +1002,7 @@ void SwFrmPage::Reset( const SfxItemSet &rSet ) m_pAnchorAtFrameRB->IsChecked() ); } - Init( rSet, true ); + Init( *rSet, true ); m_pAtVertPosED->SaveValue(); m_pAtHorzPosED->SaveValue(); m_pFollowTextFlowCB->SaveValue(); @@ -2381,20 +2381,20 @@ SfxTabPage* SwGrfExtPage::Create( Window *pParent, const SfxItemSet &rSet ) return new SwGrfExtPage( pParent, rSet ); } -void SwGrfExtPage::Reset(const SfxItemSet &rSet) +void SwGrfExtPage::Reset(const SfxItemSet *rSet) { const SfxPoolItem* pItem; const sal_uInt16 nHtmlMode = ::GetHtmlMode((const SwDocShell*)SfxObjectShell::Current()); bHtmlMode = nHtmlMode & HTMLMODE_ON ? sal_True : sal_False; - if( SFX_ITEM_SET == rSet.GetItemState( FN_PARAM_GRF_CONNECT, true, &pItem) + if( SFX_ITEM_SET == rSet->GetItemState( FN_PARAM_GRF_CONNECT, true, &pItem) && ((const SfxBoolItem *)pItem)->GetValue() ) { m_pBrowseBT->Enable(); m_pConnectED->SetReadOnly(false); } - ActivatePage(rSet); + ActivatePage(*rSet); } void SwGrfExtPage::ActivatePage(const SfxItemSet& rSet) @@ -2712,10 +2712,10 @@ SwFrmURLPage::~SwFrmURLPage() { } -void SwFrmURLPage::Reset( const SfxItemSet &rSet ) +void SwFrmURLPage::Reset( const SfxItemSet *rSet ) { const SfxPoolItem* pItem; - if ( SFX_ITEM_SET == rSet.GetItemState( SID_DOCFRAME, true, &pItem)) + if ( SFX_ITEM_SET == rSet->GetItemState( SID_DOCFRAME, true, &pItem)) { boost::scoped_ptr<TargetList> pList(new TargetList); ((const SfxFrameItem*)pItem)->GetFrame()->GetTargetList(*pList); @@ -2729,7 +2729,7 @@ void SwFrmURLPage::Reset( const SfxItemSet &rSet ) } } - if ( SFX_ITEM_SET == rSet.GetItemState( RES_URL, true, &pItem ) ) + if ( SFX_ITEM_SET == rSet->GetItemState( RES_URL, true, &pItem ) ) { const SwFmtURL* pFmtURL = (const SwFmtURL*)pItem; pURLED->SetText( INetURLObject::decode( pFmtURL->GetURL(), @@ -2860,7 +2860,7 @@ SfxTabPage* SwFrmAddPage::Create(Window *pParent, const SfxItemSet &rSet) return new SwFrmAddPage(pParent, rSet); } -void SwFrmAddPage::Reset(const SfxItemSet &rSet ) +void SwFrmAddPage::Reset(const SfxItemSet *rSet ) { const SfxPoolItem* pItem; sal_uInt16 nHtmlMode = ::GetHtmlMode((const SwDocShell*)SfxObjectShell::Current()); @@ -2881,7 +2881,7 @@ void SwFrmAddPage::Reset(const SfxItemSet &rSet ) m_pContentAlignFrame->Hide(); } - if(SFX_ITEM_SET == rSet.GetItemState(FN_SET_FRM_ALT_NAME, false, &pItem)) + if(SFX_ITEM_SET == rSet->GetItemState(FN_SET_FRM_ALT_NAME, false, &pItem)) { pAltNameED->SetText(((const SfxStringItem*)pItem)->GetValue()); pAltNameED->SaveValue(); @@ -2892,7 +2892,7 @@ void SwFrmAddPage::Reset(const SfxItemSet &rSet ) // insert graphic - properties // bNew is not set, so recognise by selection OUString aTmpName1; - if(SFX_ITEM_SET == rSet.GetItemState(FN_SET_FRM_NAME, false, &pItem)) + if(SFX_ITEM_SET == rSet->GetItemState(FN_SET_FRM_NAME, false, &pItem)) { aTmpName1 = ((const SfxStringItem*)pItem)->GetValue(); } @@ -2984,23 +2984,23 @@ void SwFrmAddPage::Reset(const SfxItemSet &rSet ) } } // Pos Protected - const SvxProtectItem& rProt = (const SvxProtectItem& )rSet.Get(RES_PROTECT); + const SvxProtectItem& rProt = (const SvxProtectItem& )rSet->Get(RES_PROTECT); pProtectFrameCB->Check(rProt.IsPosProtected()); pProtectContentCB->Check(rProt.IsCntntProtected()); pProtectSizeCB->Check(rProt.IsSizeProtected()); - const SwFmtEditInReadonly& rEdit = (const SwFmtEditInReadonly& )rSet.Get(RES_EDIT_IN_READONLY); + const SwFmtEditInReadonly& rEdit = (const SwFmtEditInReadonly& )rSet->Get(RES_EDIT_IN_READONLY); pEditInReadonlyCB->Check(rEdit.GetValue()); pEditInReadonlyCB->SaveValue(); // print - const SvxPrintItem& rPrt = (const SvxPrintItem&)rSet.Get(RES_PRINT); + const SvxPrintItem& rPrt = (const SvxPrintItem&)rSet->Get(RES_PRINT); pPrintFrameCB->Check(rPrt.GetValue()); pPrintFrameCB->SaveValue(); // textflow SfxItemState eState; if( (!bHtmlMode || (0 != (nHtmlMode&HTMLMODE_SOME_STYLES))) && sDlgType != "PictureDialog" && sDlgType != "ObjectDialog" && - SFX_ITEM_UNKNOWN != ( eState = rSet.GetItemState( + SFX_ITEM_UNKNOWN != ( eState = rSet->GetItemState( RES_FRAMEDIR, true )) ) { pTextFlowFT->Show(); @@ -3012,7 +3012,7 @@ void SwFrmAddPage::Reset(const SfxItemSet &rSet ) sal_uLong nData = FRMDIR_VERT_TOP_RIGHT; pTextFlowLB->RemoveEntry(pTextFlowLB->GetEntryPos((void*)nData)); } - sal_uInt16 nVal = ((SvxFrameDirectionItem&)rSet.Get(RES_FRAMEDIR)).GetValue(); + sal_uInt16 nVal = ((SvxFrameDirectionItem&)rSet->Get(RES_FRAMEDIR)).GetValue(); sal_Int32 nPos; for( nPos = pTextFlowLB->GetEntryCount(); nPos; ) if( (sal_uInt16)(sal_IntPtr)pTextFlowLB->GetEntryData( --nPos ) == nVal ) @@ -3027,9 +3027,9 @@ void SwFrmAddPage::Reset(const SfxItemSet &rSet ) } // Content alignment - if ( rSet.GetItemState(RES_TEXT_VERT_ADJUST) > SFX_ITEM_AVAILABLE ) + if ( rSet->GetItemState(RES_TEXT_VERT_ADJUST) > SFX_ITEM_AVAILABLE ) { - SdrTextVertAdjust nAdjust = ((const SdrTextVertAdjustItem&)rSet.Get(RES_TEXT_VERT_ADJUST)).GetValue(); + SdrTextVertAdjust nAdjust = ((const SdrTextVertAdjustItem&)rSet->Get(RES_TEXT_VERT_ADJUST)).GetValue(); sal_Int32 nPos = 0; switch(nAdjust) { diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx index f396d331947d..397d1910c91d 100644 --- a/sw/source/ui/frmdlg/wrap.cxx +++ b/sw/source/ui/frmdlg/wrap.cxx @@ -139,7 +139,7 @@ SfxTabPage* SwWrapTabPage::Create(Window *pParent, const SfxItemSet &rSet) return new SwWrapTabPage(pParent, rSet); } -void SwWrapTabPage::Reset(const SfxItemSet &rSet) +void SwWrapTabPage::Reset(const SfxItemSet *rSet) { // contour for Draw, Graphic and OLE (Insert/Graphic/Properties still missing!) if( bDrawMode ) @@ -147,7 +147,7 @@ void SwWrapTabPage::Reset(const SfxItemSet &rSet) m_pWrapOutlineCB->Show(); m_pWrapOutsideCB->Show(); - m_pWrapTransparentCB->Check( 0 == ((const SfxInt16Item&)rSet.Get( + m_pWrapTransparentCB->Check( 0 == ((const SfxInt16Item&)rSet->Get( FN_DRAW_WRAP_DLG)).GetValue() ); m_pWrapTransparentCB->SaveValue(); } @@ -178,10 +178,10 @@ void SwWrapTabPage::Reset(const SfxItemSet &rSet) SetMetric(*m_pTopMarginED, aMetric); SetMetric(*m_pBottomMarginED, aMetric); - const SwFmtSurround& rSurround = (const SwFmtSurround&)rSet.Get(RES_SURROUND); + const SwFmtSurround& rSurround = (const SwFmtSurround&)rSet->Get(RES_SURROUND); SwSurround nSur = rSurround.GetSurround(); - const SwFmtAnchor &rAnch = (const SwFmtAnchor&)rSet.Get(RES_ANCHOR); + const SwFmtAnchor &rAnch = (const SwFmtAnchor&)rSet->Get(RES_ANCHOR); nAnchorId = rAnch.GetAnchorId(); if (((nAnchorId == FLY_AT_PARA) || (nAnchorId == FLY_AT_CHAR)) @@ -217,7 +217,7 @@ void SwWrapTabPage::Reset(const SfxItemSet &rSet) if (!bDrawMode) { - const SvxOpaqueItem& rOpaque = (const SvxOpaqueItem&)rSet.Get(RES_OPAQUE); + const SvxOpaqueItem& rOpaque = (const SvxOpaqueItem&)rSet->Get(RES_OPAQUE); m_pWrapTransparentCB->Check(!rOpaque.GetValue()); } break; @@ -255,8 +255,8 @@ void SwWrapTabPage::Reset(const SfxItemSet &rSet) } m_pWrapTransparentCB->Enable( pBtn == m_pWrapThroughRB && !bHtmlMode ); - const SvxULSpaceItem& rUL = (const SvxULSpaceItem&)rSet.Get(RES_UL_SPACE); - const SvxLRSpaceItem& rLR = (const SvxLRSpaceItem&)rSet.Get(RES_LR_SPACE); + const SvxULSpaceItem& rUL = (const SvxULSpaceItem&)rSet->Get(RES_UL_SPACE); + const SvxLRSpaceItem& rLR = (const SvxLRSpaceItem&)rSet->Get(RES_LR_SPACE); // gap to text m_pLeftMarginED->SetValue(m_pLeftMarginED->Normalize(rLR.GetLeft()), FUNIT_TWIP); @@ -265,7 +265,7 @@ void SwWrapTabPage::Reset(const SfxItemSet &rSet) m_pBottomMarginED->SetValue(m_pBottomMarginED->Normalize(rUL.GetLower()), FUNIT_TWIP); ContourHdl(0); - ActivatePage( rSet ); + ActivatePage( *rSet ); } // stuff attributes into the set when OK diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 74f167cc8b90..c93ffe92e1fc 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -1192,7 +1192,7 @@ void SwTOXSelectTabPage::FillTOXDescription() rDesc.SetSortAlgorithm(*pEntryData); } -void SwTOXSelectTabPage::Reset( const SfxItemSet& ) +void SwTOXSelectTabPage::Reset( const SfxItemSet* ) { SwMultiTOXTabDialog* pTOXDlg = (SwMultiTOXTabDialog*)GetTabDialog(); SwWrtShell& rSh = pTOXDlg->GetWrtShell(); @@ -1900,7 +1900,7 @@ bool SwTOXEntryTabPage::FillItemSet( SfxItemSet* ) return true; } -void SwTOXEntryTabPage::Reset( const SfxItemSet& ) +void SwTOXEntryTabPage::Reset( const SfxItemSet* ) { SwMultiTOXTabDialog* pTOXDlg = (SwMultiTOXTabDialog*)GetTabDialog(); const CurTOXType aCurType = pTOXDlg->GetCurrentTOXType(); @@ -3517,9 +3517,9 @@ bool SwTOXStylesTabPage::FillItemSet( SfxItemSet* ) return true; } -void SwTOXStylesTabPage::Reset( const SfxItemSet& rSet ) +void SwTOXStylesTabPage::Reset( const SfxItemSet* rSet ) { - ActivatePage(rSet); + ActivatePage(*rSet); } void SwTOXStylesTabPage::ActivatePage( const SfxItemSet& ) diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx index 86c99c966613..4d0a8ff51bf1 100644 --- a/sw/source/ui/misc/docfnote.cxx +++ b/sw/source/ui/misc/docfnote.cxx @@ -117,7 +117,7 @@ SwEndNoteOptionPage::SwEndNoteOptionPage(Window *pParent, bool bEN, get(m_pFtnCharTextTemplBox, "charstylelb"); } -void SwEndNoteOptionPage::Reset( const SfxItemSet& ) +void SwEndNoteOptionPage::Reset( const SfxItemSet* ) { boost::scoped_ptr<SwEndNoteInfo> pInf(bEndNote ? new SwEndNoteInfo( pSh->GetEndNoteInfo() ) : new SwFtnInfo( pSh->GetFtnInfo() )); diff --git a/sw/source/ui/misc/impfnote.hxx b/sw/source/ui/misc/impfnote.hxx index 349a43194e51..14f2a2f06e7c 100644 --- a/sw/source/ui/misc/impfnote.hxx +++ b/sw/source/ui/misc/impfnote.hxx @@ -73,7 +73,7 @@ public: static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet); virtual bool FillItemSet(SfxItemSet *rSet) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE; void SetShell( SwWrtShell &rShell ); }; diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx index 1bf0db625ce6..bd05757d7f36 100644 --- a/sw/source/ui/misc/num.cxx +++ b/sw/source/ui/misc/num.cxx @@ -420,7 +420,7 @@ bool SwNumPositionTabPage::FillItemSet( SfxItemSet* rSet ) return bModified; } -void SwNumPositionTabPage::Reset( const SfxItemSet& rSet ) +void SwNumPositionTabPage::Reset( const SfxItemSet* rSet ) { const SfxPoolItem* pItem; if(pOutlineDlg) @@ -428,7 +428,7 @@ void SwNumPositionTabPage::Reset( const SfxItemSet& rSet ) pSaveNum = pOutlineDlg->GetNumRule(); m_pLevelLB->EnableMultiSelection(false); } - else if(SFX_ITEM_SET == rSet.GetItemState(FN_PARAM_ACT_NUMBER, false, &pItem)) + else if(SFX_ITEM_SET == rSet->GetItemState(FN_PARAM_ACT_NUMBER, false, &pItem)) pSaveNum = ((SwUINumRuleItem*)pItem)->GetNumRule(); nActNumLvl = SwOutlineTabDialog::GetActNumLevel(); diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx index a7ce9a4d4028..1fe589e836c6 100644 --- a/sw/source/ui/misc/outline.cxx +++ b/sw/source/ui/misc/outline.cxx @@ -301,7 +301,7 @@ IMPL_LINK( SwOutlineTabDialog, MenuSelectHdl, Menu *, pMenu ) sal_uInt16 nPageId = GetCurPageId(); SfxTabPage* pPage = GetTabPage( nPageId ); - pPage->Reset(*GetOutputItemSet()); + pPage->Reset(GetOutputItemSet()); return 0; } @@ -822,9 +822,9 @@ bool SwOutlineSettingsTabPage::FillItemSet( SfxItemSet* ) return true; } -void SwOutlineSettingsTabPage::Reset( const SfxItemSet& rSet ) +void SwOutlineSettingsTabPage::Reset( const SfxItemSet* rSet ) { - ActivatePage(rSet); + ActivatePage(*rSet); } SfxTabPage* SwOutlineSettingsTabPage::Create( Window* pParent, diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx index 600905f847c9..a447814121bf 100644 --- a/sw/source/ui/misc/pgfnote.cxx +++ b/sw/source/ui/misc/pgfnote.cxx @@ -141,12 +141,12 @@ SfxTabPage* SwFootNotePage::Create(Window *pParent, const SfxItemSet &rSet) return new SwFootNotePage(pParent, rSet); } -void SwFootNotePage::Reset(const SfxItemSet &rSet) +void SwFootNotePage::Reset(const SfxItemSet *rSet) { // if no example exists, otherwise Init here in Activate boost::scoped_ptr<SwPageFtnInfo> pDefFtnInfo; const SwPageFtnInfo* pFtnInfo; - const SfxPoolItem* pItem = SfxTabPage::GetItem(rSet, FN_PARAM_FTN_INFO); + const SfxPoolItem* pItem = SfxTabPage::GetItem(*rSet, FN_PARAM_FTN_INFO); if( pItem ) { pFtnInfo = &((const SwPageFtnInfoItem*)pItem)->GetPageFtnInfo(); @@ -250,7 +250,7 @@ void SwFootNotePage::Reset(const SfxItemSet &rSet) m_pDistEdit->SetValue(m_pDistEdit->Normalize(pFtnInfo->GetTopDist()),FUNIT_TWIP); m_pLineDistEdit->SetValue( m_pLineDistEdit->Normalize(pFtnInfo->GetBottomDist()), FUNIT_TWIP); - ActivatePage( rSet ); + ActivatePage( *rSet ); } // stuff attributes into the set, when OK diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx index 017d2a530a42..452be968e796 100644 --- a/sw/source/ui/misc/pggrid.cxx +++ b/sw/source/ui/misc/pggrid.cxx @@ -187,11 +187,11 @@ bool SwTextGridPage::FillItemSet(SfxItemSet *rSet) return bRet; } -void SwTextGridPage::Reset(const SfxItemSet &rSet) +void SwTextGridPage::Reset(const SfxItemSet *rSet) { - if(SFX_ITEM_AVAILABLE <= rSet.GetItemState(RES_TEXTGRID, true)) + if(SFX_ITEM_AVAILABLE <= rSet->GetItemState(RES_TEXTGRID, true)) { - const SwTextGridItem& rGridItem = (const SwTextGridItem&)rSet.Get(RES_TEXTGRID); + const SwTextGridItem& rGridItem = (const SwTextGridItem&)rSet->Get(RES_TEXTGRID); RadioButton* pButton = 0; switch(rGridItem.GetGridType()) { @@ -214,7 +214,7 @@ void SwTextGridPage::Reset(const SfxItemSet &rSet) m_pPrintCB->Check(rGridItem.IsPrintGrid()); m_pColorLB->SelectEntry(rGridItem.GetColor()); } - UpdatePageSize(rSet); + UpdatePageSize(*rSet); m_pNoGridRB->SaveValue(); m_pLinesGridRB->SaveValue(); diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx index fd0211cc5406..aa2bb48264d8 100644 --- a/sw/source/ui/table/tabledlg.cxx +++ b/sw/source/ui/table/tabledlg.cxx @@ -421,7 +421,7 @@ bool SwFormatTablePage::FillItemSet( SfxItemSet* rCoreSet ) return bModified; } -void SwFormatTablePage::Reset( const SfxItemSet& ) +void SwFormatTablePage::Reset( const SfxItemSet* ) { const SfxItemSet& rSet = GetItemSet(); const SfxPoolItem* pItem; @@ -760,7 +760,7 @@ SfxTabPage* SwTableColumnPage::Create( Window* pParent, return new SwTableColumnPage( pParent, rAttrSet ); } -void SwTableColumnPage::Reset( const SfxItemSet& ) +void SwTableColumnPage::Reset( const SfxItemSet* ) { const SfxItemSet& rSet = GetItemSet(); @@ -1435,7 +1435,7 @@ bool SwTextFlowPage::FillItemSet( SfxItemSet* rSet ) } -void SwTextFlowPage::Reset( const SfxItemSet& rSet ) +void SwTextFlowPage::Reset( const SfxItemSet* rSet ) { const SfxPoolItem* pItem; SvxHtmlOptions& rHtmlOpt = SvxHtmlOptions::Get(); @@ -1457,12 +1457,12 @@ void SwTextFlowPage::Reset( const SfxItemSet& rSet ) aFmtName = SwStyleNameMapper::GetUIName( i, aFmtName ) )) m_pPageCollLB->InsertEntry( aFmtName ); - if(SFX_ITEM_SET == rSet.GetItemState( RES_KEEP, false, &pItem )) + if(SFX_ITEM_SET == rSet->GetItemState( RES_KEEP, false, &pItem )) { m_pKeepCB->Check( ((const SvxFmtKeepItem*)pItem)->GetValue() ); m_pKeepCB->SaveValue(); } - if(SFX_ITEM_SET == rSet.GetItemState( RES_LAYOUT_SPLIT, false, &pItem )) + if(SFX_ITEM_SET == rSet->GetItemState( RES_LAYOUT_SPLIT, false, &pItem )) { m_pSplitCB->Check( ((const SwFmtLayoutSplit*)pItem)->GetValue() ); } @@ -1472,7 +1472,7 @@ void SwTextFlowPage::Reset( const SfxItemSet& rSet ) m_pSplitCB->SaveValue(); SplitHdl_Impl(m_pSplitCB); - if(SFX_ITEM_SET == rSet.GetItemState( RES_ROW_SPLIT, false, &pItem )) + if(SFX_ITEM_SET == rSet->GetItemState( RES_ROW_SPLIT, false, &pItem )) { m_pSplitRowCB->Check( ((const SwFmtRowSplit*)pItem)->GetValue() ); } @@ -1482,7 +1482,7 @@ void SwTextFlowPage::Reset( const SfxItemSet& rSet ) if(bPageBreak) { - if(SFX_ITEM_SET == rSet.GetItemState( RES_PAGEDESC, false, &pItem )) + if(SFX_ITEM_SET == rSet->GetItemState( RES_PAGEDESC, false, &pItem )) { OUString sPageDesc; const SwPageDesc* pDesc = ((const SwFmtPageDesc*)pItem)->GetPageDesc(); @@ -1522,7 +1522,7 @@ void SwTextFlowPage::Reset( const SfxItemSet& rSet ) } } - if(SFX_ITEM_SET == rSet.GetItemState( RES_BREAK, false, &pItem )) + if(SFX_ITEM_SET == rSet->GetItemState( RES_BREAK, false, &pItem )) { const SvxFmtBreakItem* pPageBreak = (const SvxFmtBreakItem*)pItem; SvxBreak eBreak = (SvxBreak)pPageBreak->GetValue(); @@ -1585,7 +1585,7 @@ void SwTextFlowPage::Reset( const SfxItemSet& rSet ) m_pPageCollLB->Enable(false); } - if(SFX_ITEM_SET == rSet.GetItemState( FN_PARAM_TABLE_HEADLINE, false, &pItem )) + if(SFX_ITEM_SET == rSet->GetItemState( FN_PARAM_TABLE_HEADLINE, false, &pItem )) { sal_uInt16 nRep = ((const SfxUInt16Item*)pItem)->GetValue(); m_pHeadLineCB->Check( nRep > 0 ); @@ -1593,15 +1593,15 @@ void SwTextFlowPage::Reset( const SfxItemSet& rSet ) m_pRepeatHeaderNF->SetValue( nRep ); m_pRepeatHeaderNF->SaveValue(); } - if ( rSet.GetItemState(FN_TABLE_BOX_TEXTORIENTATION) > SFX_ITEM_AVAILABLE ) + if ( rSet->GetItemState(FN_TABLE_BOX_TEXTORIENTATION) > SFX_ITEM_AVAILABLE ) { - sal_uLong nDirection = ((const SvxFrameDirectionItem&)rSet.Get(FN_TABLE_BOX_TEXTORIENTATION)).GetValue(); + sal_uLong nDirection = ((const SvxFrameDirectionItem&)rSet->Get(FN_TABLE_BOX_TEXTORIENTATION)).GetValue(); m_pTextDirectionLB->SelectEntryPos(m_pTextDirectionLB->GetEntryPos( (const void*)nDirection )); } - if ( rSet.GetItemState(FN_TABLE_SET_VERT_ALIGN) > SFX_ITEM_AVAILABLE ) + if ( rSet->GetItemState(FN_TABLE_SET_VERT_ALIGN) > SFX_ITEM_AVAILABLE ) { - sal_uInt16 nVert = ((const SfxUInt16Item&)rSet.Get(FN_TABLE_SET_VERT_ALIGN)).GetValue(); + sal_uInt16 nVert = ((const SfxUInt16Item&)rSet->Get(FN_TABLE_SET_VERT_ALIGN)).GetValue(); sal_uInt16 nPos = 0; switch(nVert) { diff --git a/sw/source/uibase/inc/chrdlg.hxx b/sw/source/uibase/inc/chrdlg.hxx index 1ffd7ed11ae1..7fd3f0282f0d 100644 --- a/sw/source/uibase/inc/chrdlg.hxx +++ b/sw/source/uibase/inc/chrdlg.hxx @@ -86,7 +86,7 @@ public: const SfxItemSet& rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; }; #endif diff --git a/sw/source/uibase/inc/column.hxx b/sw/source/uibase/inc/column.hxx index 1e6f3a6499bc..000b122c85a9 100644 --- a/sw/source/uibase/inc/column.hxx +++ b/sw/source/uibase/inc/column.hxx @@ -176,7 +176,7 @@ public: static const sal_uInt16* GetRanges(); virtual bool FillItemSet(SfxItemSet *rSet) SAL_OVERRIDE; - virtual void Reset(const SfxItemSet &rSet) SAL_OVERRIDE; + virtual void Reset(const SfxItemSet *rSet) SAL_OVERRIDE; void SetFrmMode(bool bMod); void SetPageWidth(long nPageWidth); diff --git a/sw/source/uibase/inc/docstdlg.hxx b/sw/source/uibase/inc/docstdlg.hxx index 06ab49936336..6c5150603b0b 100644 --- a/sw/source/uibase/inc/docstdlg.hxx +++ b/sw/source/uibase/inc/docstdlg.hxx @@ -37,7 +37,7 @@ public: protected: virtual bool FillItemSet( SfxItemSet *rSet) SAL_OVERRIDE; - virtual void Reset (const SfxItemSet &rSet) SAL_OVERRIDE; + virtual void Reset (const SfxItemSet *rSet) SAL_OVERRIDE; DECL_LINK(UpdateHdl, void *); diff --git a/sw/source/uibase/inc/drpcps.hxx b/sw/source/uibase/inc/drpcps.hxx index e6e35e6a5edd..9ef6248affb3 100644 --- a/sw/source/uibase/inc/drpcps.hxx +++ b/sw/source/uibase/inc/drpcps.hxx @@ -86,7 +86,7 @@ public: static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet *rSet) SAL_OVERRIDE; - virtual void Reset (const SfxItemSet &rSet) SAL_OVERRIDE; + virtual void Reset (const SfxItemSet *rSet) SAL_OVERRIDE; void SetFormat(bool bSet){bFormat = bSet;} protected: diff --git a/sw/source/uibase/inc/envlop.hxx b/sw/source/uibase/inc/envlop.hxx index 7195d645f0ec..f1d2447b80e8 100644 --- a/sw/source/uibase/inc/envlop.hxx +++ b/sw/source/uibase/inc/envlop.hxx @@ -111,7 +111,7 @@ public: virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; void FillItem(SwEnvItem& rItem); virtual bool FillItemSet(SfxItemSet* rSet) SAL_OVERRIDE; - virtual void Reset(const SfxItemSet& rSet) SAL_OVERRIDE; + virtual void Reset(const SfxItemSet* rSet) SAL_OVERRIDE; }; #endif diff --git a/sw/source/uibase/inc/frmpage.hxx b/sw/source/uibase/inc/frmpage.hxx index 2a4b5bc47e29..5f8941556cf6 100644 --- a/sw/source/uibase/inc/frmpage.hxx +++ b/sw/source/uibase/inc/frmpage.hxx @@ -189,7 +189,7 @@ public: static const sal_uInt16* GetRanges(); virtual bool FillItemSet(SfxItemSet *rSet) SAL_OVERRIDE; - virtual void Reset(const SfxItemSet &rSet) SAL_OVERRIDE; + virtual void Reset(const SfxItemSet *rSet) SAL_OVERRIDE; void SetNewFrame(bool bNewFrame) { bNew = bNewFrame; } void SetFormatUsed(bool bFmt); @@ -235,7 +235,7 @@ public: static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet); virtual bool FillItemSet(SfxItemSet *rSet) SAL_OVERRIDE; - virtual void Reset(const SfxItemSet &rSet) SAL_OVERRIDE; + virtual void Reset(const SfxItemSet *rSet) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; }; @@ -264,7 +264,7 @@ public: static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet); virtual bool FillItemSet(SfxItemSet *rSet) SAL_OVERRIDE; - virtual void Reset(const SfxItemSet &rSet) SAL_OVERRIDE; + virtual void Reset(const SfxItemSet *rSet) SAL_OVERRIDE; }; class SwFrmAddPage : public SfxTabPage @@ -312,7 +312,7 @@ public: static const sal_uInt16* GetRanges(); virtual bool FillItemSet(SfxItemSet *rSet) SAL_OVERRIDE; - virtual void Reset(const SfxItemSet &rSet) SAL_OVERRIDE; + virtual void Reset(const SfxItemSet *rSet) SAL_OVERRIDE; void SetFormatUsed(bool bFmt); void SetFrmType(const OString &rType) { sDlgType = rType; } diff --git a/sw/source/uibase/inc/mailconfigpage.hxx b/sw/source/uibase/inc/mailconfigpage.hxx index 948c255a74e7..bf38b0462a13 100644 --- a/sw/source/uibase/inc/mailconfigpage.hxx +++ b/sw/source/uibase/inc/mailconfigpage.hxx @@ -62,7 +62,7 @@ public: const SfxItemSet& rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; }; diff --git a/sw/source/uibase/inc/num.hxx b/sw/source/uibase/inc/num.hxx index 64088e5ece94..d59679e2184a 100644 --- a/sw/source/uibase/inc/num.hxx +++ b/sw/source/uibase/inc/num.hxx @@ -122,7 +122,7 @@ public: virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); diff --git a/sw/source/uibase/inc/numpara.hxx b/sw/source/uibase/inc/numpara.hxx index 4042001c19cb..91ed598d4c85 100644 --- a/sw/source/uibase/inc/numpara.hxx +++ b/sw/source/uibase/inc/numpara.hxx @@ -68,7 +68,7 @@ public: static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; void EnableNewStart(); void DisableOutline(); diff --git a/sw/source/uibase/inc/optcomp.hxx b/sw/source/uibase/inc/optcomp.hxx index dd437c072e36..a36e7ee3f98a 100644 --- a/sw/source/uibase/inc/optcomp.hxx +++ b/sw/source/uibase/inc/optcomp.hxx @@ -66,7 +66,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; }; #endif diff --git a/sw/source/uibase/inc/optload.hxx b/sw/source/uibase/inc/optload.hxx index 5f3ea8703738..f08a4447738a 100644 --- a/sw/source/uibase/inc/optload.hxx +++ b/sw/source/uibase/inc/optload.hxx @@ -69,7 +69,7 @@ public: const SfxItemSet& rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; }; class SwCaptionOptDlg : public SfxSingleTabDialog @@ -170,7 +170,7 @@ public: const SfxItemSet& rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; }; #endif diff --git a/sw/source/uibase/inc/optpage.hxx b/sw/source/uibase/inc/optpage.hxx index 15e0ccec95dd..fd8fb400a91f 100644 --- a/sw/source/uibase/inc/optpage.hxx +++ b/sw/source/uibase/inc/optpage.hxx @@ -75,7 +75,7 @@ public: const SfxItemSet& rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; }; @@ -123,7 +123,7 @@ public: const SfxItemSet& rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; void SetFax( const std::vector<OUString>& ); void SelectFax( const OUString& ); void SetPreview(bool bPrev); @@ -195,7 +195,7 @@ public: const SfxItemSet& rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; void SetFontMode(sal_uInt8 nGroup) {nFontGroup = nGroup;} virtual void PageCreated( const SfxAllItemSet& aSet ) SAL_OVERRIDE; @@ -237,7 +237,7 @@ public: const SfxItemSet& rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; void SetWrtShell(SwWrtShell* pSh) {pWrtShell = pSh;} virtual void PageCreated( const SfxAllItemSet& aSet) SAL_OVERRIDE; @@ -281,7 +281,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; void SetWrtShell( SwWrtShell * pSh ) { m_pWrtShell = pSh; } virtual void PageCreated( const SfxAllItemSet& aSet ) SAL_OVERRIDE; @@ -361,7 +361,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; }; // TabPage test settings for SW @@ -378,7 +378,7 @@ public: const SfxItemSet& rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; private: CheckBox* m_pTest1CBox; @@ -421,7 +421,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; }; #endif diff --git a/sw/source/uibase/inc/outline.hxx b/sw/source/uibase/inc/outline.hxx index 829cf853406a..9eb8181be1a2 100644 --- a/sw/source/uibase/inc/outline.hxx +++ b/sw/source/uibase/inc/outline.hxx @@ -128,7 +128,7 @@ public: virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); }; diff --git a/sw/source/uibase/inc/pgfnote.hxx b/sw/source/uibase/inc/pgfnote.hxx index 9c4ba3bdaf46..d704956ee2dc 100644 --- a/sw/source/uibase/inc/pgfnote.hxx +++ b/sw/source/uibase/inc/pgfnote.hxx @@ -36,7 +36,7 @@ public: static const sal_uInt16* GetRanges(); virtual bool FillItemSet(SfxItemSet *rSet) SAL_OVERRIDE; - virtual void Reset(const SfxItemSet &rSet) SAL_OVERRIDE; + virtual void Reset(const SfxItemSet *rSet) SAL_OVERRIDE; private: SwFootNotePage(Window *pParent, const SfxItemSet &rSet); diff --git a/sw/source/uibase/inc/pggrid.hxx b/sw/source/uibase/inc/pggrid.hxx index a68e12313a82..648df6daf3ba 100644 --- a/sw/source/uibase/inc/pggrid.hxx +++ b/sw/source/uibase/inc/pggrid.hxx @@ -88,7 +88,7 @@ public: static const sal_uInt16* GetRanges(); virtual bool FillItemSet(SfxItemSet *rSet) SAL_OVERRIDE; - virtual void Reset(const SfxItemSet &rSet) SAL_OVERRIDE; + virtual void Reset(const SfxItemSet *rSet) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/regionsw.hxx b/sw/source/uibase/inc/regionsw.hxx index 51f56256fcd3..4f8a4d58eaea 100644 --- a/sw/source/uibase/inc/regionsw.hxx +++ b/sw/source/uibase/inc/regionsw.hxx @@ -188,7 +188,7 @@ public: void SetWrtShell(SwWrtShell& rSh); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE; static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); @@ -230,7 +230,7 @@ public: virtual ~SwSectionFtnEndTabPage(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE; static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); @@ -248,7 +248,7 @@ public: virtual ~SwSectionIndentTabPage(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE; static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); diff --git a/sw/source/uibase/inc/swuiccoll.hxx b/sw/source/uibase/inc/swuiccoll.hxx index 8aacddc39ba1..62cfd3777613 100644 --- a/sw/source/uibase/inc/swuiccoll.hxx +++ b/sw/source/uibase/inc/swuiccoll.hxx @@ -65,7 +65,7 @@ public: static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet *rSet) SAL_OVERRIDE; - virtual void Reset (const SfxItemSet &rSet) SAL_OVERRIDE; + virtual void Reset (const SfxItemSet *rSet) SAL_OVERRIDE; void SetCollection( SwFmt* pFormat, bool bNew ); }; diff --git a/sw/source/uibase/inc/swuicnttab.hxx b/sw/source/uibase/inc/swuicnttab.hxx index 2acce7ddb705..0a776ceeda4d 100644 --- a/sw/source/uibase/inc/swuicnttab.hxx +++ b/sw/source/uibase/inc/swuicnttab.hxx @@ -223,7 +223,7 @@ public: virtual ~SwTOXSelectTabPage(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; @@ -436,7 +436,7 @@ public: virtual ~SwTOXEntryTabPage(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; @@ -482,7 +482,7 @@ public: virtual ~SwTOXStylesTabPage(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/wrap.hxx b/sw/source/uibase/inc/wrap.hxx index 71439d3c9ede..d3ace0d122c4 100644 --- a/sw/source/uibase/inc/wrap.hxx +++ b/sw/source/uibase/inc/wrap.hxx @@ -100,7 +100,7 @@ public: static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet); virtual bool FillItemSet(SfxItemSet *rSet) SAL_OVERRIDE; - virtual void Reset(const SfxItemSet &rSet) SAL_OVERRIDE; + virtual void Reset(const SfxItemSet *rSet) SAL_OVERRIDE; static const sal_uInt16* GetRanges(); inline void SetNewFrame(bool bNewFrame) { bNew = bNewFrame; } diff --git a/sw/source/uibase/table/tablepg.hxx b/sw/source/uibase/table/tablepg.hxx index e71c6b9f67a5..432db1499433 100644 --- a/sw/source/uibase/table/tablepg.hxx +++ b/sw/source/uibase/table/tablepg.hxx @@ -84,7 +84,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; }; @@ -134,7 +134,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; @@ -183,7 +183,7 @@ class SwTextFlowPage : public SfxTabPage public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; void SetShell(SwWrtShell* pSh); |