diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-06-10 17:23:12 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-06-10 17:25:23 +0200 |
| commit | 4dbeadb9c1e46ac0008f076cd6f9c5d0a38a4d40 (patch) | |
| tree | a71acd0d466e02c18bf78ffdcfea748135805d21 | |
| parent | 2f8fd888b42dc41662b54a16d62575c2b15e844a (diff) | |
Change SfxTabPage::FillItemSet param from ref to pointer
...there were a number of call sites that passed undefined "null pointer
references" (apparently in cases where the passed argument was actually unused)
Change-Id: I19799e90f0cd8e98367782441a5ea9df27b59830
282 files changed, 1261 insertions, 1261 deletions
diff --git a/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx b/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx index 3625ef5fc5f1..f68e4ae955f4 100644 --- a/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx +++ b/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx @@ -45,7 +45,7 @@ void DataLabelsDialog::Reset() void DataLabelsDialog::FillItemSet(SfxItemSet& rOutAttrs) { - m_apDataLabelResources->FillItemSet(rOutAttrs); + m_apDataLabelResources->FillItemSet(&rOutAttrs); } } //namespace chart diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx b/chart2/source/controller/dialogs/res_DataLabel.cxx index a775e72dca01..86cbe1fadf4a 100644 --- a/chart2/source/controller/dialogs/res_DataLabel.cxx +++ b/chart2/source/controller/dialogs/res_DataLabel.cxx @@ -266,49 +266,49 @@ void DataLabelResources::EnableControls() m_pBxOrientation->Enable( bEnableRotation ); } -bool DataLabelResources::FillItemSet( SfxItemSet& rOutAttrs ) const +bool DataLabelResources::FillItemSet( SfxItemSet* rOutAttrs ) const { if( m_pCBNumber->IsChecked() ) { if( !m_bNumberFormatMixedState ) - rOutAttrs.Put( SfxUInt32Item( SID_ATTR_NUMBERFORMAT_VALUE, m_nNumberFormatForValue )); + rOutAttrs->Put( SfxUInt32Item( SID_ATTR_NUMBERFORMAT_VALUE, m_nNumberFormatForValue )); if( !m_bSourceFormatMixedState ) - rOutAttrs.Put( SfxBoolItem( SID_ATTR_NUMBERFORMAT_SOURCE, m_bSourceFormatForValue )); + rOutAttrs->Put( SfxBoolItem( SID_ATTR_NUMBERFORMAT_SOURCE, m_bSourceFormatForValue )); } if( m_pCBPercent->IsChecked() ) { if( !m_bPercentFormatMixedState ) - rOutAttrs.Put( SfxUInt32Item( SCHATTR_PERCENT_NUMBERFORMAT_VALUE, m_nNumberFormatForPercent )); + rOutAttrs->Put( SfxUInt32Item( SCHATTR_PERCENT_NUMBERFORMAT_VALUE, m_nNumberFormatForPercent )); if( !m_bPercentSourceMixedState ) - rOutAttrs.Put( SfxBoolItem( SCHATTR_PERCENT_NUMBERFORMAT_SOURCE, m_bSourceFormatForPercent )); + rOutAttrs->Put( SfxBoolItem( SCHATTR_PERCENT_NUMBERFORMAT_SOURCE, m_bSourceFormatForPercent )); } if( m_pCBNumber->GetState()!= TRISTATE_INDET ) - rOutAttrs.Put( SfxBoolItem( SCHATTR_DATADESCR_SHOW_NUMBER, m_pCBNumber->IsChecked() ) ); + rOutAttrs->Put( SfxBoolItem( SCHATTR_DATADESCR_SHOW_NUMBER, m_pCBNumber->IsChecked() ) ); if( m_pCBPercent->GetState()!= TRISTATE_INDET ) - rOutAttrs.Put( SfxBoolItem( SCHATTR_DATADESCR_SHOW_PERCENTAGE, m_pCBPercent->IsChecked() ) ); + rOutAttrs->Put( SfxBoolItem( SCHATTR_DATADESCR_SHOW_PERCENTAGE, m_pCBPercent->IsChecked() ) ); if( m_pCBCategory->GetState()!= TRISTATE_INDET ) - rOutAttrs.Put( SfxBoolItem( SCHATTR_DATADESCR_SHOW_CATEGORY, m_pCBCategory->IsChecked() ) ); + rOutAttrs->Put( SfxBoolItem( SCHATTR_DATADESCR_SHOW_CATEGORY, m_pCBCategory->IsChecked() ) ); if( m_pCBSymbol->GetState()!= TRISTATE_INDET ) - rOutAttrs.Put( SfxBoolItem( SCHATTR_DATADESCR_SHOW_SYMBOL, m_pCBSymbol->IsChecked()) ); + rOutAttrs->Put( SfxBoolItem( SCHATTR_DATADESCR_SHOW_SYMBOL, m_pCBSymbol->IsChecked()) ); OUString aSep = m_aEntryMap[m_pLB_Separator->GetSelectEntryPos()]; - rOutAttrs.Put( SfxStringItem( SCHATTR_DATADESCR_SEPARATOR, aSep) ); + rOutAttrs->Put( SfxStringItem( SCHATTR_DATADESCR_SEPARATOR, aSep) ); ::std::map< sal_uInt16, sal_Int32 >::const_iterator aIt( m_aListBoxToPlacementMap.find(m_pLB_LabelPlacement->GetSelectEntryPos()) ); if(aIt!=m_aListBoxToPlacementMap.end()) { sal_Int32 nValue = aIt->second; - rOutAttrs.Put( SfxInt32Item( SCHATTR_DATADESCR_PLACEMENT, nValue ) ); + rOutAttrs->Put( SfxInt32Item( SCHATTR_DATADESCR_PLACEMENT, nValue ) ); } if( m_pLB_TextDirection->GetSelectEntryCount() > 0 ) - rOutAttrs.Put( SfxInt32Item( EE_PARA_WRITINGDIR, m_pLB_TextDirection->GetSelectEntryValue() ) ); + rOutAttrs->Put( SfxInt32Item( EE_PARA_WRITINGDIR, m_pLB_TextDirection->GetSelectEntryValue() ) ); if( m_pDC_Dial->IsVisible() ) { sal_Int32 nDegrees = m_pDC_Dial->GetRotation(); - rOutAttrs.Put(SfxInt32Item( SCHATTR_TEXT_DEGREES, nDegrees ) ); + rOutAttrs->Put(SfxInt32Item( SCHATTR_TEXT_DEGREES, nDegrees ) ); } return true; diff --git a/chart2/source/controller/dialogs/res_DataLabel.hxx b/chart2/source/controller/dialogs/res_DataLabel.hxx index 8875136c6763..b6d278969b92 100644 --- a/chart2/source/controller/dialogs/res_DataLabel.hxx +++ b/chart2/source/controller/dialogs/res_DataLabel.hxx @@ -40,7 +40,7 @@ public: DataLabelResources( VclBuilderContainer* pWindow, Window* pParent, const SfxItemSet& rInAttrs ); virtual ~DataLabelResources(); - bool FillItemSet(SfxItemSet& rOutAttrs) const; + bool FillItemSet(SfxItemSet* rOutAttrs) const; void Reset(const SfxItemSet& rInAttrs); void SetNumberFormatter( SvNumberFormatter* pFormatter ); diff --git a/chart2/source/controller/dialogs/res_Trendline.cxx b/chart2/source/controller/dialogs/res_Trendline.cxx index 2ec92e51a585..d2ac636293ac 100644 --- a/chart2/source/controller/dialogs/res_Trendline.cxx +++ b/chart2/source/controller/dialogs/res_Trendline.cxx @@ -243,41 +243,41 @@ void TrendlineResources::Reset( const SfxItemSet& rInAttrs ) } } -bool TrendlineResources::FillItemSet(SfxItemSet& rOutAttrs) const +bool TrendlineResources::FillItemSet(SfxItemSet* rOutAttrs) const { if( m_bTrendLineUnique ) - rOutAttrs.Put( SvxChartRegressItem( m_eTrendLineType, SCHATTR_REGRESSION_TYPE )); + rOutAttrs->Put( SvxChartRegressItem( m_eTrendLineType, SCHATTR_REGRESSION_TYPE )); if( m_pCB_ShowEquation->GetState() != TRISTATE_INDET ) - rOutAttrs.Put( SfxBoolItem( SCHATTR_REGRESSION_SHOW_EQUATION, m_pCB_ShowEquation->IsChecked() )); + rOutAttrs->Put( SfxBoolItem( SCHATTR_REGRESSION_SHOW_EQUATION, m_pCB_ShowEquation->IsChecked() )); if( m_pCB_ShowCorrelationCoeff->GetState() != TRISTATE_INDET ) - rOutAttrs.Put( SfxBoolItem( SCHATTR_REGRESSION_SHOW_COEFF, m_pCB_ShowCorrelationCoeff->IsChecked() )); + rOutAttrs->Put( SfxBoolItem( SCHATTR_REGRESSION_SHOW_COEFF, m_pCB_ShowCorrelationCoeff->IsChecked() )); OUString aName = m_pEE_Name->GetText(); - rOutAttrs.Put(SfxStringItem(SCHATTR_REGRESSION_CURVE_NAME, aName)); + rOutAttrs->Put(SfxStringItem(SCHATTR_REGRESSION_CURVE_NAME, aName)); sal_Int32 aDegree = m_pNF_Degree->GetValue(); - rOutAttrs.Put(SfxInt32Item( SCHATTR_REGRESSION_DEGREE, aDegree ) ); + rOutAttrs->Put(SfxInt32Item( SCHATTR_REGRESSION_DEGREE, aDegree ) ); sal_Int32 aPeriod = m_pNF_Period->GetValue(); - rOutAttrs.Put(SfxInt32Item( SCHATTR_REGRESSION_PERIOD, aPeriod ) ); + rOutAttrs->Put(SfxInt32Item( SCHATTR_REGRESSION_PERIOD, aPeriod ) ); sal_uInt32 nIndex = 0; double aValue = 0.0; m_pNumFormatter->IsNumberFormat(m_pFmtFld_ExtrapolateForward->GetText(),nIndex,aValue); - rOutAttrs.Put(SvxDoubleItem( aValue, SCHATTR_REGRESSION_EXTRAPOLATE_FORWARD ) ); + rOutAttrs->Put(SvxDoubleItem( aValue, SCHATTR_REGRESSION_EXTRAPOLATE_FORWARD ) ); aValue = 0.0; m_pNumFormatter->IsNumberFormat(m_pFmtFld_ExtrapolateBackward->GetText(),nIndex,aValue); - rOutAttrs.Put(SvxDoubleItem( aValue, SCHATTR_REGRESSION_EXTRAPOLATE_BACKWARD ) ); + rOutAttrs->Put(SvxDoubleItem( aValue, SCHATTR_REGRESSION_EXTRAPOLATE_BACKWARD ) ); if( m_pCB_SetIntercept->GetState() != TRISTATE_INDET ) - rOutAttrs.Put( SfxBoolItem( SCHATTR_REGRESSION_SET_INTERCEPT, m_pCB_SetIntercept->IsChecked() )); + rOutAttrs->Put( SfxBoolItem( SCHATTR_REGRESSION_SET_INTERCEPT, m_pCB_SetIntercept->IsChecked() )); aValue = 0.0; m_pNumFormatter->IsNumberFormat(m_pFmtFld_InterceptValue->GetText(),nIndex,aValue); - rOutAttrs.Put(SvxDoubleItem( aValue, SCHATTR_REGRESSION_INTERCEPT_VALUE ) ); + rOutAttrs->Put(SvxDoubleItem( aValue, SCHATTR_REGRESSION_INTERCEPT_VALUE ) ); return true; } diff --git a/chart2/source/controller/dialogs/res_Trendline.hxx b/chart2/source/controller/dialogs/res_Trendline.hxx index 4e51ecfb7b13..128d436ab863 100644 --- a/chart2/source/controller/dialogs/res_Trendline.hxx +++ b/chart2/source/controller/dialogs/res_Trendline.hxx @@ -38,7 +38,7 @@ public: virtual ~TrendlineResources(); void Reset(const SfxItemSet& rInAttrs); - bool FillItemSet(SfxItemSet& rOutAttrs) const; + bool FillItemSet(SfxItemSet* rOutAttrs) const; void FillValueSets(); diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.cxx b/chart2/source/controller/dialogs/tp_AxisLabel.cxx index efa7aa405dd5..2c9a4663adbc 100644 --- a/chart2/source/controller/dialogs/tp_AxisLabel.cxx +++ b/chart2/source/controller/dialogs/tp_AxisLabel.cxx @@ -85,21 +85,21 @@ SfxTabPage* SchAxisLabelTabPage::Create( Window* pParent, const SfxItemSet& rAtt return new SchAxisLabelTabPage( pParent, rAttrs ); } -bool SchAxisLabelTabPage::FillItemSet( SfxItemSet& rOutAttrs ) +bool SchAxisLabelTabPage::FillItemSet( SfxItemSet* rOutAttrs ) { bool bStacked = false; if( m_pOrientHlp->GetStackedState() != TRISTATE_INDET ) { bStacked = m_pOrientHlp->GetStackedState() == TRISTATE_TRUE; if( !m_bHasInitialStacking || (bStacked != m_bInitialStacking) ) - rOutAttrs.Put( SfxBoolItem( SCHATTR_TEXT_STACKED, bStacked ) ); + rOutAttrs->Put( SfxBoolItem( SCHATTR_TEXT_STACKED, bStacked ) ); } if( m_pCtrlDial->HasRotation() ) { sal_Int32 nDegrees = bStacked ? 0 : m_pCtrlDial->GetRotation(); if( !m_bHasInitialDegrees || (nDegrees != m_nInitialDegrees) ) - rOutAttrs.Put( SfxInt32Item( SCHATTR_TEXT_DEGREES, nDegrees ) ); + rOutAttrs->Put( SfxInt32Item( SCHATTR_TEXT_DEGREES, nDegrees ) ); } if( m_bShowStaggeringControls ) @@ -119,18 +119,18 @@ bool SchAxisLabelTabPage::FillItemSet( SfxItemSet& rOutAttrs ) bRadioButtonChecked = false; if( bRadioButtonChecked ) - rOutAttrs.Put( SvxChartTextOrderItem( eOrder, SCHATTR_AXIS_LABEL_ORDER )); + rOutAttrs->Put( SvxChartTextOrderItem( eOrder, SCHATTR_AXIS_LABEL_ORDER )); } if( m_pCbTextOverlap->GetState() != TRISTATE_INDET ) - rOutAttrs.Put( SfxBoolItem( SCHATTR_AXIS_LABEL_OVERLAP, m_pCbTextOverlap->IsChecked() ) ); + rOutAttrs->Put( SfxBoolItem( SCHATTR_AXIS_LABEL_OVERLAP, m_pCbTextOverlap->IsChecked() ) ); if( m_pCbTextBreak->GetState() != TRISTATE_INDET ) - rOutAttrs.Put( SfxBoolItem( SCHATTR_AXIS_LABEL_BREAK, m_pCbTextBreak->IsChecked() ) ); + rOutAttrs->Put( SfxBoolItem( SCHATTR_AXIS_LABEL_BREAK, m_pCbTextBreak->IsChecked() ) ); if( m_pCbShowDescription->GetState() != TRISTATE_INDET ) - rOutAttrs.Put( SfxBoolItem( SCHATTR_AXIS_SHOWDESCR, m_pCbShowDescription->IsChecked() ) ); + rOutAttrs->Put( SfxBoolItem( SCHATTR_AXIS_SHOWDESCR, m_pCbShowDescription->IsChecked() ) ); if( m_pLbTextDirection->GetSelectEntryCount() > 0 ) - rOutAttrs.Put( SfxInt32Item( EE_PARA_WRITINGDIR, m_pLbTextDirection->GetSelectEntryValue() ) ); + rOutAttrs->Put( SfxInt32Item( EE_PARA_WRITINGDIR, m_pLbTextDirection->GetSelectEntryValue() ) ); return true; } diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.hxx b/chart2/source/controller/dialogs/tp_AxisLabel.hxx index 0013a0b440de..115da2737cfc 100644 --- a/chart2/source/controller/dialogs/tp_AxisLabel.hxx +++ b/chart2/source/controller/dialogs/tp_AxisLabel.hxx @@ -75,7 +75,7 @@ public: void Construct(); static SfxTabPage* Create( Window* pParent, const SfxItemSet& rInAttrs ); - virtual bool FillItemSet( SfxItemSet& rOutAttrs ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rOutAttrs ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& rInAttrs ) SAL_OVERRIDE; void ShowStaggeringControls( bool bShowStaggeringControls ); diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.cxx b/chart2/source/controller/dialogs/tp_AxisPositions.cxx index 1dfe618f494c..461ba55ab77f 100644 --- a/chart2/source/controller/dialogs/tp_AxisPositions.cxx +++ b/chart2/source/controller/dialogs/tp_AxisPositions.cxx @@ -90,23 +90,23 @@ SfxTabPage* AxisPositionsTabPage::Create(Window* pWindow,const SfxItemSet& rOutA return new AxisPositionsTabPage(pWindow, rOutAttrs); } -bool AxisPositionsTabPage::FillItemSet(SfxItemSet& rOutAttrs) +bool AxisPositionsTabPage::FillItemSet(SfxItemSet* rOutAttrs) { // axis line sal_Int32 nPos = m_pLB_CrossesAt->GetSelectEntryPos(); - rOutAttrs.Put( SfxInt32Item( SCHATTR_AXIS_POSITION, nPos+1 )); + rOutAttrs->Put( SfxInt32Item( SCHATTR_AXIS_POSITION, nPos+1 )); if( 2==nPos ) { double fCrossover = m_pED_CrossesAt->GetValue(); if( m_bCrossingAxisIsCategoryAxis ) fCrossover = m_pED_CrossesAtCategory->GetSelectEntryPos()+1; - rOutAttrs.Put(SvxDoubleItem(fCrossover,SCHATTR_AXIS_POSITION_VALUE)); + rOutAttrs->Put(SvxDoubleItem(fCrossover,SCHATTR_AXIS_POSITION_VALUE)); } // labels sal_Int32 nLabelPos = m_pLB_PlaceLabels->GetSelectEntryPos(); if( nLabelPos != LISTBOX_ENTRY_NOTFOUND ) - rOutAttrs.Put( SfxInt32Item( SCHATTR_AXIS_LABEL_POSITION, nLabelPos )); + rOutAttrs->Put( SfxInt32Item( SCHATTR_AXIS_LABEL_POSITION, nLabelPos )); // tick marks long nTicks=0; @@ -121,12 +121,12 @@ bool AxisPositionsTabPage::FillItemSet(SfxItemSet& rOutAttrs) if(m_pCB_TicksOuter->IsChecked()) nTicks|=CHAXIS_MARK_OUTER; - rOutAttrs.Put(SfxInt32Item(SCHATTR_AXIS_TICKS,nTicks)); - rOutAttrs.Put(SfxInt32Item(SCHATTR_AXIS_HELPTICKS,nMinorTicks)); + rOutAttrs->Put(SfxInt32Item(SCHATTR_AXIS_TICKS,nTicks)); + rOutAttrs->Put(SfxInt32Item(SCHATTR_AXIS_HELPTICKS,nMinorTicks)); sal_Int32 nMarkPos = m_pLB_PlaceTicks->GetSelectEntryPos(); if( nMarkPos != LISTBOX_ENTRY_NOTFOUND ) - rOutAttrs.Put( SfxInt32Item( SCHATTR_AXIS_MARK_POSITION, nMarkPos )); + rOutAttrs->Put( SfxInt32Item( SCHATTR_AXIS_MARK_POSITION, nMarkPos )); return true; } @@ -256,7 +256,7 @@ void AxisPositionsTabPage::Reset(const SfxItemSet& rInAttrs) int AxisPositionsTabPage::DeactivatePage(SfxItemSet* pItemSet) { if( pItemSet ) - FillItemSet( *pItemSet ); + FillItemSet( pItemSet ); return LEAVE_PAGE; } diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.hxx b/chart2/source/controller/dialogs/tp_AxisPositions.hxx index 21c92f0a331f..d34997b82ca8 100644 --- a/chart2/source/controller/dialogs/tp_AxisPositions.hxx +++ b/chart2/source/controller/dialogs/tp_AxisPositions.hxx @@ -35,7 +35,7 @@ public: AxisPositionsTabPage( Window* pParent, const SfxItemSet& rInAttrs ); static SfxTabPage* Create( Window* pParent, const SfxItemSet& rInAttrs ); - virtual bool FillItemSet( SfxItemSet& rOutAttrs ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rOutAttrs ) 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 f139f287415c..417544dbc565 100644 --- a/chart2/source/controller/dialogs/tp_DataLabel.cxx +++ b/chart2/source/controller/dialogs/tp_DataLabel.cxx @@ -43,7 +43,7 @@ SfxTabPage* DataLabelsTabPage::Create(Window* pWindow, const SfxItemSet& rOutAtt return new DataLabelsTabPage(pWindow, rOutAttrs); } -bool DataLabelsTabPage::FillItemSet(SfxItemSet& rOutAttrs) +bool DataLabelsTabPage::FillItemSet(SfxItemSet* rOutAttrs) { return m_aDataLabelResources.FillItemSet(rOutAttrs); } diff --git a/chart2/source/controller/dialogs/tp_DataLabel.hxx b/chart2/source/controller/dialogs/tp_DataLabel.hxx index 72d46d7514c3..74946771c33e 100644 --- a/chart2/source/controller/dialogs/tp_DataLabel.hxx +++ b/chart2/source/controller/dialogs/tp_DataLabel.hxx @@ -41,7 +41,7 @@ public: void SetNumberFormatter( SvNumberFormatter* pFormatter ); virtual void Reset(const SfxItemSet& rInAttrs) SAL_OVERRIDE; - virtual bool FillItemSet(SfxItemSet& rOutAttrs) SAL_OVERRIDE; + virtual bool FillItemSet(SfxItemSet* rOutAttrs) SAL_OVERRIDE; private: DataLabelResources m_aDataLabelResources; diff --git a/chart2/source/controller/dialogs/tp_ErrorBars.cxx b/chart2/source/controller/dialogs/tp_ErrorBars.cxx index e77592177ade..f0fc68d5d6b1 100644 --- a/chart2/source/controller/dialogs/tp_ErrorBars.cxx +++ b/chart2/source/controller/dialogs/tp_ErrorBars.cxx @@ -47,9 +47,9 @@ SfxTabPage* ErrorBarsTabPage::Create( return new ErrorBarsTabPage( pParent, rOutAttrs ); } -bool ErrorBarsTabPage::FillItemSet( SfxItemSet& rOutAttrs ) +bool ErrorBarsTabPage::FillItemSet( SfxItemSet* rOutAttrs ) { - return m_aErrorBarResources.FillItemSet( rOutAttrs ); + return m_aErrorBarResources.FillItemSet( *rOutAttrs ); } void ErrorBarsTabPage::Reset( const SfxItemSet& rInAttrs ) diff --git a/chart2/source/controller/dialogs/tp_ErrorBars.hxx b/chart2/source/controller/dialogs/tp_ErrorBars.hxx index 3f3fa08f9d9a..838310cd639d 100644 --- a/chart2/source/controller/dialogs/tp_ErrorBars.hxx +++ b/chart2/source/controller/dialogs/tp_ErrorBars.hxx @@ -38,7 +38,7 @@ public: ::com::sun::star::chart2::XChartDocument > & xChartDocument ); static SfxTabPage* Create( Window* pParent, const SfxItemSet& rInAttrs ); - virtual bool FillItemSet( SfxItemSet& rOutAttrs ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rOutAttrs ) 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 64868b505880..eba17ae0ec53 100644 --- a/chart2/source/controller/dialogs/tp_LegendPosition.cxx +++ b/chart2/source/controller/dialogs/tp_LegendPosition.cxx @@ -46,12 +46,12 @@ SfxTabPage* SchLegendPosTabPage::Create(Window* pWindow, const SfxItemSet& rOutA return new SchLegendPosTabPage(pWindow, rOutAttrs); } -bool SchLegendPosTabPage::FillItemSet(SfxItemSet& rOutAttrs) +bool SchLegendPosTabPage::FillItemSet(SfxItemSet* rOutAttrs) { - m_aLegendPositionResources.writeToItemSet(rOutAttrs); + m_aLegendPositionResources.writeToItemSet(*rOutAttrs); if( m_pLbTextDirection->GetSelectEntryCount() > 0 ) - rOutAttrs.Put( SfxInt32Item( EE_PARA_WRITINGDIR, m_pLbTextDirection->GetSelectEntryValue() ) ); + rOutAttrs->Put( SfxInt32Item( EE_PARA_WRITINGDIR, m_pLbTextDirection->GetSelectEntryValue() ) ); return true; } diff --git a/chart2/source/controller/dialogs/tp_LegendPosition.hxx b/chart2/source/controller/dialogs/tp_LegendPosition.hxx index c870e40979b3..091f639f50dc 100644 --- a/chart2/source/controller/dialogs/tp_LegendPosition.hxx +++ b/chart2/source/controller/dialogs/tp_LegendPosition.hxx @@ -39,7 +39,7 @@ public: SchLegendPosTabPage(Window* pParent, const SfxItemSet& rInAttrs); static SfxTabPage* Create(Window* pParent, const SfxItemSet& rInAttrs); - virtual bool FillItemSet(SfxItemSet& rOutAttrs) SAL_OVERRIDE; + virtual bool FillItemSet(SfxItemSet* rOutAttrs) SAL_OVERRIDE; virtual void Reset(const SfxItemSet& rInAttrs) SAL_OVERRIDE; }; diff --git a/chart2/source/controller/dialogs/tp_PointGeometry.cxx b/chart2/source/controller/dialogs/tp_PointGeometry.cxx index 68a20d907367..cbdd53294a65 100644 --- a/chart2/source/controller/dialogs/tp_PointGeometry.cxx +++ b/chart2/source/controller/dialogs/tp_PointGeometry.cxx @@ -48,7 +48,7 @@ SfxTabPage* SchLayoutTabPage::Create(Window* pWindow, return new SchLayoutTabPage(pWindow, rOutAttrs); } -bool SchLayoutTabPage::FillItemSet(SfxItemSet& rOutAttrs) +bool SchLayoutTabPage::FillItemSet(SfxItemSet* rOutAttrs) { if(m_pGeometryResources && m_pGeometryResources->GetSelectEntryCount()) @@ -59,8 +59,8 @@ bool SchLayoutTabPage::FillItemSet(SfxItemSet& rOutAttrs) if(nShape==CHART_SHAPE3D_PYRAMID) nSegs=4; - rOutAttrs.Put(SfxInt32Item(SCHATTR_STYLE_SHAPE,nShape)); - rOutAttrs.Put(Svx3DHorizontalSegmentsItem(nSegs)); + rOutAttrs->Put(SfxInt32Item(SCHATTR_STYLE_SHAPE,nShape)); + rOutAttrs->Put(Svx3DHorizontalSegmentsItem(nSegs)); } return true; } diff --git a/chart2/source/controller/dialogs/tp_PointGeometry.hxx b/chart2/source/controller/dialogs/tp_PointGeometry.hxx index b4098a7dcc5a..69139520e429 100644 --- a/chart2/source/controller/dialogs/tp_PointGeometry.hxx +++ b/chart2/source/controller/dialogs/tp_PointGeometry.hxx @@ -32,7 +32,7 @@ public: virtual ~SchLayoutTabPage(); static SfxTabPage* Create(Window* pParent, const SfxItemSet& rInAttrs); - virtual bool FillItemSet(SfxItemSet& rOutAttrs) SAL_OVERRIDE; + virtual bool FillItemSet(SfxItemSet* rOutAttrs) SAL_OVERRIDE; virtual void Reset(const SfxItemSet& rInAttrs) SAL_OVERRIDE; private: diff --git a/chart2/source/controller/dialogs/tp_PolarOptions.cxx b/chart2/source/controller/dialogs/tp_PolarOptions.cxx index 1c30d3b02f3e..566ac73f6f56 100644 --- a/chart2/source/controller/dialogs/tp_PolarOptions.cxx +++ b/chart2/source/controller/dialogs/tp_PolarOptions.cxx @@ -53,19 +53,19 @@ SfxTabPage* PolarOptionsTabPage::Create( Window* pWindow,const SfxItemSet& rOutA return new PolarOptionsTabPage( pWindow, rOutAttrs ); } -bool PolarOptionsTabPage::FillItemSet( SfxItemSet& rOutAttrs ) +bool PolarOptionsTabPage::FillItemSet( SfxItemSet* rOutAttrs ) { if( m_pAngleDial->IsVisible() ) { - rOutAttrs.Put(SfxInt32Item(SCHATTR_STARTING_ANGLE, + rOutAttrs->Put(SfxInt32Item(SCHATTR_STARTING_ANGLE, static_cast< sal_Int32 >(m_pAngleDial->GetRotation()/100))); } if( m_pCB_Clockwise->IsVisible() ) - rOutAttrs.Put(SfxBoolItem(SCHATTR_CLOCKWISE,m_pCB_Clockwise->IsChecked())); + rOutAttrs->Put(SfxBoolItem(SCHATTR_CLOCKWISE,m_pCB_Clockwise->IsChecked())); if (m_pCB_IncludeHiddenCells->IsVisible()) - rOutAttrs.Put(SfxBoolItem(SCHATTR_INCLUDE_HIDDEN_CELLS, m_pCB_IncludeHiddenCells->IsChecked())); + rOutAttrs->Put(SfxBoolItem(SCHATTR_INCLUDE_HIDDEN_CELLS, m_pCB_IncludeHiddenCells->IsChecked())); return true; } diff --git a/chart2/source/controller/dialogs/tp_PolarOptions.hxx b/chart2/source/controller/dialogs/tp_PolarOptions.hxx index 3d3904662b18..3af8f463b333 100644 --- a/chart2/source/controller/dialogs/tp_PolarOptions.hxx +++ b/chart2/source/controller/dialogs/tp_PolarOptions.hxx @@ -36,7 +36,7 @@ public: virtual ~PolarOptionsTabPage(); static SfxTabPage* Create(Window* pParent, const SfxItemSet& rInAttrs); - virtual bool FillItemSet(SfxItemSet& rOutAttrs) SAL_OVERRIDE; + virtual bool FillItemSet(SfxItemSet* rOutAttrs) SAL_OVERRIDE; virtual void Reset(const SfxItemSet& rInAttrs) SAL_OVERRIDE; private: diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx index a3df39f48df7..7f4b17ab8387 100644 --- a/chart2/source/controller/dialogs/tp_Scale.cxx +++ b/chart2/source/controller/dialogs/tp_Scale.cxx @@ -238,37 +238,37 @@ SfxTabPage* ScaleTabPage::Create(Window* pWindow,const SfxItemSet& rOutAttrs) return new ScaleTabPage(pWindow, rOutAttrs); } -bool ScaleTabPage::FillItemSet(SfxItemSet& rOutAttrs) +bool ScaleTabPage::FillItemSet(SfxItemSet* rOutAttrs) { OSL_PRECOND( pNumFormatter, "No NumberFormatter available" ); - rOutAttrs.Put(SfxInt32Item(SCHATTR_AXISTYPE, m_nAxisType)); + rOutAttrs->Put(SfxInt32Item(SCHATTR_AXISTYPE, m_nAxisType)); if(m_bAllowDateAxis) - rOutAttrs.Put(SfxBoolItem(SCHATTR_AXIS_AUTO_DATEAXIS, TYPE_AUTO==m_pLB_AxisType->GetSelectEntryPos())); + rOutAttrs->Put(SfxBoolItem(SCHATTR_AXIS_AUTO_DATEAXIS, TYPE_AUTO==m_pLB_AxisType->GetSelectEntryPos())); bool bAutoScale = false; if( m_nAxisType==chart2::AxisType::CATEGORY ) bAutoScale = true;//reset scaling for category charts - rOutAttrs.Put(SfxBoolItem(SCHATTR_AXIS_AUTO_MIN ,bAutoScale || m_pCbxAutoMin->IsChecked())); - rOutAttrs.Put(SfxBoolItem(SCHATTR_AXIS_AUTO_MAX ,bAutoScale || m_pCbxAutoMax->IsChecked())); - rOutAttrs.Put(SfxBoolItem(SCHATTR_AXIS_AUTO_STEP_HELP,bAutoScale || m_pCbxAutoStepHelp->IsChecked())); - rOutAttrs.Put(SfxBoolItem(SCHATTR_AXIS_AUTO_ORIGIN ,bAutoScale || m_pCbxAutoOrigin->IsChecked())); - rOutAttrs.Put(SfxBoolItem(SCHATTR_AXIS_LOGARITHM ,m_pCbxLogarithm->IsChecked())); - rOutAttrs.Put(SfxBoolItem(SCHATTR_AXIS_REVERSE ,m_pCbxReverse->IsChecked())); - rOutAttrs.Put(SvxDoubleItem(fMax , SCHATTR_AXIS_MAX)); - rOutAttrs.Put(SvxDoubleItem(fMin , SCHATTR_AXIS_MIN)); - rOutAttrs.Put(SfxInt32Item(SCHATTR_AXIS_STEP_HELP, nStepHelp)); - rOutAttrs.Put(SvxDoubleItem(fOrigin , SCHATTR_AXIS_ORIGIN)); + rOutAttrs->Put(SfxBoolItem(SCHATTR_AXIS_AUTO_MIN ,bAutoScale || m_pCbxAutoMin->IsChecked())); + rOutAttrs->Put(SfxBoolItem(SCHATTR_AXIS_AUTO_MAX ,bAutoScale || m_pCbxAutoMax->IsChecked())); + rOutAttrs->Put(SfxBoolItem(SCHATTR_AXIS_AUTO_STEP_HELP,bAutoScale || m_pCbxAutoStepHelp->IsChecked())); + rOutAttrs->Put(SfxBoolItem(SCHATTR_AXIS_AUTO_ORIGIN ,bAutoScale || m_pCbxAutoOrigin->IsChecked())); + rOutAttrs->Put(SfxBoolItem(SCHATTR_AXIS_LOGARITHM ,m_pCbxLogarithm->IsChecked())); + rOutAttrs->Put(SfxBoolItem(SCHATTR_AXIS_REVERSE ,m_pCbxReverse->IsChecked())); + rOutAttrs->Put(SvxDoubleItem(fMax , SCHATTR_AXIS_MAX)); + rOutAttrs->Put(SvxDoubleItem(fMin , SCHATTR_AXIS_MIN)); + rOutAttrs->Put(SfxInt32Item(SCHATTR_AXIS_STEP_HELP, nStepHelp)); + rOutAttrs->Put(SvxDoubleItem(fOrigin , SCHATTR_AXIS_ORIGIN)); - rOutAttrs.Put(SfxBoolItem(SCHATTR_AXIS_AUTO_STEP_MAIN,bAutoScale || m_pCbxAutoStepMain->IsChecked())); - rOutAttrs.Put(SvxDoubleItem(fStepMain,SCHATTR_AXIS_STEP_MAIN)); + rOutAttrs->Put(SfxBoolItem(SCHATTR_AXIS_AUTO_STEP_MAIN,bAutoScale || m_pCbxAutoStepMain->IsChecked())); + rOutAttrs->Put(SvxDoubleItem(fStepMain,SCHATTR_AXIS_STEP_MAIN)); - rOutAttrs.Put(SfxBoolItem(SCHATTR_AXIS_AUTO_TIME_RESOLUTION,bAutoScale || m_pCbx_AutoTimeResolution->IsChecked())); - rOutAttrs.Put(SfxInt32Item(SCHATTR_AXIS_TIME_RESOLUTION,m_nTimeResolution)); + rOutAttrs->Put(SfxBoolItem(SCHATTR_AXIS_AUTO_TIME_RESOLUTION,bAutoScale || m_pCbx_AutoTimeResolution->IsChecked())); + rOutAttrs->Put(SfxInt32Item(SCHATTR_AXIS_TIME_RESOLUTION,m_nTimeResolution)); - rOutAttrs.Put(SfxInt32Item(SCHATTR_AXIS_MAIN_TIME_UNIT,m_nMainTimeUnit)); - rOutAttrs.Put(SfxInt32Item(SCHATTR_AXIS_HELP_TIME_UNIT,m_nHelpTimeUnit)); + rOutAttrs->Put(SfxInt32Item(SCHATTR_AXIS_MAIN_TIME_UNIT,m_nMainTimeUnit)); + rOutAttrs->Put(SfxInt32Item(SCHATTR_AXIS_HELP_TIME_UNIT,m_nHelpTimeUnit)); return true; } @@ -493,7 +493,7 @@ int ScaleTabPage::DeactivatePage(SfxItemSet* pItemSet) return KEEP_PAGE; if( pItemSet ) - FillItemSet( *pItemSet ); + FillItemSet( pItemSet ); return LEAVE_PAGE; } diff --git a/chart2/source/controller/dialogs/tp_Scale.hxx b/chart2/source/controller/dialogs/tp_Scale.hxx index 6839c09ef9a8..b4980c3ca74d 100644 --- a/chart2/source/controller/dialogs/tp_Scale.hxx +++ b/chart2/source/controller/dialogs/tp_Scale.hxx @@ -35,7 +35,7 @@ public: ScaleTabPage( Window* pParent, const SfxItemSet& rInAttrs ); static SfxTabPage* Create( Window* pParent, const SfxItemSet& rInAttrs ); - virtual bool FillItemSet( SfxItemSet& rOutAttrs ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rOutAttrs ) 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 c3585975a389..d981cbc7a6be 100644 --- a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx +++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx @@ -81,36 +81,36 @@ SfxTabPage* SchOptionTabPage::Create(Window* pWindow,const SfxItemSet& rOutAttrs return new SchOptionTabPage(pWindow, rOutAttrs); } -bool SchOptionTabPage::FillItemSet(SfxItemSet& rOutAttrs) +bool SchOptionTabPage::FillItemSet(SfxItemSet* rOutAttrs) { if(m_pRbtAxis2->IsChecked()) - rOutAttrs.Put(SfxInt32Item(SCHATTR_AXIS,CHART_AXIS_SECONDARY_Y)); + rOutAttrs->Put(SfxInt32Item(SCHATTR_AXIS,CHART_AXIS_SECONDARY_Y)); else - rOutAttrs.Put(SfxInt32Item(SCHATTR_AXIS,CHART_AXIS_PRIMARY_Y)); + rOutAttrs->Put(SfxInt32Item(SCHATTR_AXIS,CHART_AXIS_PRIMARY_Y)); if(m_pMTGap->IsVisible()) - rOutAttrs.Put(SfxInt32Item(SCHATTR_BAR_GAPWIDTH,static_cast< sal_Int32 >( m_pMTGap->GetValue()))); + rOutAttrs->Put(SfxInt32Item(SCHATTR_BAR_GAPWIDTH,static_cast< sal_Int32 >( m_pMTGap->GetValue()))); if(m_pMTOverlap->IsVisible()) - rOutAttrs.Put(SfxInt32Item(SCHATTR_BAR_OVERLAP,static_cast< sal_Int32 >( m_pMTOverlap->GetValue()))); + rOutAttrs->Put(SfxInt32Item(SCHATTR_BAR_OVERLAP,static_cast< sal_Int32 >( m_pMTOverlap->GetValue()))); if(m_pCBConnect->IsVisible()) - rOutAttrs.Put(SfxBoolItem(SCHATTR_BAR_CONNECT,m_pCBConnect->IsChecked())); + rOutAttrs->Put(SfxBoolItem(SCHATTR_BAR_CONNECT,m_pCBConnect->IsChecked())); // model property is "group bars per axis", UI feature is the other way // round: "show bars side by side" if(m_pCBAxisSideBySide->IsVisible()) - rOutAttrs.Put(SfxBoolItem(SCHATTR_GROUP_BARS_PER_AXIS, ! m_pCBAxisSideBySide->IsChecked())); + rOutAttrs->Put(SfxBoolItem(SCHATTR_GROUP_BARS_PER_AXIS, ! m_pCBAxisSideBySide->IsChecked())); if(m_pRB_DontPaint->IsChecked()) - rOutAttrs.Put(SfxInt32Item(SCHATTR_MISSING_VALUE_TREATMENT,::com::sun::star::chart::MissingValueTreatment::LEAVE_GAP)); + rOutAttrs->Put(SfxInt32Item(SCHATTR_MISSING_VALUE_TREATMENT,::com::sun::star::chart::MissingValueTreatment::LEAVE_GAP)); else if(m_pRB_AssumeZero->IsChecked()) - rOutAttrs.Put(SfxInt32Item(SCHATTR_MISSING_VALUE_TREATMENT,::com::sun::star::chart::MissingValueTreatment::USE_ZERO)); + rOutAttrs->Put(SfxInt32Item(SCHATTR_MISSING_VALUE_TREATMENT,::com::sun::star::chart::MissingValueTreatment::USE_ZERO)); else if(m_pRB_ContinueLine->IsChecked()) - rOutAttrs.Put(SfxInt32Item(SCHATTR_MISSING_VALUE_TREATMENT,::com::sun::star::chart::MissingValueTreatment::CONTINUE)); + rOutAttrs->Put(SfxInt32Item(SCHATTR_MISSING_VALUE_TREATMENT,::com::sun::star::chart::MissingValueTreatment::CONTINUE)); if (m_pCBIncludeHiddenCells->IsVisible()) - rOutAttrs.Put(SfxBoolItem(SCHATTR_INCLUDE_HIDDEN_CELLS, m_pCBIncludeHiddenCells->IsChecked())); + rOutAttrs->Put(SfxBoolItem(SCHATTR_INCLUDE_HIDDEN_CELLS, m_pCBIncludeHiddenCells->IsChecked())); return true; } diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx index 2336eb5c9569..04f59dca13db 100644 --- a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx +++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx @@ -34,7 +34,7 @@ public: virtual ~SchOptionTabPage(); static SfxTabPage* Create(Window* pParent, const SfxItemSet& rInAttrs); - virtual bool FillItemSet(SfxItemSet& rOutAttrs) SAL_OVERRIDE; + virtual bool FillItemSet(SfxItemSet* rOutAttrs) 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 ab0dc4c746da..5b9d4047c780 100644 --- a/chart2/source/controller/dialogs/tp_TitleRotation.cxx +++ b/chart2/source/controller/dialogs/tp_TitleRotation.cxx @@ -72,17 +72,17 @@ SfxTabPage* SchAlignmentTabPage::CreateWithoutRotation(Window* pParent, return new SchAlignmentTabPage(pParent, rInAttrs, false); } -bool SchAlignmentTabPage::FillItemSet(SfxItemSet& rOutAttrs) +bool SchAlignmentTabPage::FillItemSet(SfxItemSet* rOutAttrs) { //Since 04/1998 text can be rotated by an arbitrary angle: SCHATTR_TEXT_DEGREES bool bStacked = m_pOrientHlp->GetStackedState() == TRISTATE_TRUE; - rOutAttrs.Put( SfxBoolItem( SCHATTR_TEXT_STACKED, bStacked ) ); + rOutAttrs->Put( SfxBoolItem( SCHATTR_TEXT_STACKED, bStacked ) ); sal_Int32 nDegrees = bStacked ? 0 : m_pCtrlDial->GetRotation(); - rOutAttrs.Put( SfxInt32Item( SCHATTR_TEXT_DEGREES, nDegrees ) ); + rOutAttrs->Put( SfxInt32Item( SCHATTR_TEXT_DEGREES, nDegrees ) ); SvxFrameDirection aDirection( m_pLbTextDirection->GetSelectEntryValue() ); - rOutAttrs.Put( SfxInt32Item( EE_PARA_WRITINGDIR, aDirection ) ); + rOutAttrs->Put( SfxInt32Item( EE_PARA_WRITINGDIR, aDirection ) ); return true; } diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.hxx b/chart2/source/controller/dialogs/tp_TitleRotation.hxx index 14fff7286694..dc468191e9be 100644 --- a/chart2/source/controller/dialogs/tp_TitleRotation.hxx +++ b/chart2/source/controller/dialogs/tp_TitleRotation.hxx @@ -47,7 +47,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 bool FillItemSet(SfxItemSet* rOutAttrs) SAL_OVERRIDE; virtual void Reset(const SfxItemSet& rInAttrs) SAL_OVERRIDE; }; diff --git a/chart2/source/controller/dialogs/tp_Trendline.cxx b/chart2/source/controller/dialogs/tp_Trendline.cxx index a08f89508b43..b95acf9a14ea 100644 --- a/chart2/source/controller/dialogs/tp_Trendline.cxx +++ b/chart2/source/controller/dialogs/tp_Trendline.cxx @@ -41,7 +41,7 @@ SfxTabPage* TrendlineTabPage::Create( return new TrendlineTabPage( pParent, rOutAttrs ); } -bool TrendlineTabPage::FillItemSet( SfxItemSet& rOutAttrs ) +bool TrendlineTabPage::FillItemSet( SfxItemSet* rOutAttrs ) { return m_aTrendlineResources.FillItemSet( rOutAttrs ); } diff --git a/chart2/source/controller/dialogs/tp_Trendline.hxx b/chart2/source/controller/dialogs/tp_Trendline.hxx index b11c7d7bda0f..b50a7d03d081 100644 --- a/chart2/source/controller/dialogs/tp_Trendline.hxx +++ b/chart2/source/controller/dialogs/tp_Trendline.hxx @@ -33,7 +33,7 @@ public: virtual ~TrendlineTabPage (); static SfxTabPage* Create( Window* pParent, const SfxItemSet& rInAttrs ); - virtual bool FillItemSet( SfxItemSet& rOutAttrs ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rOutAttrs ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& rInAttrs ) SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx index ea56730811bf..50519d6666b7 100644 --- a/cui/source/customize/acccfg.cxx +++ b/cui/source/customize/acccfg.cxx @@ -1425,7 +1425,7 @@ void SfxAcceleratorConfigPage::StartFileDialog( WinBits nBits, const OUString& r } -bool SfxAcceleratorConfigPage::FillItemSet( SfxItemSet& ) +bool SfxAcceleratorConfigPage::FillItemSet( SfxItemSet* ) { Apply(m_xAct); try diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 36029954293f..10bc1347ee31 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -1823,7 +1823,7 @@ OUString SvxConfigPage::GetFrameWithDefaultAndIdentify( uno::Reference< frame::X return sModuleID; } -bool SvxConfigPage::FillItemSet( SfxItemSet& ) +bool SvxConfigPage::FillItemSet( SfxItemSet* ) { bool result = false; diff --git a/cui/source/customize/eventdlg.cxx b/cui/source/customize/eventdlg.cxx index 9f2a5cf09e88..8d2111fd5018 100644 --- a/cui/source/customize/eventdlg.cxx +++ b/cui/source/customize/eventdlg.cxx @@ -206,7 +206,7 @@ IMPL_LINK( SvxEventConfigPage, SelectHdl_Impl, ListBox *, pBox ) return sal_True; } -bool SvxEventConfigPage::FillItemSet( SfxItemSet& rSet ) +bool SvxEventConfigPage::FillItemSet( SfxItemSet* rSet ) { return _SvxMacroTabPage::FillItemSet( rSet ); } diff --git a/cui/source/customize/eventdlg.hxx b/cui/source/customize/eventdlg.hxx index dd14a12c30c3..b883ab200f06 100644 --- a/cui/source/customize/eventdlg.hxx +++ b/cui/source/customize/eventdlg.hxx @@ -53,7 +53,7 @@ public: void LateInit( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame ); protected: - virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; private: void ImplInitDocument(); diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx index 881f5a5e5c83..5f4117b83fbb 100644 --- a/cui/source/customize/macropg.cxx +++ b/cui/source/customize/macropg.cxx @@ -314,7 +314,7 @@ void _SvxMacroTabPage::InitResources() // the following method is called when the user clicks OK // We use the contents of the hashes to replace the settings -bool _SvxMacroTabPage::FillItemSet( SfxItemSet& /*rSet*/ ) +bool _SvxMacroTabPage::FillItemSet( SfxItemSet* /*rSet*/ ) { try { @@ -888,7 +888,7 @@ AssignComponentDialog::~AssignComponentDialog() IMPL_LINK( SvxMacroAssignSingleTabDialog, OKHdl_Impl, Button *, pButton ) { (void)pButton; //unused - GetTabPage()->FillItemSet( *(SfxItemSet*)0 ); + GetTabPage()->FillItemSet( 0 ); EndDialog( RET_OK ); return 0; } diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx index f5f3924d8970..517020ce7610 100644 --- a/cui/source/dialogs/cuigaldlg.cxx +++ b/cui/source/dialogs/cuigaldlg.cxx @@ -679,7 +679,7 @@ void TPGalleryThemeGeneral::SetXChgData( ExchangeData* _pData ) -bool TPGalleryThemeGeneral::FillItemSet( SfxItemSet& /*rSet*/ ) +bool TPGalleryThemeGeneral::FillItemSet( SfxItemSet* /*rSet*/ ) { pData->aEditedTitle = m_pEdtMSName->GetText(); return true; diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx index 8d33cc6ce6d5..45ec57a2c13f 100644 --- a/cui/source/dialogs/cuihyperdlg.cxx +++ b/cui/source/dialogs/cuihyperdlg.cxx @@ -227,7 +227,7 @@ IMPL_LINK_NOARG(SvxHpLinkDlg, ClickApplyHdl_Impl) if ( pCurrentPage->AskApply() ) { - pCurrentPage->FillItemSet( aItemSet ); + pCurrentPage->FillItemSet( &aItemSet ); SvxHyperlinkItem *aItem = (SvxHyperlinkItem *) aItemSet.GetItem (SID_HYPERLINK_SETLINK); diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx index f31c0568db27..3423efdd5b87 100644 --- a/cui/source/dialogs/hltpbase.cxx +++ b/cui/source/dialogs/hltpbase.cxx @@ -483,7 +483,7 @@ void SvxHyperlinkTabPageBase::Reset( const SfxItemSet& rItemSet) } // Fill output-ItemSet -bool SvxHyperlinkTabPageBase::FillItemSet( SfxItemSet& rOut) +bool SvxHyperlinkTabPageBase::FillItemSet( SfxItemSet* rOut) { OUString aStrURL, aStrName, aStrIntName, aStrFrame; SvxLinkInsertMode eMode; @@ -497,7 +497,7 @@ bool SvxHyperlinkTabPageBase::FillItemSet( SfxItemSet& rOut) SvxHyperlinkItem aItem( SID_HYPERLINK_SETLINK, aStrName, aStrURL, aStrFrame, aStrIntName, eMode, nEvents, pTable ); - rOut.Put (aItem); + rOut->Put (aItem); return true; } diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx index c0d4124b06f1..8fd3ac036509 100644 --- a/cui/source/dialogs/iconcdlg.cxx +++ b/cui/source/dialogs/iconcdlg.cxx @@ -1120,13 +1120,13 @@ short IconChoiceDialog::Ok() { SfxItemSet& rSet = (SfxItemSet&)pPage->GetItemSet(); rSet.ClearItem(); - _bModified |= pPage->FillItemSet( rSet ); + _bModified |= pPage->FillItemSet( &rSet ); } else if ( pSet && !pPage->HasExchangeSupport() ) { SfxItemSet aTmp( *pSet->GetPool(), pSet->GetRanges() ); - if ( pPage->FillItemSet( aTmp ) ) + if ( pPage->FillItemSet( &aTmp ) ) { _bModified |= true; pExampleSet->Put( aTmp ); diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx index 825f79bc7052..db5b54cb43c6 100644 --- a/cui/source/inc/acccfg.hxx +++ b/cui/source/inc/acccfg.hxx @@ -173,7 +173,7 @@ public: SfxAcceleratorConfigPage( Window *pParent, const SfxItemSet& rItemSet ); virtual ~SfxAcceleratorConfigPage(); - virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual bool FillItemSet( 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 c9f61c6665a4..76412fb48911 100644 --- a/cui/source/inc/align.hxx +++ b/cui/source/inc/align.hxx @@ -62,7 +62,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); static const sal_uInt16* GetRanges(); - virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( 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 644a8c7e84b5..652328b5d2b5 100644 --- a/cui/source/inc/autocdlg.hxx +++ b/cui/source/inc/autocdlg.hxx @@ -113,7 +113,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; @@ -172,7 +172,7 @@ class OfaSwAutoFmtOptionsPage : public SfxTabPage public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; }; @@ -265,7 +265,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( 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; @@ -324,7 +324,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( 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; @@ -390,7 +390,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; }; @@ -440,7 +440,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; @@ -506,7 +506,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( 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 709e4ea3ebd6..1fbdb817a0df 100644 --- a/cui/source/inc/backgrnd.hxx +++ b/cui/source/inc/backgrnd.hxx @@ -49,7 +49,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); static const sal_uInt16* GetRanges(); - virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( 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 a8eb384753ff..47ecbb1a5607 100644 --- a/cui/source/inc/border.hxx +++ b/cui/source/inc/border.hxx @@ -47,7 +47,7 @@ public: const SfxItemSet& rAttrSet); static const sal_uInt16* GetRanges(); - virtual bool FillItemSet( SfxItemSet& rCoreAttrs ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rCoreAttrs ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE; void HideShadowControls(); diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx index d72f5db88b69..3da574f89e3d 100644 --- a/cui/source/inc/cfg.hxx +++ b/cui/source/inc/cfg.hxx @@ -436,7 +436,7 @@ public: bool MoveEntryData( SvTreeListEntry* pSourceEntry, SvTreeListEntry* pTargetEntry ); - bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; void Reset( const SfxItemSet& ) SAL_OVERRIDE; virtual bool DeleteSelectedContent() = 0; diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx index 69b46c8fcdfd..8bc60fb4b589 100644 --- a/cui/source/inc/chardlg.hxx +++ b/cui/source/inc/chardlg.hxx @@ -156,7 +156,7 @@ public: static const sal_uInt16* GetRanges(); virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; - virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; void SetFontList( const SvxFontListItem& rItem ); void EnableRelativeMode(); @@ -235,7 +235,7 @@ public: static const sal_uInt16* GetRanges(); virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; - virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; void DisableControls( sal_uInt16 nDisable ); void EnableFlash(); @@ -314,7 +314,7 @@ public: static const sal_uInt16* GetRanges(); virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; - virtual bool FillItemSet( 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 void SetPreviewBackgroundToCharacter(); @@ -357,7 +357,7 @@ public: static const sal_uInt16* GetRanges(); virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; - virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; /// the writer uses SID_ATTR_BRUSH as font background void SetPreviewBackgroundToCharacter(); virtual void PageCreated(const SfxAllItemSet& aSet) SAL_OVERRIDE; diff --git a/cui/source/inc/connect.hxx b/cui/source/inc/connect.hxx index b5763e941a9f..c807f21a4ebe 100644 --- a/cui/source/inc/connect.hxx +++ b/cui/source/inc/connect.hxx @@ -66,7 +66,7 @@ public: static SfxTabPage* Create( Window*, const SfxItemSet& ); static const sal_uInt16* GetRanges(); - virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE; void Construct(); diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx index 3458d5d361eb..af652510faa7 100644 --- a/cui/source/inc/cuigaldlg.hxx +++ b/cui/source/inc/cuigaldlg.hxx @@ -214,7 +214,7 @@ private: ExchangeData* pData; virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE {} - virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; public: @@ -263,7 +263,7 @@ class TPGalleryThemeProperties : public SfxTabPage ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFolderPicker2 > xFolderPicker; virtual void Reset( const SfxItemSet& /*rSet*/ ) SAL_OVERRIDE {} - virtual bool FillItemSet( SfxItemSet& /*rSet*/ ) SAL_OVERRIDE { return true; } + 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 09f90c8df7b2..9149dd2d5253 100644 --- a/cui/source/inc/cuioptgenrl.hxx +++ b/cui/source/inc/cuioptgenrl.hxx @@ -69,7 +69,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; }; diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx index 4358fc457a21..e8e5fb63a830 100644 --- a/cui/source/inc/cuitabarea.hxx +++ b/cui/source/inc/cuitabarea.hxx @@ -165,7 +165,7 @@ public: static SfxTabPage* Create(Window*, const SfxItemSet&); static const sal_uInt16* GetRanges(); - virtual bool FillItemSet(SfxItemSet&) SAL_OVERRIDE; + virtual bool FillItemSet(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; @@ -295,7 +295,7 @@ public: static SfxTabPage* Create( Window*, const SfxItemSet& ); static const sal_uInt16* GetRanges(); - virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual bool FillItemSet( 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; @@ -360,7 +360,7 @@ public: static SfxTabPage* Create( Window*, const SfxItemSet& ); static const sal_uInt16* GetRanges(); - virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual bool FillItemSet( 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; @@ -438,7 +438,7 @@ public: void Construct(); static SfxTabPage* Create( Window*, const SfxItemSet& ); - virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; @@ -514,7 +514,7 @@ public: void Construct(); static SfxTabPage* Create( Window*, const SfxItemSet& ); - virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; @@ -600,7 +600,7 @@ public: void Construct(); static SfxTabPage* Create( Window*, const SfxItemSet& ); - virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; @@ -735,7 +735,7 @@ public: void Construct(); static SfxTabPage* Create( Window*, const SfxItemSet& ); - virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx index 7384ec32b137..ed3f09c406b8 100644 --- a/cui/source/inc/cuitabline.hxx +++ b/cui/source/inc/cuitabline.hxx @@ -210,7 +210,7 @@ public: static SfxTabPage* Create( Window*, const SfxItemSet& ); static const sal_uInt16* GetRanges(); - virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; @@ -306,7 +306,7 @@ public: void Construct(); static SfxTabPage* Create( Window*, const SfxItemSet& ); - virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; @@ -376,7 +376,7 @@ public: void Construct(); static SfxTabPage* Create( Window*, const SfxItemSet& ); - virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx index 3e42795c8052..4c5d0ee0546b 100644 --- a/cui/source/inc/dbregister.hxx +++ b/cui/source/inc/dbregister.hxx @@ -95,7 +95,7 @@ namespace svx static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); static const sal_uInt16* GetRanges(); - virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( 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 e2d6b076e2c3..ebc34ee1ba33 100644 --- a/cui/source/inc/dstribut.hxx +++ b/cui/source/inc/dstribut.hxx @@ -47,7 +47,7 @@ public: static SfxTabPage* Create(Window*, const SfxItemSet&, SvxDistributeHorizontal eHor, SvxDistributeVertical eVer); - virtual bool FillItemSet(SfxItemSet&) SAL_OVERRIDE; + virtual bool FillItemSet(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/grfpage.hxx b/cui/source/inc/grfpage.hxx index d5301414641e..f4290052766f 100644 --- a/cui/source/inc/grfpage.hxx +++ b/cui/source/inc/grfpage.hxx @@ -113,7 +113,7 @@ class SvxGrfCropPage : public SfxTabPage public: static SfxTabPage *Create( Window *pParent, const SfxItemSet &rSet ); - virtual bool FillItemSet( SfxItemSet &rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( 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/hltpbase.hxx b/cui/source/inc/hltpbase.hxx index dad7e1fb1fc1..cba59a52f887 100644 --- a/cui/source/inc/hltpbase.hxx +++ b/cui/source/inc/hltpbase.hxx @@ -141,7 +141,7 @@ public: virtual void SetInitFocus(); virtual void SetMarkStr ( const OUString& aStrMark ); virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE; - virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& rItemSet ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx index bc59ec3bb369..7728d740d6a1 100644 --- a/cui/source/inc/iconcdlg.hxx +++ b/cui/source/inc/iconcdlg.hxx @@ -96,7 +96,7 @@ public : const SfxItemSet& GetItemSet() const { return *pSet; } - virtual bool FillItemSet( SfxItemSet& ) = 0; + virtual bool FillItemSet( SfxItemSet* ) = 0; virtual void Reset( const SfxItemSet& ) = 0; bool HasExchangeSupport() const { return bHasExchangeSupport; } diff --git a/cui/source/inc/labdlg.hxx b/cui/source/inc/labdlg.hxx index 9970c1471f91..633f19a76d35 100644 --- a/cui/source/inc/labdlg.hxx +++ b/cui/source/inc/labdlg.hxx @@ -78,7 +78,7 @@ public: static SfxTabPage* Create( Window*, const SfxItemSet& ); static const sal_uInt16* GetRanges(); - virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE; void Construct(); void SetView( const SdrView* pSdrView ) diff --git a/cui/source/inc/macroass.hxx b/cui/source/inc/macroass.hxx index a7a8cf94f8f5..c5355f2a9f58 100644 --- a/cui/source/inc/macroass.hxx +++ b/cui/source/inc/macroass.hxx @@ -70,7 +70,7 @@ public: void LaunchFillGroup(); // --------- inherit from the base ------------- - virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( 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 24ee56458dea..cc59a5c2443c 100644 --- a/cui/source/inc/macropg.hxx +++ b/cui/source/inc/macropg.hxx @@ -84,7 +84,7 @@ public: void InitResources(); 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 bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE; diff --git a/cui/source/inc/measure.hxx b/cui/source/inc/measure.hxx index e8fb79426b74..89039461bf6b 100644 --- a/cui/source/inc/measure.hxx +++ b/cui/source/inc/measure.hxx @@ -70,7 +70,7 @@ public: static SfxTabPage* Create( Window*, const SfxItemSet& ); static const sal_uInt16* GetRanges(); - virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual bool FillItemSet( 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 bb7bbe82e605..8520f603e851 100644 --- a/cui/source/inc/numfmt.hxx +++ b/cui/source/inc/numfmt.hxx @@ -74,7 +74,7 @@ public: const SfxItemSet& rAttrSet ); static const sal_uInt16* GetRanges(); - virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; virtual int DeactivatePage ( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx index 5e115fde8a63..d0fe9418a8b4 100644 --- a/cui/source/inc/numpages.hxx +++ b/cui/source/inc/numpages.hxx @@ -115,7 +115,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 bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; void SetNumCharFmtName(const OUString& rName){sNumCharFmtName = rName;} @@ -151,7 +151,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 bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; void SetCharFmtName(const OUString& rName){sBulletCharFmtName = rName;} @@ -194,7 +194,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 bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; void SetCharFmtNames(const OUString& rCharName, const OUString& rBulName) @@ -239,7 +239,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 bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; void SetNumCharFmtName(const OUString& rName){sNumCharFmtName = rName;} @@ -351,7 +351,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 bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; void SetCharFmts(const OUString& rNumName, const OUString& rBulletName) @@ -451,7 +451,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 bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; static SfxTabPage* Create( Window* pParent, diff --git a/cui/source/inc/optasian.hxx b/cui/source/inc/optasian.hxx index 1efd15c0b38d..458965ad18b6 100644 --- a/cui/source/inc/optasian.hxx +++ b/cui/source/inc/optasian.hxx @@ -59,7 +59,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); static const sal_uInt16* GetRanges(); - virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; }; diff --git a/cui/source/inc/optlingu.hxx b/cui/source/inc/optlingu.hxx index 57ac9f3319bf..20846c516ce1 100644 --- a/cui/source/inc/optlingu.hxx +++ b/cui/source/inc/optlingu.hxx @@ -151,7 +151,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); static const sal_uInt16* GetRanges(); - virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( 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 0df98284d99e..d87961f34b9b 100644 --- a/cui/source/inc/optpath.hxx +++ b/cui/source/inc/optpath.hxx @@ -75,7 +75,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); static const sal_uInt16* GetRanges(); - virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( 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 56b7bef96783..37c54ccc57dc 100644 --- a/cui/source/inc/page.hxx +++ b/cui/source/inc/page.hxx @@ -180,7 +180,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); static const sal_uInt16* GetRanges(); - virtual bool FillItemSet( SfxItemSet& rOutSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rOutSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; virtual void FillUserData() SAL_OVERRIDE; diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx index 81dc3919eb5d..fa15f7dc0e29 100644 --- a/cui/source/inc/paragrph.hxx +++ b/cui/source/inc/paragrph.hxx @@ -102,7 +102,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); static const sal_uInt16* GetRanges(); - virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; @@ -163,7 +163,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); static const sal_uInt16* GetRanges(); - virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; void EnableJustifyExt(); @@ -195,7 +195,7 @@ public: const SfxItemSet& rSet ); static const sal_uInt16* GetRanges(); - virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; void DisablePageBreak(); @@ -275,7 +275,7 @@ public: const SfxItemSet& rSet ); static const sal_uInt16* GetRanges(); - virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( 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 48907f16c8d4..03b81ffb9145 100644 --- a/cui/source/inc/swpossizetabpage.hxx +++ b/cui/source/inc/swpossizetabpage.hxx @@ -128,7 +128,7 @@ public: static SfxTabPage* Create( Window*, const SfxItemSet& ); static const sal_uInt16* GetRanges(); - virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual bool FillItemSet( 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 2f8a384039fb..6cf3a1dad283 100644 --- a/cui/source/inc/tabstpge.hxx +++ b/cui/source/inc/tabstpge.hxx @@ -53,7 +53,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); static const sal_uInt16* GetRanges(); - virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( 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 0e986a1cb4c4..7a71b1576f12 100644 --- a/cui/source/inc/textanim.hxx +++ b/cui/source/inc/textanim.hxx @@ -79,7 +79,7 @@ public: static SfxTabPage* Create( Window*, const SfxItemSet& ); static const sal_uInt16* GetRanges(); - virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual bool FillItemSet( 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 24c360595956..fe8eddd5cd63 100644 --- a/cui/source/inc/textattr.hxx +++ b/cui/source/inc/textattr.hxx @@ -80,7 +80,7 @@ public: static SfxTabPage* Create( Window*, const SfxItemSet& ); static const sal_uInt16* GetRanges(); - virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual bool FillItemSet( 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 72a4e3dec2c9..2f44a1552f04 100644 --- a/cui/source/inc/transfrm.hxx +++ b/cui/source/inc/transfrm.hxx @@ -150,7 +150,7 @@ public: static SfxTabPage* Create( Window*, const SfxItemSet& ); static const sal_uInt16* GetRanges(); - virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; @@ -205,7 +205,7 @@ public: static SfxTabPage* Create( Window*, const SfxItemSet& ); static const sal_uInt16* GetRanges(); - virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; @@ -249,7 +249,7 @@ public: static SfxTabPage* Create( Window*, const SfxItemSet& ); static const sal_uInt16* GetRanges(); - virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx index fcb0ca90288b..613c8a4e750a 100644 --- a/cui/source/options/connpooloptions.cxx +++ b/cui/source/options/connpooloptions.cxx @@ -367,7 +367,7 @@ namespace offapp } - bool ConnectionPoolOptionsPage::FillItemSet(SfxItemSet& _rSet) + bool ConnectionPoolOptionsPage::FillItemSet(SfxItemSet* _rSet) { commitTimeoutField(); @@ -375,14 +375,14 @@ namespace offapp // the enabled flag if (m_pEnablePooling->IsValueChangedFromSaved()) { - _rSet.Put(SfxBoolItem(SID_SB_POOLING_ENABLED, m_pEnablePooling->IsChecked()), SID_SB_POOLING_ENABLED); + _rSet->Put(SfxBoolItem(SID_SB_POOLING_ENABLED, m_pEnablePooling->IsChecked()), SID_SB_POOLING_ENABLED); bModified = true; } // the settings for the single drivers if (m_pDriverList->isModified()) { - _rSet.Put(DriverPoolingSettingsItem(SID_SB_DRIVER_TIMEOUTS, m_pDriverList->getSettings()), SID_SB_DRIVER_TIMEOUTS); + _rSet->Put(DriverPoolingSettingsItem(SID_SB_DRIVER_TIMEOUTS, m_pDriverList->getSettings()), SID_SB_DRIVER_TIMEOUTS); bModified = true; } diff --git a/cui/source/options/connpooloptions.hxx b/cui/source/options/connpooloptions.hxx index cd80ccfc578c..064999cbb121 100644 --- a/cui/source/options/connpooloptions.hxx +++ b/cui/source/options/connpooloptions.hxx @@ -56,7 +56,7 @@ namespace offapp protected: virtual bool Notify( NotifyEvent& _rNEvt ) SAL_OVERRIDE; - virtual bool FillItemSet(SfxItemSet& _rSet) SAL_OVERRIDE; + virtual bool FillItemSet(SfxItemSet* _rSet) SAL_OVERRIDE; virtual void Reset(const SfxItemSet& _rSet) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& _rSet) SAL_OVERRIDE; diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx index 7af151db533d..151d65457314 100644 --- a/cui/source/options/dbregister.cxx +++ b/cui/source/options/dbregister.cxx @@ -182,7 +182,7 @@ SfxTabPage* DbRegistrationOptionsPage::Create( Window* pParent, -bool DbRegistrationOptionsPage::FillItemSet( SfxItemSet& rCoreSet ) +bool DbRegistrationOptionsPage::FillItemSet( SfxItemSet* rCoreSet ) { // the settings for the single drivers bool bModified = false; @@ -201,7 +201,7 @@ bool DbRegistrationOptionsPage::FillItemSet( SfxItemSet& rCoreSet ) } if ( m_nOldCount != aRegistrations.size() || m_bModified ) { - rCoreSet.Put(DatabaseMapItem( SID_SB_DB_REGISTER, aRegistrations ), SID_SB_DB_REGISTER); + rCoreSet->Put(DatabaseMapItem( SID_SB_DB_REGISTER, aRegistrations ), SID_SB_DB_REGISTER); bModified = true; } diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx index efe9f7163483..be2dd1c79481 100644 --- a/cui/source/options/fontsubs.cxx +++ b/cui/source/options/fontsubs.cxx @@ -150,7 +150,7 @@ SfxTabPage* SvxFontSubstTabPage::Create( Window* pParent, return new SvxFontSubstTabPage(pParent, rAttrSet); } -bool SvxFontSubstTabPage::FillItemSet( SfxItemSet& ) +bool SvxFontSubstTabPage::FillItemSet( SfxItemSet* ) { pConfig->ClearSubstitutions();// remove all entries diff --git a/cui/source/options/fontsubs.hxx b/cui/source/options/fontsubs.hxx index 415f59c83317..bad9084f829f 100644 --- a/cui/source/options/fontsubs.hxx +++ b/cui/source/options/fontsubs.hxx @@ -96,7 +96,7 @@ class SvxFontSubstTabPage : public SfxTabPage public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( 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 d8f062de37ee..4b260d36fae1 100644 --- a/cui/source/options/optaccessibility.cxx +++ b/cui/source/options/optaccessibility.cxx @@ -66,7 +66,7 @@ SfxTabPage* SvxAccessibilityOptionsTabPage::Create( Window* pParent, const SfxIt return new SvxAccessibilityOptionsTabPage(pParent, rAttrSet); } -bool SvxAccessibilityOptionsTabPage::FillItemSet( SfxItemSet& ) +bool SvxAccessibilityOptionsTabPage::FillItemSet( SfxItemSet* ) { //aConfig.Set... from controls diff --git a/cui/source/options/optaccessibility.hxx b/cui/source/options/optaccessibility.hxx index 97bd44e21dd4..cd65854ed230 100644 --- a/cui/source/options/optaccessibility.hxx +++ b/cui/source/options/optaccessibility.hxx @@ -46,7 +46,7 @@ public: virtual ~SvxAccessibilityOptionsTabPage(); static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; }; diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx index d79a954dceea..44d8cbb8dd65 100644 --- a/cui/source/options/optasian.cxx +++ b/cui/source/options/optasian.cxx @@ -160,7 +160,7 @@ SfxTabPage* SvxAsianLayoutPage::Create( Window* pParent, const SfxItemSet& rAttr return new SvxAsianLayoutPage(pParent, rAttrSet); } -bool SvxAsianLayoutPage::FillItemSet( SfxItemSet& ) +bool SvxAsianLayoutPage::FillItemSet( SfxItemSet* ) { if(m_pCharKerningRB->IsValueChangedFromSaved()) { diff --git a/cui/source/options/optbasic.cxx b/cui/source/options/optbasic.cxx index 27a983c6621b..317d52666cb5 100644 --- a/cui/source/options/optbasic.cxx +++ b/cui/source/options/optbasic.cxx @@ -66,7 +66,7 @@ void SvxBasicIDEOptionsPage::LoadConfig() pUseExtendedTypesChk->Check( bExtended ); } -bool SvxBasicIDEOptionsPage::FillItemSet( SfxItemSet& /*rCoreSet*/ ) +bool SvxBasicIDEOptionsPage::FillItemSet( SfxItemSet* /*rCoreSet*/ ) { bool bModified = false; boost::shared_ptr< comphelper::ConfigurationChanges > batch( comphelper::ConfigurationChanges::create() ); diff --git a/cui/source/options/optbasic.hxx b/cui/source/options/optbasic.hxx index ac46d81d1132..d065ea6ac006 100644 --- a/cui/source/options/optbasic.hxx +++ b/cui/source/options/optbasic.hxx @@ -41,7 +41,7 @@ public: virtual ~SvxBasicIDEOptionsPage(); static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); - virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( 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 673a08f013af..74b9b605c55a 100644 --- a/cui/source/options/optchart.cxx +++ b/cui/source/options/optchart.cxx @@ -108,10 +108,10 @@ SfxTabPage* SvxDefaultColorOptPage::Create( Window* pParent, const SfxItemSet& r return new SvxDefaultColorOptPage( pParent, rAttrs ); } -bool SvxDefaultColorOptPage::FillItemSet( SfxItemSet& rOutAttrs ) +bool SvxDefaultColorOptPage::FillItemSet( SfxItemSet* rOutAttrs ) { if( pColorConfig ) - rOutAttrs.Put( *(static_cast< SfxPoolItem* >(pColorConfig))); + rOutAttrs->Put( *(static_cast< SfxPoolItem* >(pColorConfig))); return true; } diff --git a/cui/source/options/optchart.hxx b/cui/source/options/optchart.hxx index 5590d5ae1a95..7a1bd24337d8 100644 --- a/cui/source/options/optchart.hxx +++ b/cui/source/options/optchart.hxx @@ -59,7 +59,7 @@ public: void Construct(); static SfxTabPage* Create( Window* pParent, const SfxItemSet& rInAttrs ); - virtual bool FillItemSet( SfxItemSet& rOutAttrs ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rOutAttrs ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& rInAttrs ) SAL_OVERRIDE; }; diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx index 77108e8d26a9..9abfde7728a4 100644 --- a/cui/source/options/optcolor.cxx +++ b/cui/source/options/optcolor.cxx @@ -1079,7 +1079,7 @@ SfxTabPage* SvxColorOptionsTabPage::Create( Window* pParent, const SfxItemSet& r return ( new SvxColorOptionsTabPage( pParent, rAttrSet ) ); } -bool SvxColorOptionsTabPage::FillItemSet( SfxItemSet& ) +bool SvxColorOptionsTabPage::FillItemSet( SfxItemSet* ) { bFillItemSetCalled = true; if(m_pColorSchemeLB->IsValueChangedFromSaved()) @@ -1131,7 +1131,7 @@ void SvxColorOptionsTabPage::Reset( const SfxItemSet& ) int SvxColorOptionsTabPage::DeactivatePage( SfxItemSet* pSet_ ) { if ( pSet_ ) - FillItemSet( *pSet_ ); + FillItemSet( pSet_ ); return( LEAVE_PAGE ); } diff --git a/cui/source/options/optcolor.hxx b/cui/source/options/optcolor.hxx index b3033bade873..d3553785a686 100644 --- a/cui/source/options/optcolor.hxx +++ b/cui/source/options/optcolor.hxx @@ -52,7 +52,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; diff --git a/cui/source/options/optctl.cxx b/cui/source/options/optctl.cxx index 3d51979d507d..e5501136c20a 100644 --- a/cui/source/options/optctl.cxx +++ b/cui/source/options/optctl.cxx @@ -66,7 +66,7 @@ SfxTabPage* SvxCTLOptionsPage::Create( Window* pParent, const SfxItemSet& rAttrS return new SvxCTLOptionsPage( pParent, rAttrSet ); } -bool SvxCTLOptionsPage::FillItemSet( SfxItemSet& ) +bool SvxCTLOptionsPage::FillItemSet( SfxItemSet* ) { bool bModified = false; SvtCTLOptions aCTLOptions; diff --git a/cui/source/options/optctl.hxx b/cui/source/options/optctl.hxx index 326718bee03f..e2396e2e3366 100644 --- a/cui/source/options/optctl.hxx +++ b/cui/source/options/optctl.hxx @@ -48,7 +48,7 @@ public: virtual ~SvxCTLOptionsPage(); static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; }; diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx index bf877b692bac..8c5e47160ff4 100644 --- a/cui/source/options/optfltr.cxx +++ b/cui/source/options/optfltr.cxx @@ -76,7 +76,7 @@ SfxTabPage* OfaMSFilterTabPage::Create( Window* pParent, return new OfaMSFilterTabPage( pParent, rAttrSet ); } -bool OfaMSFilterTabPage::FillItemSet( SfxItemSet& ) +bool OfaMSFilterTabPage::FillItemSet( SfxItemSet* ) { SvtFilterOptions& rOpt = SvtFilterOptions::Get(); @@ -169,7 +169,7 @@ SfxTabPage* OfaMSFilterTabPage2::Create( Window* pParent, return new OfaMSFilterTabPage2( pParent, rAttrSet ); } -bool OfaMSFilterTabPage2::FillItemSet( SfxItemSet& ) +bool OfaMSFilterTabPage2::FillItemSet( SfxItemSet* ) { SvtFilterOptions& rOpt = SvtFilterOptions::Get(); diff --git a/cui/source/options/optfltr.hxx b/cui/source/options/optfltr.hxx index 30b58f011a94..da22fe558f83 100644 --- a/cui/source/options/optfltr.hxx +++ b/cui/source/options/optfltr.hxx @@ -46,7 +46,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; }; @@ -95,7 +95,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( 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 7b6f9478fa7a..6bb145a60b57 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -106,7 +106,7 @@ using namespace ::utl; int OfaMiscTabPage::DeactivatePage( SfxItemSet* pSet_ ) { if ( pSet_ ) - FillItemSet( *pSet_ ); + FillItemSet( pSet_ ); return LEAVE_PAGE; } @@ -243,7 +243,7 @@ SfxTabPage* OfaMiscTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet -bool OfaMiscTabPage::FillItemSet( SfxItemSet& rSet ) +bool OfaMiscTabPage::FillItemSet( SfxItemSet* rSet ) { bool bModified = false; @@ -283,12 +283,12 @@ bool OfaMiscTabPage::FillItemSet( SfxItemSet& rSet ) } const SfxUInt16Item* pUInt16Item = - PTR_CAST( SfxUInt16Item, GetOldItem( rSet, SID_ATTR_YEAR2000 ) ); + PTR_CAST( SfxUInt16Item, GetOldItem( *rSet, SID_ATTR_YEAR2000 ) ); sal_uInt16 nNum = (sal_uInt16)m_pYearValueField->GetText().toInt32(); if ( pUInt16Item && pUInt16Item->GetValue() != nNum ) { bModified = true; - rSet.Put( SfxUInt16Item( SID_ATTR_YEAR2000, nNum ) ); + rSet->Put( SfxUInt16Item( SID_ATTR_YEAR2000, nNum ) ); } return bModified; @@ -652,7 +652,7 @@ SfxTabPage* OfaViewTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet return new OfaViewTabPage(pParent, rAttrSet); } -bool OfaViewTabPage::FillItemSet( SfxItemSet& ) +bool OfaViewTabPage::FillItemSet( SfxItemSet* ) { SvtFontOptions aFontOpt; SvtMenuOptions aMenuOpt; @@ -1177,7 +1177,7 @@ static void lcl_UpdateAndDelete(SfxVoidItem* pInvalidItems[], SfxBoolItem* pBool } } -bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet ) +bool OfaLanguagesTabPage::FillItemSet( SfxItemSet* rSet ) { // lock configuration broadcasters so that we can coordinate the notifications pLangConfig->aSysLocaleOptions.BlockBroadcasts( true ); @@ -1270,7 +1270,7 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet ) // this will happen after releasing the lock on the ConfigurationBroadcaster at // the end of this method pLangConfig->aSysLocaleOptions.SetLocaleConfigString( sNewLang ); - rSet.Put( SfxBoolItem( SID_OPT_LOCALE_CHANGED, true ) ); + rSet->Put( SfxBoolItem( SID_OPT_LOCALE_CHANGED, true ) ); sal_uInt16 nNewType = SvtLanguageOptions::GetScriptTypeOfLanguage( eNewLocale ); bool bNewCJK = ( nNewType & SCRIPTTYPE_ASIAN ) != 0; @@ -1324,7 +1324,7 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet ) } if(pCurrentDocShell) { - rSet.Put(SvxLanguageItem(MsLangId::resolveSystemLanguageByScriptType(eSelectLang, ::com::sun::star::i18n::ScriptType::LATIN), + rSet->Put(SvxLanguageItem(MsLangId::resolveSystemLanguageByScriptType(eSelectLang, ::com::sun::star::i18n::ScriptType::LATIN), SID_ATTR_LANGUAGE)); } } @@ -1344,7 +1344,7 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet ) } if(pCurrentDocShell) { - rSet.Put(SvxLanguageItem(MsLangId::resolveSystemLanguageByScriptType(eSelectLang, ::com::sun::star::i18n::ScriptType::ASIAN), + rSet->Put(SvxLanguageItem(MsLangId::resolveSystemLanguageByScriptType(eSelectLang, ::com::sun::star::i18n::ScriptType::ASIAN), SID_ATTR_CHAR_CJK_LANGUAGE)); } } @@ -1364,7 +1364,7 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet ) } if(pCurrentDocShell) { - rSet.Put(SvxLanguageItem(MsLangId::resolveSystemLanguageByScriptType(eSelectLang, ::com::sun::star::i18n::ScriptType::COMPLEX), + rSet->Put(SvxLanguageItem(MsLangId::resolveSystemLanguageByScriptType(eSelectLang, ::com::sun::star::i18n::ScriptType::COMPLEX), SID_ATTR_CHAR_CTL_LANGUAGE)); } } diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx index 61b22282cddd..28a7a581f252 100644 --- a/cui/source/options/optgdlg.hxx +++ b/cui/source/options/optgdlg.hxx @@ -70,7 +70,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; }; @@ -125,7 +125,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; }; @@ -169,7 +169,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( 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 1cff7c16567d..af517dcdbf17 100644 --- a/cui/source/options/optgenrl.cxx +++ b/cui/source/options/optgenrl.cxx @@ -304,7 +304,7 @@ SfxTabPage* SvxGeneralTabPage::Create( Window* pParent, const SfxItemSet& rAttrS -bool SvxGeneralTabPage::FillItemSet( SfxItemSet& ) +bool SvxGeneralTabPage::FillItemSet( SfxItemSet* ) { // remove leading and trailing whitespaces for (unsigned i = 0; i != vFields.size(); ++i) @@ -435,7 +435,7 @@ void SvxGeneralTabPage::SetAddress_Impl() int SvxGeneralTabPage::DeactivatePage( SfxItemSet* pSet_ ) { if ( pSet_ ) - FillItemSet( *pSet_ ); + FillItemSet( pSet_ ); return LEAVE_PAGE; } diff --git a/cui/source/options/opthtml.cxx b/cui/source/options/opthtml.cxx index c6c724cab33b..a7a4e3388fec 100644 --- a/cui/source/options/opthtml.cxx +++ b/cui/source/options/opthtml.cxx @@ -94,7 +94,7 @@ SfxTabPage* OfaHtmlTabPage::Create( Window* pParent, return new OfaHtmlTabPage(pParent, rAttrSet); } -bool OfaHtmlTabPage::FillItemSet( SfxItemSet& ) +bool OfaHtmlTabPage::FillItemSet( SfxItemSet* ) { SvxHtmlOptions& rHtmlOpt = SvxHtmlOptions::Get(); if(aSize1NF->IsValueChangedFromSaved()) diff --git a/cui/source/options/opthtml.hxx b/cui/source/options/opthtml.hxx index 1bab77f331ed..a91a4ed507be 100644 --- a/cui/source/options/opthtml.hxx +++ b/cui/source/options/opthtml.hxx @@ -59,7 +59,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( 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 893848327919..ad94515a8cd9 100644 --- a/cui/source/options/optinet2.cxx +++ b/cui/source/options/optinet2.cxx @@ -391,7 +391,7 @@ void SvxProxyTabPage::Reset(const SfxItemSet&) EnableControls_Impl( m_pProxyModeLB->GetSelectEntryPos() == 2 ); } -bool SvxProxyTabPage::FillItemSet(SfxItemSet& ) +bool SvxProxyTabPage::FillItemSet(SfxItemSet* ) { bool bModified = false; @@ -865,7 +865,7 @@ void SvxSecurityTabPage::ActivatePage( const SfxItemSet& ) int SvxSecurityTabPage::DeactivatePage( SfxItemSet* _pSet ) { if( _pSet ) - FillItemSet( *_pSet ); + FillItemSet( _pSet ); return LEAVE_PAGE; } @@ -888,7 +888,7 @@ namespace } } -bool SvxSecurityTabPage::FillItemSet( SfxItemSet& ) +bool SvxSecurityTabPage::FillItemSet( SfxItemSet* ) { bool bModified = false; @@ -929,7 +929,7 @@ SfxTabPage* MozPluginTabPage::Create( Window* pParent, return new MozPluginTabPage( pParent, rAttrSet ); } -bool MozPluginTabPage::FillItemSet( SfxItemSet& ) +bool MozPluginTabPage::FillItemSet( SfxItemSet* ) { bool hasInstall = isInstalled(); bool hasChecked = m_pWBasicCodeCB->IsChecked(); @@ -1232,7 +1232,7 @@ SfxTabPage* SvxEMailTabPage::Create( Window* pParent, const SfxItemSet& rAttrSe /* -------------------------------------------------------------------------*/ -bool SvxEMailTabPage::FillItemSet( SfxItemSet& ) +bool SvxEMailTabPage::FillItemSet( SfxItemSet* ) { bool bMailModified = false; if(!pImpl->aMailConfig.bROProgram && m_pMailerURLED->IsValueChangedFromSaved()) diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx index c76a8eb97a92..105bce864705 100644 --- a/cui/source/options/optinet2.hxx +++ b/cui/source/options/optinet2.hxx @@ -105,7 +105,7 @@ private: public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; }; @@ -175,7 +175,7 @@ protected: public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; }; @@ -195,7 +195,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; }; @@ -220,7 +220,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; }; diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index b54f710b906d..39ec6a3b1f85 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -642,7 +642,7 @@ SfxTabPage* SvxJavaOptionsPage::Create( Window* pParent, const SfxItemSet& rAttr -bool SvxJavaOptionsPage::FillItemSet( SfxItemSet& /*rCoreSet*/ ) +bool SvxJavaOptionsPage::FillItemSet( SfxItemSet* /*rCoreSet*/ ) { bool bModified = false; diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx index a6b4d52c5923..421c1e49067e 100644 --- a/cui/source/options/optjava.hxx +++ b/cui/source/options/optjava.hxx @@ -109,7 +109,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); - virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( 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 8fbf05f7c67b..b3951b850691 100644 --- a/cui/source/options/optjsearch.cxx +++ b/cui/source/options/optjsearch.cxx @@ -211,7 +211,7 @@ void SvxJSearchOptionsPage::Reset( const SfxItemSet& ) } -bool SvxJSearchOptionsPage::FillItemSet( SfxItemSet& ) +bool SvxJSearchOptionsPage::FillItemSet( SfxItemSet* ) { sal_Int32 nOldVal = nTransliterationFlags; nTransliterationFlags = GetTransliterationFlags_Impl(); diff --git a/cui/source/options/optjsearch.hxx b/cui/source/options/optjsearch.hxx index 4c20a5c178a5..9173c24ca156 100644 --- a/cui/source/options/optjsearch.hxx +++ b/cui/source/options/optjsearch.hxx @@ -67,7 +67,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; - virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; bool IsSaveOptions() const { return bSaveOptions; } void EnableSaveOptions( bool bVal ) { bSaveOptions = bVal; } diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index 6168506a864d..3481b7553fd4 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -1156,7 +1156,7 @@ SfxTabPage* SvxLinguTabPage::Create( Window* pParent, -bool SvxLinguTabPage::FillItemSet( SfxItemSet& rCoreSet ) +bool SvxLinguTabPage::FillItemSet( SfxItemSet* rCoreSet ) { bool bModified = true; // !!!! @@ -1301,17 +1301,17 @@ bool SvxLinguTabPage::FillItemSet( SfxItemSet& rCoreSet ) SfxHyphenRegionItem aHyp( GetWhich( SID_ATTR_HYPHENREGION ) ); aHyp.GetMinLead() = (sal_uInt8) aPreBreakData.GetNumericValue(); aHyp.GetMinTrail() = (sal_uInt8) aPostBreakData.GetNumericValue(); - rCoreSet.Put( aHyp ); + rCoreSet->Put( aHyp ); } } // automatic spell checking bool bNewAutoCheck = m_pLinguOptionsCLB->IsChecked( (sal_uLong) EID_SPELL_AUTO ); - const SfxPoolItem* pOld = GetOldItem( rCoreSet, SID_AUTOSPELL_CHECK ); + const SfxPoolItem* pOld = GetOldItem( *rCoreSet, SID_AUTOSPELL_CHECK ); if ( !pOld || ( (SfxBoolItem*)pOld )->GetValue() != bNewAutoCheck ) { - rCoreSet.Put( SfxBoolItem( GetWhich( SID_AUTOSPELL_CHECK ), + rCoreSet->Put( SfxBoolItem( GetWhich( SID_AUTOSPELL_CHECK ), bNewAutoCheck ) ); bModified |= true; } diff --git a/cui/source/options/optmemory.cxx b/cui/source/options/optmemory.cxx index 72bda7a569f7..1e1a97daa8b0 100644 --- a/cui/source/options/optmemory.cxx +++ b/cui/source/options/optmemory.cxx @@ -105,7 +105,7 @@ inline void OfaMemoryOptionsPage::SetNfGraphicObjectCacheLast( long nSizeInBytes int OfaMemoryOptionsPage::DeactivatePage( SfxItemSet* _pSet ) { if ( _pSet ) - FillItemSet( *_pSet ); + FillItemSet( _pSet ); return LEAVE_PAGE; } @@ -155,7 +155,7 @@ SfxTabPage* OfaMemoryOptionsPage::Create( Window* pParent, const SfxItemSet& rAt -bool OfaMemoryOptionsPage::FillItemSet( SfxItemSet& rSet ) +bool OfaMemoryOptionsPage::FillItemSet( SfxItemSet* rSet ) { bool bModified = false; @@ -198,7 +198,7 @@ bool OfaMemoryOptionsPage::FillItemSet( SfxItemSet& rSet ) if( m_pQuickLaunchCB->IsValueChangedFromSaved()) { - rSet.Put(SfxBoolItem(SID_ATTR_QUICKLAUNCHER, m_pQuickLaunchCB->IsChecked())); + rSet->Put(SfxBoolItem(SID_ATTR_QUICKLAUNCHER, m_pQuickLaunchCB->IsChecked())); bModified = true; } diff --git a/cui/source/options/optmemory.hxx b/cui/source/options/optmemory.hxx index 0e5fb8b1e147..b1564fbaa5f6 100644 --- a/cui/source/options/optmemory.hxx +++ b/cui/source/options/optmemory.hxx @@ -61,7 +61,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( 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 1b065062d555..5b44550ba650 100644 --- a/cui/source/options/optpath.cxx +++ b/cui/source/options/optpath.cxx @@ -264,7 +264,7 @@ SfxTabPage* SvxPathTabPage::Create( Window* pParent, -bool SvxPathTabPage::FillItemSet( SfxItemSet& ) +bool SvxPathTabPage::FillItemSet( SfxItemSet* ) { for ( sal_uInt16 i = 0; i < pPathBox->GetEntryCount(); ++i ) { diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx index 59b95b50a8df..42e744fe62fb 100644 --- a/cui/source/options/optsave.cxx +++ b/cui/source/options/optsave.cxx @@ -238,7 +238,7 @@ void SfxSaveTabPage::DetectHiddenControls() } -bool SfxSaveTabPage::FillItemSet( SfxItemSet& rSet ) +bool SfxSaveTabPage::FillItemSet( SfxItemSet* rSet ) { bool bModified = false; SvtSaveOptions aSaveOpt; @@ -258,55 +258,55 @@ bool SfxSaveTabPage::FillItemSet( SfxItemSet& rSet ) if ( aDocInfoCB->IsValueChangedFromSaved() ) { - rSet.Put( SfxBoolItem( GetWhich( SID_ATTR_DOCINFO ), + rSet->Put( SfxBoolItem( GetWhich( SID_ATTR_DOCINFO ), aDocInfoCB->IsChecked() ) ); bModified |= true; } if ( aBackupCB->IsEnabled() && aBackupCB->IsValueChangedFromSaved() ) { - rSet.Put( SfxBoolItem( GetWhich( SID_ATTR_BACKUP ), + rSet->Put( SfxBoolItem( GetWhich( SID_ATTR_BACKUP ), aBackupCB->IsChecked() ) ); bModified |= true; } if ( aAutoSaveCB->IsValueChangedFromSaved() ) { - rSet.Put( SfxBoolItem( GetWhich( SID_ATTR_AUTOSAVE ), + rSet->Put( SfxBoolItem( GetWhich( SID_ATTR_AUTOSAVE ), aAutoSaveCB->IsChecked() ) ); bModified |= true; } if ( aWarnAlienFormatCB->IsValueChangedFromSaved() ) { - rSet.Put( SfxBoolItem( GetWhich( SID_ATTR_WARNALIENFORMAT ), + rSet->Put( SfxBoolItem( GetWhich( SID_ATTR_WARNALIENFORMAT ), aWarnAlienFormatCB->IsChecked() ) ); bModified |= true; } if ( aAutoSaveEdit->IsValueChangedFromSaved() ) { - rSet.Put( SfxUInt16Item( GetWhich( SID_ATTR_AUTOSAVEMINUTE ), + rSet->Put( SfxUInt16Item( GetWhich( SID_ATTR_AUTOSAVEMINUTE ), (sal_uInt16)aAutoSaveEdit->GetValue() ) ); bModified |= true; } if ( aUserAutoSaveCB->IsValueChangedFromSaved() ) { - rSet.Put( SfxBoolItem( GetWhich( SID_ATTR_USERAUTOSAVE ), + rSet->Put( SfxBoolItem( GetWhich( SID_ATTR_USERAUTOSAVE ), aUserAutoSaveCB->IsChecked() ) ); bModified |= true; } // save relatively if ( aRelativeFsysCB->IsValueChangedFromSaved() ) { - rSet.Put( SfxBoolItem( GetWhich( SID_SAVEREL_FSYS ), + rSet->Put( SfxBoolItem( GetWhich( SID_SAVEREL_FSYS ), aRelativeFsysCB->IsChecked() ) ); bModified |= true; } if ( aRelativeInetCB->IsValueChangedFromSaved() ) { - rSet.Put( SfxBoolItem( GetWhich( SID_SAVEREL_INET ), + rSet->Put( SfxBoolItem( GetWhich( SID_SAVEREL_INET ), aRelativeInetCB->IsChecked() ) ); bModified |= true; } diff --git a/cui/source/options/optsave.hxx b/cui/source/options/optsave.hxx index 810c1af3e3b6..189240ca7ad0 100644 --- a/cui/source/options/optsave.hxx +++ b/cui/source/options/optsave.hxx @@ -76,7 +76,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; }; diff --git a/cui/source/options/optupdt.cxx b/cui/source/options/optupdt.cxx index 127131057620..2ac7d83986bd 100644 --- a/cui/source/options/optupdt.cxx +++ b/cui/source/options/optupdt.cxx @@ -157,7 +157,7 @@ SvxOnlineUpdateTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) -bool SvxOnlineUpdateTabPage::FillItemSet( SfxItemSet& ) +bool SvxOnlineUpdateTabPage::FillItemSet( SfxItemSet* ) { bool bModified = false; diff --git a/cui/source/options/optupdt.hxx b/cui/source/options/optupdt.hxx index c0d61f72b1e4..525fbcad56f5 100644 --- a/cui/source/options/optupdt.hxx +++ b/cui/source/options/optupdt.hxx @@ -56,7 +56,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); - virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( 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 21cb2b4dde41..57cffe7e2d29 100644 --- a/cui/source/options/personalization.cxx +++ b/cui/source/options/personalization.cxx @@ -108,7 +108,7 @@ SfxTabPage* SvxPersonalizationTabPage::Create( Window *pParent, const SfxItemSet return new SvxPersonalizationTabPage( pParent, rSet ); } -bool SvxPersonalizationTabPage::FillItemSet( SfxItemSet & ) +bool SvxPersonalizationTabPage::FillItemSet( SfxItemSet * ) { // persona OUString aPersona( "default" ); diff --git a/cui/source/options/personalization.hxx b/cui/source/options/personalization.hxx index 40661f83e98a..b41beca5155a 100644 --- a/cui/source/options/personalization.hxx +++ b/cui/source/options/personalization.hxx @@ -32,7 +32,7 @@ public: static SfxTabPage* Create( Window *pParent, const SfxItemSet &rSet ); /// Apply the settings ([OK] button). - virtual bool FillItemSet( SfxItemSet &rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet *rSet ) SAL_OVERRIDE; /// Reset to default settings ([Revert] button). virtual void Reset( const SfxItemSet &rSet ) SAL_OVERRIDE; diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index 69f68513a910..95bd35308fc8 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -696,7 +696,7 @@ IMPL_LINK_NOARG(OfaTreeOptionsDialog, OKHdl_Impl) { OptionsGroupInfo* pGroupInfo = (OptionsGroupInfo*)aTreeLB.GetParent(pEntry)->GetUserData(); - pPageInfo->m_pPage->FillItemSet(*pGroupInfo->m_pOutItemSet); + pPageInfo->m_pPage->FillItemSet(pGroupInfo->m_pOutItemSet); } if ( pPageInfo->m_pExtPage ) diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx index 3a8b84611309..c7063342ff0a 100644 --- a/cui/source/tabpages/align.cxx +++ b/cui/source/tabpages/align.cxx @@ -265,7 +265,7 @@ const sal_uInt16* AlignmentTabPage::GetRanges() return s_pRanges; } -bool AlignmentTabPage::FillItemSet( SfxItemSet& rSet ) +bool AlignmentTabPage::FillItemSet( SfxItemSet* rSet ) { bool bChanged = SfxTabPage::FillItemSet(rSet); @@ -273,14 +273,14 @@ bool AlignmentTabPage::FillItemSet( SfxItemSet& rSet ) // method to 'distribute' to distinguish from the normal justification. sal_uInt16 nWhichHorJM = GetWhich(SID_ATTR_ALIGN_HOR_JUSTIFY_METHOD); - lcl_SetJustifyMethodToItemSet(rSet, nWhichHorJM, *m_pLbHorAlign, ALIGNDLG_HORALIGN_DISTRIBUTED); + lcl_SetJustifyMethodToItemSet(*rSet, nWhichHorJM, *m_pLbHorAlign, ALIGNDLG_HORALIGN_DISTRIBUTED); if (!bChanged) - bChanged = HasAlignmentChanged(rSet, nWhichHorJM); + bChanged = HasAlignmentChanged(*rSet, nWhichHorJM); sal_uInt16 nWhichVerJM = GetWhich(SID_ATTR_ALIGN_VER_JUSTIFY_METHOD); - lcl_SetJustifyMethodToItemSet(rSet, nWhichVerJM, *m_pLbVerAlign, ALIGNDLG_VERALIGN_DISTRIBUTED); + lcl_SetJustifyMethodToItemSet(*rSet, nWhichVerJM, *m_pLbVerAlign, ALIGNDLG_VERALIGN_DISTRIBUTED); if (!bChanged) - bChanged = HasAlignmentChanged(rSet, nWhichVerJM); + bChanged = HasAlignmentChanged(*rSet, nWhichVerJM); return bChanged; } @@ -308,7 +308,7 @@ void AlignmentTabPage::Reset( const SfxItemSet& rCoreAttrs ) int AlignmentTabPage::DeactivatePage( SfxItemSet* _pSet ) { if( _pSet ) - FillItemSet( *_pSet ); + FillItemSet( _pSet ); return LEAVE_PAGE; } diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index 1ac62ea42cc0..4b4c816303fd 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -197,7 +197,7 @@ SfxTabPage* OfaAutocorrOptionsPage::Create( Window* pParent, return new OfaAutocorrOptionsPage(pParent, rSet); } -bool OfaAutocorrOptionsPage::FillItemSet( SfxItemSet& ) +bool OfaAutocorrOptionsPage::FillItemSet( SfxItemSet* ) { SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect(); long nFlags = pAutoCorrect->GetFlags(); @@ -481,7 +481,7 @@ SfxTabPage* OfaSwAutoFmtOptionsPage::Create( Window* pParent, return new OfaSwAutoFmtOptionsPage(pParent, rAttrSet); } -bool OfaSwAutoFmtOptionsPage::FillItemSet( SfxItemSet& ) +bool OfaSwAutoFmtOptionsPage::FillItemSet( SfxItemSet* ) { bool bModified = false; SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect(); @@ -921,7 +921,7 @@ int OfaAutocorrReplacePage::DeactivatePage( SfxItemSet* ) return LEAVE_PAGE; } -bool OfaAutocorrReplacePage::FillItemSet( SfxItemSet& ) +bool OfaAutocorrReplacePage::FillItemSet( SfxItemSet* ) { SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect(); @@ -1422,7 +1422,7 @@ int OfaAutocorrExceptPage::DeactivatePage( SfxItemSet* ) return LEAVE_PAGE; } -bool OfaAutocorrExceptPage::FillItemSet( SfxItemSet& ) +bool OfaAutocorrExceptPage::FillItemSet( SfxItemSet* ) { SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect(); for(StringsTable::reverse_iterator it1 = aStringsTable.rbegin(); it1 != aStringsTable.rend(); ++it1) @@ -1827,7 +1827,7 @@ SfxTabPage* OfaQuoteTabPage::Create( Window* pParent, return new OfaQuoteTabPage(pParent, rAttrSet); } -bool OfaQuoteTabPage::FillItemSet( SfxItemSet& ) +bool OfaQuoteTabPage::FillItemSet( SfxItemSet* ) { SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect(); @@ -2152,7 +2152,7 @@ SfxTabPage* OfaAutoCompleteTabPage::Create( Window* pParent, return new OfaAutoCompleteTabPage( pParent, rSet ); } -bool OfaAutoCompleteTabPage::FillItemSet( SfxItemSet& ) +bool OfaAutoCompleteTabPage::FillItemSet( SfxItemSet* ) { bool bModified = false, bCheck; SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect(); @@ -2523,7 +2523,7 @@ IMPL_LINK_NOARG(OfaSmartTagOptionsTabPage, SelectHdl) /** Propagates the current settings to the smart tag manager. */ -bool OfaSmartTagOptionsTabPage::FillItemSet( SfxItemSet& ) +bool OfaSmartTagOptionsTabPage::FillItemSet( 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 374f79dc19b2..58a60f2c4334 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -717,7 +717,7 @@ void SvxBackgroundTabPage::FillUserData() -bool SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet ) +bool SvxBackgroundTabPage::FillItemSet( SfxItemSet* rCoreSet ) { if ( pPageImpl->pLoadTimer && pPageImpl->pLoadTimer->IsActive() ) { @@ -729,8 +729,8 @@ bool SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet ) // const SfxPoolItem* pX = GetOldItem( rCoreSet, SID_VIEW_FLD_PIC ); // if( pX && pX->ISA(SfxWallpaperItem)) - if(SFX_ITEM_AVAILABLE <= rCoreSet.GetItemState(GetWhich(SID_VIEW_FLD_PIC), false)) - return FillItemSetWithWallpaperItem( rCoreSet, SID_VIEW_FLD_PIC ); + if(SFX_ITEM_AVAILABLE <= rCoreSet->GetItemState(GetWhich(SID_VIEW_FLD_PIC), false)) + return FillItemSetWithWallpaperItem( *rCoreSet, SID_VIEW_FLD_PIC ); bool bModified = false; sal_uInt16 nSlot = SID_ATTR_BRUSH; @@ -764,8 +764,8 @@ bool SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet ) } sal_uInt16 nWhich = GetWhich( nSlot ); - const SfxPoolItem* pOld = GetOldItem( rCoreSet, nSlot ); - SfxItemState eOldItemState = rCoreSet.GetItemState(nSlot, false); + const SfxPoolItem* pOld = GetOldItem( *rCoreSet, nSlot ); + SfxItemState eOldItemState = rCoreSet->GetItemState(nSlot, false); const SfxItemSet& rOldSet = GetItemSet(); bool bGraphTransparencyChanged = bGraphTransparency && m_pGraphTransMF->IsValueChangedFromSaved(); @@ -793,10 +793,10 @@ bool SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet ) (SFX_ITEM_AVAILABLE >= eOldItemState && !m_pBackgroundColorSet->IsNoSelection())) { bModified = true; - rCoreSet.Put( SvxBrushItem( aBgdColor, nWhich ) ); + rCoreSet->Put( SvxBrushItem( aBgdColor, nWhich ) ); } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) ) - rCoreSet.ClearItem( nWhich ); + rCoreSet->ClearItem( nWhich ); } else { @@ -835,17 +835,17 @@ bool SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet ) nWhich ); lcl_SetTransparency(aTmpBrush, static_cast<long>(m_pGraphTransMF->GetValue())); - rCoreSet.Put(aTmpBrush); + rCoreSet->Put(aTmpBrush); } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) ) - rCoreSet.ClearItem( nWhich ); + rCoreSet->ClearItem( nWhich ); } } else // Brush <-> Bitmap changed! { if ( bIsBrush ) { - rCoreSet.Put( SvxBrushItem( aBgdColor, nWhich ) ); + rCoreSet->Put( SvxBrushItem( aBgdColor, nWhich ) ); } else { @@ -870,7 +870,7 @@ bool SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet ) if(pTmpBrush) { lcl_SetTransparency(*pTmpBrush, static_cast<long>(m_pGraphTransMF->GetValue())); - rCoreSet.Put(*pTmpBrush); + rCoreSet->Put(*pTmpBrush); delete pTmpBrush; } } @@ -879,7 +879,7 @@ bool SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet ) } else if ( SID_ATTR_BRUSH_CHAR == nSlot && aBgdColor != Color( COL_WHITE ) ) { - rCoreSet.Put( SvxBrushItem( aBgdColor, nWhich ) ); + rCoreSet->Put( SvxBrushItem( aBgdColor, nWhich ) ); bModified = true; } @@ -889,11 +889,11 @@ bool SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet ) if( nSlot != SID_ATTR_BRUSH && pTableBck_Impl->pCellBrush) { const SfxPoolItem* pOldCell = - GetOldItem( rCoreSet, SID_ATTR_BRUSH ); + GetOldItem( *rCoreSet, SID_ATTR_BRUSH ); if ( *pTableBck_Impl->pCellBrush != *pOldCell ) { - rCoreSet.Put( *pTableBck_Impl->pCellBrush ); + rCoreSet->Put( *pTableBck_Impl->pCellBrush ); bModified |= true; } } @@ -901,11 +901,11 @@ bool SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet ) if( nSlot != SID_ATTR_BRUSH_ROW && pTableBck_Impl->pRowBrush) { const SfxPoolItem* pOldRow = - GetOldItem( rCoreSet, SID_ATTR_BRUSH_ROW ); + GetOldItem( *rCoreSet, SID_ATTR_BRUSH_ROW ); if ( *pTableBck_Impl->pRowBrush != *pOldRow ) { - rCoreSet.Put( *pTableBck_Impl->pRowBrush ); + rCoreSet->Put( *pTableBck_Impl->pRowBrush ); bModified |= true; } } @@ -913,18 +913,18 @@ bool SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet ) if( nSlot != SID_ATTR_BRUSH_TABLE && pTableBck_Impl->pTableBrush) { const SfxPoolItem* pOldTable = - GetOldItem( rCoreSet, SID_ATTR_BRUSH_TABLE ); + GetOldItem( *rCoreSet, SID_ATTR_BRUSH_TABLE ); if ( *pTableBck_Impl->pTableBrush != *pOldTable ) { - rCoreSet.Put( *pTableBck_Impl->pTableBrush ); + rCoreSet->Put( *pTableBck_Impl->pTableBrush ); bModified |= true; } } if( m_pTblLBox->IsValueChangedFromSaved() ) { - rCoreSet.Put( SfxUInt16Item( SID_BACKGRND_DESTINATION, + rCoreSet->Put( SfxUInt16Item( SID_BACKGRND_DESTINATION, m_pTblLBox->GetSelectEntryPos() ) ); bModified |= true; } @@ -935,11 +935,11 @@ bool SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet ) if( nSlot != SID_ATTR_BRUSH && m_pParaLBox->IsVisible()) // not in search format dialog { const SfxPoolItem* pOldPara = - GetOldItem( rCoreSet, SID_ATTR_BRUSH ); + GetOldItem( *rCoreSet, SID_ATTR_BRUSH ); if ( *pParaBck_Impl->pParaBrush != *pOldPara ) { - rCoreSet.Put( *pParaBck_Impl->pParaBrush ); + rCoreSet->Put( *pParaBck_Impl->pParaBrush ); bModified |= true; } } @@ -947,7 +947,7 @@ bool SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet ) if( nSlot != SID_ATTR_BRUSH_CHAR ) { const SfxPoolItem* pOldChar = - GetOldItem( rCoreSet, SID_ATTR_BRUSH_CHAR ); + GetOldItem( *rCoreSet, SID_ATTR_BRUSH_CHAR ); DBG_ASSERT(pParaBck_Impl, "pParaBck_Impl == NULL ?"); if ( pOldChar && //#111173# crash report shows that pParaBck_Impl can be NULL, the cause is unknown @@ -955,14 +955,14 @@ bool SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet ) (*pParaBck_Impl->pCharBrush != *pOldChar || *pParaBck_Impl->pCharBrush != SvxBrushItem(SID_ATTR_BRUSH_CHAR))) { - rCoreSet.Put( *pParaBck_Impl->pCharBrush ); + rCoreSet->Put( *pParaBck_Impl->pCharBrush ); bModified |= true; } } if( m_pParaLBox->IsValueChangedFromSaved() ) { - rCoreSet.Put( SfxUInt16Item( SID_BACKGRND_DESTINATION, + rCoreSet->Put( SfxUInt16Item( SID_BACKGRND_DESTINATION, m_pParaLBox->GetSelectEntryPos() ) ); bModified |= true; } @@ -1062,7 +1062,7 @@ int SvxBackgroundTabPage::DeactivatePage( SfxItemSet* _pSet ) return KEEP_PAGE; if ( _pSet ) - FillItemSet( *_pSet ); + FillItemSet( _pSet ); return LEAVE_PAGE; } diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx index 476b7b3e5b40..184b72093ff4 100644 --- a/cui/source/tabpages/border.cxx +++ b/cui/source/tabpages/border.cxx @@ -586,24 +586,24 @@ void SvxBorderTabPage::Reset( const SfxItemSet& rSet ) int SvxBorderTabPage::DeactivatePage( SfxItemSet* _pSet ) { if ( _pSet ) - FillItemSet( *_pSet ); + FillItemSet( _pSet ); return LEAVE_PAGE; } -bool SvxBorderTabPage::FillItemSet( SfxItemSet& rCoreAttrs ) +bool SvxBorderTabPage::FillItemSet( SfxItemSet* rCoreAttrs ) { bool bAttrsChanged = SfxTabPage::FillItemSet( rCoreAttrs ); bool bPut = true; sal_uInt16 nBoxWhich = GetWhich( SID_ATTR_BORDER_OUTER ); - sal_uInt16 nBoxInfoWhich = rCoreAttrs.GetPool()->GetWhich( SID_ATTR_BORDER_INNER, false ); + sal_uInt16 nBoxInfoWhich = rCoreAttrs->GetPool()->GetWhich( SID_ATTR_BORDER_INNER, false ); const SfxItemSet& rOldSet = GetItemSet(); SvxBoxItem aBoxItem ( nBoxWhich ); SvxBoxInfoItem aBoxInfoItem ( nBoxInfoWhich ); - SvxBoxItem* pOldBoxItem = (SvxBoxItem*)GetOldItem( rCoreAttrs, SID_ATTR_BORDER_OUTER ); + SvxBoxItem* pOldBoxItem = (SvxBoxItem*)GetOldItem( *rCoreAttrs, SID_ATTR_BORDER_OUTER ); SfxMapUnit eCoreUnit = rOldSet.GetPool()->GetMetric( nBoxWhich ); @@ -657,7 +657,7 @@ bool SvxBorderTabPage::FillItemSet( SfxItemSet& rCoreAttrs ) || m_pFrameSel->GetFrameBorderState( svx::FRAMEBORDER_RIGHT ) != svx::FRAMESTATE_HIDE ) { SvxBoxInfoItem* pOldBoxInfoItem = (SvxBoxInfoItem*)GetOldItem( - rCoreAttrs, SID_ATTR_BORDER_INNER ); + *rCoreAttrs, SID_ATTR_BORDER_INNER ); if ( !pOldBoxItem || m_pLeftMF->IsValueChangedFromSaved() || @@ -724,21 +724,21 @@ bool SvxBorderTabPage::FillItemSet( SfxItemSet& rCoreAttrs ) { if ( !pOldBoxItem || !( *pOldBoxItem == aBoxItem ) ) { - rCoreAttrs.Put( aBoxItem ); + rCoreAttrs->Put( aBoxItem ); bAttrsChanged |= true; } - const SfxPoolItem* pOld = GetOldItem( rCoreAttrs, SID_ATTR_BORDER_INNER, false ); + const SfxPoolItem* pOld = GetOldItem( *rCoreAttrs, SID_ATTR_BORDER_INNER, false ); if ( !pOld || !( *(const SvxBoxInfoItem*)pOld == aBoxInfoItem ) ) { - rCoreAttrs.Put( aBoxInfoItem ); + rCoreAttrs->Put( aBoxInfoItem ); bAttrsChanged |= true; } } else { - rCoreAttrs.ClearItem( nBoxWhich ); - rCoreAttrs.ClearItem( nBoxInfoWhich ); + rCoreAttrs->ClearItem( nBoxWhich ); + rCoreAttrs->ClearItem( nBoxInfoWhich ); } return bAttrsChanged; diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index 85e6d765ed73..fc53366be96a 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -1171,7 +1171,7 @@ void SvxCharNamePage::ActivatePage( const SfxItemSet& rSet ) int SvxCharNamePage::DeactivatePage( SfxItemSet* _pSet ) { if ( _pSet ) - FillItemSet( *_pSet ); + FillItemSet( _pSet ); return LEAVE_PAGE; } @@ -1203,11 +1203,11 @@ void SvxCharNamePage::Reset( const SfxItemSet& rSet ) -bool SvxCharNamePage::FillItemSet( SfxItemSet& rSet ) +bool SvxCharNamePage::FillItemSet( SfxItemSet* rSet ) { - bool bModified = FillItemSet_Impl( rSet, Western ); - bModified |= FillItemSet_Impl( rSet, Asian ); - bModified |= FillItemSet_Impl( rSet, Ctl ); + bool bModified = FillItemSet_Impl( *rSet, Western ); + bModified |= FillItemSet_Impl( *rSet, Asian ); + bModified |= FillItemSet_Impl( *rSet, Ctl ); return bModified; } @@ -1718,7 +1718,7 @@ IMPL_LINK( SvxCharEffectsPage, ColorBoxSelectHdl_Impl, ColorListBox*, pBox ) int SvxCharEffectsPage::DeactivatePage( SfxItemSet* _pSet ) { if ( _pSet ) - FillItemSet( *_pSet ); + FillItemSet( _pSet ); return LEAVE_PAGE; } @@ -2185,7 +2185,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet& rSet ) -bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) +bool SvxCharEffectsPage::FillItemSet( SfxItemSet* rSet ) { const SfxPoolItem* pOld = 0; const SfxItemSet& rOldSet = GetItemSet(); @@ -2194,7 +2194,7 @@ bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) // Underline sal_uInt16 nWhich = GetWhich( SID_ATTR_CHAR_UNDERLINE ); - pOld = GetOldItem( rSet, SID_ATTR_CHAR_UNDERLINE ); + pOld = GetOldItem( *rSet, SID_ATTR_CHAR_UNDERLINE ); sal_Int32 nPos = m_pUnderlineLB->GetSelectEntryPos(); FontUnderline eUnder = (FontUnderline)(sal_uLong)m_pUnderlineLB->GetEntryData( nPos ); @@ -2218,17 +2218,17 @@ bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) { SvxUnderlineItem aNewItem( eUnder, nWhich ); aNewItem.SetColor( m_pUnderlineColorLB->GetSelectEntryColor() ); - rSet.Put( aNewItem ); + rSet->Put( aNewItem ); bModified = true; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) ) - CLEARTITEM; + rSet->InvalidateItem(nWhich); bChanged = true; // Overline nWhich = GetWhich( SID_ATTR_CHAR_OVERLINE ); - pOld = GetOldItem( rSet, SID_ATTR_CHAR_OVERLINE ); + pOld = GetOldItem( *rSet, SID_ATTR_CHAR_OVERLINE ); nPos = m_pOverlineLB->GetSelectEntryPos(); FontUnderline eOver = (FontUnderline)(sal_uLong)m_pOverlineLB->GetEntryData( nPos ); @@ -2252,17 +2252,17 @@ bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) { SvxOverlineItem aNewItem( eOver, nWhich ); aNewItem.SetColor( m_pOverlineColorLB->GetSelectEntryColor() ); - rSet.Put( aNewItem ); + rSet->Put( aNewItem ); bModified = true; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) ) - CLEARTITEM; + rSet->InvalidateItem(nWhich); bChanged = true; // Strikeout nWhich = GetWhich( SID_ATTR_CHAR_STRIKEOUT ); - pOld = GetOldItem( rSet, SID_ATTR_CHAR_STRIKEOUT ); + pOld = GetOldItem( *rSet, SID_ATTR_CHAR_STRIKEOUT ); nPos = m_pStrikeoutLB->GetSelectEntryPos(); FontStrikeout eStrike = (FontStrikeout)(sal_uLong)m_pStrikeoutLB->GetEntryData( nPos ); @@ -2283,17 +2283,17 @@ bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) if ( bChanged ) { - rSet.Put( SvxCrossedOutItem( eStrike, nWhich ) ); + rSet->Put( SvxCrossedOutItem( eStrike, nWhich ) ); bModified = true; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) ) - CLEARTITEM; + rSet->InvalidateItem(nWhich); bChanged = true; // Individual words nWhich = GetWhich( SID_ATTR_CHAR_WORDLINEMODE ); - pOld = GetOldItem( rSet, SID_ATTR_CHAR_WORDLINEMODE ); + pOld = GetOldItem( *rSet, SID_ATTR_CHAR_WORDLINEMODE ); if ( pOld ) { @@ -2308,17 +2308,17 @@ bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) if ( bChanged ) { - rSet.Put( SvxWordLineModeItem( m_pIndividualWordsBtn->IsChecked(), nWhich ) ); + rSet->Put( SvxWordLineModeItem( m_pIndividualWordsBtn->IsChecked(), nWhich ) ); bModified = true; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) ) - CLEARTITEM; + rSet->InvalidateItem(nWhich); bChanged = true; // Emphasis nWhich = GetWhich( SID_ATTR_CHAR_EMPHASISMARK ); - pOld = GetOldItem( rSet, SID_ATTR_CHAR_EMPHASISMARK ); + pOld = GetOldItem( *rSet, SID_ATTR_CHAR_EMPHASISMARK ); sal_Int32 nMarkPos = m_pEmphasisLB->GetSelectEntryPos(); sal_Int32 nPosPos = m_pPositionLB->GetSelectEntryPos(); FontEmphasisMark eMark = (FontEmphasisMark)nMarkPos; @@ -2344,17 +2344,17 @@ bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) if ( bChanged ) { - rSet.Put( SvxEmphasisMarkItem( eMark, nWhich ) ); + rSet->Put( SvxEmphasisMarkItem( eMark, nWhich ) ); bModified = true; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) ) - CLEARTITEM; + rSet->InvalidateItem(nWhich); bChanged = true; // Effects nWhich = GetWhich( SID_ATTR_CHAR_CASEMAP ); - pOld = GetOldItem( rSet, SID_ATTR_CHAR_CASEMAP ); + pOld = GetOldItem( *rSet, SID_ATTR_CHAR_CASEMAP ); SvxCaseMap eCaseMap = SVX_CASEMAP_NOT_MAPPED; bool bChecked = false; sal_Int32 nCapsPos = m_pEffectsLB->GetSelectEntryPos(); @@ -2380,11 +2380,11 @@ bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) if ( bChanged && bChecked ) { - rSet.Put( SvxCaseMapItem( eCaseMap, nWhich ) ); + rSet->Put( SvxCaseMapItem( eCaseMap, nWhich ) ); bModified = true; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) ) - CLEARTITEM; + rSet->InvalidateItem(nWhich); bChanged = true; @@ -2394,13 +2394,13 @@ bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) { m_pReliefLB->SaveValue(); SvxCharReliefItem aRelief((FontRelief)m_pReliefLB->GetSelectEntryPos(), nWhich); - rSet.Put(aRelief); + rSet->Put(aRelief); } // Outline const SfxItemSet* pExampleSet = GetTabDialog() ? GetTabDialog()->GetExampleSet() : NULL; nWhich = GetWhich( SID_ATTR_CHAR_CONTOUR ); - pOld = GetOldItem( rSet, SID_ATTR_CHAR_CONTOUR ); + pOld = GetOldItem( *rSet, SID_ATTR_CHAR_CONTOUR ); TriState eState = m_pOutlineBtn->GetState(); const SfxPoolItem* pItem; @@ -2417,17 +2417,17 @@ bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) if ( bChanged && eState != TRISTATE_INDET ) { - rSet.Put( SvxContourItem( StateToAttr( eState ), nWhich ) ); + rSet->Put( SvxContourItem( StateToAttr( eState ), nWhich ) ); bModified = true; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) ) - CLEARTITEM; + rSet->InvalidateItem(nWhich); bChanged = true; // Shadow nWhich = GetWhich( SID_ATTR_CHAR_SHADOWED ); - pOld = GetOldItem( rSet, SID_ATTR_CHAR_SHADOWED ); + pOld = GetOldItem( *rSet, SID_ATTR_CHAR_SHADOWED ); eState = m_pShadowBtn->GetState(); if ( pOld ) @@ -2443,17 +2443,17 @@ bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) if ( bChanged && eState != TRISTATE_INDET ) { - rSet.Put( SvxShadowedItem( StateToAttr( eState ), nWhich ) ); + rSet->Put( SvxShadowedItem( StateToAttr( eState ), nWhich ) ); bModified = true; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) ) - CLEARTITEM; + rSet->InvalidateItem(nWhich); bChanged = true; // Blinking nWhich = GetWhich( SID_ATTR_FLASH ); - pOld = GetOldItem( rSet, SID_ATTR_FLASH ); + pOld = GetOldItem( *rSet, SID_ATTR_FLASH ); eState = m_pBlinkingBtn->GetState(); if ( pOld ) @@ -2469,15 +2469,15 @@ bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) if ( bChanged && eState != TRISTATE_INDET ) { - rSet.Put( SvxBlinkItem( StateToAttr( eState ), nWhich ) ); + rSet->Put( SvxBlinkItem( StateToAttr( eState ), nWhich ) ); bModified = true; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) ) - CLEARTITEM; + rSet->InvalidateItem(nWhich); // Hidden nWhich = GetWhich( SID_ATTR_CHAR_HIDDEN ); - pOld = GetOldItem( rSet, SID_ATTR_CHAR_HIDDEN ); + pOld = GetOldItem( *rSet, SID_ATTR_CHAR_HIDDEN ); eState = m_pHiddenBtn->GetState(); bChanged = true; @@ -2494,13 +2494,13 @@ bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) if ( bChanged && eState != TRISTATE_INDET ) { - rSet.Put( SvxCharHiddenItem( StateToAttr( eState ), nWhich ) ); + rSet->Put( SvxCharHiddenItem( StateToAttr( eState ), nWhich ) ); bModified = true; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) ) - CLEARTITEM; + rSet->InvalidateItem(nWhich); - bModified |= FillItemSetColor_Impl( rSet ); + bModified |= FillItemSetColor_Impl( *rSet ); return bModified; } @@ -2892,7 +2892,7 @@ void SvxCharPositionPage::ActivatePage( const SfxItemSet& rSet ) int SvxCharPositionPage::DeactivatePage( SfxItemSet* _pSet ) { if ( _pSet ) - FillItemSet( *_pSet ); + FillItemSet( _pSet ); return LEAVE_PAGE; } @@ -3163,13 +3163,13 @@ void SvxCharPositionPage::Reset( const SfxItemSet& rSet ) -bool SvxCharPositionPage::FillItemSet( SfxItemSet& rSet ) +bool SvxCharPositionPage::FillItemSet( SfxItemSet* rSet ) { // Position (high, normal or low) const SfxItemSet& rOldSet = GetItemSet(); bool bModified = false, bChanged = true; sal_uInt16 nWhich = GetWhich( SID_ATTR_CHAR_ESCAPEMENT ); - const SfxPoolItem* pOld = GetOldItem( rSet, SID_ATTR_CHAR_ESCAPEMENT ); + const SfxPoolItem* pOld = GetOldItem( *rSet, SID_ATTR_CHAR_ESCAPEMENT ); const bool bHigh = m_pHighPosBtn->IsChecked(); short nEsc; sal_uInt8 nEscProp; @@ -3205,20 +3205,20 @@ bool SvxCharPositionPage::FillItemSet( SfxItemSet& rSet ) if ( bChanged && ( m_pHighPosBtn->IsChecked() || m_pNormalPosBtn->IsChecked() || m_pLowPosBtn->IsChecked() ) ) { - rSet.Put( SvxEscapementItem( nEsc, nEscProp, nWhich ) ); + rSet->Put( SvxEscapementItem( nEsc, nEscProp, nWhich ) ); bModified = true; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) ) - CLEARTITEM; + rSet->InvalidateItem(nWhich); bChanged = true; // Kerning nWhich = GetWhich( SID_ATTR_CHAR_KERNING ); - pOld = GetOldItem( rSet, SID_ATTR_CHAR_KERNING ); + pOld = GetOldItem( *rSet, SID_ATTR_CHAR_KERNING ); sal_Int32 nPos = m_pKerningLB->GetSelectEntryPos(); short nKerning = 0; - SfxMapUnit eUnit = rSet.GetPool()->GetMetric( nWhich ); + SfxMapUnit eUnit = rSet->GetPool()->GetMetric( nWhich ); if ( nPos == LW_EXPANDED || nPos == LW_CONDENSED ) { @@ -3244,11 +3244,11 @@ bool SvxCharPositionPage::FillItemSet( SfxItemSet& rSet ) if ( bChanged && nPos != LISTBOX_ENTRY_NOTFOUND ) { - rSet.Put( SvxKerningItem( nKerning, nWhich ) ); + rSet->Put( SvxKerningItem( nKerning, nWhich ) ); bModified = true; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) ) - CLEARTITEM; + rSet->InvalidateItem(nWhich); bChanged = true; @@ -3257,21 +3257,21 @@ bool SvxCharPositionPage::FillItemSet( SfxItemSet& rSet ) if ( m_pPairKerningBtn->IsValueChangedFromSaved() ) { - rSet.Put( SvxAutoKernItem( m_pPairKerningBtn->IsChecked(), nWhich ) ); + rSet->Put( SvxAutoKernItem( m_pPairKerningBtn->IsChecked(), nWhich ) ); bModified = true; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) ) - CLEARTITEM; + rSet->InvalidateItem(nWhich); // Scale Width nWhich = GetWhich( SID_ATTR_CHAR_SCALEWIDTH ); if ( m_pScaleWidthMF->IsValueChangedFromSaved() ) { - rSet.Put( SvxCharScaleWidthItem( (sal_uInt16)m_pScaleWidthMF->GetValue(), nWhich ) ); + rSet->Put( SvxCharScaleWidthItem( (sal_uInt16)m_pScaleWidthMF->GetValue(), nWhich ) ); bModified = true; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) ) - CLEARTITEM; + rSet->InvalidateItem(nWhich); // Rotation nWhich = GetWhich( SID_ATTR_CHAR_ROTATED ); @@ -3285,11 +3285,11 @@ bool SvxCharPositionPage::FillItemSet( SfxItemSet& rSet ) aItem.SetBottomToTop(); else if (m_p270degRB->IsChecked()) aItem.SetTopToBotton(); - rSet.Put( aItem ); + rSet->Put( aItem ); bModified = true; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) ) - CLEARTITEM; + rSet->InvalidateItem(nWhich); return bModified; } @@ -3465,7 +3465,7 @@ void SvxCharTwoLinesPage::ActivatePage( const SfxItemSet& rSet ) int SvxCharTwoLinesPage::DeactivatePage( SfxItemSet* _pSet ) { if ( _pSet ) - FillItemSet( *_pSet ); + FillItemSet( _pSet ); return LEAVE_PAGE; } @@ -3509,12 +3509,12 @@ void SvxCharTwoLinesPage::Reset( const SfxItemSet& rSet ) -bool SvxCharTwoLinesPage::FillItemSet( SfxItemSet& rSet ) +bool SvxCharTwoLinesPage::FillItemSet( SfxItemSet* rSet ) { const SfxItemSet& rOldSet = GetItemSet(); bool bModified = false, bChanged = true; sal_uInt16 nWhich = GetWhich( SID_ATTR_CHAR_TWO_LINES ); - const SfxPoolItem* pOld = GetOldItem( rSet, SID_ATTR_CHAR_TWO_LINES ); + const SfxPoolItem* pOld = GetOldItem( *rSet, SID_ATTR_CHAR_TWO_LINES ); bool bOn = m_pTwoLinesBtn->IsChecked(); sal_Unicode cStart = ( bOn && m_pStartBracketLB->GetSelectEntryPos() > 0 ) ? m_pStartBracketLB->GetSelectEntry()[0] : 0; @@ -3531,11 +3531,11 @@ bool SvxCharTwoLinesPage::FillItemSet( SfxItemSet& rSet ) if ( bChanged ) { - rSet.Put( SvxTwoLinesItem( bOn, cStart, cEnd, nWhich ) ); + rSet->Put( SvxTwoLinesItem( bOn, cStart, cEnd, nWhich ) ); bModified = true; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) ) - CLEARTITEM; + rSet->InvalidateItem(nWhich); return bModified; } diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx index dbc40966f05e..fcbb583ad32c 100644 --- a/cui/source/tabpages/connect.cxx +++ b/cui/source/tabpages/connect.cxx @@ -307,7 +307,7 @@ void SvxConnectionPage::Reset( const SfxItemSet& rAttrs ) |* \************************************************************************/ -bool SvxConnectionPage::FillItemSet( SfxItemSet& rAttrs) +bool SvxConnectionPage::FillItemSet( SfxItemSet* rAttrs) { bool bModified = false; sal_Int32 nValue; @@ -315,49 +315,49 @@ bool SvxConnectionPage::FillItemSet( SfxItemSet& rAttrs) if( m_pMtrFldHorz1->IsValueChangedFromSaved() ) { nValue = GetCoreValue( *m_pMtrFldHorz1, eUnit ); - rAttrs.Put( SdrEdgeNode1HorzDistItem( nValue ) ); + rAttrs->Put( SdrEdgeNode1HorzDistItem( nValue ) ); bModified = true; } if( m_pMtrFldHorz2->IsValueChangedFromSaved() ) { nValue = GetCoreValue( *m_pMtrFldHorz2, eUnit ); - rAttrs.Put( SdrEdgeNode2HorzDistItem( nValue ) ); + rAttrs->Put( SdrEdgeNode2HorzDistItem( nValue ) ); bModified = true; } if( m_pMtrFldVert1->IsValueChangedFromSaved() ) { nValue = GetCoreValue( *m_pMtrFldVert1, eUnit ); - rAttrs.Put( SdrEdgeNode1VertDistItem( nValue ) ); + rAttrs->Put( SdrEdgeNode1VertDistItem( nValue ) ); bModified = true; } if( m_pMtrFldVert2->IsValueChangedFromSaved() ) { nValue = GetCoreValue( *m_pMtrFldVert2, eUnit ); - rAttrs.Put( SdrEdgeNode2VertDistItem( nValue ) ); + rAttrs->Put( SdrEdgeNode2VertDistItem( nValue ) ); bModified = true; } if( m_pMtrFldLine1->IsValueChangedFromSaved() ) { nValue = GetCoreValue( *m_pMtrFldLine1, eUnit ); - rAttrs.Put( SdrEdgeLine1DeltaItem( nValue ) ); + rAttrs->Put( SdrEdgeLine1DeltaItem( nValue ) ); bModified = true; } if( m_pMtrFldLine2->IsValueChangedFromSaved() ) { nValue = GetCoreValue( *m_pMtrFldLine2, eUnit ); - rAttrs.Put( SdrEdgeLine2DeltaItem( nValue ) ); + rAttrs->Put( SdrEdgeLine2DeltaItem( nValue ) ); bModified = true; } if( m_pMtrFldLine3->IsValueChangedFromSaved() ) { nValue = GetCoreValue( *m_pMtrFldLine3, eUnit ); - rAttrs.Put( SdrEdgeLine3DeltaItem( nValue ) ); + rAttrs->Put( SdrEdgeLine3DeltaItem( nValue ) ); bModified = true; } @@ -367,7 +367,7 @@ bool SvxConnectionPage::FillItemSet( SfxItemSet& rAttrs) { if( nPos != LISTBOX_ENTRY_NOTFOUND ) { - rAttrs.Put( SdrEdgeKindItem( (SdrEdgeKind) nPos ) ); + rAttrs->Put( SdrEdgeKindItem( (SdrEdgeKind) nPos ) ); bModified = true; } } diff --git a/cui/source/tabpages/dstribut.cxx b/cui/source/tabpages/dstribut.cxx index 4f177947b3f9..530da67ed7c8 100644 --- a/cui/source/tabpages/dstribut.cxx +++ b/cui/source/tabpages/dstribut.cxx @@ -130,7 +130,7 @@ void SvxDistributePage::Reset(const SfxItemSet& ) |* \************************************************************************/ -bool SvxDistributePage::FillItemSet( SfxItemSet& ) +bool SvxDistributePage::FillItemSet( SfxItemSet* ) { SvxDistributeHorizontal eDistributeHor(SvxDistributeHorizontalNone); SvxDistributeVertical eDistributeVer(SvxDistributeVerticalNone); diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx index ad4804528ae6..898315fdbb6f 100644 --- a/cui/source/tabpages/grfpage.cxx +++ b/cui/source/tabpages/grfpage.cxx @@ -236,15 +236,15 @@ void SvxGrfCropPage::Reset( const SfxItemSet &rSet ) bReset = false; } -bool SvxGrfCropPage::FillItemSet(SfxItemSet &rSet) +bool SvxGrfCropPage::FillItemSet(SfxItemSet *rSet) { - const SfxItemPool& rPool = *rSet.GetPool(); + const SfxItemPool& rPool = *rSet->GetPool(); bool bModified = false; if( m_pWidthMF->IsValueChangedFromSaved() || m_pHeightMF->IsValueChangedFromSaved() ) { sal_uInt16 nW = rPool.GetWhich( SID_ATTR_GRAF_FRMSIZE ); - FieldUnit eUnit = MapToFieldUnit( rSet.GetPool()->GetMetric( nW )); + FieldUnit eUnit = MapToFieldUnit( rSet->GetPool()->GetMetric( nW )); SvxSizeItem aSz( nW ); @@ -267,11 +267,11 @@ bool SvxGrfCropPage::FillItemSet(SfxItemSet &rSet) m_pWidthMF->SaveValue(); m_pHeightMF->SaveValue(); - bModified |= 0 != rSet.Put( aSz ); + bModified |= 0 != rSet->Put( aSz ); if( bSetOrigSize ) { - bModified |= 0 != rSet.Put( SvxSizeItem( rPool.GetWhich( + bModified |= 0 != rSet->Put( SvxSizeItem( rPool.GetWhich( SID_ATTR_GRAF_FRMSIZE_PERCENT ), Size( 0, 0 )) ); } } @@ -279,20 +279,20 @@ bool SvxGrfCropPage::FillItemSet(SfxItemSet &rSet) m_pTopMF->IsModified() || m_pBottomMF->IsModified() ) { sal_uInt16 nW = rPool.GetWhich( SID_ATTR_GRAF_CROP ); - FieldUnit eUnit = MapToFieldUnit( rSet.GetPool()->GetMetric( nW )); - SvxGrfCrop* pNew = (SvxGrfCrop*)rSet.Get( nW ).Clone(); + FieldUnit eUnit = MapToFieldUnit( rSet->GetPool()->GetMetric( nW )); + SvxGrfCrop* pNew = (SvxGrfCrop*)rSet->Get( nW ).Clone(); pNew->SetLeft( lcl_GetValue( *m_pLeftMF, eUnit ) ); pNew->SetRight( lcl_GetValue( *m_pRightMF, eUnit ) ); pNew->SetTop( lcl_GetValue( *m_pTopMF, eUnit ) ); pNew->SetBottom( lcl_GetValue( *m_pBottomMF, eUnit ) ); - bModified |= 0 != rSet.Put( *pNew ); + bModified |= 0 != rSet->Put( *pNew ); delete pNew; } if( m_pZoomConstRB->IsValueChangedFromSaved() ) { - bModified |= 0 != rSet.Put( SfxBoolItem( rPool.GetWhich( + bModified |= 0 != rSet->Put( SfxBoolItem( rPool.GetWhich( SID_ATTR_GRAF_KEEP_ZOOM), m_pZoomConstRB->IsChecked() ) ); } @@ -385,7 +385,7 @@ void SvxGrfCropPage::ActivatePage(const SfxItemSet& rSet) int SvxGrfCropPage::DeactivatePage(SfxItemSet *_pSet) { if ( _pSet ) - FillItemSet( *_pSet ); + FillItemSet( _pSet ); return sal_True; } diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx index bba01e446fa0..024fdc70f5b5 100644 --- a/cui/source/tabpages/labdlg.cxx +++ b/cui/source/tabpages/labdlg.cxx @@ -147,21 +147,21 @@ void SvxCaptionTabPage::Construct() -bool SvxCaptionTabPage::FillItemSet( SfxItemSet& _rOutAttrs) +bool SvxCaptionTabPage::FillItemSet( SfxItemSet* _rOutAttrs) { - SfxItemPool* pPool = _rOutAttrs.GetPool(); + SfxItemPool* pPool = _rOutAttrs->GetPool(); DBG_ASSERT( pPool, "Wo ist der Pool" ); SfxMapUnit eUnit; nCaptionType = m_pCT_CAPTTYPE->GetSelectItemId()-1; - _rOutAttrs.Put( SdrCaptionTypeItem( (SdrCaptionType) nCaptionType ) ); + _rOutAttrs->Put( SdrCaptionTypeItem( (SdrCaptionType) nCaptionType ) ); if( m_pMF_ABSTAND->IsValueModified() ) { eUnit = pPool->GetMetric( GetWhich( SDRATTR_CAPTIONGAP ) ); - _rOutAttrs.Put( SdrCaptionGapItem( GetCoreValue(*m_pMF_ABSTAND, eUnit ) ) ); + _rOutAttrs->Put( SdrCaptionGapItem( GetCoreValue(*m_pMF_ABSTAND, eUnit ) ) ); } // special treatment!!! XXX @@ -174,10 +174,10 @@ bool SvxCaptionTabPage::FillItemSet( SfxItemSet& _rOutAttrs) } } - _rOutAttrs.Put( SdrCaptionEscDirItem( (SdrCaptionEscDir)nEscDir ) ); + _rOutAttrs->Put( SdrCaptionEscDirItem( (SdrCaptionEscDir)nEscDir ) ); bEscRel = m_pLB_ANSATZ_REL->IsVisible(); - _rOutAttrs.Put( SdrCaptionEscIsRelItem( bEscRel ) ); + _rOutAttrs->Put( SdrCaptionEscIsRelItem( bEscRel ) ); if( bEscRel ) { @@ -189,26 +189,26 @@ bool SvxCaptionTabPage::FillItemSet( SfxItemSet& _rOutAttrs) case AT_MITTE: nVal=5000;break; case AT_UNTEN: nVal=10000;break; } - _rOutAttrs.Put( SdrCaptionEscRelItem( nVal ) ); + _rOutAttrs->Put( SdrCaptionEscRelItem( nVal ) ); } else { if( m_pMF_ANSATZ->IsValueModified() ) { eUnit = pPool->GetMetric( GetWhich( SDRATTR_CAPTIONESCABS ) ); - _rOutAttrs.Put( SdrCaptionEscAbsItem( GetCoreValue(*m_pMF_ANSATZ, eUnit ) ) ); + _rOutAttrs->Put( SdrCaptionEscAbsItem( GetCoreValue(*m_pMF_ANSATZ, eUnit ) ) ); } } bFitLineLen = m_pCB_LAENGE->IsChecked(); - _rOutAttrs.Put( SdrCaptionFitLineLenItem( bFitLineLen ) ); + _rOutAttrs->Put( SdrCaptionFitLineLenItem( bFitLineLen ) ); if( ! bFitLineLen ) { if( m_pMF_LAENGE->IsValueModified() ) { eUnit = pPool->GetMetric( GetWhich( SDRATTR_CAPTIONLINELEN ) ); - _rOutAttrs.Put( SdrCaptionLineLenItem( GetCoreValue(*m_pMF_LAENGE, eUnit ) ) ); + _rOutAttrs->Put( SdrCaptionLineLenItem( GetCoreValue(*m_pMF_LAENGE, eUnit ) ) ); } } diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx index cc180d67f4ba..3178ee8be057 100644 --- a/cui/source/tabpages/macroass.cxx +++ b/cui/source/tabpages/macroass.cxx @@ -172,7 +172,7 @@ void _SfxMacroTabPage::ScriptChanged() EnableButtons(); } -bool _SfxMacroTabPage::FillItemSet( SfxItemSet& rSet ) +bool _SfxMacroTabPage::FillItemSet( SfxItemSet* rSet ) { SvxMacroItem aItem( GetWhich( aPageRg[0] ) ); ((SvxMacroTableDtor&)aItem.GetMacroTable()) = aTbl; @@ -181,7 +181,7 @@ bool _SfxMacroTabPage::FillItemSet( SfxItemSet& rSet ) if( SFX_ITEM_SET != GetItemSet().GetItemState( aItem.Which(), true, &pItem ) || aItem != *(SvxMacroItem*)pItem ) { - rSet.Put( aItem ); + rSet->Put( aItem ); return true; } return false; diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx index 61b2baac7a26..1d6884608d54 100644 --- a/cui/source/tabpages/measure.cxx +++ b/cui/source/tabpages/measure.cxx @@ -419,7 +419,7 @@ void SvxMeasurePage::Reset( const SfxItemSet& rAttrs ) |* \************************************************************************/ -bool SvxMeasurePage::FillItemSet( SfxItemSet& rAttrs) +bool SvxMeasurePage::FillItemSet( SfxItemSet* rAttrs) { bool bModified = false; sal_Int32 nValue; @@ -428,49 +428,49 @@ bool SvxMeasurePage::FillItemSet( SfxItemSet& rAttrs) if( m_pMtrFldLineDist->IsValueChangedFromSaved() ) { nValue = GetCoreValue( *m_pMtrFldLineDist, eUnit ); - rAttrs.Put( SdrMeasureLineDistItem( nValue ) ); + rAttrs->Put( SdrMeasureLineDistItem( nValue ) ); bModified = true; } if( m_pMtrFldHelplineOverhang->IsValueChangedFromSaved() ) { nValue = GetCoreValue( *m_pMtrFldHelplineOverhang, eUnit ); - rAttrs.Put( SdrMeasureHelplineOverhangItem( nValue ) ); + rAttrs->Put( SdrMeasureHelplineOverhangItem( nValue ) ); bModified = true; } if( m_pMtrFldHelplineDist->IsValueChangedFromSaved() ) { nValue = GetCoreValue( *m_pMtrFldHelplineDist, eUnit ); - rAttrs.Put( SdrMeasureHelplineDistItem( nValue ) ); + rAttrs->Put( SdrMeasureHelplineDistItem( nValue ) ); bModified = true; } if( m_pMtrFldHelpline1Len->IsValueChangedFromSaved() ) { nValue = GetCoreValue( *m_pMtrFldHelpline1Len, eUnit ); - rAttrs.Put( SdrMeasureHelpline1LenItem( nValue ) ); + rAttrs->Put( SdrMeasureHelpline1LenItem( nValue ) ); bModified = true; } if( m_pMtrFldHelpline2Len->IsValueChangedFromSaved() ) { nValue = GetCoreValue( *m_pMtrFldHelpline2Len, eUnit ); - rAttrs.Put( SdrMeasureHelpline2LenItem( nValue ) ); + rAttrs->Put( SdrMeasureHelpline2LenItem( nValue ) ); bModified = true; } eState = m_pTsbBelowRefEdge->GetState(); if( m_pTsbBelowRefEdge->IsValueChangedFromSaved() ) { - rAttrs.Put( SdrMeasureBelowRefEdgeItem( TRISTATE_TRUE == eState ) ); + rAttrs->Put( SdrMeasureBelowRefEdgeItem( TRISTATE_TRUE == eState ) ); bModified = true; } if( m_pMtrFldDecimalPlaces->IsValueChangedFromSaved() ) { nValue = static_cast<sal_Int32>(m_pMtrFldDecimalPlaces->GetValue()); - rAttrs.Put( + rAttrs->Put( SdrMeasureDecimalPlacesItem( sal::static_int_cast< sal_Int16 >( nValue ) ) ); bModified = true; @@ -479,14 +479,14 @@ bool SvxMeasurePage::FillItemSet( SfxItemSet& rAttrs) eState = m_pTsbParallel->GetState(); if( m_pTsbParallel->IsValueChangedFromSaved() ) { - rAttrs.Put( SdrMeasureTextRota90Item( TRISTATE_FALSE == eState ) ); + rAttrs->Put( SdrMeasureTextRota90Item( TRISTATE_FALSE == eState ) ); bModified = true; } eState = m_pTsbShowUnit->GetState(); if( m_pTsbShowUnit->IsValueChangedFromSaved() ) { - rAttrs.Put( SdrMeasureShowUnitItem( TRISTATE_TRUE == eState ) ); + rAttrs->Put( SdrMeasureShowUnitItem( TRISTATE_TRUE == eState ) ); bModified = true; } @@ -497,7 +497,7 @@ bool SvxMeasurePage::FillItemSet( SfxItemSet& rAttrs) { sal_uInt16 nFieldUnit = (sal_uInt16)(sal_IntPtr)m_pLbUnit->GetEntryData( nPos ); FieldUnit _eUnit = (FieldUnit) nFieldUnit; - rAttrs.Put( SdrMeasureUnitItem( _eUnit ) ); + rAttrs->Put( SdrMeasureUnitItem( _eUnit ) ); bModified = true; } } @@ -537,35 +537,35 @@ bool SvxMeasurePage::FillItemSet( SfxItemSet& rAttrs) if( m_pTsbAutoPosV->GetState() == TRISTATE_TRUE ) eVPos = SDRMEASURE_TEXTVAUTO; - if ( rAttrs.GetItemState( SDRATTR_MEASURETEXTVPOS ) != SFX_ITEM_DONTCARE ) + if ( rAttrs->GetItemState( SDRATTR_MEASURETEXTVPOS ) != SFX_ITEM_DONTCARE ) { eOldVPos = (SdrMeasureTextVPos) ( ( const SdrMeasureTextVPosItem& )rOutAttrs.Get( SDRATTR_MEASURETEXTVPOS ) ).GetValue(); if( eOldVPos != eVPos ) { - rAttrs.Put( SdrMeasureTextVPosItem( eVPos ) ); + rAttrs->Put( SdrMeasureTextVPosItem( eVPos ) ); bModified = true; } } else { - rAttrs.Put( SdrMeasureTextVPosItem( eVPos ) ); + rAttrs->Put( SdrMeasureTextVPosItem( eVPos ) ); bModified = true; } - if ( rAttrs.GetItemState( SDRATTR_MEASURETEXTHPOS ) != SFX_ITEM_DONTCARE ) + if ( rAttrs->GetItemState( SDRATTR_MEASURETEXTHPOS ) != SFX_ITEM_DONTCARE ) { eOldHPos = (SdrMeasureTextHPos) ( ( const SdrMeasureTextHPosItem& )rOutAttrs.Get( SDRATTR_MEASURETEXTHPOS ) ).GetValue(); if( eOldHPos != eHPos ) { - rAttrs.Put( SdrMeasureTextHPosItem( eHPos ) ); + rAttrs->Put( SdrMeasureTextHPosItem( eHPos ) ); bModified = true; } } else { - rAttrs.Put( SdrMeasureTextHPosItem( eHPos ) ); + rAttrs->Put( SdrMeasureTextHPosItem( eHPos ) ); bModified = true; } } diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index ddc08da2482e..3c706b0d5cd7 100644 --- a/cui/source/tabpages/numfmt.cxx +++ b/cui/source/tabpages/numfmt.cxx @@ -686,7 +686,7 @@ void SvxNumberFormatTabPage::HideLanguage(bool nFlag) #* #************************************************************************/ -bool SvxNumberFormatTabPage::FillItemSet( SfxItemSet& rCoreAttrs ) +bool SvxNumberFormatTabPage::FillItemSet( SfxItemSet* rCoreAttrs ) { bool bDataChanged = m_pFtLanguage->IsEnabled() || m_pCbSourceFormat->IsEnabled(); if ( bDataChanged ) @@ -722,11 +722,11 @@ bool SvxNumberFormatTabPage::FillItemSet( SfxItemSet& rCoreAttrs ) if (bDataChanged) { - rCoreAttrs.Put( SfxUInt32Item( nWhich, nCurKey ) ); + rCoreAttrs->Put( SfxUInt32Item( nWhich, nCurKey ) ); } else if(SFX_ITEM_DEFAULT == eItemState) { - rCoreAttrs.ClearItem( nWhich ); + rCoreAttrs->ClearItem( nWhich ); } } @@ -744,7 +744,7 @@ bool SvxNumberFormatTabPage::FillItemSet( SfxItemSet& rCoreAttrs ) if(bNumItemFlag) { - rCoreAttrs.Put( *pNumItem ); + rCoreAttrs->Put( *pNumItem ); } else { @@ -768,7 +768,7 @@ bool SvxNumberFormatTabPage::FillItemSet( SfxItemSet& rCoreAttrs ) const SfxBoolItem* pBoolItem = (const SfxBoolItem*) GetItem( rMyItemSet, SID_ATTR_NUMBERFORMAT_SOURCE ); bool bOld = pBoolItem && pBoolItem->GetValue(); - rCoreAttrs.Put( SfxBoolItem( _nWhich, m_pCbSourceFormat->IsChecked() ) ); + rCoreAttrs->Put( SfxBoolItem( _nWhich, m_pCbSourceFormat->IsChecked() ) ); if ( !bDataChanged ) bDataChanged = (bOld != m_pCbSourceFormat->IsChecked() || _eItemState != SFX_ITEM_SET); @@ -779,7 +779,7 @@ bool SvxNumberFormatTabPage::FillItemSet( SfxItemSet& rCoreAttrs ) pNumFmtShell->ValidateNewEntries(); if(m_pLbLanguage->IsVisible() && LISTBOX_ENTRY_NOTFOUND != m_pLbLanguage->GetEntryPos(sAutomaticEntry)) - rCoreAttrs.Put(SfxBoolItem(SID_ATTR_NUMBERFORMAT_ADD_AUTO, + rCoreAttrs->Put(SfxBoolItem(SID_ATTR_NUMBERFORMAT_ADD_AUTO, m_pLbLanguage->GetSelectEntry() == sAutomaticEntry)); } @@ -790,7 +790,7 @@ bool SvxNumberFormatTabPage::FillItemSet( SfxItemSet& rCoreAttrs ) int SvxNumberFormatTabPage::DeactivatePage( SfxItemSet* _pSet ) { if ( _pSet ) - FillItemSet( *_pSet ); + FillItemSet( _pSet ); return LEAVE_PAGE; } diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index c57db72b6468..c42888c48a88 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -229,13 +229,13 @@ SfxTabPage* SvxSingleNumPickTabPage::Create( Window* pParent, return new SvxSingleNumPickTabPage(pParent, rAttrSet); } -bool SvxSingleNumPickTabPage::FillItemSet( SfxItemSet& rSet ) +bool SvxSingleNumPickTabPage::FillItemSet( SfxItemSet* rSet ) { if( (bPreset || bModified) && pSaveNum) { *pSaveNum = *pActNum; - rSet.Put(SvxNumBulletItem( *pSaveNum ), nNumItemId); - rSet.Put(SfxBoolItem(SID_PARAM_NUM_PRESET, bPreset)); + rSet->Put(SvxNumBulletItem( *pSaveNum ), nNumItemId); + rSet->Put(SfxBoolItem(SID_PARAM_NUM_PRESET, bPreset)); } return bModified; @@ -279,7 +279,7 @@ void SvxSingleNumPickTabPage::ActivatePage(const SfxItemSet& rSet) int SvxSingleNumPickTabPage::DeactivatePage(SfxItemSet *_pSet) { if(_pSet) - FillItemSet(*_pSet); + FillItemSet(_pSet); return sal_True; } @@ -390,13 +390,13 @@ SfxTabPage* SvxBulletPickTabPage::Create( Window* pParent, return new SvxBulletPickTabPage(pParent, rAttrSet); } -bool SvxBulletPickTabPage::FillItemSet( SfxItemSet& rSet ) +bool SvxBulletPickTabPage::FillItemSet( SfxItemSet* rSet ) { if( (bPreset || bModified) && pActNum) { *pSaveNum = *pActNum; - rSet.Put(SvxNumBulletItem( *pSaveNum ), nNumItemId); - rSet.Put(SfxBoolItem(SID_PARAM_NUM_PRESET, bPreset)); + rSet->Put(SvxNumBulletItem( *pSaveNum ), nNumItemId); + rSet->Put(SfxBoolItem(SID_PARAM_NUM_PRESET, bPreset)); } return bModified; } @@ -438,7 +438,7 @@ void SvxBulletPickTabPage::ActivatePage(const SfxItemSet& rSet) int SvxBulletPickTabPage::DeactivatePage(SfxItemSet *_pSet) { if(_pSet) - FillItemSet(*_pSet); + FillItemSet(_pSet); return sal_True; } @@ -587,13 +587,13 @@ SfxTabPage* SvxNumPickTabPage::Create( Window* pParent, return new SvxNumPickTabPage(pParent, rAttrSet); } -bool SvxNumPickTabPage::FillItemSet( SfxItemSet& rSet ) +bool SvxNumPickTabPage::FillItemSet( SfxItemSet* rSet ) { if( (bPreset || bModified) && pActNum) { *pSaveNum = *pActNum; - rSet.Put(SvxNumBulletItem( *pSaveNum ), nNumItemId); - rSet.Put(SfxBoolItem(SID_PARAM_NUM_PRESET, bPreset)); + rSet->Put(SvxNumBulletItem( *pSaveNum ), nNumItemId); + rSet->Put(SfxBoolItem(SID_PARAM_NUM_PRESET, bPreset)); } return bModified; } @@ -635,7 +635,7 @@ void SvxNumPickTabPage::ActivatePage(const SfxItemSet& rSet) int SvxNumPickTabPage::DeactivatePage(SfxItemSet *_pSet) { if(_pSet) - FillItemSet(*_pSet); + FillItemSet(_pSet); return sal_True; } @@ -866,11 +866,11 @@ void SvxBitmapPickTabPage::ActivatePage(const SfxItemSet& rSet) int SvxBitmapPickTabPage::DeactivatePage(SfxItemSet *_pSet) { if(_pSet) - FillItemSet(*_pSet); + FillItemSet(_pSet); return sal_True; } -bool SvxBitmapPickTabPage::FillItemSet( SfxItemSet& rSet ) +bool SvxBitmapPickTabPage::FillItemSet( SfxItemSet* rSet ) { if ( aGrfNames.empty() ) { @@ -879,8 +879,8 @@ bool SvxBitmapPickTabPage::FillItemSet( SfxItemSet& rSet ) if( (bPreset || bModified) && pActNum) { *pSaveNum = *pActNum; - rSet.Put(SvxNumBulletItem( *pSaveNum ), nNumItemId); - rSet.Put(SfxBoolItem(SID_PARAM_NUM_PRESET, bPreset)); + rSet->Put(SvxNumBulletItem( *pSaveNum ), nNumItemId); + rSet->Put(SfxBoolItem(SID_PARAM_NUM_PRESET, bPreset)); } return bModified; @@ -1191,18 +1191,18 @@ void SvxNumOptionsTabPage::ActivatePage(const SfxItemSet& rSet) int SvxNumOptionsTabPage::DeactivatePage(SfxItemSet * _pSet) { if(_pSet) - FillItemSet(*_pSet); + FillItemSet(_pSet); return sal_True; } -bool SvxNumOptionsTabPage::FillItemSet( SfxItemSet& rSet ) +bool SvxNumOptionsTabPage::FillItemSet( SfxItemSet* rSet ) { - rSet.Put(SfxUInt16Item(SID_PARAM_CUR_NUM_LEVEL, nActNumLvl)); + rSet->Put(SfxUInt16Item(SID_PARAM_CUR_NUM_LEVEL, nActNumLvl)); if(bModified && pActNum) { *pSaveNum = *pActNum; - rSet.Put(SvxNumBulletItem( *pSaveNum ), nNumItemId); - rSet.Put(SfxBoolItem(SID_PARAM_NUM_PRESET, false)); + rSet->Put(SvxNumBulletItem( *pSaveNum ), nNumItemId); + rSet->Put(SfxBoolItem(SID_PARAM_NUM_PRESET, false)); } return bModified; }; @@ -2953,20 +2953,20 @@ int SvxNumPositionTabPage::DeactivatePage(SfxItemSet *_pSet) if(m_pDistBorderMF->IsEnabled()) DistanceHdl_Impl(m_pDistBorderMF); DistanceHdl_Impl(m_pIndentMF); - FillItemSet(*_pSet); + FillItemSet(_pSet); } return sal_True; } -bool SvxNumPositionTabPage::FillItemSet( SfxItemSet& rSet ) +bool SvxNumPositionTabPage::FillItemSet( SfxItemSet* rSet ) { - rSet.Put(SfxUInt16Item(SID_PARAM_CUR_NUM_LEVEL, nActNumLvl)); + rSet->Put(SfxUInt16Item(SID_PARAM_CUR_NUM_LEVEL, nActNumLvl)); if(bModified && pActNum) { *pSaveNum = *pActNum; - rSet.Put(SvxNumBulletItem( *pSaveNum ), nNumItemId); - rSet.Put(SfxBoolItem(SID_PARAM_NUM_PRESET, false)); + rSet->Put(SvxNumBulletItem( *pSaveNum ), nNumItemId); + rSet->Put(SfxBoolItem(SID_PARAM_NUM_PRESET, false)); } return bModified; } diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx index 1051d02b78f2..1ee2803d319e 100644 --- a/cui/source/tabpages/page.cxx +++ b/cui/source/tabpages/page.cxx @@ -659,7 +659,7 @@ void SvxPageDescPage::FillUserData() -bool SvxPageDescPage::FillItemSet( SfxItemSet& rSet ) +bool SvxPageDescPage::FillItemSet( SfxItemSet* rSet ) { bool bModified = false; const SfxItemSet& rOldSet = GetItemSet(); @@ -691,10 +691,10 @@ bool SvxPageDescPage::FillItemSet( SfxItemSet& rSet ) // set left and right margins if ( bModified ) { - pOld = GetOldItem( rSet, SID_ATTR_LRSPACE ); + pOld = GetOldItem( *rSet, SID_ATTR_LRSPACE ); if ( !pOld || !( *(const SvxLRSpaceItem*)pOld == aMargin ) ) - rSet.Put( aMargin ); + rSet->Put( aMargin ); else bModified = false; } @@ -717,12 +717,12 @@ bool SvxPageDescPage::FillItemSet( SfxItemSet& rSet ) if ( bMod ) { - pOld = GetOldItem( rSet, SID_ATTR_ULSPACE ); + pOld = GetOldItem( *rSet, SID_ATTR_ULSPACE ); if ( !pOld || !( *(const SvxULSpaceItem*)pOld == aTopMargin ) ) { bModified = true; - rSet.Put( aTopMargin ); + rSet->Put( aTopMargin ); } } @@ -730,11 +730,11 @@ bool SvxPageDescPage::FillItemSet( SfxItemSet& rSet ) nWhich = GetWhich( SID_ATTR_PAGE_PAPERBIN ); sal_Int32 nPos = m_pPaperTrayBox->GetSelectEntryPos(); sal_uInt16 nBin = (sal_uInt16)(sal_uLong)m_pPaperTrayBox->GetEntryData( nPos ); - pOld = GetOldItem( rSet, SID_ATTR_PAGE_PAPERBIN ); + pOld = GetOldItem( *rSet, SID_ATTR_PAGE_PAPERBIN ); if ( !pOld || ( (const SvxPaperBinItem*)pOld )->GetValue() != nBin ) { - rSet.Put( SvxPaperBinItem( nWhich, (sal_uInt8)nBin ) ); + rSet->Put( SvxPaperBinItem( nWhich, (sal_uInt8)nBin ) ); bModified = true; } @@ -752,11 +752,11 @@ bool SvxPageDescPage::FillItemSet( SfxItemSet& rSet ) { Size aSize( GetCoreValue( *m_pPaperWidthEdit, eUnit ), GetCoreValue( *m_pPaperHeightEdit, eUnit ) ); - pOld = GetOldItem( rSet, SID_ATTR_PAGE_SIZE ); + pOld = GetOldItem( *rSet, SID_ATTR_PAGE_SIZE ); if ( !pOld || ( (const SvxSizeItem*)pOld )->GetSize() != aSize ) { - rSet.Put( SvxSizeItem( GetWhich(SID_ATTR_PAGE_SIZE), aSize ) ); + rSet->Put( SvxSizeItem( GetWhich(SID_ATTR_PAGE_SIZE), aSize ) ); bModified = true; } } @@ -770,11 +770,11 @@ bool SvxPageDescPage::FillItemSet( SfxItemSet& rSet ) if ( bChecked ) Swap( aSize ); - pOld = GetOldItem( rSet, SID_ATTR_PAGE_SIZE ); + pOld = GetOldItem( *rSet, SID_ATTR_PAGE_SIZE ); if ( !pOld || ( (const SvxSizeItem*)pOld )->GetSize() != aSize ) { - rSet.Put( SvxSizeItem( GetWhich(SID_ATTR_PAGE_SIZE), aSize ) ); + rSet->Put( SvxSizeItem( GetWhich(SID_ATTR_PAGE_SIZE), aSize ) ); bModified = true; } } @@ -805,18 +805,18 @@ bool SvxPageDescPage::FillItemSet( SfxItemSet& rSet ) if ( bMod ) { - pOld = GetOldItem( rSet, SID_ATTR_PAGE ); + pOld = GetOldItem( *rSet, SID_ATTR_PAGE ); if ( !pOld || !( *(const SvxPageItem*)pOld == aPage ) ) { - rSet.Put( aPage ); + rSet->Put( aPage ); bModified = true; } } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich ) ) - rSet.ClearItem( nWhich ); + rSet->ClearItem( nWhich ); else - rSet.Put( rOldSet.Get( nWhich ) ); + rSet->Put( rOldSet.Get( nWhich ) ); // evaluate mode specific controls @@ -828,7 +828,7 @@ bool SvxPageDescPage::FillItemSet( SfxItemSet& rSet ) { SfxBoolItem aHorz( GetWhich( SID_ATTR_PAGE_EXT1 ), m_pHorzBox->IsChecked() ); - rSet.Put( aHorz ); + rSet->Put( aHorz ); bModified = true; } @@ -836,7 +836,7 @@ bool SvxPageDescPage::FillItemSet( SfxItemSet& rSet ) { SfxBoolItem aVert( GetWhich( SID_ATTR_PAGE_EXT2 ), m_pVertBox->IsChecked() ); - rSet.Put( aVert ); + rSet->Put( aVert ); bModified = true; } break; @@ -845,7 +845,7 @@ bool SvxPageDescPage::FillItemSet( SfxItemSet& rSet ) case SVX_PAGE_MODE_PRESENTATION: { // always put so that draw can evaluate this - rSet.Put( SfxBoolItem( GetWhich( SID_ATTR_PAGE_EXT1 ), + rSet->Put( SfxBoolItem( GetWhich( SID_ATTR_PAGE_EXT1 ), m_pAdaptBox->IsChecked() ) ); bModified = true; break; @@ -861,12 +861,12 @@ bool SvxPageDescPage::FillItemSet( SfxItemSet& rSet ) SfxBoolItem* pRegItem = (SfxBoolItem*)rRegItem.Clone(); bool bCheck = m_pRegisterCB->IsChecked(); pRegItem->SetValue(bCheck); - rSet.Put(*pRegItem); + rSet->Put(*pRegItem); bModified = true; if(bCheck) { bModified = true; - rSet.Put(SfxStringItem(SID_SWREGISTER_COLLECTION, + rSet->Put(SfxStringItem(SID_SWREGISTER_COLLECTION, m_pRegisterLB->GetSelectEntry())); } delete pRegItem; @@ -875,7 +875,7 @@ bool SvxPageDescPage::FillItemSet( SfxItemSet& rSet ) SvxFrameDirection eDirection = m_pTextFlowBox->GetSelectEntryValue(); if( m_pTextFlowBox->IsVisible() && m_pTextFlowBox->IsValueChangedFromSaved() ) { - rSet.Put( SvxFrameDirectionItem( eDirection, GetWhich( SID_ATTR_FRAMEDIRECTION ) ) ); + rSet->Put( SvxFrameDirectionItem( eDirection, GetWhich( SID_ATTR_FRAMEDIRECTION ) ) ); bModified = true; } @@ -1415,7 +1415,7 @@ int SvxPageDescPage::DeactivatePage( SfxItemSet* _pSet ) if ( _pSet ) { - FillItemSet( *_pSet ); + FillItemSet( _pSet ); // put portray/landscape if applicable sal_uInt16 nWh = GetWhich( SID_ATTR_PAGE_SIZE ); diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx index 0e71f68c8d16..45e3c7d29ecf 100644 --- a/cui/source/tabpages/paragrph.cxx +++ b/cui/source/tabpages/paragrph.cxx @@ -198,11 +198,11 @@ SfxTabPage* SvxStdParagraphTabPage::Create( Window* pParent, const SfxItemSet& r return new SvxStdParagraphTabPage( pParent, rSet ); } -bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) +bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet* rOutSet ) { SfxItemState eState = SFX_ITEM_UNKNOWN; const SfxPoolItem* pOld = 0; - SfxItemPool* pPool = rOutSet.GetPool(); + SfxItemPool* pPool = rOutSet->GetPool(); DBG_ASSERT( pPool, "Wo ist der Pool" ); bool bModified = false; @@ -245,12 +245,12 @@ bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) break; } eState = GetItemSet().GetItemState( nWhich ); - pOld = GetOldItem( rOutSet, SID_ATTR_PARA_LINESPACE ); + pOld = GetOldItem( *rOutSet, SID_ATTR_PARA_LINESPACE ); if ( !pOld || !( *(const SvxLineSpacingItem*)pOld == aSpacing ) || SFX_ITEM_DONTCARE == eState ) { - rOutSet.Put( aSpacing ); + rOutSet->Put( aSpacing ); bModified = true; } } @@ -260,7 +260,7 @@ bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) { nWhich = GetWhich( SID_ATTR_ULSPACE ); SfxMapUnit eUnit = pPool->GetMetric( nWhich ); - pOld = GetOldItem( rOutSet, SID_ATTR_ULSPACE ); + pOld = GetOldItem( *rOutSet, SID_ATTR_ULSPACE ); SvxULSpaceItem aMargin( nWhich ); if ( bRelativeMode ) @@ -294,7 +294,7 @@ bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) if ( !pOld || !( *(const SvxULSpaceItem*)pOld == aMargin ) || SFX_ITEM_DONTCARE == eState ) { - rOutSet.Put( aMargin ); + rOutSet->Put( aMargin ); bModified = true; } } @@ -308,7 +308,7 @@ bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) nWhich = GetWhich( SID_ATTR_LRSPACE ); SfxMapUnit eUnit = pPool->GetMetric( nWhich ); SvxLRSpaceItem aMargin( nWhich ); - pOld = GetOldItem( rOutSet, SID_ATTR_LRSPACE ); + pOld = GetOldItem( *rOutSet, SID_ATTR_LRSPACE ); if ( bRelativeMode ) { @@ -351,7 +351,7 @@ bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) if ( !pOld || !( *(const SvxLRSpaceItem*)pOld == aMargin ) || SFX_ITEM_DONTCARE == eState ) { - rOutSet.Put( aMargin ); + rOutSet->Put( aMargin ); bModified = true; } } @@ -373,14 +373,14 @@ bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) SvxTabStopItem aNullTab( rTabItem ); SvxTabStop aNull( 0, SVX_TAB_ADJUST_DEFAULT ); aNullTab.Insert( aNull ); - rOutSet.Put( aNullTab ); + rOutSet->Put( aNullTab ); } } } if( m_pRegisterCB->IsVisible()) { const SfxBoolItem* pBoolItem = (SfxBoolItem*)GetOldItem( - rOutSet, SID_ATTR_PARA_REGISTER); + *rOutSet, SID_ATTR_PARA_REGISTER); if (!pBoolItem) return bModified; SfxBoolItem* pRegItem = (SfxBoolItem*)pBoolItem->Clone(); @@ -390,11 +390,11 @@ bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) if(m_pRegisterCB->IsChecked() != bSet ) { pRegItem->SetValue(!bSet); - rOutSet.Put(*pRegItem); + rOutSet->Put(*pRegItem); bModified = true; } else if ( SFX_ITEM_DEFAULT == GetItemSet().GetItemState( _nWhich, false ) ) - rOutSet.ClearItem(_nWhich); + rOutSet->ClearItem(_nWhich); delete pRegItem; } @@ -614,7 +614,7 @@ int SvxStdParagraphTabPage::DeactivatePage( SfxItemSet* _pSet ) ELRLoseFocusHdl( NULL ); if ( _pSet ) - FillItemSet( *_pSet ); + FillItemSet( _pSet ); return LEAVE_PAGE; } @@ -1042,7 +1042,7 @@ SvxParaAlignTabPage::~SvxParaAlignTabPage() int SvxParaAlignTabPage::DeactivatePage( SfxItemSet* _pSet ) { if ( _pSet ) - FillItemSet( *_pSet ); + FillItemSet( _pSet ); return LEAVE_PAGE; } @@ -1056,7 +1056,7 @@ const sal_uInt16* SvxParaAlignTabPage::GetRanges() return pAlignRanges; } -bool SvxParaAlignTabPage::FillItemSet( SfxItemSet& rOutSet ) +bool SvxParaAlignTabPage::FillItemSet( SfxItemSet* rOutSet ) { bool bModified = false; @@ -1093,7 +1093,7 @@ bool SvxParaAlignTabPage::FillItemSet( SfxItemSet& rOutSet ) if ( bAdj ) { - const SvxAdjustItem* pOld = (const SvxAdjustItem*)GetOldItem( rOutSet, SID_ATTR_PARA_ADJUST ); + const SvxAdjustItem* pOld = (const SvxAdjustItem*)GetOldItem( *rOutSet, SID_ATTR_PARA_ADJUST ); SvxAdjust eOneWord = m_pExpandCB->IsChecked() ? SVX_ADJUST_BLOCK : SVX_ADJUST_LEFT; @@ -1120,17 +1120,17 @@ bool SvxParaAlignTabPage::FillItemSet( SfxItemSet& rOutSet ) aAdj.SetAdjust( eAdjust ); aAdj.SetOneWord( eOneWord ); aAdj.SetLastBlock( eLastBlock ); - rOutSet.Put( aAdj ); + rOutSet->Put( aAdj ); } } if(m_pSnapToGridCB->IsValueChangedFromSaved()) { - rOutSet.Put(SvxParaGridItem(m_pSnapToGridCB->IsChecked(), GetWhich( SID_ATTR_PARA_SNAPTOGRID ))); + rOutSet->Put(SvxParaGridItem(m_pSnapToGridCB->IsChecked(), GetWhich( SID_ATTR_PARA_SNAPTOGRID ))); bModified = true; } if(m_pVertAlignLB->IsValueChangedFromSaved()) { - rOutSet.Put(SvxParaVertAlignItem(m_pVertAlignLB->GetSelectEntryPos(), GetWhich( SID_PARA_VERTALIGN ))); + rOutSet->Put(SvxParaVertAlignItem(m_pVertAlignLB->GetSelectEntryPos(), GetWhich( SID_PARA_VERTALIGN ))); bModified = true; } @@ -1139,7 +1139,7 @@ bool SvxParaAlignTabPage::FillItemSet( SfxItemSet& rOutSet ) SvxFrameDirection eDir = m_pTextDirectionLB->GetSelectEntryValue(); if( m_pTextDirectionLB->IsValueChangedFromSaved() ) { - rOutSet.Put( SvxFrameDirectionItem( eDir, GetWhich( SID_ATTR_FRAMEDIRECTION ) ) ); + rOutSet->Put( SvxFrameDirectionItem( eDir, GetWhich( SID_ATTR_FRAMEDIRECTION ) ) ); bModified = true; } } @@ -1326,12 +1326,12 @@ SfxTabPage* SvxExtParagraphTabPage::Create( Window* pParent, return new SvxExtParagraphTabPage( pParent, rSet ); } -bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) +bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet* rOutSet ) { bool bModified = false; sal_uInt16 _nWhich = GetWhich( SID_ATTR_PARA_HYPHENZONE ); const TriState eHyphenState = m_pHyphenBox->GetState(); - const SfxPoolItem* pOld = GetOldItem( rOutSet, SID_ATTR_PARA_HYPHENZONE ); + const SfxPoolItem* pOld = GetOldItem( *rOutSet, SID_ATTR_PARA_HYPHENZONE ); if ( m_pHyphenBox->IsValueChangedFromSaved() || m_pExtHyphenBeforeBox->IsValueModified() || @@ -1353,7 +1353,7 @@ bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) !( *(SvxHyphenZoneItem*)pOld == aHyphen ) || m_pHyphenBox->IsValueChangedFromSaved()) { - rOutSet.Put( aHyphen ); + rOutSet->Put( aHyphen ); bModified = true; } } @@ -1363,11 +1363,11 @@ bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) SfxUInt16Item aPageNum( SID_ATTR_PARA_PAGENUM, (sal_uInt16)m_pPagenumEdit->GetValue() ); - pOld = GetOldItem( rOutSet, SID_ATTR_PARA_PAGENUM ); + pOld = GetOldItem( *rOutSet, SID_ATTR_PARA_PAGENUM ); if ( !pOld || ( (const SfxUInt16Item*)pOld )->GetValue() != aPageNum.GetValue() ) { - rOutSet.Put( aPageNum ); + rOutSet->Put( aPageNum ); bModified = true; } } @@ -1388,11 +1388,11 @@ bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) sPage = m_pApplyCollBox->GetSelectEntry(); bIsPageModel = !sPage.isEmpty(); } - pOld = GetOldItem( rOutSet, SID_ATTR_PARA_MODEL ); + pOld = GetOldItem( *rOutSet, SID_ATTR_PARA_MODEL ); if ( !pOld || ( (const SvxPageModelItem*)pOld )->GetValue() != sPage ) { - rOutSet.Put( SvxPageModelItem( sPage, false, _nWhich ) ); + rOutSet->Put( SvxPageModelItem( sPage, false, _nWhich ) ); bModified = true; } else @@ -1401,13 +1401,13 @@ bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) else if(TRISTATE_TRUE == eState && m_pApplyCollBtn->IsEnabled()) bIsPageModel = true; else - rOutSet.Put( SvxPageModelItem( sPage, false, _nWhich ) ); + rOutSet->Put( SvxPageModelItem( sPage, false, _nWhich ) ); _nWhich = GetWhich( SID_ATTR_PARA_PAGEBREAK ); if ( bIsPageModel ) // if PageModel is turned on, always turn off PageBreak - rOutSet.Put( SvxFmtBreakItem( SVX_BREAK_NONE, _nWhich ) ); + rOutSet->Put( SvxFmtBreakItem( SVX_BREAK_NONE, _nWhich ) ); else { eState = m_pPageBreakBox->GetState(); @@ -1450,13 +1450,13 @@ bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) break; default: ; //prevent warning } - pOld = GetOldItem( rOutSet, SID_ATTR_PARA_PAGEBREAK ); + pOld = GetOldItem( *rOutSet, SID_ATTR_PARA_PAGEBREAK ); if ( eState != m_pPageBreakBox->GetSavedValue() || !pOld || !( *(const SvxFmtBreakItem*)pOld == aBreak ) ) { bModified = true; - rOutSet.Put( aBreak ); + rOutSet->Put( aBreak ); } } } @@ -1467,12 +1467,12 @@ bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) if ( m_pKeepTogetherBox->IsValueChangedFromSaved() ) { - pOld = GetOldItem( rOutSet, SID_ATTR_PARA_SPLIT ); + pOld = GetOldItem( *rOutSet, SID_ATTR_PARA_SPLIT ); if ( !pOld || ( (const SvxFmtSplitItem*)pOld )->GetValue() != ( eState == TRISTATE_FALSE ) ) { - rOutSet.Put( SvxFmtSplitItem( eState == TRISTATE_FALSE, _nWhich ) ); + rOutSet->Put( SvxFmtSplitItem( eState == TRISTATE_FALSE, _nWhich ) ); bModified = true; } } @@ -1484,7 +1484,7 @@ bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) if ( m_pKeepParaBox->IsValueChangedFromSaved() ) { // if the status has changed, putting is necessary - rOutSet.Put( SvxFmtKeepItem( eState == TRISTATE_TRUE, _nWhich ) ); + rOutSet->Put( SvxFmtKeepItem( eState == TRISTATE_TRUE, _nWhich ) ); bModified = true; } @@ -1497,11 +1497,11 @@ bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) { SvxWidowsItem rItem( eState == TRISTATE_TRUE ? (sal_uInt8)m_pWidowRowNo->GetValue() : 0, _nWhich ); - pOld = GetOldItem( rOutSet, SID_ATTR_PARA_WIDOWS ); + pOld = GetOldItem( *rOutSet, SID_ATTR_PARA_WIDOWS ); if ( m_pWidowBox->IsValueChangedFromSaved() || !pOld || !( *(const SvxWidowsItem*)pOld == rItem ) ) { - rOutSet.Put( rItem ); + rOutSet->Put( rItem ); bModified = true; } } @@ -1514,13 +1514,13 @@ bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) { SvxOrphansItem rItem( eState == TRISTATE_TRUE ? (sal_uInt8)m_pOrphanRowNo->GetValue() : 0, _nWhich ); - pOld = GetOldItem( rOutSet, SID_ATTR_PARA_ORPHANS ); + pOld = GetOldItem( *rOutSet, SID_ATTR_PARA_ORPHANS ); if ( m_pOrphanBox->IsValueChangedFromSaved() || !pOld || !( *(const SvxOrphansItem*)pOld == rItem ) ) { - rOutSet.Put( rItem ); + rOutSet->Put( rItem ); bModified = true; } } @@ -1809,7 +1809,7 @@ void SvxExtParagraphTabPage::Reset( const SfxItemSet& rSet ) int SvxExtParagraphTabPage::DeactivatePage( SfxItemSet* _pSet ) { if ( _pSet ) - FillItemSet( *_pSet ); + FillItemSet( _pSet ); return LEAVE_PAGE; } @@ -2149,34 +2149,34 @@ const sal_uInt16* SvxAsianTabPage::GetRanges() return pRanges; } -bool SvxAsianTabPage::FillItemSet( SfxItemSet& rSet ) +bool SvxAsianTabPage::FillItemSet( SfxItemSet* rSet ) { bool bRet = false; - SfxItemPool* pPool = rSet.GetPool(); + SfxItemPool* pPool = rSet->GetPool(); if (m_pScriptSpaceCB->IsEnabled() && m_pScriptSpaceCB->IsValueChangedFromSaved()) { - SfxBoolItem* pNewItem = (SfxBoolItem*)rSet.Get( + SfxBoolItem* pNewItem = (SfxBoolItem*)rSet->Get( pPool->GetWhich(SID_ATTR_PARA_SCRIPTSPACE)).Clone(); pNewItem->SetValue(m_pScriptSpaceCB->IsChecked()); - rSet.Put(*pNewItem); + rSet->Put(*pNewItem); delete pNewItem; bRet = true; } if (m_pHangingPunctCB->IsEnabled() && m_pHangingPunctCB->IsValueChangedFromSaved()) { - SfxBoolItem* pNewItem = (SfxBoolItem*)rSet.Get( + SfxBoolItem* pNewItem = (SfxBoolItem*)rSet->Get( pPool->GetWhich(SID_ATTR_PARA_HANGPUNCTUATION)).Clone(); pNewItem->SetValue(m_pHangingPunctCB->IsChecked()); - rSet.Put(*pNewItem); + rSet->Put(*pNewItem); delete pNewItem; bRet = true; } if (m_pForbiddenRulesCB->IsEnabled() && m_pForbiddenRulesCB->IsValueChangedFromSaved()) { - SfxBoolItem* pNewItem = (SfxBoolItem*)rSet.Get( + SfxBoolItem* pNewItem = (SfxBoolItem*)rSet->Get( pPool->GetWhich(SID_ATTR_PARA_FORBIDDEN_RULES)).Clone(); pNewItem->SetValue(m_pForbiddenRulesCB->IsChecked()); - rSet.Put(*pNewItem); + rSet->Put(*pNewItem); delete pNewItem; bRet = true; } diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx index 87ce9e5f8363..5e34fbf34467 100644 --- a/cui/source/tabpages/swpossizetabpage.cxx +++ b/cui/source/tabpages/swpossizetabpage.cxx @@ -726,22 +726,22 @@ const sal_uInt16* SvxSwPosSizeTabPage::GetRanges() return pSwPosRanges; } -bool SvxSwPosSizeTabPage::FillItemSet( SfxItemSet& rSet) +bool SvxSwPosSizeTabPage::FillItemSet( SfxItemSet* rSet) { bool bAnchorChanged = false; short nAnchor = GetAnchorType(&bAnchorChanged); bool bModified = false; if(bAnchorChanged) { - rSet.Put(SfxInt16Item(SID_ATTR_TRANSFORM_ANCHOR, nAnchor)); + rSet->Put(SfxInt16Item(SID_ATTR_TRANSFORM_ANCHOR, nAnchor)); bModified = true; } if ( m_pPositionCB->IsValueChangedFromSaved() ) { if( m_pPositionCB->GetState() == TRISTATE_INDET ) - rSet.InvalidateItem( SID_ATTR_TRANSFORM_PROTECT_POS ); + rSet->InvalidateItem( SID_ATTR_TRANSFORM_PROTECT_POS ); else - rSet.Put( + rSet->Put( SfxBoolItem( GetWhich( SID_ATTR_TRANSFORM_PROTECT_POS ), m_pPositionCB->GetState() == TRISTATE_TRUE ? sal_True : sal_False ) ); bModified = true; @@ -750,9 +750,9 @@ bool SvxSwPosSizeTabPage::FillItemSet( SfxItemSet& rSet) if ( m_pSizeCB->IsValueChangedFromSaved() ) { if ( m_pSizeCB->GetState() == TRISTATE_INDET ) - rSet.InvalidateItem( SID_ATTR_TRANSFORM_PROTECT_SIZE ); + rSet->InvalidateItem( SID_ATTR_TRANSFORM_PROTECT_SIZE ); else - rSet.Put( + rSet->Put( SfxBoolItem( GetWhich( SID_ATTR_TRANSFORM_PROTECT_SIZE ), m_pSizeCB->GetState() == TRISTATE_TRUE ? sal_True : sal_False ) ); bModified = true; @@ -779,8 +779,8 @@ bool SvxSwPosSizeTabPage::FillItemSet( SfxItemSet& rSet) nHoriByPos += m_aAnchorPos.X(); nVertByPos += m_aAnchorPos.Y(); - rSet.Put( SfxInt32Item( GetWhich( SID_ATTR_TRANSFORM_POS_X ), nHoriByPos ) ); - rSet.Put( SfxInt32Item( GetWhich( SID_ATTR_TRANSFORM_POS_Y ), nVertByPos ) ); + rSet->Put( SfxInt32Item( GetWhich( SID_ATTR_TRANSFORM_POS_X ), nHoriByPos ) ); + rSet->Put( SfxInt32Item( GetWhich( SID_ATTR_TRANSFORM_POS_Y ), nVertByPos ) ); bModified = true; } @@ -807,15 +807,15 @@ bool SvxSwPosSizeTabPage::FillItemSet( SfxItemSet& rSet) (m_pHoriByMF->IsEnabled() && nHoriByPos != rHoriPosition.GetValue()) ) { - rSet.Put(SfxInt16Item(SID_ATTR_TRANSFORM_HORI_ORIENT, nAlign)); - rSet.Put(SfxInt16Item(SID_ATTR_TRANSFORM_HORI_RELATION, nRel)); + rSet->Put(SfxInt16Item(SID_ATTR_TRANSFORM_HORI_ORIENT, nAlign)); + rSet->Put(SfxInt16Item(SID_ATTR_TRANSFORM_HORI_RELATION, nRel)); if(m_pHoriByMF->IsEnabled()) - rSet.Put(SfxInt32Item(SID_ATTR_TRANSFORM_HORI_POSITION, nHoriByPos)); + rSet->Put(SfxInt32Item(SID_ATTR_TRANSFORM_HORI_POSITION, nHoriByPos)); bModified = true; } } if(m_pHoriMirrorCB->IsEnabled() && m_pHoriMirrorCB->IsValueChangedFromSaved()) - bModified |= 0 != rSet.Put(SfxBoolItem(SID_ATTR_TRANSFORM_HORI_MIRROR, m_pHoriMirrorCB->IsChecked())); + bModified |= 0 != rSet->Put(SfxBoolItem(SID_ATTR_TRANSFORM_HORI_MIRROR, m_pHoriMirrorCB->IsChecked())); if ( m_pVMap ) { @@ -842,10 +842,10 @@ bool SvxSwPosSizeTabPage::FillItemSet( SfxItemSet& rSet) ( m_pVertByMF->IsEnabled() && nVertByPos != rVertPosition.GetValue() ) ) { - rSet.Put(SfxInt16Item(SID_ATTR_TRANSFORM_VERT_ORIENT, nAlign)); - rSet.Put(SfxInt16Item(SID_ATTR_TRANSFORM_VERT_RELATION, nRel)); + rSet->Put(SfxInt16Item(SID_ATTR_TRANSFORM_VERT_ORIENT, nAlign)); + rSet->Put(SfxInt16Item(SID_ATTR_TRANSFORM_VERT_RELATION, nRel)); if(m_pVertByMF->IsEnabled()) - rSet.Put(SfxInt32Item(SID_ATTR_TRANSFORM_VERT_POSITION, nVertByPos)); + rSet->Put(SfxInt32Item(SID_ATTR_TRANSFORM_VERT_POSITION, nVertByPos)); bModified = true; } } @@ -859,7 +859,7 @@ bool SvxSwPosSizeTabPage::FillItemSet( SfxItemSet& rSet) { SfxBoolItem* pFollow = static_cast<SfxBoolItem*>(pItem->Clone()); pFollow->SetValue(m_pFollowCB->IsChecked()); - bModified |= 0 != rSet.Put(*pFollow); + bModified |= 0 != rSet->Put(*pFollow); delete pFollow; } } @@ -869,12 +869,12 @@ bool SvxSwPosSizeTabPage::FillItemSet( SfxItemSet& rSet) { sal_uInt32 nWidth = static_cast<sal_uInt32>(m_pWidthMF->Denormalize(m_pWidthMF->GetValue(FUNIT_TWIP))); sal_uInt32 nHeight = static_cast<sal_uInt32>(m_pHeightMF->Denormalize(m_pHeightMF->GetValue(FUNIT_TWIP))); - rSet.Put( SfxUInt32Item( GetWhich( SID_ATTR_TRANSFORM_WIDTH ), + rSet->Put( SfxUInt32Item( GetWhich( SID_ATTR_TRANSFORM_WIDTH ), (sal_uInt32) nWidth ) ); - rSet.Put( SfxUInt32Item( GetWhich( SID_ATTR_TRANSFORM_HEIGHT ), + rSet->Put( SfxUInt32Item( GetWhich( SID_ATTR_TRANSFORM_HEIGHT ), (sal_uInt32) nHeight ) ); //this item is required by SdrEditView::SetGeoAttrToMarked() - rSet.Put( SfxAllEnumItem( GetWhich( SID_ATTR_TRANSFORM_SIZE_POINT ), RP_LT ) ); + rSet->Put( SfxAllEnumItem( GetWhich( SID_ATTR_TRANSFORM_SIZE_POINT ), RP_LT ) ); bModified = true; } @@ -1050,7 +1050,7 @@ void SvxSwPosSizeTabPage::Reset( const SfxItemSet& rSet) int SvxSwPosSizeTabPage::DeactivatePage( SfxItemSet* _pSet ) { if( _pSet ) - FillItemSet( *_pSet ); + FillItemSet( _pSet ); return( LEAVE_PAGE ); } diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx index 32896237893b..d904bca24e00 100644 --- a/cui/source/tabpages/tabstpge.cxx +++ b/cui/source/tabpages/tabstpge.cxx @@ -201,7 +201,7 @@ const sal_uInt16* SvxTabulatorTabPage::GetRanges() -bool SvxTabulatorTabPage::FillItemSet( SfxItemSet& rSet ) +bool SvxTabulatorTabPage::FillItemSet( SfxItemSet* rSet ) { bool bModified = false; @@ -214,9 +214,9 @@ bool SvxTabulatorTabPage::FillItemSet( SfxItemSet& rSet ) GetFillCharHdl_Impl( m_pFillChar ); FillUpWithDefTabs_Impl( nDefDist, aNewTabs ); - SfxItemPool* pPool = rSet.GetPool(); + SfxItemPool* pPool = rSet->GetPool(); MapUnit eUnit = (MapUnit)pPool->GetMetric( GetWhich( SID_ATTR_TABSTOP ) ); - const SfxPoolItem* pOld = GetOldItem( rSet, SID_ATTR_TABSTOP ); + const SfxPoolItem* pOld = GetOldItem( *rSet, SID_ATTR_TABSTOP ); if ( MAP_100TH_MM != eUnit ) { @@ -224,8 +224,8 @@ bool SvxTabulatorTabPage::FillItemSet( SfxItemSet& rSet ) // the TabStopItem needs to have a DefTab at position 0. const SfxPoolItem* pLRSpace; // If not in the new set, then maybe in the old one - if ( SFX_ITEM_SET != rSet.GetItemState( GetWhich( SID_ATTR_LRSPACE ), true, &pLRSpace ) ) - pLRSpace = GetOldItem( rSet, SID_ATTR_LRSPACE ); + if ( SFX_ITEM_SET != rSet->GetItemState( GetWhich( SID_ATTR_LRSPACE ), true, &pLRSpace ) ) + pLRSpace = GetOldItem( *rSet, SID_ATTR_LRSPACE ); if ( pLRSpace && ( (SvxLRSpaceItem*)pLRSpace )->GetTxtFirstLineOfst() < 0 ) { @@ -246,13 +246,13 @@ bool SvxTabulatorTabPage::FillItemSet( SfxItemSet& rSet ) if ( !pOld || !( *( (SvxTabStopItem*)pOld ) == aTmp ) ) { - rSet.Put( aTmp ); + rSet->Put( aTmp ); bModified = true; } } else if ( !pOld || !( *( (SvxTabStopItem*)pOld ) == aNewTabs ) ) { - rSet.Put( aNewTabs ); + rSet->Put( aNewTabs ); bModified = true; } return bModified; @@ -364,7 +364,7 @@ void SvxTabulatorTabPage::DisableControls( const sal_uInt16 nFlag ) int SvxTabulatorTabPage::DeactivatePage( SfxItemSet* _pSet ) { if ( _pSet ) - FillItemSet( *_pSet ); + FillItemSet( _pSet ); return LEAVE_PAGE; } diff --git a/cui/source/tabpages/textanim.cxx b/cui/source/tabpages/textanim.cxx index 84cd104103ad..63da943c8071 100644 --- a/cui/source/tabpages/textanim.cxx +++ b/cui/source/tabpages/textanim.cxx @@ -332,7 +332,7 @@ void SvxTextAnimationPage::Reset( const SfxItemSet& rAttrs ) |* \************************************************************************/ -bool SvxTextAnimationPage::FillItemSet( SfxItemSet& rAttrs) +bool SvxTextAnimationPage::FillItemSet( SfxItemSet* rAttrs) { bool bModified = false; sal_Int32 nPos; @@ -343,7 +343,7 @@ bool SvxTextAnimationPage::FillItemSet( SfxItemSet& rAttrs) if( nPos != LISTBOX_ENTRY_NOTFOUND && m_pLbEffect->IsValueChangedFromSaved() ) { - rAttrs.Put( SdrTextAniKindItem( (SdrTextAniKind) nPos ) ); + rAttrs->Put( SdrTextAniKindItem( (SdrTextAniKind) nPos ) ); bModified = true; } @@ -354,7 +354,7 @@ bool SvxTextAnimationPage::FillItemSet( SfxItemSet& rAttrs) m_pBtnDown->IsValueChangedFromSaved() ) { SdrTextAniDirection eValue = (SdrTextAniDirection) GetSelectedDirection(); - rAttrs.Put( SdrTextAniDirectionItem( eValue ) ); + rAttrs->Put( SdrTextAniDirectionItem( eValue ) ); bModified = true; } @@ -362,7 +362,7 @@ bool SvxTextAnimationPage::FillItemSet( SfxItemSet& rAttrs) eState = m_pTsbStartInside->GetState(); if( m_pTsbStartInside->IsValueChangedFromSaved() ) { - rAttrs.Put( SdrTextAniStartInsideItem( TRISTATE_TRUE == eState ) ); + rAttrs->Put( SdrTextAniStartInsideItem( TRISTATE_TRUE == eState ) ); bModified = true; } @@ -370,7 +370,7 @@ bool SvxTextAnimationPage::FillItemSet( SfxItemSet& rAttrs) eState = m_pTsbStopInside->GetState(); if( m_pTsbStopInside->IsValueChangedFromSaved() ) { - rAttrs.Put( SdrTextAniStopInsideItem( TRISTATE_TRUE == eState ) ); + rAttrs->Put( SdrTextAniStopInsideItem( TRISTATE_TRUE == eState ) ); bModified = true; } @@ -392,7 +392,7 @@ bool SvxTextAnimationPage::FillItemSet( SfxItemSet& rAttrs) } } if( bModified ) - rAttrs.Put( SdrTextAniCountItem( (sal_uInt16) nValue ) ); + rAttrs->Put( SdrTextAniCountItem( (sal_uInt16) nValue ) ); } // delay @@ -413,7 +413,7 @@ bool SvxTextAnimationPage::FillItemSet( SfxItemSet& rAttrs) } } if( bModified ) - rAttrs.Put( SdrTextAniDelayItem( (sal_uInt16) nValue ) ); + rAttrs->Put( SdrTextAniDelayItem( (sal_uInt16) nValue ) ); } // step size @@ -432,7 +432,7 @@ bool SvxTextAnimationPage::FillItemSet( SfxItemSet& rAttrs) { nValue = GetCoreValue( *m_pMtrFldAmount, eUnit ); } - rAttrs.Put( SdrTextAniAmountItem( (sal_Int16) nValue ) ); + rAttrs->Put( SdrTextAniAmountItem( (sal_Int16) nValue ) ); bModified = true; } diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx index f349198f8ac4..4a80ba77d147 100644 --- a/cui/source/tabpages/textattr.cxx +++ b/cui/source/tabpages/textattr.cxx @@ -322,9 +322,9 @@ void SvxTextAttrPage::Reset( const SfxItemSet& rAttrs ) |* \************************************************************************/ -bool SvxTextAttrPage::FillItemSet( SfxItemSet& rAttrs) +bool SvxTextAttrPage::FillItemSet( SfxItemSet* rAttrs) { - SfxItemPool* pPool = rAttrs.GetPool(); + SfxItemPool* pPool = rAttrs->GetPool(); DBG_ASSERT( pPool, "Wo ist der Pool" ); SfxMapUnit eUnit = pPool->GetMetric( SDRATTR_TEXT_LEFTDIST ); @@ -334,55 +334,55 @@ bool SvxTextAttrPage::FillItemSet( SfxItemSet& rAttrs) if( m_pMtrFldLeft->IsValueChangedFromSaved() ) { nValue = GetCoreValue( *m_pMtrFldLeft, eUnit ); - rAttrs.Put( SdrTextLeftDistItem( nValue ) ); + rAttrs->Put( SdrTextLeftDistItem( nValue ) ); } if( m_pMtrFldRight->IsValueChangedFromSaved() ) { nValue = GetCoreValue( *m_pMtrFldRight, eUnit ); - rAttrs.Put( SdrTextRightDistItem( nValue ) ); + rAttrs->Put( SdrTextRightDistItem( nValue ) ); } if( m_pMtrFldTop->IsValueChangedFromSaved() ) { nValue = GetCoreValue( *m_pMtrFldTop, eUnit ); - rAttrs.Put( SdrTextUpperDistItem( nValue ) ); + rAttrs->Put( SdrTextUpperDistItem( nValue ) ); } if( m_pMtrFldBottom->IsValueChangedFromSaved() ) { nValue = GetCoreValue( *m_pMtrFldBottom, eUnit ); - rAttrs.Put( SdrTextLowerDistItem( nValue ) ); + rAttrs->Put( SdrTextLowerDistItem( nValue ) ); } eState = m_pTsbAutoGrowHeight->GetState(); if( m_pTsbAutoGrowHeight->IsValueChangedFromSaved() ) { - rAttrs.Put( SdrTextAutoGrowHeightItem( TRISTATE_TRUE == eState ) ); + rAttrs->Put( SdrTextAutoGrowHeightItem( TRISTATE_TRUE == eState ) ); } eState = m_pTsbAutoGrowWidth->GetState(); if( m_pTsbAutoGrowWidth->IsValueChangedFromSaved() ) { - rAttrs.Put( SdrTextAutoGrowWidthItem( TRISTATE_TRUE == eState ) ); + rAttrs->Put( SdrTextAutoGrowWidthItem( TRISTATE_TRUE == eState ) ); } eState = m_pTsbAutoGrowSize->GetState(); if( m_pTsbAutoGrowSize->IsValueChangedFromSaved() ) { - rAttrs.Put( SdrTextAutoGrowHeightItem( TRISTATE_TRUE == eState ) ); + rAttrs->Put( SdrTextAutoGrowHeightItem( TRISTATE_TRUE == eState ) ); } eState = m_pTsbWordWrapText->GetState(); if( m_pTsbWordWrapText->IsValueChangedFromSaved() ) { - rAttrs.Put( SdrTextWordWrapItem( TRISTATE_TRUE == eState ) ); + rAttrs->Put( SdrTextWordWrapItem( TRISTATE_TRUE == eState ) ); } eState = m_pTsbContour->GetState(); if( m_pTsbContour->IsValueChangedFromSaved() ) { - rAttrs.Put( SdrTextContourFrameItem( TRISTATE_TRUE == eState ) ); + rAttrs->Put( SdrTextContourFrameItem( TRISTATE_TRUE == eState ) ); } eState = m_pTsbFitToSize->GetState(); @@ -397,7 +397,7 @@ bool SvxTextAttrPage::FillItemSet( SfxItemSet& rAttrs) case TRISTATE_FALSE: eFTS = SDRTEXTFIT_NONE; break; case TRISTATE_TRUE: eFTS = SDRTEXTFIT_AUTOFIT; break; } - rAttrs.Put( SdrTextFitToSizeTypeItem( eFTS ) ); + rAttrs->Put( SdrTextFitToSizeTypeItem( eFTS ) ); } // centered @@ -446,20 +446,20 @@ bool SvxTextAttrPage::FillItemSet( SfxItemSet& rAttrs) eOldTVA = (SdrTextVertAdjust) ( ( const SdrTextVertAdjustItem& )rOutAttrs.Get( SDRATTR_TEXT_VERTADJUST ) ).GetValue(); if( eOldTVA != eTVA ) - rAttrs.Put( SdrTextVertAdjustItem( eTVA ) ); + rAttrs->Put( SdrTextVertAdjustItem( eTVA ) ); } else - rAttrs.Put( SdrTextVertAdjustItem( eTVA ) ); + rAttrs->Put( SdrTextVertAdjustItem( eTVA ) ); if ( rOutAttrs.GetItemState( SDRATTR_TEXT_HORZADJUST ) != SFX_ITEM_DONTCARE ) { eOldTHA = (SdrTextHorzAdjust) ( ( const SdrTextHorzAdjustItem& )rOutAttrs.Get( SDRATTR_TEXT_HORZADJUST ) ).GetValue(); if( eOldTHA != eTHA ) - rAttrs.Put( SdrTextHorzAdjustItem( eTHA ) ); + rAttrs->Put( SdrTextHorzAdjustItem( eTHA ) ); } else - rAttrs.Put( SdrTextHorzAdjustItem( eTHA ) ); + rAttrs->Put( SdrTextHorzAdjustItem( eTHA ) ); } return true; diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx index eb0add42eb74..0084f4c6e853 100644 --- a/cui/source/tabpages/tparea.cxx +++ b/cui/source/tabpages/tparea.cxx @@ -297,7 +297,7 @@ const sal_uInt16* SvxTransparenceTabPage::GetRanges() return(pTransparenceRanges); } -bool SvxTransparenceTabPage::FillItemSet(SfxItemSet& rAttrs) +bool SvxTransparenceTabPage::FillItemSet(SfxItemSet* rAttrs) { const SfxPoolItem* pGradientItem = NULL; const SfxPoolItem* pLinearItem = NULL; @@ -322,11 +322,11 @@ bool SvxTransparenceTabPage::FillItemSet(SfxItemSet& rAttrs) { XFillTransparenceItem aItem(nPos); SdrShadowTransparenceItem aShadowItem(nPos); - const SfxPoolItem* pOld = GetOldItem(rAttrs, XATTR_FILLTRANSPARENCE); + const SfxPoolItem* pOld = GetOldItem(*rAttrs, XATTR_FILLTRANSPARENCE); if(!pOld || !(*(const XFillTransparenceItem*)pOld == aItem) || !bLinearActive) { - rAttrs.Put(aItem); - rAttrs.Put(aShadowItem); + rAttrs->Put(aItem); + rAttrs->Put(aShadowItem); bModified = true; bSwitchOffGradient = true; } @@ -357,11 +357,11 @@ bool SvxTransparenceTabPage::FillItemSet(SfxItemSet& rAttrs) 100, 100); XFillFloatTransparenceItem aItem( rXFSet.GetPool()/*aString*/, aTmpGradient); - const SfxPoolItem* pOld = GetOldItem(rAttrs, XATTR_FILLFLOATTRANSPARENCE); + const SfxPoolItem* pOld = GetOldItem(*rAttrs, XATTR_FILLFLOATTRANSPARENCE); if(!pOld || !(*(const XFillFloatTransparenceItem*)pOld == aItem) || !bGradActive) { - rAttrs.Put(aItem); + rAttrs->Put(aItem); bModified = true; bSwitchOffLinear = true; } @@ -383,7 +383,7 @@ bool SvxTransparenceTabPage::FillItemSet(SfxItemSet& rAttrs) aGrad.SetEndIntens(100); XFillFloatTransparenceItem aItem( rXFSet.GetPool()/*aString*/, aGrad); aItem.SetEnabled(false); - rAttrs.Put(aItem); + rAttrs->Put(aItem); bModified = true; } @@ -392,11 +392,11 @@ bool SvxTransparenceTabPage::FillItemSet(SfxItemSet& rAttrs) { XFillTransparenceItem aItem(0); SdrShadowTransparenceItem aShadowItem(0); - rAttrs.Put(aItem); - rAttrs.Put(aShadowItem); + rAttrs->Put(aItem); + rAttrs->Put(aShadowItem); bModified = true; } - rAttrs.Put (CntUInt16Item(SID_PAGE_TYPE,nPageType)); + rAttrs->Put (CntUInt16Item(SID_PAGE_TYPE,nPageType)); return bModified; } @@ -480,7 +480,7 @@ void SvxTransparenceTabPage::ActivatePage(const SfxItemSet& rSet) int SvxTransparenceTabPage::DeactivatePage(SfxItemSet* _pSet) { if( _pSet ) - FillItemSet( *_pSet ); + FillItemSet( _pSet ); return(LEAVE_PAGE); } @@ -980,14 +980,14 @@ int SvxAreaTabPage::DeactivatePage( SfxItemSet* _pSet ) } if( _pSet ) - FillItemSet( *_pSet ); + FillItemSet( _pSet ); return( LEAVE_PAGE ); } -bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) +bool SvxAreaTabPage::FillItemSet( SfxItemSet* rAttrs ) { sal_Int32 _nPos; bool bModified = false; @@ -1004,10 +1004,10 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) if( eSavedStyle != eStyle ) { XFillStyleItem aStyleItem( XFILL_NONE ); - pOld = GetOldItem( rAttrs, XATTR_FILLSTYLE ); + pOld = GetOldItem( *rAttrs, XATTR_FILLSTYLE ); if ( !pOld || !( *(const XFillStyleItem*)pOld == aStyleItem ) ) { - rAttrs.Put( aStyleItem ); + rAttrs->Put( aStyleItem ); bModified = true; } } @@ -1021,10 +1021,10 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) { XFillColorItem aItem( m_pLbColor->GetSelectEntry(), m_pLbColor->GetSelectEntryColor() ); - pOld = GetOldItem( rAttrs, XATTR_FILLCOLOR ); + pOld = GetOldItem( *rAttrs, XATTR_FILLCOLOR ); if ( !pOld || !( *(const XFillColorItem*)pOld == aItem ) ) { - rAttrs.Put( aItem ); + rAttrs->Put( aItem ); bModified = true; } } @@ -1034,10 +1034,10 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLCOLOR ), true ) ) ) { XFillStyleItem aStyleItem( XFILL_SOLID ); - pOld = GetOldItem( rAttrs, XATTR_FILLSTYLE ); + pOld = GetOldItem( *rAttrs, XATTR_FILLSTYLE ); if ( !pOld || !( *(const XFillStyleItem*)pOld == aStyleItem ) ) { - rAttrs.Put( aStyleItem ); + rAttrs->Put( aStyleItem ); bModified = true; } } @@ -1052,10 +1052,10 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) XGradient aGradient = pGradientList->GetGradient( _nPos )->GetGradient(); OUString aString = m_pLbGradient->GetSelectEntry(); XFillGradientItem aItem( aString, aGradient ); - pOld = GetOldItem( rAttrs, XATTR_FILLGRADIENT ); + pOld = GetOldItem( *rAttrs, XATTR_FILLGRADIENT ); if ( !pOld || !( *(const XFillGradientItem*)pOld == aItem ) ) { - rAttrs.Put( aItem ); + rAttrs->Put( aItem ); bModified = true; } } @@ -1065,10 +1065,10 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLGRADIENT ), true ) ) ) { XFillStyleItem aStyleItem( XFILL_GRADIENT ); - pOld = GetOldItem( rAttrs, XATTR_FILLSTYLE ); + pOld = GetOldItem( *rAttrs, XATTR_FILLSTYLE ); if ( !pOld || !( *(const XFillStyleItem*)pOld == aStyleItem ) ) { - rAttrs.Put( aStyleItem ); + rAttrs->Put( aStyleItem ); bModified = true; } } @@ -1083,25 +1083,25 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) XHatch aHatching = pHatchingList->GetHatch( _nPos )->GetHatch(); OUString aString = m_pLbHatching->GetSelectEntry(); XFillHatchItem aItem( aString, aHatching ); - pOld = GetOldItem( rAttrs, XATTR_FILLHATCH ); + pOld = GetOldItem( *rAttrs, XATTR_FILLHATCH ); if ( !pOld || !( *(const XFillHatchItem*)pOld == aItem ) ) { - rAttrs.Put( aItem ); + rAttrs->Put( aItem ); bModified = true; } } XFillBackgroundItem aItem ( m_pCbxHatchBckgrd->IsChecked() ); - rAttrs.Put( aItem ); + rAttrs->Put( aItem ); nPos = m_pLbHatchBckgrdColor->GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND && m_pLbHatchBckgrdColor->IsValueChangedFromSaved() ) { XFillColorItem aFillColorItem( m_pLbHatchBckgrdColor->GetSelectEntry(), m_pLbHatchBckgrdColor->GetSelectEntryColor() ); - pOld = GetOldItem( rAttrs, XATTR_FILLCOLOR ); + pOld = GetOldItem( *rAttrs, XATTR_FILLCOLOR ); if ( !pOld || !( *(const XFillColorItem*)pOld == aFillColorItem ) ) { - rAttrs.Put( aFillColorItem ); + rAttrs->Put( aFillColorItem ); bModified = true; } } @@ -1111,10 +1111,10 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLHATCH ), true ) ) ) { XFillStyleItem aStyleItem( XFILL_HATCH ); - pOld = GetOldItem( rAttrs, XATTR_FILLSTYLE ); + pOld = GetOldItem( *rAttrs, XATTR_FILLSTYLE ); if ( !pOld || !( *(const XFillStyleItem*)pOld == aStyleItem ) ) { - rAttrs.Put( aStyleItem ); + rAttrs->Put( aStyleItem ); bModified = true; } } @@ -1126,8 +1126,8 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) if(mbDirectGraphicSet && GRAPHIC_NONE != maDirectGraphic.GetType()) { const XFillBitmapItem aXBmpItem(maDirectName, maDirectGraphic); - rAttrs.Put(XFillStyleItem(XFILL_BITMAP)); - rAttrs.Put(aXBmpItem); + rAttrs->Put(XFillStyleItem(XFILL_BITMAP)); + rAttrs->Put(aXBmpItem); bModified = true; } else @@ -1139,10 +1139,10 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) const XBitmapEntry* pXBitmapEntry = pBitmapList->GetBitmap(nPos); const OUString aString(m_pLbBitmap->GetSelectEntry()); const XFillBitmapItem aFillBitmapItem(aString, pXBitmapEntry->GetGraphicObject()); - pOld = GetOldItem( rAttrs, XATTR_FILLBITMAP ); + pOld = GetOldItem( *rAttrs, XATTR_FILLBITMAP ); if ( !pOld || !( *(const XFillBitmapItem*)pOld == aFillBitmapItem ) ) { - rAttrs.Put( aFillBitmapItem ); + rAttrs->Put( aFillBitmapItem ); bModified = true; } } @@ -1152,10 +1152,10 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLBITMAP ), true ) ) ) { XFillStyleItem aStyleItem( XFILL_BITMAP ); - pOld = GetOldItem( rAttrs, XATTR_FILLSTYLE ); + pOld = GetOldItem( *rAttrs, XATTR_FILLSTYLE ); if ( !pOld || !( *(const XFillStyleItem*)pOld == aStyleItem ) ) { - rAttrs.Put( aStyleItem ); + rAttrs->Put( aStyleItem ); bModified = true; } } @@ -1188,10 +1188,10 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) if( bValueModified ) { XGradientStepCountItem aFillBitmapItem( nValue ); - pOld = GetOldItem( rAttrs, XATTR_GRADIENTSTEPCOUNT ); + pOld = GetOldItem( *rAttrs, XATTR_GRADIENTSTEPCOUNT ); if ( !pOld || !( *(const XGradientStepCountItem*)pOld == aFillBitmapItem ) ) { - rAttrs.Put( aFillBitmapItem ); + rAttrs->Put( aFillBitmapItem ); bModified = true; } } @@ -1204,10 +1204,10 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) { XFillBmpTileItem aFillBmpTileItem( sal::static_int_cast< sal_Bool >( eState ) ); - pOld = GetOldItem( rAttrs, XATTR_FILLBMP_TILE ); + pOld = GetOldItem( *rAttrs, XATTR_FILLBMP_TILE ); if ( !pOld || !( *(const XFillBmpTileItem*)pOld == aFillBmpTileItem ) ) { - rAttrs.Put( aFillBmpTileItem ); + rAttrs->Put( aFillBmpTileItem ); bModified = true; } } @@ -1220,10 +1220,10 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) { XFillBmpStretchItem aFillBmpStretchItem( sal::static_int_cast< sal_Bool >( eState ) ); - pOld = GetOldItem( rAttrs, XATTR_FILLBMP_STRETCH ); + pOld = GetOldItem( *rAttrs, XATTR_FILLBMP_STRETCH ); if ( !pOld || !( *(const XFillBmpStretchItem*)pOld == aFillBmpStretchItem ) ) { - rAttrs.Put( aFillBmpStretchItem ); + rAttrs->Put( aFillBmpStretchItem ); bModified = true; } } @@ -1248,10 +1248,10 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) if( pItem ) { - pOld = GetOldItem( rAttrs, XATTR_FILLBMP_SIZELOG ); + pOld = GetOldItem( *rAttrs, XATTR_FILLBMP_SIZELOG ); if ( !pOld || !( *(const XFillBmpSizeLogItem*)pOld == *pItem ) ) { - rAttrs.Put( *pItem ); + rAttrs->Put( *pItem ); bModified = true; } delete pItem; @@ -1284,10 +1284,10 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) if( pItem ) { - pOld = GetOldItem( rAttrs, XATTR_FILLBMP_SIZEX ); + pOld = GetOldItem( *rAttrs, XATTR_FILLBMP_SIZEX ); if ( !pOld || !( *(const XFillBmpSizeXItem*)pOld == *pItem ) ) { - rAttrs.Put( *pItem ); + rAttrs->Put( *pItem ); bModified = true; } delete pItem; @@ -1321,10 +1321,10 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) if( pItem ) { - pOld = GetOldItem( rAttrs, XATTR_FILLBMP_SIZEY ); + pOld = GetOldItem( *rAttrs, XATTR_FILLBMP_SIZEY ); if ( !pOld || !( *(const XFillBmpSizeYItem*)pOld == *pItem ) ) { - rAttrs.Put( *pItem ); + rAttrs->Put( *pItem ); bModified = true; } delete pItem; @@ -1345,22 +1345,22 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) if( m_pRbtRow->IsChecked() ) { XFillBmpTileOffsetXItem aFillBmpTileOffsetXItem( (sal_uInt16) m_pMtrFldOffset->GetValue() ); - pOld = GetOldItem( rAttrs, XATTR_FILLBMP_TILEOFFSETX ); + pOld = GetOldItem( *rAttrs, XATTR_FILLBMP_TILEOFFSETX ); if ( !pOld || !( *(const XFillBmpTileOffsetXItem*)pOld == aFillBmpTileOffsetXItem ) ) { - rAttrs.Put( aFillBmpTileOffsetXItem ); - rAttrs.Put( XFillBmpTileOffsetYItem( 0 ) ); + rAttrs->Put( aFillBmpTileOffsetXItem ); + rAttrs->Put( XFillBmpTileOffsetYItem( 0 ) ); bModified = true; } } else if( m_pRbtColumn->IsChecked() ) { XFillBmpTileOffsetYItem aFillBmpTileOffsetYItem( (sal_uInt16) m_pMtrFldOffset->GetValue() ); - pOld = GetOldItem( rAttrs, XATTR_FILLBMP_TILEOFFSETY ); + pOld = GetOldItem( *rAttrs, XATTR_FILLBMP_TILEOFFSETY ); if ( !pOld || !( *(const XFillBmpTileOffsetYItem*)pOld == aFillBmpTileOffsetYItem ) ) { - rAttrs.Put( aFillBmpTileOffsetYItem ); - rAttrs.Put( XFillBmpTileOffsetXItem( 0 ) ); + rAttrs->Put( aFillBmpTileOffsetYItem ); + rAttrs->Put( XFillBmpTileOffsetXItem( 0 ) ); bModified = true; } } @@ -1384,10 +1384,10 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) if( bPut ) { XFillBmpPosItem aFillBmpPosItem( _eRP ); - pOld = GetOldItem( rAttrs, XATTR_FILLBMP_POS ); + pOld = GetOldItem( *rAttrs, XATTR_FILLBMP_POS ); if ( !pOld || !( *(const XFillBmpPosItem*)pOld == aFillBmpPosItem ) ) { - rAttrs.Put( aFillBmpPosItem ); + rAttrs->Put( aFillBmpPosItem ); bModified = true; } } @@ -1401,10 +1401,10 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) m_pMtrFldXOffset->IsValueChangedFromSaved() ) { XFillBmpPosOffsetXItem aFillBmpPosOffsetXItem( (sal_uInt16) m_pMtrFldXOffset->GetValue() ); - pOld = GetOldItem( rAttrs, XATTR_FILLBMP_POSOFFSETX ); + pOld = GetOldItem( *rAttrs, XATTR_FILLBMP_POSOFFSETX ); if ( !pOld || !( *(const XFillBmpPosOffsetXItem*)pOld == aFillBmpPosOffsetXItem ) ) { - rAttrs.Put( aFillBmpPosOffsetXItem ); + rAttrs->Put( aFillBmpPosOffsetXItem ); bModified = true; } } @@ -1418,16 +1418,16 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) m_pMtrFldYOffset->IsValueChangedFromSaved() ) { XFillBmpPosOffsetYItem aFillBmpPosOffsetYItem( (sal_uInt16) m_pMtrFldYOffset->GetValue() ); - pOld = GetOldItem( rAttrs, XATTR_FILLBMP_POSOFFSETY ); + pOld = GetOldItem( *rAttrs, XATTR_FILLBMP_POSOFFSETY ); if ( !pOld || !( *(const XFillBmpPosOffsetYItem*)pOld == aFillBmpPosOffsetYItem ) ) { - rAttrs.Put( aFillBmpPosOffsetYItem ); + rAttrs->Put( aFillBmpPosOffsetYItem ); bModified = true; } } } - rAttrs.Put (SfxUInt16Item(SID_PAGE_TYPE,nPageType)); - rAttrs.Put (SfxUInt16Item(SID_TABPAGE_POS,nPos)); + rAttrs->Put (SfxUInt16Item(SID_PAGE_TYPE,nPageType)); + rAttrs->Put (SfxUInt16Item(SID_TABPAGE_POS,nPos)); } return( bModified ); diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index c0b95d0c7de2..3c488e0f47fb 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -218,33 +218,33 @@ int SvxBitmapTabPage::DeactivatePage( SfxItemSet* _pSet) return KEEP_PAGE; if( _pSet ) - FillItemSet( *_pSet ); + FillItemSet( _pSet ); return LEAVE_PAGE; } -bool SvxBitmapTabPage::FillItemSet( SfxItemSet& _rOutAttrs ) +bool SvxBitmapTabPage::FillItemSet( SfxItemSet* _rOutAttrs ) { if( nDlgType == 0 && *pbAreaTP == false ) // area dialog { if(PT_BITMAP == *pPageType) { - _rOutAttrs.Put(XFillStyleItem(XFILL_BITMAP)); + _rOutAttrs->Put(XFillStyleItem(XFILL_BITMAP)); sal_Int32 nPos = m_pLbBitmaps->GetSelectEntryPos(); if(LISTBOX_ENTRY_NOTFOUND != nPos) { const XBitmapEntry* pXBitmapEntry = pBitmapList->GetBitmap(nPos); const OUString aString(m_pLbBitmaps->GetSelectEntry()); - _rOutAttrs.Put(XFillBitmapItem(aString, pXBitmapEntry->GetGraphicObject())); + _rOutAttrs->Put(XFillBitmapItem(aString, pXBitmapEntry->GetGraphicObject())); } else { const BitmapEx aBitmapEx(m_pBitmapCtl->GetBitmapEx()); - _rOutAttrs.Put(XFillBitmapItem(OUString(), Graphic(aBitmapEx))); + _rOutAttrs->Put(XFillBitmapItem(OUString(), Graphic(aBitmapEx))); } } } diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index c20bb39c9218..a81af85dca67 100644 --- a/cui/source/tabpages/tpcolor.cxx +++ b/cui/source/tabpages/tpcolor.cxx @@ -483,7 +483,7 @@ int SvxColorTabPage::DeactivatePage( SfxItemSet* _pSet ) return( KEEP_PAGE ); if( _pSet ) - FillItemSet( *_pSet ); + FillItemSet( _pSet ); return( LEAVE_PAGE ); } @@ -556,7 +556,7 @@ long SvxColorTabPage::CheckChanges_Impl() -bool SvxColorTabPage::FillItemSet( SfxItemSet& rSet ) +bool SvxColorTabPage::FillItemSet( SfxItemSet* rSet ) { if( ( nDlgType != 0 ) || ( *pPageType == PT_COLOR && *pbAreaTP == false ) ) @@ -574,8 +574,8 @@ bool SvxColorTabPage::FillItemSet( SfxItemSet& rSet ) { aColor.SetColor (aCurrentColor.GetColor()); } - rSet.Put( XFillColorItem( aString, aColor ) ); - rSet.Put( XFillStyleItem( XFILL_SOLID ) ); + rSet->Put( XFillColorItem( aString, aColor ) ); + rSet->Put( XFillStyleItem( XFILL_SOLID ) ); } return true; diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx index 8a0e37906c92..eba96ba2dae0 100644 --- a/cui/source/tabpages/tpgradnt.cxx +++ b/cui/source/tabpages/tpgradnt.cxx @@ -232,7 +232,7 @@ int SvxGradientTabPage::DeactivatePage( SfxItemSet* _pSet ) return KEEP_PAGE; if( _pSet ) - FillItemSet( *_pSet ); + FillItemSet( _pSet ); return LEAVE_PAGE; } @@ -306,7 +306,7 @@ long SvxGradientTabPage::CheckChanges_Impl() -bool SvxGradientTabPage::FillItemSet( SfxItemSet& rSet ) +bool SvxGradientTabPage::FillItemSet( SfxItemSet* rSet ) { if( nDlgType == 0 && *pPageType == PT_GRADIENT && *pbAreaTP == false ) { @@ -335,8 +335,8 @@ bool SvxGradientTabPage::FillItemSet( SfxItemSet& rSet ) (sal_uInt16) m_pMtrColorTo->GetValue() ); } DBG_ASSERT( pXGradient, "XGradient konnte nicht erzeugt werden" ); - rSet.Put( XFillStyleItem( XFILL_GRADIENT ) ); - rSet.Put( XFillGradientItem( aString, *pXGradient ) ); + rSet->Put( XFillStyleItem( XFILL_GRADIENT ) ); + rSet->Put( XFillGradientItem( aString, *pXGradient ) ); delete pXGradient; } diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx index c24bcbfbdb6e..8524a6c4f4de 100644 --- a/cui/source/tabpages/tphatch.cxx +++ b/cui/source/tabpages/tphatch.cxx @@ -221,7 +221,7 @@ int SvxHatchTabPage::DeactivatePage( SfxItemSet* _pSet ) return KEEP_PAGE; if( _pSet ) - FillItemSet( *_pSet ); + FillItemSet( _pSet ); return LEAVE_PAGE; } @@ -278,7 +278,7 @@ long SvxHatchTabPage::CheckChanges_Impl() -bool SvxHatchTabPage::FillItemSet( SfxItemSet& rSet ) +bool SvxHatchTabPage::FillItemSet( SfxItemSet* rSet ) { if( nDlgType == 0 && *pbAreaTP == false ) // area dialog { @@ -303,8 +303,8 @@ bool SvxHatchTabPage::FillItemSet( SfxItemSet& rSet ) static_cast<long>(m_pMtrAngle->GetValue() * 10) ); } DBG_ASSERT( pXHatch, "XHatch konnte nicht erzeugt werden" ); - rSet.Put( XFillStyleItem( XFILL_HATCH ) ); - rSet.Put( XFillHatchItem( aString, *pXHatch ) ); + rSet->Put( XFillStyleItem( XFILL_HATCH ) ); + rSet->Put( XFillHatchItem( aString, *pXHatch ) ); delete pXHatch; } diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index d6878cd78e23..1ac752934993 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -661,14 +661,14 @@ int SvxLineTabPage::DeactivatePage( SfxItemSet* _pSet ) } if( _pSet ) - FillItemSet( *_pSet ); + FillItemSet( _pSet ); return( LEAVE_PAGE ); } -bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs ) +bool SvxLineTabPage::FillItemSet( SfxItemSet* rAttrs ) { const SfxPoolItem* pOld = NULL; sal_Int32 nPos; @@ -696,18 +696,18 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs ) { XLineDashItem aDashItem( m_pLbLineStyle->GetSelectEntry(), pDashList->GetDash( nPos - 2 )->GetDash() ); - pOld = GetOldItem( rAttrs, XATTR_LINEDASH ); + pOld = GetOldItem( *rAttrs, XATTR_LINEDASH ); if ( !pOld || !( *(const XLineDashItem*)pOld == aDashItem ) ) { - rAttrs.Put( aDashItem ); + rAttrs->Put( aDashItem ); bModified = true; } } } - pOld = GetOldItem( rAttrs, XATTR_LINESTYLE ); + pOld = GetOldItem( *rAttrs, XATTR_LINESTYLE ); if ( !pOld || !( *(const XLineStyleItem*)pOld == *pStyleItem ) ) { - rAttrs.Put( *pStyleItem ); + rAttrs->Put( *pStyleItem ); bModified = true; } delete pStyleItem; @@ -718,10 +718,10 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs ) if( m_pMtrLineWidth->IsValueChangedFromSaved() ) { XLineWidthItem aItem( GetCoreValue( *m_pMtrLineWidth, ePoolUnit ) ); - pOld = GetOldItem( rAttrs, XATTR_LINEWIDTH ); + pOld = GetOldItem( *rAttrs, XATTR_LINEWIDTH ); if ( !pOld || !( *(const XLineWidthItem*)pOld == aItem ) ) { - rAttrs.Put( aItem ); + rAttrs->Put( aItem ); bModified = true; } } @@ -729,10 +729,10 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs ) if( m_pMtrStartWidth->IsValueChangedFromSaved() ) { XLineStartWidthItem aItem( GetCoreValue( *m_pMtrStartWidth, ePoolUnit ) ); - pOld = GetOldItem( rAttrs, XATTR_LINESTARTWIDTH ); + pOld = GetOldItem( *rAttrs, XATTR_LINESTARTWIDTH ); if ( !pOld || !( *(const XLineStartWidthItem*)pOld == aItem ) ) { - rAttrs.Put( aItem ); + rAttrs->Put( aItem ); bModified = true; } } @@ -740,10 +740,10 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs ) if( m_pMtrEndWidth->IsValueChangedFromSaved() ) { XLineEndWidthItem aItem( GetCoreValue( *m_pMtrEndWidth, ePoolUnit ) ); - pOld = GetOldItem( rAttrs, XATTR_LINEENDWIDTH ); + pOld = GetOldItem( *rAttrs, XATTR_LINEENDWIDTH ); if ( !pOld || !( *(const XLineEndWidthItem*)pOld == aItem ) ) { - rAttrs.Put( aItem ); + rAttrs->Put( aItem ); bModified = true; } } @@ -752,10 +752,10 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs ) if( m_pLbColor->IsValueChangedFromSaved() ) { XLineColorItem aItem( m_pLbColor->GetSelectEntry(), m_pLbColor->GetSelectEntryColor() ); - pOld = GetOldItem( rAttrs, XATTR_LINECOLOR ); + pOld = GetOldItem( *rAttrs, XATTR_LINECOLOR ); if ( !pOld || !( *(const XLineColorItem*)pOld == aItem ) ) { - rAttrs.Put( aItem ); + rAttrs->Put( aItem ); bModified = true; } } @@ -771,10 +771,10 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs ) pItem = new XLineStartItem(); else if( pLineEndList->Count() > (long) ( nPos - 1 ) ) pItem = new XLineStartItem( m_pLbStartStyle->GetSelectEntry(), pLineEndList->GetLineEnd( nPos - 1 )->GetLineEnd() ); - pOld = GetOldItem( rAttrs, XATTR_LINESTART ); + pOld = GetOldItem( *rAttrs, XATTR_LINESTART ); if( pItem && ( !pOld || !( *(const XLineEndItem*)pOld == *pItem ) ) ) { - rAttrs.Put( *pItem ); + rAttrs->Put( *pItem ); bModified = true; } delete pItem; @@ -788,11 +788,11 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs ) pItem = new XLineEndItem(); else if( pLineEndList->Count() > (long) ( nPos - 1 ) ) pItem = new XLineEndItem( m_pLbEndStyle->GetSelectEntry(), pLineEndList->GetLineEnd( nPos - 1 )->GetLineEnd() ); - pOld = GetOldItem( rAttrs, XATTR_LINEEND ); + pOld = GetOldItem( *rAttrs, XATTR_LINEEND ); if( pItem && ( !pOld || !( *(const XLineEndItem*)pOld == *pItem ) ) ) { - rAttrs.Put( *pItem ); + rAttrs->Put( *pItem ); bModified = true; } delete pItem; @@ -804,10 +804,10 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs ) if( m_pTsbCenterStart->IsValueChangedFromSaved() ) { XLineStartCenterItem aItem( sal::static_int_cast< sal_Bool >( eState ) ); - pOld = GetOldItem( rAttrs, XATTR_LINESTARTCENTER ); + pOld = GetOldItem( *rAttrs, XATTR_LINESTARTCENTER ); if ( !pOld || !( *(const XLineStartCenterItem*)pOld == aItem ) ) { - rAttrs.Put( aItem ); + rAttrs->Put( aItem ); bModified = true; } } @@ -815,10 +815,10 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs ) if( m_pTsbCenterEnd->IsValueChangedFromSaved() ) { XLineEndCenterItem aItem( sal::static_int_cast< sal_Bool >( eState ) ); - pOld = GetOldItem( rAttrs, XATTR_LINEENDCENTER ); + pOld = GetOldItem( *rAttrs, XATTR_LINEENDCENTER ); if ( !pOld || !( *(const XLineEndCenterItem*)pOld == aItem ) ) { - rAttrs.Put( aItem ); + rAttrs->Put( aItem ); bModified = true; } } @@ -828,10 +828,10 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs ) if( m_pMtrTransparent->IsValueChangedFromSaved() ) { XLineTransparenceItem aItem( nVal ); - pOld = GetOldItem( rAttrs, XATTR_LINETRANSPARENCE ); + pOld = GetOldItem( *rAttrs, XATTR_LINETRANSPARENCE ); if ( !pOld || !( *(const XLineTransparenceItem*)pOld == aItem ) ) { - rAttrs.Put( aItem ); + rAttrs->Put( aItem ); bModified = true; } } @@ -868,11 +868,11 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs ) if(pNew) { - pOld = GetOldItem( rAttrs, XATTR_LINEJOINT ); + pOld = GetOldItem( *rAttrs, XATTR_LINEJOINT ); if(!pOld || !(*(const XLineJointItem*)pOld == *pNew)) { - rAttrs.Put( *pNew ); + rAttrs->Put( *pNew ); bModified = true; } @@ -907,11 +907,11 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs ) if(pNew) { - pOld = GetOldItem( rAttrs, XATTR_LINECAP ); + pOld = GetOldItem( *rAttrs, XATTR_LINECAP ); if(!pOld || !(*(const XLineCapItem*)pOld == *pNew)) { - rAttrs.Put( *pNew ); + rAttrs->Put( *pNew ); bModified = true; } @@ -922,40 +922,40 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs ) if(nSymbolType!=SVX_SYMBOLTYPE_UNKNOWN || bNewSize) { // Was set by selection or the size is different - SvxSizeItem aSItem(rAttrs.GetPool()->GetWhich(SID_ATTR_SYMBOLSIZE),aSymbolSize); - const SfxPoolItem* pSOld = GetOldItem( rAttrs, rAttrs.GetPool()->GetWhich(SID_ATTR_SYMBOLSIZE) ); + SvxSizeItem aSItem(rAttrs->GetPool()->GetWhich(SID_ATTR_SYMBOLSIZE),aSymbolSize); + const SfxPoolItem* pSOld = GetOldItem( *rAttrs, rAttrs->GetPool()->GetWhich(SID_ATTR_SYMBOLSIZE) ); bNewSize = pSOld ? *(const SvxSizeItem *)pSOld != aSItem : bNewSize ; if(bNewSize) { - rAttrs.Put(aSItem); + rAttrs->Put(aSItem); bModified=true; } - SfxInt32Item aTItem(rAttrs.GetPool()->GetWhich(SID_ATTR_SYMBOLTYPE),nSymbolType); - const SfxPoolItem* pTOld = GetOldItem( rAttrs, rAttrs.GetPool()->GetWhich(SID_ATTR_SYMBOLTYPE) ); + SfxInt32Item aTItem(rAttrs->GetPool()->GetWhich(SID_ATTR_SYMBOLTYPE),nSymbolType); + const SfxPoolItem* pTOld = GetOldItem( *rAttrs, rAttrs->GetPool()->GetWhich(SID_ATTR_SYMBOLTYPE) ); bool bNewType = pTOld == NULL || *(const SfxInt32Item*)pTOld != aTItem; if(bNewType && nSymbolType==SVX_SYMBOLTYPE_UNKNOWN) bNewType=false; // a small fix, type wasn't set -> don't create a type item after all! if(bNewType) { - rAttrs.Put(aTItem); + rAttrs->Put(aTItem); bModified=true; } if(nSymbolType!=SVX_SYMBOLTYPE_NONE) { - SvxBrushItem aBItem(aSymbolGraphic,GPOS_MM,rAttrs.GetPool()->GetWhich(SID_ATTR_BRUSH)); - const SfxPoolItem* pBOld = GetOldItem( rAttrs, rAttrs.GetPool()->GetWhich(SID_ATTR_BRUSH) ); + SvxBrushItem aBItem(aSymbolGraphic,GPOS_MM,rAttrs->GetPool()->GetWhich(SID_ATTR_BRUSH)); + const SfxPoolItem* pBOld = GetOldItem( *rAttrs, rAttrs->GetPool()->GetWhich(SID_ATTR_BRUSH) ); bool bNewBrush = pBOld == NULL || *(const SvxBrushItem*)pBOld != aBItem; if(bNewBrush) { - rAttrs.Put(aBItem); + rAttrs->Put(aBItem); bModified=true; } } } - rAttrs.Put (CntUInt16Item(SID_PAGE_TYPE,nPageType)); + rAttrs->Put (CntUInt16Item(SID_PAGE_TYPE,nPageType)); return( bModified ); } diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx index 4d6de14752f4..2365b0cb2808 100644 --- a/cui/source/tabpages/tplnedef.cxx +++ b/cui/source/tabpages/tplnedef.cxx @@ -194,7 +194,7 @@ int SvxLineDefTabPage::DeactivatePage( SfxItemSet* _pSet ) CheckChanges_Impl(); if( _pSet ) - FillItemSet( *_pSet ); + FillItemSet( _pSet ); return( LEAVE_PAGE ); } @@ -257,7 +257,7 @@ void SvxLineDefTabPage::CheckChanges_Impl() -bool SvxLineDefTabPage::FillItemSet( SfxItemSet& rAttrs ) +bool SvxLineDefTabPage::FillItemSet( SfxItemSet* rAttrs ) { if( nDlgType == 0 ) // line dialog { @@ -266,8 +266,8 @@ bool SvxLineDefTabPage::FillItemSet( SfxItemSet& rAttrs ) FillDash_Impl(); OUString aString( m_pLbLineStyles->GetSelectEntry() ); - rAttrs.Put( XLineStyleItem( XLINE_DASH ) ); - rAttrs.Put( XLineDashItem( aString, aDash ) ); + rAttrs->Put( XLineStyleItem( XLINE_DASH ) ); + rAttrs->Put( XLineDashItem( aString, aDash ) ); } } return true; diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx index 41f3917b1757..243f43ed73d5 100644 --- a/cui/source/tabpages/tplneend.cxx +++ b/cui/source/tabpages/tplneend.cxx @@ -172,7 +172,7 @@ int SvxLineEndDefTabPage::DeactivatePage( SfxItemSet* _pSet ) CheckChanges_Impl(); if( _pSet ) - FillItemSet( *_pSet ); + FillItemSet( _pSet ); return( LEAVE_PAGE ); } @@ -205,7 +205,7 @@ void SvxLineEndDefTabPage::CheckChanges_Impl() -bool SvxLineEndDefTabPage::FillItemSet( SfxItemSet& rSet ) +bool SvxLineEndDefTabPage::FillItemSet( SfxItemSet* rSet ) { if( nDlgType == 0 ) // line dialog { @@ -216,8 +216,8 @@ bool SvxLineEndDefTabPage::FillItemSet( SfxItemSet& rSet ) long nPos = m_pLbLineEnds->GetSelectEntryPos(); XLineEndEntry* pEntry = pLineEndList->GetLineEnd( nPos ); - rSet.Put( XLineStartItem( pEntry->GetName(), pEntry->GetLineEnd() ) ); - rSet.Put( XLineEndItem( pEntry->GetName(), pEntry->GetLineEnd() ) ); + rSet->Put( XLineStartItem( pEntry->GetName(), pEntry->GetLineEnd() ) ); + rSet->Put( XLineEndItem( pEntry->GetName(), pEntry->GetLineEnd() ) ); } } return true; diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx index 15c58c1c29d4..68119d537025 100644 --- a/cui/source/tabpages/tpshadow.cxx +++ b/cui/source/tabpages/tpshadow.cxx @@ -237,14 +237,14 @@ void SvxShadowTabPage::ActivatePage( const SfxItemSet& rSet ) int SvxShadowTabPage::DeactivatePage( SfxItemSet* _pSet ) { if( _pSet ) - FillItemSet( *_pSet ); + FillItemSet( _pSet ); return( LEAVE_PAGE ); } -bool SvxShadowTabPage::FillItemSet( SfxItemSet& rAttrs ) +bool SvxShadowTabPage::FillItemSet( SfxItemSet* rAttrs ) { const SfxPoolItem* pOld = NULL; bool bModified = false; @@ -255,10 +255,10 @@ bool SvxShadowTabPage::FillItemSet( SfxItemSet& rAttrs ) if( m_pTsbShowShadow->IsValueChangedFromSaved() ) { SdrShadowItem aItem( sal::static_int_cast< sal_Bool >( eState ) ); - pOld = GetOldItem( rAttrs, SDRATTR_SHADOW ); + pOld = GetOldItem( *rAttrs, SDRATTR_SHADOW ); if ( !pOld || !( *(const SdrShadowItem*)pOld == aItem ) ) { - rAttrs.Put( aItem ); + rAttrs->Put( aItem ); bModified = true; } } @@ -301,19 +301,19 @@ bool SvxShadowTabPage::FillItemSet( SfxItemSet& rAttrs ) Get( SDRATTR_SHADOWYDIST ) ).GetValue(); } SdrShadowXDistItem aXItem( nX ); - pOld = GetOldItem( rAttrs, SDRATTR_SHADOWXDIST ); + pOld = GetOldItem( *rAttrs, SDRATTR_SHADOWXDIST ); if ( nX != nOldX && ( !pOld || !( *(const SdrShadowXDistItem*)pOld == aXItem ) ) ) { - rAttrs.Put( aXItem ); + rAttrs->Put( aXItem ); bModified = true; } SdrShadowYDistItem aYItem( nY ); - pOld = GetOldItem( rAttrs, SDRATTR_SHADOWYDIST ); + pOld = GetOldItem( *rAttrs, SDRATTR_SHADOWYDIST ); if ( nY != nOldY && ( !pOld || !( *(const SdrShadowYDistItem*)pOld == aYItem ) ) ) { - rAttrs.Put( aYItem ); + rAttrs->Put( aYItem ); bModified = true; } } @@ -324,10 +324,10 @@ bool SvxShadowTabPage::FillItemSet( SfxItemSet& rAttrs ) m_pLbShadowColor->IsValueChangedFromSaved() ) { SdrShadowColorItem aItem(m_pLbShadowColor->GetSelectEntryColor()); - pOld = GetOldItem( rAttrs, SDRATTR_SHADOWCOLOR ); + pOld = GetOldItem( *rAttrs, SDRATTR_SHADOWCOLOR ); if ( !pOld || !( *(const SdrShadowColorItem*)pOld == aItem ) ) { - rAttrs.Put( aItem ); + rAttrs->Put( aItem ); bModified = true; } } @@ -337,16 +337,16 @@ bool SvxShadowTabPage::FillItemSet( SfxItemSet& rAttrs ) if( m_pMtrTransparent->IsValueChangedFromSaved() ) { SdrShadowTransparenceItem aItem( nVal ); - pOld = GetOldItem( rAttrs, SDRATTR_SHADOWTRANSPARENCE ); + pOld = GetOldItem( *rAttrs, SDRATTR_SHADOWTRANSPARENCE ); if ( !pOld || !( *(const SdrShadowTransparenceItem*)pOld == aItem ) ) { - rAttrs.Put( aItem ); + rAttrs->Put( aItem ); bModified = true; } } } - rAttrs.Put (CntUInt16Item(SID_PAGE_TYPE,nPageType)); + rAttrs->Put (CntUInt16Item(SID_PAGE_TYPE,nPageType)); return( bModified ); } diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx index 629085bfdb44..6f680cccc34a 100644 --- a/cui/source/tabpages/transfrm.cxx +++ b/cui/source/tabpages/transfrm.cxx @@ -269,7 +269,7 @@ void SvxAngleTabPage::Construct() } } -bool SvxAngleTabPage::FillItemSet(SfxItemSet& rSet) +bool SvxAngleTabPage::FillItemSet(SfxItemSet* rSet) { bool bModified = false; @@ -279,9 +279,9 @@ bool SvxAngleTabPage::FillItemSet(SfxItemSet& rSet) const double fTmpX((GetCoreValue(*m_pMtrPosX, ePoolUnit) + maAnchor.getX()) * fUIScale); const double fTmpY((GetCoreValue(*m_pMtrPosY, ePoolUnit) + maAnchor.getY()) * fUIScale); - rSet.Put(SfxInt32Item(GetWhich(SID_ATTR_TRANSFORM_ANGLE), m_pCtlAngle->GetRotation())); - rSet.Put(SfxInt32Item(GetWhich(SID_ATTR_TRANSFORM_ROT_X), basegfx::fround(fTmpX))); - rSet.Put(SfxInt32Item(GetWhich(SID_ATTR_TRANSFORM_ROT_Y), basegfx::fround(fTmpY))); + rSet->Put(SfxInt32Item(GetWhich(SID_ATTR_TRANSFORM_ANGLE), m_pCtlAngle->GetRotation())); + rSet->Put(SfxInt32Item(GetWhich(SID_ATTR_TRANSFORM_ROT_X), basegfx::fround(fTmpX))); + rSet->Put(SfxInt32Item(GetWhich(SID_ATTR_TRANSFORM_ROT_Y), basegfx::fround(fTmpY))); bModified = true; } @@ -355,7 +355,7 @@ int SvxAngleTabPage::DeactivatePage( SfxItemSet* _pSet ) { if(_pSet) { - FillItemSet(*_pSet); + FillItemSet(_pSet); } return LEAVE_PAGE; @@ -469,7 +469,7 @@ void SvxSlantTabPage::Construct() -bool SvxSlantTabPage::FillItemSet(SfxItemSet& rAttrs) +bool SvxSlantTabPage::FillItemSet(SfxItemSet* rAttrs) { bool bModified = false; OUString aStr = m_pMtrRadius->GetText(); @@ -480,7 +480,7 @@ bool SvxSlantTabPage::FillItemSet(SfxItemSet& rAttrs) long nTmp = GetCoreValue( *m_pMtrRadius, ePoolUnit ); nTmp = Fraction( nTmp ) * aUIScale; - rAttrs.Put( SdrEckenradiusItem( nTmp ) ); + rAttrs->Put( SdrEckenradiusItem( nTmp ) ); bModified = true; } @@ -489,7 +489,7 @@ bool SvxSlantTabPage::FillItemSet(SfxItemSet& rAttrs) if( m_pMtrAngle->IsValueChangedFromSaved() ) { sal_Int32 nValue = static_cast<sal_Int32>(m_pMtrAngle->GetValue()); - rAttrs.Put( SfxInt32Item( SID_ATTR_TRANSFORM_SHEAR, nValue ) ); + rAttrs->Put( SfxInt32Item( SID_ATTR_TRANSFORM_SHEAR, nValue ) ); bModified = true; } @@ -501,9 +501,9 @@ bool SvxSlantTabPage::FillItemSet(SfxItemSet& rAttrs) pView->GetSdrPageView()->LogicToPagePos(aObjectRect); Point aPt = aObjectRect.Center(); - rAttrs.Put(SfxInt32Item(SID_ATTR_TRANSFORM_SHEAR_X, aPt.X())); - rAttrs.Put(SfxInt32Item(SID_ATTR_TRANSFORM_SHEAR_Y, aPt.Y())); - rAttrs.Put( SfxBoolItem( SID_ATTR_TRANSFORM_SHEAR_VERTICAL, false ) ); + rAttrs->Put(SfxInt32Item(SID_ATTR_TRANSFORM_SHEAR_X, aPt.X())); + rAttrs->Put(SfxInt32Item(SID_ATTR_TRANSFORM_SHEAR_Y, aPt.Y())); + rAttrs->Put( SfxBoolItem( SID_ATTR_TRANSFORM_SHEAR_VERTICAL, false ) ); } return( bModified ); @@ -596,7 +596,7 @@ int SvxSlantTabPage::DeactivatePage( SfxItemSet* _pSet ) { if(_pSet) { - FillItemSet(*_pSet); + FillItemSet(_pSet); } return LEAVE_PAGE; @@ -773,7 +773,7 @@ void SvxPositionSizeTabPage::Construct() -bool SvxPositionSizeTabPage::FillItemSet( SfxItemSet& rOutAttrs ) +bool SvxPositionSizeTabPage::FillItemSet( SfxItemSet* rOutAttrs ) { bool bModified(false); @@ -804,8 +804,8 @@ bool SvxPositionSizeTabPage::FillItemSet( SfxItemSet& rOutAttrs ) // #101581# GetTopLeftPosition(...) needs coordinates after UI scaling, in real PagePositions GetTopLeftPosition(fX, fY, maRange); - rOutAttrs.Put(SfxInt32Item(GetWhich(SID_ATTR_TRANSFORM_POS_X), basegfx::fround(fX))); - rOutAttrs.Put(SfxInt32Item(GetWhich(SID_ATTR_TRANSFORM_POS_Y), basegfx::fround(fY))); + rOutAttrs->Put(SfxInt32Item(GetWhich(SID_ATTR_TRANSFORM_POS_X), basegfx::fround(fX))); + rOutAttrs->Put(SfxInt32Item(GetWhich(SID_ATTR_TRANSFORM_POS_Y), basegfx::fround(fY))); bModified = true; } @@ -814,11 +814,11 @@ bool SvxPositionSizeTabPage::FillItemSet( SfxItemSet& rOutAttrs ) { if( m_pTsbPosProtect->GetState() == TRISTATE_INDET ) { - rOutAttrs.InvalidateItem( SID_ATTR_TRANSFORM_PROTECT_POS ); + rOutAttrs->InvalidateItem( SID_ATTR_TRANSFORM_PROTECT_POS ); } else { - rOutAttrs.Put( + rOutAttrs->Put( SfxBoolItem( GetWhich( SID_ATTR_TRANSFORM_PROTECT_POS ), m_pTsbPosProtect->GetState() == TRISTATE_TRUE ? sal_True : sal_False ) ); } @@ -846,18 +846,18 @@ bool SvxPositionSizeTabPage::FillItemSet( SfxItemSet& rOutAttrs ) lHeight = static_cast<long>(m_pMtrHeight->Denormalize( lHeight )); // put Width & Height to itemset - rOutAttrs.Put( SfxUInt32Item( GetWhich( SID_ATTR_TRANSFORM_WIDTH ), (sal_uInt32) lWidth ) ); - rOutAttrs.Put( SfxUInt32Item( GetWhich( SID_ATTR_TRANSFORM_HEIGHT ), (sal_uInt32) lHeight ) ); - rOutAttrs.Put( SfxAllEnumItem( GetWhich( SID_ATTR_TRANSFORM_SIZE_POINT ), sal::static_int_cast< sal_uInt16 >( meRP ) ) ); + rOutAttrs->Put( SfxUInt32Item( GetWhich( SID_ATTR_TRANSFORM_WIDTH ), (sal_uInt32) lWidth ) ); + rOutAttrs->Put( SfxUInt32Item( GetWhich( SID_ATTR_TRANSFORM_HEIGHT ), (sal_uInt32) lHeight ) ); + rOutAttrs->Put( SfxAllEnumItem( GetWhich( SID_ATTR_TRANSFORM_SIZE_POINT ), sal::static_int_cast< sal_uInt16 >( meRP ) ) ); bModified = true; } if ( m_pTsbSizeProtect->IsValueChangedFromSaved() ) { if ( m_pTsbSizeProtect->GetState() == TRISTATE_INDET ) - rOutAttrs.InvalidateItem( SID_ATTR_TRANSFORM_PROTECT_SIZE ); + rOutAttrs->InvalidateItem( SID_ATTR_TRANSFORM_PROTECT_SIZE ); else - rOutAttrs.Put( + rOutAttrs->Put( SfxBoolItem( GetWhich( SID_ATTR_TRANSFORM_PROTECT_SIZE ), m_pTsbSizeProtect->GetState() == TRISTATE_TRUE ? sal_True : sal_False ) ); bModified = true; @@ -868,9 +868,9 @@ bool SvxPositionSizeTabPage::FillItemSet( SfxItemSet& rOutAttrs ) if ( !m_pTsbAutoGrowWidth->IsTriStateEnabled() ) { if( m_pTsbAutoGrowWidth->GetState() == TRISTATE_INDET ) - rOutAttrs.InvalidateItem( SID_ATTR_TRANSFORM_AUTOWIDTH ); + rOutAttrs->InvalidateItem( SID_ATTR_TRANSFORM_AUTOWIDTH ); else - rOutAttrs.Put( + rOutAttrs->Put( SfxBoolItem( GetWhich( SID_ATTR_TRANSFORM_AUTOWIDTH ), m_pTsbAutoGrowWidth->GetState() == TRISTATE_TRUE ? sal_True : sal_False ) ); } @@ -882,9 +882,9 @@ bool SvxPositionSizeTabPage::FillItemSet( SfxItemSet& rOutAttrs ) if ( !m_pTsbAutoGrowHeight->IsTriStateEnabled() ) { if( m_pTsbAutoGrowHeight->GetState() == TRISTATE_INDET ) - rOutAttrs.InvalidateItem( SID_ATTR_TRANSFORM_AUTOHEIGHT ); + rOutAttrs->InvalidateItem( SID_ATTR_TRANSFORM_AUTOHEIGHT ); else - rOutAttrs.Put( + rOutAttrs->Put( SfxBoolItem( GetWhich( SID_ATTR_TRANSFORM_AUTOHEIGHT ), m_pTsbAutoGrowHeight->GetState() == TRISTATE_TRUE ? sal_True : sal_False ) ); } @@ -1048,7 +1048,7 @@ int SvxPositionSizeTabPage::DeactivatePage( SfxItemSet* _pSet ) basegfx::fround(fX + maRange.getWidth()), basegfx::fround(fY + maRange.getHeight())); _pSet->Put(SfxRectangleItem(SID_ATTR_TRANSFORM_INTERN, aOutRectangle)); - FillItemSet(*_pSet); + FillItemSet(_pSet); } return LEAVE_PAGE; diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx index 573a8feafa65..00648f52da29 100644 --- a/dbaccess/source/ui/dlg/ConnectionPage.cxx +++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx @@ -278,25 +278,25 @@ namespace dbaui OConnectionHelper::fillControls(_rControlList); } - bool OConnectionTabPage::FillItemSet(SfxItemSet& _rSet) + bool OConnectionTabPage::FillItemSet(SfxItemSet* _rSet) { bool bChangedSomething = false; if (m_aUserName.IsValueChangedFromSaved()) { - _rSet.Put(SfxStringItem(DSID_USER, m_aUserName.GetText())); - _rSet.Put(SfxStringItem(DSID_PASSWORD, OUString())); + _rSet->Put(SfxStringItem(DSID_USER, m_aUserName.GetText())); + _rSet->Put(SfxStringItem(DSID_PASSWORD, OUString())); bChangedSomething = true; } - fillBool(_rSet,&m_aPasswordRequired,DSID_PASSWORDREQUIRED,bChangedSomething); + fillBool(*_rSet,&m_aPasswordRequired,DSID_PASSWORDREQUIRED,bChangedSomething); if ( m_pCollection->determineType(m_eType) == ::dbaccess::DST_JDBC ) { - fillString(_rSet,&m_aJavaDriver, DSID_JDBCDRIVERCLASS, bChangedSomething); + fillString(*_rSet,&m_aJavaDriver, DSID_JDBCDRIVERCLASS, bChangedSomething); } - fillString(_rSet,&m_aConnectionURL, DSID_CONNECTURL, bChangedSomething); + fillString(*_rSet,&m_aConnectionURL, DSID_CONNECTURL, bChangedSomething); return bChangedSomething; } diff --git a/dbaccess/source/ui/dlg/ConnectionPage.hxx b/dbaccess/source/ui/dlg/ConnectionPage.hxx index df10774033f8..8ce9296020dc 100644 --- a/dbaccess/source/ui/dlg/ConnectionPage.hxx +++ b/dbaccess/source/ui/dlg/ConnectionPage.hxx @@ -58,7 +58,7 @@ namespace dbaui public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& _rAttrSet ); - virtual bool FillItemSet (SfxItemSet& _rCoreAttrs) SAL_OVERRIDE; + virtual bool FillItemSet (SfxItemSet* _rCoreAttrs) SAL_OVERRIDE; virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx index cc25f65f0a51..e775dbcaba86 100644 --- a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx +++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx @@ -180,10 +180,10 @@ namespace dbaui return commitURL(); } - bool OConnectionTabPageSetup::FillItemSet(SfxItemSet& _rSet) + bool OConnectionTabPageSetup::FillItemSet(SfxItemSet* _rSet) { bool bChangedSomething = false; - fillString(_rSet,&m_aConnectionURL, DSID_CONNECTURL, bChangedSomething); + fillString(*_rSet,&m_aConnectionURL, DSID_CONNECTURL, bChangedSomething); return bChangedSomething; } bool OConnectionTabPageSetup::checkTestConnection() diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx index f5aac6ec8400..a7b707fa52f5 100644 --- a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx +++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx @@ -51,7 +51,7 @@ namespace dbaui static OGenericAdministrationPage* CreateODBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); static OGenericAdministrationPage* CreateUserDefinedTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); - virtual bool FillItemSet (SfxItemSet& _rCoreAttrs) SAL_OVERRIDE; + virtual bool FillItemSet (SfxItemSet* _rCoreAttrs) SAL_OVERRIDE; virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) SAL_OVERRIDE; diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx index 853e5cbe60c2..27d5b97134f1 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx @@ -116,10 +116,10 @@ using namespace ::com::sun::star; m_pTextConnectionHelper->implInitControls(_rSet, bValid); } - bool OTextConnectionPageSetup::FillItemSet( SfxItemSet& _rSet ) + bool OTextConnectionPageSetup::FillItemSet( SfxItemSet* _rSet ) { bool bChangedSomething = OConnectionTabPageSetup::FillItemSet(_rSet); - bChangedSomething = m_pTextConnectionHelper->FillItemSet(_rSet, bChangedSomething); + bChangedSomething = m_pTextConnectionHelper->FillItemSet(*_rSet, bChangedSomething); return bChangedSomething; } @@ -156,15 +156,15 @@ using namespace ::com::sun::star; FreeResource(); } - bool OLDAPConnectionPageSetup::FillItemSet( SfxItemSet& _rSet ) + bool OLDAPConnectionPageSetup::FillItemSet( SfxItemSet* _rSet ) { bool bChangedSomething = false; - fillString(_rSet,&m_aETBaseDN,DSID_CONN_LDAP_BASEDN, bChangedSomething); - fillInt32(_rSet,&m_aNFPortNumber,DSID_CONN_LDAP_PORTNUMBER,bChangedSomething); + fillString(*_rSet,&m_aETBaseDN,DSID_CONN_LDAP_BASEDN, bChangedSomething); + fillInt32(*_rSet,&m_aNFPortNumber,DSID_CONN_LDAP_PORTNUMBER,bChangedSomething); if ( m_aETHostServer.IsValueChangedFromSaved() ) { - DbuTypeCollectionItem* pCollectionItem = PTR_CAST(DbuTypeCollectionItem, _rSet.GetItem(DSID_TYPECOLLECTION)); + DbuTypeCollectionItem* pCollectionItem = PTR_CAST(DbuTypeCollectionItem, _rSet->GetItem(DSID_TYPECOLLECTION)); ::dbaccess::ODsnTypeCollection* pCollection = NULL; if (pCollectionItem) pCollection = pCollectionItem->getCollection(); @@ -173,12 +173,12 @@ using namespace ::com::sun::star; { OUString sUrl = pCollection->getPrefix( OUString("sdbc:address:ldap:")); sUrl += m_aETHostServer.GetText(); - _rSet.Put(SfxStringItem(DSID_CONNECTURL, sUrl)); + _rSet->Put(SfxStringItem(DSID_CONNECTURL, sUrl)); bChangedSomething = true; } } - fillBool(_rSet,&m_aCBUseSSL,DSID_CONN_LDAP_USESSL,bChangedSomething); + fillBool(*_rSet,&m_aCBUseSSL,DSID_CONN_LDAP_USESSL,bChangedSomething); return bChangedSomething; } void OLDAPConnectionPageSetup::fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) @@ -283,7 +283,7 @@ using namespace ::com::sun::star; { } - bool OMySQLIntroPageSetup::FillItemSet(SfxItemSet& /*_rSet*/) + bool OMySQLIntroPageSetup::FillItemSet(SfxItemSet* /*_rSet*/) { OSL_FAIL("Who called me?! Please ask oj for more information."); return true; @@ -331,7 +331,7 @@ using namespace ::com::sun::star; m_aMySQLSettings.fillWindows( _rControlList ); } - bool MySQLNativeSetupPage::FillItemSet( SfxItemSet& _rSet ) + bool MySQLNativeSetupPage::FillItemSet( SfxItemSet* _rSet ) { return m_aMySQLSettings.FillItemSet( _rSet ); } @@ -441,13 +441,13 @@ using namespace ::com::sun::star; _rControlList.push_back(new ODisableWrapper<FixedText>(&m_aFTDriverClass)); } - bool OGeneralSpecialJDBCConnectionPageSetup::FillItemSet( SfxItemSet& _rSet ) + bool OGeneralSpecialJDBCConnectionPageSetup::FillItemSet( SfxItemSet* _rSet ) { bool bChangedSomething = false; - fillString(_rSet,&m_aETDriverClass,DSID_JDBCDRIVERCLASS,bChangedSomething); - fillString(_rSet,&m_aETHostname,DSID_CONN_HOSTNAME,bChangedSomething); - fillString(_rSet,&m_aETDatabasename,DSID_DATABASENAME,bChangedSomething); - fillInt32(_rSet,&m_aNFPortNumber,m_nPortId,bChangedSomething ); + fillString(*_rSet,&m_aETDriverClass,DSID_JDBCDRIVERCLASS,bChangedSomething); + fillString(*_rSet,&m_aETHostname,DSID_CONN_HOSTNAME,bChangedSomething); + fillString(*_rSet,&m_aETDatabasename,DSID_DATABASENAME,bChangedSomething); + fillInt32(*_rSet,&m_aNFPortNumber,m_nPortId,bChangedSomething ); return bChangedSomething; } @@ -553,10 +553,10 @@ using namespace ::com::sun::star; _rControlList.push_back(new ODisableWrapper<FixedText>(&m_aFTDriverClass)); } - bool OJDBCConnectionPageSetup::FillItemSet( SfxItemSet& _rSet ) + bool OJDBCConnectionPageSetup::FillItemSet( SfxItemSet* _rSet ) { bool bChangedSomething = OConnectionTabPageSetup::FillItemSet(_rSet); - fillString(_rSet,&m_aETDriverClass,DSID_JDBCDRIVERCLASS,bChangedSomething); + fillString(*_rSet,&m_aETDriverClass,DSID_JDBCDRIVERCLASS,bChangedSomething); return bChangedSomething; } @@ -670,10 +670,10 @@ using namespace ::com::sun::star; OConnectionTabPageSetup::implInitControls(_rSet, _bSaveValue); } - bool OSpreadSheetConnectionPageSetup::FillItemSet( SfxItemSet& _rSet ) + bool OSpreadSheetConnectionPageSetup::FillItemSet( SfxItemSet* _rSet ) { bool bChangedSomething = OConnectionTabPageSetup::FillItemSet(_rSet); - fillBool(_rSet,&m_aCBPasswordrequired,DSID_PASSWORDREQUIRED,bChangedSomething); + fillBool(*_rSet,&m_aCBPasswordrequired,DSID_PASSWORDREQUIRED,bChangedSomething); return bChangedSomething; } @@ -734,17 +734,17 @@ using namespace ::com::sun::star; m_aETUserName.ClearModifyFlag(); } - bool OAuthentificationPageSetup::FillItemSet( SfxItemSet& _rSet ) + bool OAuthentificationPageSetup::FillItemSet( SfxItemSet* _rSet ) { bool bChangedSomething = false; if (m_aETUserName.IsValueChangedFromSaved()) { - _rSet.Put(SfxStringItem(DSID_USER, m_aETUserName.GetText())); - _rSet.Put(SfxStringItem(DSID_PASSWORD, OUString())); + _rSet->Put(SfxStringItem(DSID_USER, m_aETUserName.GetText())); + _rSet->Put(SfxStringItem(DSID_PASSWORD, OUString())); bChangedSomething = true; } - fillBool(_rSet,&m_aCBPasswordRequired,DSID_PASSWORDREQUIRED,bChangedSomething); + fillBool(*_rSet,&m_aCBPasswordRequired,DSID_PASSWORDREQUIRED,bChangedSomething); return bChangedSomething; } @@ -818,7 +818,7 @@ using namespace ::com::sun::star; m_pCBStartTableWizard->Enable(_bSupportsTableCreation); } - bool OFinalDBPageSetup::FillItemSet( SfxItemSet& /*_rSet*/ ) + bool OFinalDBPageSetup::FillItemSet( SfxItemSet* /*_rSet*/ ) { return true; } diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx index f903b6824036..a8c3d7c65a5a 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx @@ -39,7 +39,7 @@ namespace dbaui class OSpreadSheetConnectionPageSetup : public OConnectionTabPageSetup { public: - virtual bool FillItemSet ( SfxItemSet& _rCoreAttrs ) SAL_OVERRIDE; + virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; static OGenericAdministrationPage* CreateSpreadSheetTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); OSpreadSheetConnectionPageSetup(Window* pParent, const SfxItemSet& _rCoreAttrs); @@ -58,7 +58,7 @@ namespace dbaui class OTextConnectionPageSetup : public OConnectionTabPageSetup { public: - virtual bool FillItemSet ( SfxItemSet& _rCoreAttrs ) SAL_OVERRIDE; + virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; static OGenericAdministrationPage* CreateTextTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); OTextConnectionPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs ); OTextConnectionHelper* m_pTextConnectionHelper; @@ -80,7 +80,7 @@ namespace dbaui class OLDAPConnectionPageSetup : public OGenericAdministrationPage { public: - virtual bool FillItemSet ( SfxItemSet& _rCoreAttrs ) SAL_OVERRIDE; + virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; static OGenericAdministrationPage* CreateLDAPTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); OLDAPConnectionPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs ); virtual Link getControlModifiedLink() SAL_OVERRIDE { return LINK(this, OLDAPConnectionPageSetup, OnEditModified); } @@ -121,7 +121,7 @@ namespace dbaui virtual void fillControls( ::std::vector< ISaveValueWrapper* >& _rControlList ) SAL_OVERRIDE; virtual void fillWindows( ::std::vector< ISaveValueWrapper* >& _rControlList ) SAL_OVERRIDE; - virtual bool FillItemSet( SfxItemSet& _rCoreAttrs ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; virtual Link getControlModifiedLink() SAL_OVERRIDE; @@ -146,7 +146,7 @@ namespace dbaui static OGenericAdministrationPage* CreateOracleJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); protected: - virtual bool FillItemSet( SfxItemSet& _rCoreAttrs ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; @@ -181,7 +181,7 @@ namespace dbaui protected: virtual bool checkTestConnection() SAL_OVERRIDE; - virtual bool FillItemSet( SfxItemSet& _rCoreAttrs ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; @@ -214,7 +214,7 @@ namespace dbaui DECL_LINK(ImplClickHdl, OMySQLIntroPageSetup*); protected: - virtual bool FillItemSet(SfxItemSet& _rSet) SAL_OVERRIDE; + virtual bool FillItemSet(SfxItemSet* _rSet) SAL_OVERRIDE; virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; @@ -236,7 +236,7 @@ namespace dbaui class OAuthentificationPageSetup : public OGenericAdministrationPage { public: - virtual bool FillItemSet ( SfxItemSet& _rCoreAttrs ) SAL_OVERRIDE; + virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; static OGenericAdministrationPage* CreateAuthentificationTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); OAuthentificationPageSetup(Window* pParent, const SfxItemSet& _rCoreAttrs); @@ -259,7 +259,7 @@ namespace dbaui class OFinalDBPageSetup : public OGenericAdministrationPage { public: - virtual bool FillItemSet ( SfxItemSet& _rCoreAttrs ) SAL_OVERRIDE; + virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; static OGenericAdministrationPage* CreateFinalDBTabPageSetup( Window* pParent, const SfxItemSet& _rAttrSet); FixedText* m_pFTFinalHeader; diff --git a/dbaccess/source/ui/dlg/admincontrols.cxx b/dbaccess/source/ui/dlg/admincontrols.cxx index a33958dc4b7f..e87ba7d33df8 100644 --- a/dbaccess/source/ui/dlg/admincontrols.cxx +++ b/dbaccess/source/ui/dlg/admincontrols.cxx @@ -192,17 +192,17 @@ namespace dbaui _rControlList.push_back( new ODisableWrapper< RadioButton >( &m_aNamedPipeRadio ) ); } - bool MySQLNativeSettings::FillItemSet( SfxItemSet& _rSet ) + bool MySQLNativeSettings::FillItemSet( SfxItemSet* _rSet ) { bool bChangedSomething = false; - OGenericAdministrationPage::fillString( _rSet, &m_aHostName, DSID_CONN_HOSTNAME, bChangedSomething ); - OGenericAdministrationPage::fillString( _rSet, &m_aDatabaseName, DSID_DATABASENAME, bChangedSomething ); - OGenericAdministrationPage::fillInt32 ( _rSet, &m_aPort, DSID_MYSQL_PORTNUMBER, bChangedSomething ); + OGenericAdministrationPage::fillString( *_rSet, &m_aHostName, DSID_CONN_HOSTNAME, bChangedSomething ); + OGenericAdministrationPage::fillString( *_rSet, &m_aDatabaseName, DSID_DATABASENAME, bChangedSomething ); + OGenericAdministrationPage::fillInt32 ( *_rSet, &m_aPort, DSID_MYSQL_PORTNUMBER, bChangedSomething ); #ifdef UNX - OGenericAdministrationPage::fillString( _rSet, &m_aSocket, DSID_CONN_SOCKET, bChangedSomething ); + OGenericAdministrationPage::fillString( *_rSet, &m_aSocket, DSID_CONN_SOCKET, bChangedSomething ); #else - OGenericAdministrationPage::fillString( _rSet, &m_aNamedPipe, DSID_NAMED_PIPE, bChangedSomething ); + OGenericAdministrationPage::fillString( *_rSet, &m_aNamedPipe, DSID_NAMED_PIPE, bChangedSomething ); #endif return bChangedSomething; diff --git a/dbaccess/source/ui/dlg/admincontrols.hxx b/dbaccess/source/ui/dlg/admincontrols.hxx index c2621933aca9..8147c9c73faa 100644 --- a/dbaccess/source/ui/dlg/admincontrols.hxx +++ b/dbaccess/source/ui/dlg/admincontrols.hxx @@ -58,7 +58,7 @@ namespace dbaui void fillControls( ::std::vector< ISaveValueWrapper* >& _rControlList ); void fillWindows( ::std::vector< ISaveValueWrapper* >& _rControlList ); - bool FillItemSet( SfxItemSet& _rCoreAttrs ); + bool FillItemSet( SfxItemSet* _rCoreAttrs ); void implInitControls( const SfxItemSet& _rSet ); bool canAdvance() const; diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx index 24a66a4d1d54..5f62953bb30d 100644 --- a/dbaccess/source/ui/dlg/adminpages.cxx +++ b/dbaccess/source/ui/dlg/adminpages.cxx @@ -92,7 +92,7 @@ namespace dbaui { if (!prepareLeave()) return KEEP_PAGE; - FillItemSet(*_pSet); + FillItemSet(_pSet); } return LEAVE_PAGE; diff --git a/dbaccess/source/ui/dlg/advancedsettings.cxx b/dbaccess/source/ui/dlg/advancedsettings.cxx index 288f94377d7f..8ebc9967f92c 100644 --- a/dbaccess/source/ui/dlg/advancedsettings.cxx +++ b/dbaccess/source/ui/dlg/advancedsettings.cxx @@ -264,7 +264,7 @@ namespace dbaui OGenericAdministrationPage::implInitControls(_rSet, _bSaveValue); } - bool SpecialSettingsPage::FillItemSet( SfxItemSet& _rSet ) + bool SpecialSettingsPage::FillItemSet( SfxItemSet* _rSet ) { bool bChangedSomething = false; @@ -276,7 +276,7 @@ namespace dbaui { if ( !*setting->ppControl ) continue; - fillBool( _rSet, *setting->ppControl, setting->nItemId, bChangedSomething, setting->bInvertedDisplay ); + fillBool( *_rSet, *setting->ppControl, setting->nItemId, bChangedSomething, setting->bInvertedDisplay ); } // the non-boolean items @@ -284,13 +284,13 @@ namespace dbaui { if ( m_pBooleanComparisonMode->IsValueChangedFromSaved() ) { - _rSet.Put( SfxInt32Item( DSID_BOOLEANCOMPARISON, m_pBooleanComparisonMode->GetSelectEntryPos() ) ); + _rSet->Put( SfxInt32Item( DSID_BOOLEANCOMPARISON, m_pBooleanComparisonMode->GetSelectEntryPos() ) ); bChangedSomething = true; } } if ( m_bHasMaxRowScan ) { - fillInt32(_rSet,m_pMaxRowScan,DSID_MAX_ROW_SCAN,bChangedSomething); + fillInt32(*_rSet,m_pMaxRowScan,DSID_MAX_ROW_SCAN,bChangedSomething); } return bChangedSomething; } @@ -357,13 +357,13 @@ namespace dbaui OGenericAdministrationPage::implInitControls( _rSet, _bSaveValue ); } - bool GeneratedValuesPage::FillItemSet(SfxItemSet& _rSet) + bool GeneratedValuesPage::FillItemSet(SfxItemSet* _rSet) { bool bChangedSomething = false; - fillString( _rSet, m_pAutoIncrement, DSID_AUTOINCREMENTVALUE, bChangedSomething ); - fillBool( _rSet, m_pAutoRetrievingEnabled, DSID_AUTORETRIEVEENABLED, bChangedSomething ); - fillString( _rSet, m_pAutoRetrieving, DSID_AUTORETRIEVEVALUE, bChangedSomething ); + fillString( *_rSet, m_pAutoIncrement, DSID_AUTOINCREMENTVALUE, bChangedSomething ); + fillBool( *_rSet, m_pAutoRetrievingEnabled, DSID_AUTORETRIEVEENABLED, bChangedSomething ); + fillString( *_rSet, m_pAutoRetrieving, DSID_AUTORETRIEVEVALUE, bChangedSomething ); return bChangedSomething; } diff --git a/dbaccess/source/ui/dlg/advancedsettings.hxx b/dbaccess/source/ui/dlg/advancedsettings.hxx index acb3532b42f9..543d82a3bcbd 100644 --- a/dbaccess/source/ui/dlg/advancedsettings.hxx +++ b/dbaccess/source/ui/dlg/advancedsettings.hxx @@ -72,7 +72,7 @@ namespace dbaui bool m_bHasMaxRowScan; public: - virtual bool FillItemSet ( SfxItemSet& _rCoreAttrs ) SAL_OVERRIDE; + virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; SpecialSettingsPage(Window* pParent, const SfxItemSet& _rCoreAttrs, const DataSourceMetaData& _rDSMeta ); @@ -108,7 +108,7 @@ namespace dbaui m_aControlDependencies; public: - virtual bool FillItemSet (SfxItemSet& _rCoreAttrs) SAL_OVERRIDE; + virtual bool FillItemSet (SfxItemSet* _rCoreAttrs) SAL_OVERRIDE; GeneratedValuesPage( Window* pParent, const SfxItemSet& _rCoreAttrs ); protected: diff --git a/dbaccess/source/ui/dlg/dbwiz.cxx b/dbaccess/source/ui/dlg/dbwiz.cxx index 30779c7ad23b..559e9c373170 100644 --- a/dbaccess/source/ui/dlg/dbwiz.cxx +++ b/dbaccess/source/ui/dlg/dbwiz.cxx @@ -300,7 +300,7 @@ bool ODbTypeWizDialog::leaveState(WizardState _nState) { SfxTabPage* pPage = static_cast<SfxTabPage*>(WizardDialog::GetPage(_nState)); if ( pPage ) - pPage->FillItemSet(*m_pOutSet); + pPage->FillItemSet(m_pOutSet); return true; } @@ -324,7 +324,7 @@ bool ODbTypeWizDialog::saveDatasource() { SfxTabPage* pPage = static_cast<SfxTabPage*>(WizardDialog::GetPage(getCurrentState())); if ( pPage ) - pPage->FillItemSet(*m_pOutSet); + pPage->FillItemSet(m_pOutSet); OUString sOldURL; if ( m_pImpl->getCurrentDataSource().is() ) diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx index 39a655ba7bcb..b2db57842934 100644 --- a/dbaccess/source/ui/dlg/dbwizsetup.cxx +++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx @@ -642,7 +642,7 @@ bool ODbTypeWizDialogSetup::saveDatasource() { SfxTabPage* pPage = static_cast<SfxTabPage*>(WizardDialog::GetPage(getCurrentState())); if ( pPage ) - pPage->FillItemSet(*m_pOutSet); + pPage->FillItemSet(m_pOutSet); return true; } diff --git a/dbaccess/source/ui/dlg/detailpages.cxx b/dbaccess/source/ui/dlg/detailpages.cxx index 16b192ef171e..7786afd89990 100644 --- a/dbaccess/source/ui/dlg/detailpages.cxx +++ b/dbaccess/source/ui/dlg/detailpages.cxx @@ -183,18 +183,18 @@ namespace dbaui OGenericAdministrationPage::implInitControls(_rSet, _bSaveValue); } - bool OCommonBehaviourTabPage::FillItemSet(SfxItemSet& _rSet) + bool OCommonBehaviourTabPage::FillItemSet(SfxItemSet* _rSet) { bool bChangedSomething = false; if ((m_nControlFlags & CBTP_USE_OPTIONS) == CBTP_USE_OPTIONS) { - fillString(_rSet,m_pOptions,DSID_ADDITIONALOPTIONS,bChangedSomething); + fillString(*_rSet,m_pOptions,DSID_ADDITIONALOPTIONS,bChangedSomething); } if ((m_nControlFlags & CBTP_USE_CHARSET) == CBTP_USE_CHARSET) { - if ( m_pCharset->StoreSelectedCharSet( _rSet, DSID_CHARSET ) ) + if ( m_pCharset->StoreSelectedCharSet( *_rSet, DSID_CHARSET ) ) bChangedSomething = true; } @@ -266,11 +266,11 @@ namespace dbaui OCommonBehaviourTabPage::implInitControls(_rSet, _bSaveValue); } - bool ODbaseDetailsPage::FillItemSet( SfxItemSet& _rSet ) + bool ODbaseDetailsPage::FillItemSet( SfxItemSet* _rSet ) { bool bChangedSomething = OCommonBehaviourTabPage::FillItemSet(_rSet); - fillBool(_rSet,&m_aShowDeleted,DSID_SHOWDELETEDROWS,bChangedSomething); + fillBool(*_rSet,&m_aShowDeleted,DSID_SHOWDELETEDROWS,bChangedSomething); return bChangedSomething; } @@ -330,10 +330,10 @@ namespace dbaui return ( new OOdbcDetailsPage( pParent, _rAttrSet ) ); } - bool OOdbcDetailsPage::FillItemSet( SfxItemSet& _rSet ) + bool OOdbcDetailsPage::FillItemSet( SfxItemSet* _rSet ) { bool bChangedSomething = OCommonBehaviourTabPage::FillItemSet(_rSet); - fillBool(_rSet,&m_aUseCatalog,DSID_USECATALOG,bChangedSomething); + fillBool(*_rSet,&m_aUseCatalog,DSID_USECATALOG,bChangedSomething); return bChangedSomething; } void OOdbcDetailsPage::fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) @@ -378,13 +378,13 @@ namespace dbaui return ( new OUserDriverDetailsPage( pParent, _rAttrSet ) ); } - bool OUserDriverDetailsPage::FillItemSet( SfxItemSet& _rSet ) + bool OUserDriverDetailsPage::FillItemSet( SfxItemSet* _rSet ) { bool bChangedSomething = OCommonBehaviourTabPage::FillItemSet(_rSet); - fillInt32(_rSet,&m_aNFPortNumber,DSID_CONN_PORTNUMBER,bChangedSomething); - fillString(_rSet,&m_aEDHostname,DSID_CONN_HOSTNAME,bChangedSomething); - fillBool(_rSet,&m_aUseCatalog,DSID_USECATALOG,bChangedSomething); + fillInt32(*_rSet,&m_aNFPortNumber,DSID_CONN_PORTNUMBER,bChangedSomething); + fillString(*_rSet,&m_aEDHostname,DSID_CONN_HOSTNAME,bChangedSomething); + fillBool(*_rSet,&m_aUseCatalog,DSID_USECATALOG,bChangedSomething); return bChangedSomething; } @@ -511,14 +511,14 @@ namespace dbaui _rControlList.push_back(new ODisableWrapper<FixedLine>(&m_aFL_1)); } - bool OGeneralSpecialJDBCDetailsPage::FillItemSet( SfxItemSet& _rSet ) + bool OGeneralSpecialJDBCDetailsPage::FillItemSet( SfxItemSet* _rSet ) { bool bChangedSomething = OCommonBehaviourTabPage::FillItemSet(_rSet); if ( m_bUseClass ) - fillString(_rSet,&m_aEDDriverClass,DSID_JDBCDRIVERCLASS,bChangedSomething); - fillString(_rSet,&m_aEDHostname,DSID_CONN_HOSTNAME,bChangedSomething); - fillString(_rSet,&m_aEDSocket,DSID_CONN_SOCKET,bChangedSomething); - fillInt32(_rSet,&m_aNFPortNumber,m_nPortId,bChangedSomething ); + fillString(*_rSet,&m_aEDDriverClass,DSID_JDBCDRIVERCLASS,bChangedSomething); + fillString(*_rSet,&m_aEDHostname,DSID_CONN_HOSTNAME,bChangedSomething); + fillString(*_rSet,&m_aEDSocket,DSID_CONN_SOCKET,bChangedSomething); + fillInt32(*_rSet,&m_aNFPortNumber,m_nPortId,bChangedSomething ); return bChangedSomething; } @@ -638,7 +638,7 @@ namespace dbaui _rControlList.push_back(new ODisableWrapper<FixedText>(&m_aUserNameLabel)); } - bool MySQLNativePage::FillItemSet( SfxItemSet& _rSet ) + bool MySQLNativePage::FillItemSet( SfxItemSet* _rSet ) { bool bChangedSomething = OCommonBehaviourTabPage::FillItemSet( _rSet ); @@ -646,11 +646,11 @@ namespace dbaui if ( m_aUserName.IsValueChangedFromSaved() ) { - _rSet.Put( SfxStringItem( DSID_USER, m_aUserName.GetText() ) ); - _rSet.Put( SfxStringItem( DSID_PASSWORD, OUString())); + _rSet->Put( SfxStringItem( DSID_USER, m_aUserName.GetText() ) ); + _rSet->Put( SfxStringItem( DSID_PASSWORD, OUString())); bChangedSomething = true; } - fillBool(_rSet,&m_aPasswordRequired,DSID_PASSWORDREQUIRED,bChangedSomething); + fillBool(*_rSet,&m_aPasswordRequired,DSID_PASSWORDREQUIRED,bChangedSomething); return bChangedSomething; } @@ -718,14 +718,14 @@ namespace dbaui return ( new OLDAPDetailsPage( pParent, _rAttrSet ) ); } - bool OLDAPDetailsPage::FillItemSet( SfxItemSet& _rSet ) + bool OLDAPDetailsPage::FillItemSet( SfxItemSet* _rSet ) { bool bChangedSomething = OCommonBehaviourTabPage::FillItemSet(_rSet); - fillString(_rSet,&m_aETBaseDN,DSID_CONN_LDAP_BASEDN,bChangedSomething); - fillInt32(_rSet,&m_aNFPortNumber,DSID_CONN_LDAP_PORTNUMBER,bChangedSomething); - fillInt32(_rSet,&m_aNFRowCount,DSID_CONN_LDAP_ROWCOUNT,bChangedSomething); - fillBool(_rSet,&m_aCBUseSSL,DSID_CONN_LDAP_USESSL,bChangedSomething); + fillString(*_rSet,&m_aETBaseDN,DSID_CONN_LDAP_BASEDN,bChangedSomething); + fillInt32(*_rSet,&m_aNFPortNumber,DSID_CONN_LDAP_PORTNUMBER,bChangedSomething); + fillInt32(*_rSet,&m_aNFRowCount,DSID_CONN_LDAP_ROWCOUNT,bChangedSomething); + fillBool(*_rSet,&m_aCBUseSSL,DSID_CONN_LDAP_USESSL,bChangedSomething); return bChangedSomething; } IMPL_LINK( OLDAPDetailsPage, OnCheckBoxClick, CheckBox*, pCheckBox ) @@ -826,10 +826,10 @@ namespace dbaui OCommonBehaviourTabPage::implInitControls(_rSet, _bSaveValue); } - bool OTextDetailsPage::FillItemSet( SfxItemSet& rSet ) + bool OTextDetailsPage::FillItemSet( SfxItemSet* rSet ) { bool bChangedSomething = OCommonBehaviourTabPage::FillItemSet(rSet); - bChangedSomething = m_pTextConnectionHelper->FillItemSet(rSet, bChangedSomething); + bChangedSomething = m_pTextConnectionHelper->FillItemSet(*rSet, bChangedSomething); return bChangedSomething; } diff --git a/dbaccess/source/ui/dlg/detailpages.hxx b/dbaccess/source/ui/dlg/detailpages.hxx index 1b0b5c9f76ae..bf74cd6a03a4 100644 --- a/dbaccess/source/ui/dlg/detailpages.hxx +++ b/dbaccess/source/ui/dlg/detailpages.hxx @@ -67,7 +67,7 @@ namespace dbaui sal_uInt32 m_nControlFlags; public: - virtual bool FillItemSet (SfxItemSet& _rCoreAttrs) SAL_OVERRIDE; + virtual bool FillItemSet (SfxItemSet* _rCoreAttrs) SAL_OVERRIDE; // nControlFlags is a combination of the CBTP_xxx-constants OCommonBehaviourTabPage(Window* pParent, sal_uInt16 nResId, const SfxItemSet& _rCoreAttrs, sal_uInt32 nControlFlags,bool _bFreeResource = true); @@ -89,7 +89,7 @@ namespace dbaui class ODbaseDetailsPage : public OCommonBehaviourTabPage { public: - virtual bool FillItemSet ( SfxItemSet& _rCoreAttrs ) SAL_OVERRIDE; + virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; ODbaseDetailsPage(Window* pParent, const SfxItemSet& _rCoreAttrs); private: @@ -128,7 +128,7 @@ namespace dbaui class OOdbcDetailsPage : public OCommonBehaviourTabPage { public: - virtual bool FillItemSet ( SfxItemSet& _rCoreAttrs ) SAL_OVERRIDE; + virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; OOdbcDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ); protected: @@ -144,7 +144,7 @@ namespace dbaui class OUserDriverDetailsPage : public OCommonBehaviourTabPage { public: - virtual bool FillItemSet ( SfxItemSet& _rCoreAttrs ) SAL_OVERRIDE; + virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; OUserDriverDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ); protected: @@ -178,7 +178,7 @@ namespace dbaui protected: - virtual bool FillItemSet( SfxItemSet& _rCoreAttrs ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; @@ -220,7 +220,7 @@ namespace dbaui CheckBox m_aPasswordRequired; protected: - virtual bool FillItemSet( SfxItemSet& _rCoreAttrs ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; @@ -230,7 +230,7 @@ namespace dbaui class OLDAPDetailsPage : public OCommonBehaviourTabPage { public: - virtual bool FillItemSet ( SfxItemSet& _rCoreAttrs ) SAL_OVERRIDE; + virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; OLDAPDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ); protected: @@ -266,7 +266,7 @@ namespace dbaui class OTextDetailsPage : public OCommonBehaviourTabPage { public: - virtual bool FillItemSet ( SfxItemSet& _rCoreAttrs ) SAL_OVERRIDE; + virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; OTextDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ); OTextConnectionHelper* m_pTextConnectionHelper; diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx index 5f5ba276c58f..b4b24832b61c 100644 --- a/dbaccess/source/ui/dlg/generalpage.cxx +++ b/dbaccess/source/ui/dlg/generalpage.cxx @@ -466,7 +466,7 @@ namespace dbaui m_pDatasourceType->Enable( bValid ); } - bool OGeneralPageDialog::FillItemSet( SfxItemSet& _rCoreAttrs ) + bool OGeneralPageDialog::FillItemSet( SfxItemSet* _rCoreAttrs ) { bool bChangedSomething = false; @@ -475,7 +475,7 @@ namespace dbaui if ( m_pDatasourceType->IsValueChangedFromSaved() ) { - _rCoreAttrs.Put( SfxStringItem( DSID_CONNECTURL, sURLPrefix ) ); + _rCoreAttrs->Put( SfxStringItem( DSID_CONNECTURL, sURLPrefix ) ); bChangedSomething = true; } @@ -626,7 +626,7 @@ namespace dbaui return OGeneralPage::approveDatasourceType( eType, _inout_rDisplayName ); } - bool OGeneralPageWizard::FillItemSet(SfxItemSet& _rCoreAttrs) + bool OGeneralPageWizard::FillItemSet(SfxItemSet* _rCoreAttrs) { bool bChangedSomething = false; @@ -634,7 +634,7 @@ namespace dbaui if ( m_pRB_CreateDatabase->IsChecked() ) { - _rCoreAttrs.Put( SfxStringItem( DSID_CONNECTURL, OUString( "sdbc:dbase:" ) ) ); + _rCoreAttrs->Put( SfxStringItem( DSID_CONNECTURL, OUString( "sdbc:dbase:" ) ) ); bChangedSomething = true; bCommitTypeSelection = false; } @@ -656,7 +656,7 @@ namespace dbaui || ( GetDatabaseCreationMode() != m_eOriginalCreationMode ) ) { - _rCoreAttrs.Put( SfxStringItem( DSID_CONNECTURL,sURLPrefix ) ); + _rCoreAttrs->Put( SfxStringItem( DSID_CONNECTURL,sURLPrefix ) ); bChangedSomething = true; } else diff --git a/dbaccess/source/ui/dlg/generalpage.hxx b/dbaccess/source/ui/dlg/generalpage.hxx index dd54e145788d..48f5b6d01741 100644 --- a/dbaccess/source/ui/dlg/generalpage.hxx +++ b/dbaccess/source/ui/dlg/generalpage.hxx @@ -105,7 +105,7 @@ namespace dbaui OGeneralPageDialog( Window* pParent, const SfxItemSet& _rItems ); protected: - virtual bool FillItemSet( SfxItemSet& _rCoreAttrs ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; virtual void implInitControls( const SfxItemSet& _rSet, bool _bSaveValue ) SAL_OVERRIDE; virtual void setParentTitle( const OUString& _sURLPrefix ) SAL_OVERRIDE; @@ -170,7 +170,7 @@ namespace dbaui DocumentDescriptor GetSelectedDocument() const; protected: - virtual bool FillItemSet( SfxItemSet& _rCoreAttrs ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; virtual void GetFocus() SAL_OVERRIDE; diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx index 9f1a4a77b530..a4b2860a9b93 100644 --- a/dbaccess/source/ui/dlg/tablespage.cxx +++ b/dbaccess/source/ui/dlg/tablespage.cxx @@ -546,10 +546,10 @@ namespace dbaui return pReturn; } - bool OTableSubscriptionPage::FillItemSet( SfxItemSet& _rCoreAttrs ) + bool OTableSubscriptionPage::FillItemSet( SfxItemSet* _rCoreAttrs ) { bool bValid, bReadonly; - getFlags(_rCoreAttrs, bValid, bReadonly); + getFlags(*_rCoreAttrs, bValid, bReadonly); if (!bValid || bReadonly) // don't store anything if the data we're working with is invalid or readonly @@ -568,7 +568,7 @@ namespace dbaui { aTableFilter = collectDetailedSelection(); } - _rCoreAttrs.Put( OStringListItem(DSID_TABLEFILTER, aTableFilter) ); + _rCoreAttrs->Put( OStringListItem(DSID_TABLEFILTER, aTableFilter) ); } return true; diff --git a/dbaccess/source/ui/dlg/tablespage.hxx b/dbaccess/source/ui/dlg/tablespage.hxx index b0cc2885dc90..acfeaa45834f 100644 --- a/dbaccess/source/ui/dlg/tablespage.hxx +++ b/dbaccess/source/ui/dlg/tablespage.hxx @@ -51,7 +51,7 @@ namespace dbaui OTableSubscriptionDialog* m_pTablesDlg; public: - virtual bool FillItemSet(SfxItemSet& _rCoreAttrs) SAL_OVERRIDE; + virtual bool FillItemSet(SfxItemSet* _rCoreAttrs) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet* _pSet) SAL_OVERRIDE; using OGenericAdministrationPage::DeactivatePage; diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx index 917397f3e845..a2af178fb6c6 100644 --- a/include/sfx2/dinfdlg.hxx +++ b/include/sfx2/dinfdlg.hxx @@ -219,7 +219,7 @@ private: protected: SfxDocumentPage( Window* pParent, const SfxItemSet& ); - virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE; public: @@ -242,7 +242,7 @@ private: protected: SfxDocumentDescPage( Window* pParent, const SfxItemSet& ); - virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE; public: @@ -506,7 +506,7 @@ private: protected: SfxCustomPropertiesPage( Window* pParent, const SfxItemSet& ); - virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; @@ -628,7 +628,7 @@ private: protected: SfxCmisPropertiesPage( Window* pParent, const SfxItemSet& ); - virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; diff --git a/include/sfx2/mgetempl.hxx b/include/sfx2/mgetempl.hxx index 6082fbe370b3..66d1cd2773d3 100644 --- a/include/sfx2/mgetempl.hxx +++ b/include/sfx2/mgetempl.hxx @@ -79,7 +79,7 @@ friend class SfxStyleDialog; static SfxTabPage* Create(Window *pParent, const SfxItemSet &rAttrSet ); protected: - virtual bool FillItemSet(SfxItemSet &) SAL_OVERRIDE; + virtual bool FillItemSet(SfxItemSet *) SAL_OVERRIDE; virtual void Reset(const SfxItemSet &) SAL_OVERRIDE; using TabPage::ActivatePage; diff --git a/include/sfx2/printopt.hxx b/include/sfx2/printopt.hxx index b0d3c8f381b6..629b5ad080ee 100644 --- a/include/sfx2/printopt.hxx +++ b/include/sfx2/printopt.hxx @@ -96,7 +96,7 @@ public: SfxCommonPrintOptionsTabPage( Window* pParent, const SfxItemSet& rSet ); virtual ~SfxCommonPrintOptionsTabPage(); - virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( 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 96b2017516dc..aeac0ee6a541 100644 --- a/include/sfx2/securitypage.hxx +++ b/include/sfx2/securitypage.hxx @@ -36,7 +36,7 @@ protected: SfxSecurityPage( Window* pParent, const SfxItemSet& ); virtual ~SfxSecurityPage(); - virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE; public: diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx index 98dfeddd87b9..34f5ef02a50a 100644 --- a/include/sfx2/tabdlg.hxx +++ b/include/sfx2/tabdlg.hxx @@ -258,7 +258,7 @@ public: const SfxItemSet& GetItemSet() const { return *pSet; } - virtual bool FillItemSet( SfxItemSet& ); + virtual bool FillItemSet( SfxItemSet* ); virtual void Reset( const SfxItemSet& ); bool HasExchangeSupport() const diff --git a/include/svx/hdft.hxx b/include/svx/hdft.hxx index b840ada4198f..632b64c1d779 100644 --- a/include/svx/hdft.hxx +++ b/include/svx/hdft.hxx @@ -44,7 +44,7 @@ class SVX_DLLPUBLIC SvxHFPage: public SfxTabPage public: - virtual bool FillItemSet( SfxItemSet& rOutSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rOutSet ) 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 15c3e666ef8d..aad434ba93cb 100644 --- a/include/svx/optgrid.hxx +++ b/include/svx/optgrid.hxx @@ -104,7 +104,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; diff --git a/sc/source/ui/attrdlg/tabpages.cxx b/sc/source/ui/attrdlg/tabpages.cxx index 71a30d40315c..d03198ad899c 100644 --- a/sc/source/ui/attrdlg/tabpages.cxx +++ b/sc/source/ui/attrdlg/tabpages.cxx @@ -116,11 +116,11 @@ void ScTabPageProtection::Reset( const SfxItemSet& rCoreAttrs ) UpdateButtons(); } -bool ScTabPageProtection::FillItemSet( SfxItemSet& rCoreAttrs ) +bool ScTabPageProtection::FillItemSet( SfxItemSet* rCoreAttrs ) { bool bAttrsChanged = false; sal_uInt16 nWhich = GetWhich( SID_SCATTR_PROTECTION ); - const SfxPoolItem* pOldItem = GetOldItem( rCoreAttrs, SID_SCATTR_PROTECTION ); + const SfxPoolItem* pOldItem = GetOldItem( *rCoreAttrs, SID_SCATTR_PROTECTION ); const SfxItemSet& rOldSet = GetItemSet(); SfxItemState eItemState = rOldSet.GetItemState( nWhich, false ); ScProtectionAttr aProtAttr; @@ -139,9 +139,9 @@ bool ScTabPageProtection::FillItemSet( SfxItemSet& rCoreAttrs ) } if ( bAttrsChanged ) - rCoreAttrs.Put( aProtAttr ); + rCoreAttrs->Put( aProtAttr ); else if ( eItemState == SFX_ITEM_DEFAULT ) - rCoreAttrs.ClearItem( nWhich ); + rCoreAttrs->ClearItem( nWhich ); return bAttrsChanged; } @@ -149,7 +149,7 @@ bool ScTabPageProtection::FillItemSet( SfxItemSet& rCoreAttrs ) int ScTabPageProtection::DeactivatePage( SfxItemSet* pSetP ) { if ( pSetP ) - FillItemSet( *pSetP ); + FillItemSet( pSetP ); return LEAVE_PAGE; } diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx index a9a793c2e238..d87aa1a81185 100644 --- a/sc/source/ui/dbgui/tpsort.cxx +++ b/sc/source/ui/dbgui/tpsort.cxx @@ -224,7 +224,7 @@ void ScTabPageSortFields::Reset( const SfxItemSet& /* rArgSet */ ) SetLastSortKey( nSortKeyCount ); } -bool ScTabPageSortFields::FillItemSet( SfxItemSet& rArgSet ) +bool ScTabPageSortFields::FillItemSet( SfxItemSet* rArgSet ) { ScSortParam aNewSortData = aSortData; @@ -283,7 +283,7 @@ bool ScTabPageSortFields::FillItemSet( SfxItemSet& rArgSet ) aNewSortData.maKeyState[i].bDoSort = false; } - rArgSet.Put( ScSortItem( SCITEM_SORTDATA, NULL, &aNewSortData ) ); + rArgSet->Put( ScSortItem( SCITEM_SORTDATA, NULL, &aNewSortData ) ); return true; } @@ -324,7 +324,7 @@ int ScTabPageSortFields::DeactivatePage( SfxItemSet* pSetP ) } if ( pSetP ) - FillItemSet( *pSetP ); + FillItemSet( pSetP ); return SfxTabPage::LEAVE_PAGE; } @@ -688,7 +688,7 @@ void ScTabPageSortOptions::Reset( const SfxItemSet& /* rArgSet */ ) } } -bool ScTabPageSortOptions::FillItemSet( SfxItemSet& rArgSet ) +bool ScTabPageSortOptions::FillItemSet( SfxItemSet* rArgSet ) { // Create local copy of ScParam ScSortParam aNewSortData = aSortData; @@ -730,7 +730,7 @@ bool ScTabPageSortOptions::FillItemSet( SfxItemSet& rArgSet ) } aNewSortData.aCollatorAlgorithm = sAlg; - rArgSet.Put( ScSortItem( SCITEM_SORTDATA, &aNewSortData ) ); + rArgSet->Put( ScSortItem( SCITEM_SORTDATA, &aNewSortData ) ); return true; } @@ -806,7 +806,7 @@ int ScTabPageSortOptions::DeactivatePage( SfxItemSet* pSetP ) } if ( pSetP && bPosInputOk ) - FillItemSet( *pSetP ); + FillItemSet( pSetP ); return bPosInputOk ? SfxTabPage::LEAVE_PAGE : SfxTabPage::KEEP_PAGE; } diff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxx index d2c53569f760..d76bc51992a2 100644 --- a/sc/source/ui/dbgui/tpsubt.cxx +++ b/sc/source/ui/dbgui/tpsubt.cxx @@ -413,10 +413,10 @@ 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 )) -bool ScTpSubTotalGroup1::FillItemSet( SfxItemSet& rArgSet ) { return FILLSET(1); } -bool ScTpSubTotalGroup2::FillItemSet( SfxItemSet& rArgSet ) { return FILLSET(2); } -bool ScTpSubTotalGroup3::FillItemSet( SfxItemSet& rArgSet ) { return FILLSET(3); } +#define FILLSET(i) (ScTpSubTotalGroup::DoFillItemSet( (i), *rArgSet )) +bool ScTpSubTotalGroup1::FillItemSet( SfxItemSet* rArgSet ) { return FILLSET(1); } +bool ScTpSubTotalGroup2::FillItemSet( SfxItemSet* rArgSet ) { return FILLSET(2); } +bool ScTpSubTotalGroup3::FillItemSet( SfxItemSet* rArgSet ) { return FILLSET(3); } #undef FILL @@ -499,7 +499,7 @@ void ScTpSubTotalOptions::Reset( const SfxItemSet& /* rArgSet */ ) CheckHdl( pBtnSort ); } -bool ScTpSubTotalOptions::FillItemSet( SfxItemSet& rArgSet ) +bool ScTpSubTotalOptions::FillItemSet( SfxItemSet* rArgSet ) { ScSubTotalParam theSubTotalData; // auslesen, wenn schon teilweise gefuellt SfxTabDialog* pDlg = GetTabDialog(); @@ -522,7 +522,7 @@ bool ScTpSubTotalOptions::FillItemSet( SfxItemSet& rArgSet ) ? pLbUserDef->GetSelectEntryPos() : 0; - rArgSet.Put( ScSubTotalItem( nWhichSubTotals, &theSubTotalData ) ); + rArgSet->Put( ScSubTotalItem( nWhichSubTotals, &theSubTotalData ) ); return true; } diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx index df23c4b4a15f..19708bff48b7 100644 --- a/sc/source/ui/dbgui/validate.cxx +++ b/sc/source/ui/dbgui/validate.cxx @@ -428,20 +428,20 @@ void ScTPValidationValue::Reset( const SfxItemSet& rArgSet ) CheckHdl( NULL ); } -bool ScTPValidationValue::FillItemSet( SfxItemSet& rArgSet ) +bool ScTPValidationValue::FillItemSet( SfxItemSet* rArgSet ) { sal_Int16 nListType = m_pCbShow->IsChecked() ? (m_pCbSort->IsChecked() ? ValidListType::SORTEDASCENDING : ValidListType::UNSORTED) : ValidListType::INVISIBLE; - rArgSet.Put( SfxAllEnumItem( FID_VALID_MODE, sal::static_int_cast<sal_uInt16>( + rArgSet->Put( SfxAllEnumItem( FID_VALID_MODE, sal::static_int_cast<sal_uInt16>( lclGetValModeFromPos( m_pLbAllow->GetSelectEntryPos() ) ) ) ); - rArgSet.Put( SfxAllEnumItem( FID_VALID_CONDMODE, sal::static_int_cast<sal_uInt16>( + rArgSet->Put( SfxAllEnumItem( FID_VALID_CONDMODE, sal::static_int_cast<sal_uInt16>( lclGetCondModeFromPos( m_pLbValue->GetSelectEntryPos() ) ) ) ); - rArgSet.Put( SfxStringItem( FID_VALID_VALUE1, GetFirstFormula() ) ); - rArgSet.Put( SfxStringItem( FID_VALID_VALUE2, GetSecondFormula() ) ); - rArgSet.Put( SfxBoolItem( FID_VALID_BLANK, m_pCbAllow->IsChecked() ) ); - rArgSet.Put( SfxInt16Item( FID_VALID_LISTTYPE, nListType ) ); + rArgSet->Put( SfxStringItem( FID_VALID_VALUE1, GetFirstFormula() ) ); + rArgSet->Put( SfxStringItem( FID_VALID_VALUE2, GetSecondFormula() ) ); + rArgSet->Put( SfxBoolItem( FID_VALID_BLANK, m_pCbAllow->IsChecked() ) ); + rArgSet->Put( SfxInt16Item( FID_VALID_LISTTYPE, nListType ) ); return true; } @@ -697,11 +697,11 @@ void ScTPValidationHelp::Reset( const SfxItemSet& rArgSet ) pEdInputHelp->SetText( EMPTY_OUSTRING ); } -bool ScTPValidationHelp::FillItemSet( SfxItemSet& rArgSet ) +bool ScTPValidationHelp::FillItemSet( SfxItemSet* rArgSet ) { - rArgSet.Put( SfxBoolItem( FID_VALID_SHOWHELP, pTsbHelp->GetState() == TRISTATE_TRUE ) ); - rArgSet.Put( SfxStringItem( FID_VALID_HELPTITLE, pEdtTitle->GetText() ) ); - rArgSet.Put( SfxStringItem( FID_VALID_HELPTEXT, pEdInputHelp->GetText() ) ); + rArgSet->Put( SfxBoolItem( FID_VALID_SHOWHELP, pTsbHelp->GetState() == TRISTATE_TRUE ) ); + rArgSet->Put( SfxStringItem( FID_VALID_HELPTITLE, pEdtTitle->GetText() ) ); + rArgSet->Put( SfxStringItem( FID_VALID_HELPTEXT, pEdInputHelp->GetText() ) ); return true; } @@ -774,12 +774,12 @@ void ScTPValidationError::Reset( const SfxItemSet& rArgSet ) SelectActionHdl( NULL ); } -bool ScTPValidationError::FillItemSet( SfxItemSet& rArgSet ) +bool ScTPValidationError::FillItemSet( SfxItemSet* rArgSet ) { - rArgSet.Put( SfxBoolItem( FID_VALID_SHOWERR, m_pTsbShow->GetState() == TRISTATE_TRUE ) ); - rArgSet.Put( SfxAllEnumItem( FID_VALID_ERRSTYLE, m_pLbAction->GetSelectEntryPos() ) ); - rArgSet.Put( SfxStringItem( FID_VALID_ERRTITLE, m_pEdtTitle->GetText() ) ); - rArgSet.Put( SfxStringItem( FID_VALID_ERRTEXT, m_pEdError->GetText() ) ); + rArgSet->Put( SfxBoolItem( FID_VALID_SHOWERR, m_pTsbShow->GetState() == TRISTATE_TRUE ) ); + rArgSet->Put( SfxAllEnumItem( FID_VALID_ERRSTYLE, m_pLbAction->GetSelectEntryPos() ) ); + rArgSet->Put( SfxStringItem( FID_VALID_ERRTITLE, m_pEdtTitle->GetText() ) ); + rArgSet->Put( SfxStringItem( FID_VALID_ERRTEXT, m_pEdError->GetText() ) ); return true; } diff --git a/sc/source/ui/docshell/tpstat.cxx b/sc/source/ui/docshell/tpstat.cxx index d1dbac731dc3..1602531b7b36 100644 --- a/sc/source/ui/docshell/tpstat.cxx +++ b/sc/source/ui/docshell/tpstat.cxx @@ -60,7 +60,7 @@ ScDocStatPage::~ScDocStatPage() { } -bool ScDocStatPage::FillItemSet( SfxItemSet& /* rSet */ ) +bool ScDocStatPage::FillItemSet( SfxItemSet* /* rSet */ ) { return false; } diff --git a/sc/source/ui/inc/opredlin.hxx b/sc/source/ui/inc/opredlin.hxx index fda8522e9ea8..04da009d50cb 100644 --- a/sc/source/ui/inc/opredlin.hxx +++ b/sc/source/ui/inc/opredlin.hxx @@ -51,7 +51,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( 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 f74eaff36945..758915aa2d15 100644 --- a/sc/source/ui/inc/scuitphfedit.hxx +++ b/sc/source/ui/inc/scuitphfedit.hxx @@ -46,7 +46,7 @@ class EditEngine; class ScHFEditPage : public SfxTabPage { public: - virtual bool FillItemSet ( SfxItemSet& rCoreSet ) SAL_OVERRIDE; + virtual bool FillItemSet ( SfxItemSet* rCoreSet ) SAL_OVERRIDE; virtual void Reset ( const SfxItemSet& rCoreSet ) SAL_OVERRIDE; void SetNumType(SvxNumType eNumType); diff --git a/sc/source/ui/inc/tabpages.hxx b/sc/source/ui/inc/tabpages.hxx index e5780f45d807..eed164d10da4 100644 --- a/sc/source/ui/inc/tabpages.hxx +++ b/sc/source/ui/inc/tabpages.hxx @@ -30,7 +30,7 @@ public: static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rAttrSet ); static const sal_uInt16* GetRanges (); - virtual bool FillItemSet ( SfxItemSet& rCoreAttrs ) SAL_OVERRIDE; + virtual bool FillItemSet ( SfxItemSet* rCoreAttrs ) SAL_OVERRIDE; virtual void Reset ( const SfxItemSet& ) SAL_OVERRIDE; protected: diff --git a/sc/source/ui/inc/tpcalc.hxx b/sc/source/ui/inc/tpcalc.hxx index abb50f013807..fbc56eaf8159 100644 --- a/sc/source/ui/inc/tpcalc.hxx +++ b/sc/source/ui/inc/tpcalc.hxx @@ -35,7 +35,7 @@ class ScTpCalcOptions : public SfxTabPage public: static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rCoreSet ); - virtual bool FillItemSet ( SfxItemSet& rCoreSet ) SAL_OVERRIDE; + virtual bool FillItemSet ( 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 12114289ee7d..f4ed342c43ef 100644 --- a/sc/source/ui/inc/tpcompatibility.hxx +++ b/sc/source/ui/inc/tpcompatibility.hxx @@ -21,7 +21,7 @@ public: static SfxTabPage* Create (Window* pParent, const SfxItemSet& rCoreAttrs); - virtual bool FillItemSet(SfxItemSet& rCoreAttrs) SAL_OVERRIDE; + virtual bool FillItemSet(SfxItemSet* rCoreAttrs) SAL_OVERRIDE; virtual void Reset(const SfxItemSet& rCoreAttrs) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet* pSet = NULL) SAL_OVERRIDE; diff --git a/sc/source/ui/inc/tpdefaults.hxx b/sc/source/ui/inc/tpdefaults.hxx index 68b6e2c01137..7122263428d5 100644 --- a/sc/source/ui/inc/tpdefaults.hxx +++ b/sc/source/ui/inc/tpdefaults.hxx @@ -21,7 +21,7 @@ public: static SfxTabPage* Create (Window* pParent, const SfxItemSet& rCoreSet); - virtual bool FillItemSet(SfxItemSet& rCoreSet) SAL_OVERRIDE; + virtual bool FillItemSet(SfxItemSet* rCoreSet) SAL_OVERRIDE; virtual void Reset(const SfxItemSet& rCoreSet) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet* pSet = NULL) SAL_OVERRIDE; diff --git a/sc/source/ui/inc/tpformula.hxx b/sc/source/ui/inc/tpformula.hxx index de7c1e45d92c..15352a5b6fce 100644 --- a/sc/source/ui/inc/tpformula.hxx +++ b/sc/source/ui/inc/tpformula.hxx @@ -35,7 +35,7 @@ public: static SfxTabPage* Create (Window* pParent, const SfxItemSet& rCoreSet); - virtual bool FillItemSet(SfxItemSet& rCoreSet) SAL_OVERRIDE; + virtual bool FillItemSet(SfxItemSet* rCoreSet) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& rCoreSet ) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet* pSet = NULL) SAL_OVERRIDE; diff --git a/sc/source/ui/inc/tphf.hxx b/sc/source/ui/inc/tphf.hxx index 2f4fff087ac8..1061e4139128 100644 --- a/sc/source/ui/inc/tphf.hxx +++ b/sc/source/ui/inc/tphf.hxx @@ -30,7 +30,7 @@ public: virtual ~ScHFPage(); virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; - virtual bool FillItemSet( SfxItemSet& rOutSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rOutSet ) SAL_OVERRIDE; void SetPageStyle( const OUString& rName ) { aStrPageStyle = rName; } void SetStyleDlg ( const ScStyleDlg* pDlg ) { pStyleDlg = pDlg; } diff --git a/sc/source/ui/inc/tpprint.hxx b/sc/source/ui/inc/tpprint.hxx index fe93a048f19c..24ca945c5c35 100644 --- a/sc/source/ui/inc/tpprint.hxx +++ b/sc/source/ui/inc/tpprint.hxx @@ -34,7 +34,7 @@ class ScTpPrintOptions : public SfxTabPage public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rCoreSet ); - virtual bool FillItemSet( SfxItemSet& rCoreSet ) SAL_OVERRIDE; + virtual bool FillItemSet( 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 256ec321056a..f654a88e4509 100644 --- a/sc/source/ui/inc/tpsort.hxx +++ b/sc/source/ui/inc/tpsort.hxx @@ -54,7 +54,7 @@ public: static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rArgSet ); - virtual bool FillItemSet ( SfxItemSet& rArgSet ) SAL_OVERRIDE; + virtual bool FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE; virtual void Reset ( const SfxItemSet& rArgSet ) SAL_OVERRIDE; virtual void SetPosSizePixel(const Point& rAllocPos, const Size& rAllocation) SAL_OVERRIDE; @@ -116,7 +116,7 @@ public: #define SfxTabPage ::SfxTabPage static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rArgSet ); - virtual bool FillItemSet ( SfxItemSet& rArgSet ) SAL_OVERRIDE; + virtual bool FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE; virtual void Reset ( const SfxItemSet& rArgSet ) SAL_OVERRIDE; protected: diff --git a/sc/source/ui/inc/tpstat.hxx b/sc/source/ui/inc/tpstat.hxx index 4cd4d4aa1ac8..6b2c18fd0fcb 100644 --- a/sc/source/ui/inc/tpstat.hxx +++ b/sc/source/ui/inc/tpstat.hxx @@ -37,7 +37,7 @@ private: virtual ~ScDocStatPage(); protected: - virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset ( const SfxItemSet& rSet ) SAL_OVERRIDE; private: diff --git a/sc/source/ui/inc/tpsubt.hxx b/sc/source/ui/inc/tpsubt.hxx index 008bfe7bc59f..f6d48d5b5d03 100644 --- a/sc/source/ui/inc/tpsubt.hxx +++ b/sc/source/ui/inc/tpsubt.hxx @@ -84,7 +84,7 @@ public: static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rArgSet ); - virtual bool FillItemSet ( SfxItemSet& rArgSet ) SAL_OVERRIDE; + virtual bool FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE; virtual void Reset ( const SfxItemSet& rArgSet ) SAL_OVERRIDE; }; @@ -99,7 +99,7 @@ public: static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rArgSet ); - virtual bool FillItemSet ( SfxItemSet& rArgSet ) SAL_OVERRIDE; + virtual bool FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE; virtual void Reset ( const SfxItemSet& rArgSet ) SAL_OVERRIDE; }; @@ -114,7 +114,7 @@ public: static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rArgSet ); - virtual bool FillItemSet ( SfxItemSet& rArgSet ) SAL_OVERRIDE; + virtual bool FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE; virtual void Reset ( const SfxItemSet& rArgSet ) SAL_OVERRIDE; }; @@ -129,7 +129,7 @@ public: static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rArgSet ); - virtual bool FillItemSet ( SfxItemSet& rArgSet ) SAL_OVERRIDE; + virtual bool FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE; virtual void Reset ( const SfxItemSet& rArgSet ) SAL_OVERRIDE; private: diff --git a/sc/source/ui/inc/tptable.hxx b/sc/source/ui/inc/tptable.hxx index c04c3be2ba14..9ea189edd6fb 100644 --- a/sc/source/ui/inc/tptable.hxx +++ b/sc/source/ui/inc/tptable.hxx @@ -31,7 +31,7 @@ public: static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rCoreSet ); static const sal_uInt16* GetRanges (); - virtual bool FillItemSet ( SfxItemSet& rCoreSet ) SAL_OVERRIDE; + virtual bool FillItemSet ( 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/tpusrlst.hxx b/sc/source/ui/inc/tpusrlst.hxx index 9e3564976e87..3c82200eb610 100644 --- a/sc/source/ui/inc/tpusrlst.hxx +++ b/sc/source/ui/inc/tpusrlst.hxx @@ -35,7 +35,7 @@ class ScTpUserLists : public SfxTabPage public: static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rAttrSet ); - virtual bool FillItemSet ( SfxItemSet& rCoreAttrs ) SAL_OVERRIDE; + virtual bool FillItemSet ( 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 3d2c65df5ba9..02a6c6a5ba78 100644 --- a/sc/source/ui/inc/tpview.hxx +++ b/sc/source/ui/inc/tpview.hxx @@ -71,7 +71,7 @@ class ScTpContentOptions : public SfxTabPage public: static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rCoreSet ); - virtual bool FillItemSet ( SfxItemSet& rCoreSet ) SAL_OVERRIDE; + virtual bool FillItemSet ( SfxItemSet* rCoreSet ) SAL_OVERRIDE; virtual void Reset ( const SfxItemSet& rCoreSet ) SAL_OVERRIDE; using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; @@ -119,7 +119,7 @@ class ScTpLayoutOptions : public SfxTabPage public: static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rCoreSet ); - virtual bool FillItemSet ( SfxItemSet& rCoreSet ) SAL_OVERRIDE; + virtual bool FillItemSet ( SfxItemSet* rCoreSet ) SAL_OVERRIDE; virtual void Reset ( const SfxItemSet& rCoreSet ) SAL_OVERRIDE; using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx index b7b6cafee94a..183cf00a1e59 100644 --- a/sc/source/ui/inc/validate.hxx +++ b/sc/source/ui/inc/validate.hxx @@ -182,7 +182,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rArgSet ); static const sal_uInt16* GetRanges(); - virtual bool FillItemSet( SfxItemSet& rArgSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rArgSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& rArgSet ) SAL_OVERRIDE; private: @@ -276,7 +276,7 @@ public: virtual ~ScTPValidationHelp(); static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rArgSet ); - virtual bool FillItemSet ( SfxItemSet& rArgSet ) SAL_OVERRIDE; + virtual bool FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE; virtual void Reset ( const SfxItemSet& rArgSet ) SAL_OVERRIDE; }; @@ -301,7 +301,7 @@ public: virtual ~ScTPValidationError(); static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rArgSet ); - virtual bool FillItemSet ( SfxItemSet& rArgSet ) SAL_OVERRIDE; + virtual bool FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE; virtual void Reset ( const SfxItemSet& rArgSet ) SAL_OVERRIDE; }; diff --git a/sc/source/ui/optdlg/opredlin.cxx b/sc/source/ui/optdlg/opredlin.cxx index ada6c99fb964..9caa442e2edf 100644 --- a/sc/source/ui/optdlg/opredlin.cxx +++ b/sc/source/ui/optdlg/opredlin.cxx @@ -65,7 +65,7 @@ SfxTabPage* ScRedlineOptionsTabPage::Create( Window* pParent, const SfxItemSet& return new ScRedlineOptionsTabPage( pParent, rSet ); } -bool ScRedlineOptionsTabPage::FillItemSet( SfxItemSet& /* rSet */ ) +bool ScRedlineOptionsTabPage::FillItemSet( SfxItemSet* /* rSet */ ) { ScAppOptions aAppOptions=SC_MOD()->GetAppOptions(); diff --git a/sc/source/ui/optdlg/tpcalc.cxx b/sc/source/ui/optdlg/tpcalc.cxx index 2bbee5a06d58..cff06b6995c7 100644 --- a/sc/source/ui/optdlg/tpcalc.cxx +++ b/sc/source/ui/optdlg/tpcalc.cxx @@ -133,7 +133,7 @@ void ScTpCalcOptions::Reset( const SfxItemSet& /* rCoreAttrs */ ) } -bool ScTpCalcOptions::FillItemSet( SfxItemSet& rCoreAttrs ) +bool ScTpCalcOptions::FillItemSet( SfxItemSet* rCoreAttrs ) { // alle weiteren Optionen werden in den Handlern aktualisiert pLocalOptions->SetIterCount( (sal_uInt16)m_pEdSteps->GetValue() ); @@ -151,7 +151,7 @@ bool ScTpCalcOptions::FillItemSet( SfxItemSet& rCoreAttrs ) if ( *pLocalOptions != *pOldOptions ) { - rCoreAttrs.Put( ScTpCalcItem( nWhichCalc, *pLocalOptions ) ); + rCoreAttrs->Put( ScTpCalcItem( nWhichCalc, *pLocalOptions ) ); return true; } else @@ -179,7 +179,7 @@ int ScTpCalcOptions::DeactivatePage( SfxItemSet* pSetP ) m_pEdEps->GrabFocus(); } else if ( pSetP ) - FillItemSet( *pSetP ); + FillItemSet( pSetP ); return nReturn; } diff --git a/sc/source/ui/optdlg/tpcompatibility.cxx b/sc/source/ui/optdlg/tpcompatibility.cxx index 17ceca431145..2c6dfdf1d6a1 100644 --- a/sc/source/ui/optdlg/tpcompatibility.cxx +++ b/sc/source/ui/optdlg/tpcompatibility.cxx @@ -30,12 +30,12 @@ SfxTabPage* ScTpCompatOptions::Create(Window *pParent, const SfxItemSet &rCoreAt return new ScTpCompatOptions(pParent, rCoreAttrs); } -bool ScTpCompatOptions::FillItemSet(SfxItemSet &rCoreAttrs) +bool ScTpCompatOptions::FillItemSet(SfxItemSet *rCoreAttrs) { bool bRet = false; if (m_pLbKeyBindings->IsValueChangedFromSaved()) { - rCoreAttrs.Put( + rCoreAttrs->Put( SfxUInt16Item( SID_SC_OPT_KEY_BINDING_COMPAT, m_pLbKeyBindings->GetSelectEntryPos())); bRet = true; diff --git a/sc/source/ui/optdlg/tpdefaults.cxx b/sc/source/ui/optdlg/tpdefaults.cxx index 637c6614c517..f68ee2f79046 100644 --- a/sc/source/ui/optdlg/tpdefaults.cxx +++ b/sc/source/ui/optdlg/tpdefaults.cxx @@ -39,7 +39,7 @@ SfxTabPage* ScTpDefaultsOptions::Create(Window *pParent, const SfxItemSet &rCore return new ScTpDefaultsOptions(pParent, rCoreAttrs); } -bool ScTpDefaultsOptions::FillItemSet(SfxItemSet &rCoreSet) +bool ScTpDefaultsOptions::FillItemSet(SfxItemSet *rCoreSet) { bool bRet = false; ScDefaultsOptions aOpt; @@ -54,7 +54,7 @@ bool ScTpDefaultsOptions::FillItemSet(SfxItemSet &rCoreSet) aOpt.SetInitTabCount( nTabCount ); aOpt.SetInitTabPrefix( aSheetPrefix ); - rCoreSet.Put( ScTpDefaultsItem( SID_SCDEFAULTSOPTIONS, aOpt ) ); + rCoreSet->Put( ScTpDefaultsItem( SID_SCDEFAULTSOPTIONS, aOpt ) ); bRet = true; } return bRet; diff --git a/sc/source/ui/optdlg/tpformula.cxx b/sc/source/ui/optdlg/tpformula.cxx index 132008148259..587928018961 100644 --- a/sc/source/ui/optdlg/tpformula.cxx +++ b/sc/source/ui/optdlg/tpformula.cxx @@ -225,7 +225,7 @@ SfxTabPage* ScTpFormulaOptions::Create(Window* pParent, const SfxItemSet& rCoreS return new ScTpFormulaOptions(pParent, rCoreSet); } -bool ScTpFormulaOptions::FillItemSet(SfxItemSet& rCoreSet) +bool ScTpFormulaOptions::FillItemSet(SfxItemSet* rCoreSet) { bool bRet = false; ScFormulaOptions aOpt; @@ -279,7 +279,7 @@ bool ScTpFormulaOptions::FillItemSet(SfxItemSet& rCoreSet) aOpt.SetOOXMLRecalcOptions(eOOXMLRecalc); aOpt.SetODFRecalcOptions(eODFRecalc); - rCoreSet.Put( ScTpFormulaItem( SID_SCFORMULAOPTIONS, aOpt ) ); + rCoreSet->Put( ScTpFormulaItem( SID_SCFORMULAOPTIONS, aOpt ) ); bRet = true; } return bRet; diff --git a/sc/source/ui/optdlg/tpprint.cxx b/sc/source/ui/optdlg/tpprint.cxx index 3890d4383c82..eb49658e800d 100644 --- a/sc/source/ui/optdlg/tpprint.cxx +++ b/sc/source/ui/optdlg/tpprint.cxx @@ -52,7 +52,7 @@ SfxTabPage* ScTpPrintOptions::Create( Window* pParent, const SfxItemSet& rAttrSe int ScTpPrintOptions::DeactivatePage( SfxItemSet* pSetP ) { if ( pSetP ) - FillItemSet( *pSetP ); + FillItemSet( pSetP ); return LEAVE_PAGE; } @@ -87,9 +87,9 @@ void ScTpPrintOptions::Reset( const SfxItemSet& rCoreSet ) m_pForceBreaksCB->SaveValue(); } -bool ScTpPrintOptions::FillItemSet( SfxItemSet& rCoreAttrs ) +bool ScTpPrintOptions::FillItemSet( SfxItemSet* rCoreAttrs ) { - rCoreAttrs.ClearItem( SID_PRINT_SELECTEDSHEET ); + rCoreAttrs->ClearItem( SID_PRINT_SELECTEDSHEET ); bool bSkipEmptyChanged = m_pSkipEmptyPagesCB->IsValueChangedFromSaved(); bool bSelectedSheetsChanged = m_pSelectedSheetsCB->IsValueChangedFromSaved(); @@ -101,10 +101,10 @@ bool ScTpPrintOptions::FillItemSet( SfxItemSet& rCoreAttrs ) aOpt.SetSkipEmpty( m_pSkipEmptyPagesCB->IsChecked() ); aOpt.SetAllSheets( !m_pSelectedSheetsCB->IsChecked() ); aOpt.SetForceBreaks( m_pForceBreaksCB->IsChecked() ); - rCoreAttrs.Put( ScTpPrintItem( SID_SCPRINTOPTIONS, aOpt ) ); + rCoreAttrs->Put( ScTpPrintItem( SID_SCPRINTOPTIONS, aOpt ) ); if ( bSelectedSheetsChanged ) { - rCoreAttrs.Put( SfxBoolItem( SID_PRINT_SELECTEDSHEET, m_pSelectedSheetsCB->IsChecked() ) ); + rCoreAttrs->Put( SfxBoolItem( SID_PRINT_SELECTEDSHEET, m_pSelectedSheetsCB->IsChecked() ) ); } return true; } diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx index 19c432f81f7f..06abb7ae9d53 100644 --- a/sc/source/ui/optdlg/tpusrlst.cxx +++ b/sc/source/ui/optdlg/tpusrlst.cxx @@ -192,7 +192,7 @@ void ScTpUserLists::Reset( const SfxItemSet& rCoreAttrs ) } } -bool ScTpUserLists::FillItemSet( SfxItemSet& rCoreAttrs ) +bool ScTpUserLists::FillItemSet( SfxItemSet* rCoreAttrs ) { // Modifikationen noch nicht uebernommen? // -> Click auf Add-Button simulieren @@ -225,7 +225,7 @@ bool ScTpUserLists::FillItemSet( SfxItemSet& rCoreAttrs ) if ( pUserLists ) aULItem.SetUserList( *pUserLists ); - rCoreAttrs.Put( aULItem ); + rCoreAttrs->Put( aULItem ); } return bDataModified; @@ -234,7 +234,7 @@ bool ScTpUserLists::FillItemSet( SfxItemSet& rCoreAttrs ) int ScTpUserLists::DeactivatePage( SfxItemSet* pSetP ) { if ( pSetP ) - FillItemSet( *pSetP ); + FillItemSet( pSetP ); return LEAVE_PAGE; } diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx index 3c693ce6b6e8..2bf7d4d62f28 100644 --- a/sc/source/ui/optdlg/tpview.cxx +++ b/sc/source/ui/optdlg/tpview.cxx @@ -106,7 +106,7 @@ SfxTabPage* ScTpContentOptions::Create( Window* pParent, return new ScTpContentOptions(pParent, rCoreSet); } -bool ScTpContentOptions::FillItemSet( SfxItemSet& rCoreSet ) +bool ScTpContentOptions::FillItemSet( SfxItemSet* rCoreSet ) { bool bRet = false; if( pFormulaCB ->IsValueChangedFromSaved() || @@ -130,17 +130,17 @@ bool ScTpContentOptions::FillItemSet( SfxItemSet& rCoreSet ) { pLocalOptions->SetGridColor( pColorLB->GetSelectEntryColor(), pColorLB->GetSelectEntry() ); - rCoreSet.Put(ScTpViewItem(SID_SCVIEWOPTIONS, *pLocalOptions)); + rCoreSet->Put(ScTpViewItem(SID_SCVIEWOPTIONS, *pLocalOptions)); bRet = true; } if(pRangeFindCB->IsValueChangedFromSaved()) { - rCoreSet.Put(SfxBoolItem(SID_SC_INPUT_RANGEFINDER, pRangeFindCB->IsChecked())); + rCoreSet->Put(SfxBoolItem(SID_SC_INPUT_RANGEFINDER, pRangeFindCB->IsChecked())); bRet = true; } if(pSyncZoomCB->IsValueChangedFromSaved()) { - rCoreSet.Put(SfxBoolItem(SID_SC_OPT_SYNCZOOM, pSyncZoomCB->IsChecked())); + rCoreSet->Put(SfxBoolItem(SID_SC_OPT_SYNCZOOM, pSyncZoomCB->IsChecked())); bRet = true; } @@ -216,7 +216,7 @@ void ScTpContentOptions::ActivatePage( const SfxItemSet& rSet) int ScTpContentOptions::DeactivatePage( SfxItemSet* pSetP ) { if(pSetP) - FillItemSet(*pSetP); + FillItemSet(pSetP); return SfxTabPage::LEAVE_PAGE; } @@ -423,21 +423,21 @@ SfxTabPage* ScTpLayoutOptions::Create( Window* pParent, return pNew; } -bool ScTpLayoutOptions::FillItemSet( SfxItemSet& rCoreSet ) +bool ScTpLayoutOptions::FillItemSet( SfxItemSet* rCoreSet ) { bool bRet = true; const sal_Int32 nMPos = m_pUnitLB->GetSelectEntryPos(); if ( m_pUnitLB->IsValueChangedFromSaved() ) { sal_uInt16 nFieldUnit = (sal_uInt16)(sal_IntPtr)m_pUnitLB->GetEntryData( nMPos ); - rCoreSet.Put( SfxUInt16Item( SID_ATTR_METRIC, + rCoreSet->Put( SfxUInt16Item( SID_ATTR_METRIC, (sal_uInt16)nFieldUnit ) ); bRet = true; } if(m_pTabMF->IsValueChangedFromSaved()) { - rCoreSet.Put(SfxUInt16Item(SID_ATTR_DEFTABSTOP, + rCoreSet->Put(SfxUInt16Item(SID_ATTR_DEFTABSTOP, sal::static_int_cast<sal_uInt16>( m_pTabMF->Denormalize(m_pTabMF->GetValue(FUNIT_TWIP)) ))); bRet = true; } @@ -465,56 +465,56 @@ bool ScTpLayoutOptions::FillItemSet( SfxItemSet& rCoreSet ) } if(m_pAlignCB->IsValueChangedFromSaved()) { - rCoreSet.Put(SfxBoolItem(SID_SC_INPUT_SELECTION, m_pAlignCB->IsChecked())); + rCoreSet->Put(SfxBoolItem(SID_SC_INPUT_SELECTION, m_pAlignCB->IsChecked())); bRet = true; } if(m_pAlignLB->IsValueChangedFromSaved()) { - rCoreSet.Put(SfxUInt16Item(SID_SC_INPUT_SELECTIONPOS, m_pAlignLB->GetSelectEntryPos())); + rCoreSet->Put(SfxUInt16Item(SID_SC_INPUT_SELECTIONPOS, m_pAlignLB->GetSelectEntryPos())); bRet = true; } if(m_pEditModeCB->IsValueChangedFromSaved()) { - rCoreSet.Put(SfxBoolItem(SID_SC_INPUT_EDITMODE, m_pEditModeCB->IsChecked())); + rCoreSet->Put(SfxBoolItem(SID_SC_INPUT_EDITMODE, m_pEditModeCB->IsChecked())); bRet = true; } if(m_pFormatCB->IsValueChangedFromSaved()) { - rCoreSet.Put(SfxBoolItem(SID_SC_INPUT_FMT_EXPAND, m_pFormatCB->IsChecked())); + rCoreSet->Put(SfxBoolItem(SID_SC_INPUT_FMT_EXPAND, m_pFormatCB->IsChecked())); bRet = true; } if(m_pExpRefCB->IsValueChangedFromSaved()) { - rCoreSet.Put(SfxBoolItem(SID_SC_INPUT_REF_EXPAND, m_pExpRefCB->IsChecked())); + rCoreSet->Put(SfxBoolItem(SID_SC_INPUT_REF_EXPAND, m_pExpRefCB->IsChecked())); bRet = true; } if(m_pMarkHdrCB->IsValueChangedFromSaved()) { - rCoreSet.Put(SfxBoolItem(SID_SC_INPUT_MARK_HEADER, m_pMarkHdrCB->IsChecked())); + rCoreSet->Put(SfxBoolItem(SID_SC_INPUT_MARK_HEADER, m_pMarkHdrCB->IsChecked())); bRet = true; } if(m_pTextFmtCB->IsValueChangedFromSaved()) { - rCoreSet.Put(SfxBoolItem(SID_SC_INPUT_TEXTWYSIWYG, m_pTextFmtCB->IsChecked())); + rCoreSet->Put(SfxBoolItem(SID_SC_INPUT_TEXTWYSIWYG, m_pTextFmtCB->IsChecked())); bRet = true; } if( m_pReplWarnCB->IsValueChangedFromSaved() ) { - rCoreSet.Put( SfxBoolItem( SID_SC_INPUT_REPLCELLSWARN, m_pReplWarnCB->IsChecked() ) ); + rCoreSet->Put( SfxBoolItem( SID_SC_INPUT_REPLCELLSWARN, m_pReplWarnCB->IsChecked() ) ); bRet = true; } if( m_pLegacyCellSelectionCB->IsValueChangedFromSaved() ) { - rCoreSet.Put( SfxBoolItem( SID_SC_INPUT_LEGACY_CELL_SELECTION, m_pLegacyCellSelectionCB->IsChecked() ) ); + rCoreSet->Put( SfxBoolItem( SID_SC_INPUT_LEGACY_CELL_SELECTION, m_pLegacyCellSelectionCB->IsChecked() ) ); bRet = true; } @@ -627,7 +627,7 @@ void ScTpLayoutOptions::ActivatePage( const SfxItemSet& /* rCoreSet */ ) int ScTpLayoutOptions::DeactivatePage( SfxItemSet* pSetP ) { if(pSetP) - FillItemSet(*pSetP); + FillItemSet(pSetP); return SfxTabPage::LEAVE_PAGE; } diff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx b/sc/source/ui/pagedlg/scuitphfedit.cxx index dcbcedac8c81..1ffa69423c1d 100644 --- a/sc/source/ui/pagedlg/scuitphfedit.cxx +++ b/sc/source/ui/pagedlg/scuitphfedit.cxx @@ -183,7 +183,7 @@ void ScHFEditPage::Reset( const SfxItemSet& rCoreSet ) } } -bool ScHFEditPage::FillItemSet( SfxItemSet& rCoreSet ) +bool ScHFEditPage::FillItemSet( SfxItemSet* rCoreSet ) { ScPageHFItem aItem( nWhich ); EditTextObject* pLeft = m_pWndLeft->CreateTextObject(); @@ -197,7 +197,7 @@ bool ScHFEditPage::FillItemSet( SfxItemSet& rCoreSet ) delete pCenter; delete pRight; - rCoreSet.Put( aItem ); + rCoreSet->Put( aItem ); return true; } diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx index 3d495da48f0b..e1cf1d5d994c 100644 --- a/sc/source/ui/pagedlg/tphf.cxx +++ b/sc/source/ui/pagedlg/tphf.cxx @@ -87,19 +87,19 @@ void ScHFPage::Reset( const SfxItemSet& rSet ) TurnOnHdl( 0 ); } -bool ScHFPage::FillItemSet( SfxItemSet& rOutSet ) +bool ScHFPage::FillItemSet( SfxItemSet* rOutSet ) { bool bResult = SvxHFPage::FillItemSet( rOutSet ); if ( nId == SID_ATTR_PAGE_HEADERSET ) { - rOutSet.Put( aDataSet.Get( ATTR_PAGE_HEADERLEFT ) ); - rOutSet.Put( aDataSet.Get( ATTR_PAGE_HEADERRIGHT ) ); + rOutSet->Put( aDataSet.Get( ATTR_PAGE_HEADERLEFT ) ); + rOutSet->Put( aDataSet.Get( ATTR_PAGE_HEADERRIGHT ) ); } else { - rOutSet.Put( aDataSet.Get( ATTR_PAGE_FOOTERLEFT ) ); - rOutSet.Put( aDataSet.Get( ATTR_PAGE_FOOTERRIGHT ) ); + rOutSet->Put( aDataSet.Get( ATTR_PAGE_FOOTERLEFT ) ); + rOutSet->Put( aDataSet.Get( ATTR_PAGE_FOOTERRIGHT ) ); } return bResult; @@ -125,7 +125,7 @@ int ScHFPage::DeactivatePage( SfxItemSet* pSetP ) { if ( LEAVE_PAGE == SvxHFPage::DeactivatePage( pSetP ) ) if ( pSetP ) - FillItemSet( *pSetP ); + FillItemSet( pSetP ); return LEAVE_PAGE; } diff --git a/sc/source/ui/pagedlg/tptable.cxx b/sc/source/ui/pagedlg/tptable.cxx index e99f4566ca59..ac2453831436 100644 --- a/sc/source/ui/pagedlg/tptable.cxx +++ b/sc/source/ui/pagedlg/tptable.cxx @@ -231,7 +231,7 @@ void ScTablePage::Reset( const SfxItemSet& rCoreSet ) m_pEdScalePageNum->SaveValue(); } -bool ScTablePage::FillItemSet( SfxItemSet& rCoreSet ) +bool ScTablePage::FillItemSet( SfxItemSet* rCoreSet ) { const SfxItemSet& rOldSet = GetItemSet(); sal_uInt16 nWhichPageNo = GetWhich(SID_SCATTR_PAGE_FIRSTPAGENO); @@ -239,32 +239,32 @@ bool ScTablePage::FillItemSet( SfxItemSet& rCoreSet ) // sal_Bool flags bDataChanged |= lcl_PutBoolItem( GetWhich(SID_SCATTR_PAGE_NOTES), - rCoreSet, rOldSet, + *rCoreSet, rOldSet, m_pBtnNotes->IsChecked(), m_pBtnNotes->GetSavedValue() != TRISTATE_FALSE ); bDataChanged |= lcl_PutBoolItem( GetWhich(SID_SCATTR_PAGE_GRID), - rCoreSet, rOldSet, + *rCoreSet, rOldSet, m_pBtnGrid->IsChecked(), m_pBtnGrid->GetSavedValue() != TRISTATE_FALSE ); bDataChanged |= lcl_PutBoolItem( GetWhich(SID_SCATTR_PAGE_HEADERS), - rCoreSet, rOldSet, + *rCoreSet, rOldSet, m_pBtnHeaders->IsChecked(), m_pBtnHeaders->GetSavedValue() != TRISTATE_FALSE ); bDataChanged |= lcl_PutBoolItem( GetWhich(SID_SCATTR_PAGE_TOPDOWN), - rCoreSet, rOldSet, + *rCoreSet, rOldSet, m_pBtnTopDown->IsChecked(), m_pBtnTopDown->GetSavedValue() ); bDataChanged |= lcl_PutBoolItem( GetWhich(SID_SCATTR_PAGE_FORMULAS), - rCoreSet, rOldSet, + *rCoreSet, rOldSet, m_pBtnFormulas->IsChecked(), m_pBtnFormulas->GetSavedValue() != TRISTATE_FALSE ); bDataChanged |= lcl_PutBoolItem( GetWhich(SID_SCATTR_PAGE_NULLVALS), - rCoreSet, rOldSet, + *rCoreSet, rOldSet, m_pBtnNullVals->IsChecked(), m_pBtnNullVals->GetSavedValue() != TRISTATE_FALSE ); @@ -276,7 +276,7 @@ bool ScTablePage::FillItemSet( SfxItemSet& rCoreSet ) || ( bUseValue && (bUseValue ? 1 : 0) == m_pBtnPageNo->GetSavedValue() && ! m_pEdPageNo->IsValueChangedFromSaved() ) ) ) { - rCoreSet.ClearItem( nWhichPageNo ); + rCoreSet->ClearItem( nWhichPageNo ); } else { @@ -284,19 +284,19 @@ bool ScTablePage::FillItemSet( SfxItemSet& rCoreSet ) ? m_pEdPageNo->GetValue() : 0 ); - rCoreSet.Put( SfxUInt16Item( nWhichPageNo, nPage ) ); + rCoreSet->Put( SfxUInt16Item( nWhichPageNo, nPage ) ); bDataChanged = true; } // object representation: bDataChanged |= lcl_PutVObjModeItem( GetWhich(SID_SCATTR_PAGE_CHARTS), - rCoreSet, rOldSet, *m_pBtnCharts ); + *rCoreSet, rOldSet, *m_pBtnCharts ); bDataChanged |= lcl_PutVObjModeItem( GetWhich(SID_SCATTR_PAGE_OBJECTS), - rCoreSet, rOldSet, *m_pBtnObjects ); + *rCoreSet, rOldSet, *m_pBtnObjects ); bDataChanged |= lcl_PutVObjModeItem( GetWhich(SID_SCATTR_PAGE_DRAWINGS), - rCoreSet, rOldSet, *m_pBtnDrawings ); + *rCoreSet, rOldSet, *m_pBtnDrawings ); // scaling: if( !m_pEdScalePageWidth->GetValue() && !m_pEdScalePageHeight->GetValue() ) @@ -306,17 +306,17 @@ bool ScTablePage::FillItemSet( SfxItemSet& rCoreSet ) } bDataChanged |= lcl_PutScaleItem( GetWhich(SID_SCATTR_PAGE_SCALE), - rCoreSet, rOldSet, + *rCoreSet, rOldSet, *m_pLbScaleMode, SC_TPTABLE_SCALE_PERCENT, *m_pEdScaleAll, (sal_uInt16)m_pEdScaleAll->GetValue() ); bDataChanged |= lcl_PutScaleItem2( GetWhich(SID_SCATTR_PAGE_SCALETO), - rCoreSet, rOldSet, + *rCoreSet, rOldSet, *m_pLbScaleMode, SC_TPTABLE_SCALE_TO, *m_pEdScalePageWidth, *m_pEdScalePageHeight ); bDataChanged |= lcl_PutScaleItem( GetWhich(SID_SCATTR_PAGE_SCALETOPAGES), - rCoreSet, rOldSet, + *rCoreSet, rOldSet, *m_pLbScaleMode, SC_TPTABLE_SCALE_TO_PAGES, *m_pEdScalePageNum, (sal_uInt16)m_pEdScalePageNum->GetValue() ); @@ -326,7 +326,7 @@ bool ScTablePage::FillItemSet( SfxItemSet& rCoreSet ) int ScTablePage::DeactivatePage( SfxItemSet* pSetP ) { if ( pSetP ) - FillItemSet( *pSetP ); + FillItemSet( pSetP ); return LEAVE_PAGE; } diff --git a/sd/source/ui/dlg/paragr.cxx b/sd/source/ui/dlg/paragr.cxx index d4cbe22c66de..d438f3f75cdc 100644 --- a/sd/source/ui/dlg/paragr.cxx +++ b/sd/source/ui/dlg/paragr.cxx @@ -43,7 +43,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); static const sal_uInt16* GetRanges(); - virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; private: @@ -90,7 +90,7 @@ const sal_uInt16* SdParagraphNumTabPage::GetRanges() return aRange; } -bool SdParagraphNumTabPage::FillItemSet( SfxItemSet& rSet ) +bool SdParagraphNumTabPage::FillItemSet( SfxItemSet* rSet ) { if(m_pNewStartCB->IsValueChangedFromSaved() || m_pNewStartNumberCB->IsValueChangedFromSaved()|| @@ -99,10 +99,10 @@ bool SdParagraphNumTabPage::FillItemSet( SfxItemSet& rSet ) mbModified = true; bool bNewStartChecked = TRISTATE_TRUE == m_pNewStartCB->GetState(); bool bNumberNewStartChecked = TRISTATE_TRUE == m_pNewStartNumberCB->GetState(); - rSet.Put(SfxBoolItem(ATTR_NUMBER_NEWSTART, bNewStartChecked)); + rSet->Put(SfxBoolItem(ATTR_NUMBER_NEWSTART, bNewStartChecked)); const sal_Int16 nStartAt = (sal_Int16)m_pNewStartNF->GetValue(); - rSet.Put(SfxInt16Item(ATTR_NUMBER_NEWSTART_AT, bNumberNewStartChecked && bNewStartChecked ? nStartAt : -1)); + rSet->Put(SfxInt16Item(ATTR_NUMBER_NEWSTART_AT, bNumberNewStartChecked && bNewStartChecked ? nStartAt : -1)); } return mbModified; diff --git a/sd/source/ui/dlg/prntopts.cxx b/sd/source/ui/dlg/prntopts.cxx index eaf7233563a7..9a0167324a1f 100644 --- a/sd/source/ui/dlg/prntopts.cxx +++ b/sd/source/ui/dlg/prntopts.cxx @@ -80,7 +80,7 @@ SdPrintOptions::~SdPrintOptions() -bool SdPrintOptions::FillItemSet( SfxItemSet& rAttrs ) +bool SdPrintOptions::FillItemSet( SfxItemSet* rAttrs ) { if( m_pCbxDraw->IsValueChangedFromSaved() || m_pCbxNotes->IsValueChangedFromSaved() || @@ -124,7 +124,7 @@ bool SdPrintOptions::FillItemSet( SfxItemSet& rAttrs ) nQuality = 2; aOptions.GetOptionsPrint().SetOutputQuality( nQuality ); - rAttrs.Put( aOptions ); + rAttrs->Put( aOptions ); return true; } diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx index e65398ba7f62..f08751c5363a 100644 --- a/sd/source/ui/dlg/tpaction.cxx +++ b/sd/source/ui/dlg/tpaction.cxx @@ -265,7 +265,7 @@ void SdTPAction::Construct() -bool SdTPAction::FillItemSet( SfxItemSet& rAttrs ) +bool SdTPAction::FillItemSet( SfxItemSet* rAttrs ) { bool bModified = false; presentation::ClickAction eCA = presentation::ClickAction_NONE; @@ -275,15 +275,15 @@ bool SdTPAction::FillItemSet( SfxItemSet& rAttrs ) if( m_pLbAction->IsValueChangedFromSaved() ) { - rAttrs.Put( SfxAllEnumItem( ATTR_ACTION, (sal_uInt16)eCA ) ); + rAttrs->Put( SfxAllEnumItem( ATTR_ACTION, (sal_uInt16)eCA ) ); bModified = true; } else - rAttrs.InvalidateItem( ATTR_ACTION ); + rAttrs->InvalidateItem( ATTR_ACTION ); OUString aFileName = GetEditText( true ); if( aFileName.isEmpty() ) - rAttrs.InvalidateItem( ATTR_ACTION_FILENAME ); + rAttrs->InvalidateItem( ATTR_ACTION_FILENAME ); else { if( mpDoc && mpDoc->GetDocSh() && mpDoc->GetDocSh()->GetMedium() ) @@ -296,7 +296,7 @@ bool SdTPAction::FillItemSet( SfxItemSet& rAttrs ) INetURLObject::WAS_ENCODED, INetURLObject::DECODE_UNAMBIGUOUS ); - rAttrs.Put( SfxStringItem( ATTR_ACTION_FILENAME, aFileName ) ); + rAttrs->Put( SfxStringItem( ATTR_ACTION_FILENAME, aFileName ) ); bModified = true; } else @@ -368,7 +368,7 @@ void SdTPAction::ActivatePage( const SfxItemSet& ) int SdTPAction::DeactivatePage( SfxItemSet* pPageSet ) { if( pPageSet ) - FillItemSet( *pPageSet ); + FillItemSet( pPageSet ); return( LEAVE_PAGE ); } diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx index bf80be0d46da..8cdbfbc55c58 100644 --- a/sd/source/ui/dlg/tpoption.cxx +++ b/sd/source/ui/dlg/tpoption.cxx @@ -59,7 +59,7 @@ SdTpOptionsSnap::~SdTpOptionsSnap() -bool SdTpOptionsSnap::FillItemSet( SfxItemSet& rAttrs ) +bool SdTpOptionsSnap::FillItemSet( SfxItemSet* rAttrs ) { SvxGridTabPage::FillItemSet(rAttrs); SdOptionsSnapItem aOptsItem( ATTR_OPTIONS_SNAP ); @@ -75,7 +75,7 @@ bool SdTpOptionsSnap::FillItemSet( SfxItemSet& rAttrs ) aOptsItem.GetOptionsSnap().SetAngle( (sal_Int16) pMtrFldAngle->GetValue() ); aOptsItem.GetOptionsSnap().SetEliminatePolyPointLimitAngle( (sal_Int16) pMtrFldBezAngle->GetValue() ); - rAttrs.Put( aOptsItem ); + rAttrs->Put( aOptsItem ); // we get a possible existing GridItem, this ensures that we do net set // some default values by accident @@ -136,7 +136,7 @@ SdTpOptionsContents::~SdTpOptionsContents() -bool SdTpOptionsContents::FillItemSet( SfxItemSet& rAttrs ) +bool SdTpOptionsContents::FillItemSet( SfxItemSet* rAttrs ) { bool bModified = false; @@ -152,7 +152,7 @@ bool SdTpOptionsContents::FillItemSet( SfxItemSet& rAttrs ) aOptsItem.GetOptionsLayout().SetDragStripes( m_pCbxDragStripes->IsChecked() ); aOptsItem.GetOptionsLayout().SetHandlesBezier( m_pCbxHandlesBezier->IsChecked() ); - rAttrs.Put( aOptsItem ); + rAttrs->Put( aOptsItem ); bModified = true; } return( bModified ); @@ -347,7 +347,7 @@ int SdTpOptionsMisc::DeactivatePage( SfxItemSet* pActiveSet ) if( SetScale( m_pCbScale->GetText(), nX, nY ) ) { if( pActiveSet ) - FillItemSet( *pActiveSet ); + FillItemSet( pActiveSet ); return( LEAVE_PAGE ); } WarningBox aWarnBox( GetParent(), WB_YES_NO, SD_RESSTR( STR_WARN_SCALE_FAIL ) ); @@ -357,14 +357,14 @@ int SdTpOptionsMisc::DeactivatePage( SfxItemSet* pActiveSet ) return( KEEP_PAGE ); if( pActiveSet ) - FillItemSet( *pActiveSet ); + FillItemSet( pActiveSet ); return( LEAVE_PAGE ); } -bool SdTpOptionsMisc::FillItemSet( SfxItemSet& rAttrs ) +bool SdTpOptionsMisc::FillItemSet( SfxItemSet* rAttrs ) { bool bModified = false; @@ -394,7 +394,7 @@ bool SdTpOptionsMisc::FillItemSet( SfxItemSet& rAttrs ) m_pCbxUsePrinterMetrics->IsChecked() ? ::com::sun::star::document::PrinterIndependentLayout::DISABLED : ::com::sun::star::document::PrinterIndependentLayout::ENABLED); - rAttrs.Put( aOptsItem ); + rAttrs->Put( aOptsItem ); bModified = true; } @@ -404,7 +404,7 @@ bool SdTpOptionsMisc::FillItemSet( SfxItemSet& rAttrs ) if ( m_pLbMetric->IsValueChangedFromSaved() ) { sal_uInt16 nFieldUnit = (sal_uInt16)(sal_IntPtr)m_pLbMetric->GetEntryData( nMPos ); - rAttrs.Put( SfxUInt16Item( GetWhich( SID_ATTR_METRIC ), + rAttrs->Put( SfxUInt16Item( GetWhich( SID_ATTR_METRIC ), (sal_uInt16)nFieldUnit ) ); bModified = true; } @@ -413,17 +413,17 @@ bool SdTpOptionsMisc::FillItemSet( SfxItemSet& rAttrs ) if( m_pMtrFldTabstop->IsValueChangedFromSaved() ) { sal_uInt16 nWh = GetWhich( SID_ATTR_DEFTABSTOP ); - SfxMapUnit eUnit = rAttrs.GetPool()->GetMetric( nWh ); + SfxMapUnit eUnit = rAttrs->GetPool()->GetMetric( nWh ); SfxUInt16Item aDef( nWh,(sal_uInt16)GetCoreValue( *m_pMtrFldTabstop, eUnit ) ); - rAttrs.Put( aDef ); + rAttrs->Put( aDef ); bModified = true; } sal_Int32 nX, nY; if( SetScale( m_pCbScale->GetText(), nX, nY ) ) { - rAttrs.Put( SfxInt32Item( ATTR_OPTIONS_SCALE_X, nX ) ); - rAttrs.Put( SfxInt32Item( ATTR_OPTIONS_SCALE_Y, nY ) ); + rAttrs->Put( SfxInt32Item( ATTR_OPTIONS_SCALE_X, nX ) ); + rAttrs->Put( SfxInt32Item( ATTR_OPTIONS_SCALE_Y, nY ) ); bModified = true; } diff --git a/sd/source/ui/inc/prntopts.hxx b/sd/source/ui/inc/prntopts.hxx index 0de3e9c62ca5..bca0debb02f0 100644 --- a/sd/source/ui/inc/prntopts.hxx +++ b/sd/source/ui/inc/prntopts.hxx @@ -66,7 +66,7 @@ public: static SfxTabPage* Create( Window*, const SfxItemSet& ); - virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE; void SetDrawMode(); diff --git a/sd/source/ui/inc/tpaction.hxx b/sd/source/ui/inc/tpaction.hxx index b2d97df13848..91275a0347c1 100644 --- a/sd/source/ui/inc/tpaction.hxx +++ b/sd/source/ui/inc/tpaction.hxx @@ -103,7 +103,7 @@ public: static SfxTabPage* Create( Window*, const SfxItemSet& ); - virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; diff --git a/sd/source/ui/inc/tpoption.hxx b/sd/source/ui/inc/tpoption.hxx index cfc9d9ebbb0d..0ae5b87e41a2 100644 --- a/sd/source/ui/inc/tpoption.hxx +++ b/sd/source/ui/inc/tpoption.hxx @@ -40,7 +40,7 @@ public: virtual ~SdTpOptionsSnap(); static SfxTabPage* Create( Window*, const SfxItemSet& ); - virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE; }; @@ -62,7 +62,7 @@ public: virtual ~SdTpOptionsContents(); static SfxTabPage* Create( Window*, const SfxItemSet& ); - virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE; }; @@ -135,7 +135,7 @@ public: virtual ~SdTpOptionsMisc(); static SfxTabPage* Create( Window*, const SfxItemSet& ); - virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE; /** Hide Impress specific controls, make Draw specific controls visible diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx index 9bebf9dff15b..026ee868a9ba 100644 --- a/sfx2/source/dialog/basedlgs.cxx +++ b/sfx2/source/dialog/basedlgs.cxx @@ -680,7 +680,7 @@ IMPL_LINK_NOARG(SfxSingleTabDialog, OKHdl_Impl) bModified = ( GetOutputItemSet()->Count() > 0 ); } else - bModified = pImpl->m_pSfxPage->FillItemSet( *GetOutputSetImpl() ); + bModified = pImpl->m_pSfxPage->FillItemSet( GetOutputSetImpl() ); if ( bModified ) { diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index e307917ea525..65c1a87cc36b 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -637,7 +637,7 @@ SfxTabPage *SfxDocumentDescPage::Create(Window *pParent, const SfxItemSet &rItem } -bool SfxDocumentDescPage::FillItemSet(SfxItemSet &rSet) +bool SfxDocumentDescPage::FillItemSet(SfxItemSet *rSet) { // Test whether a change is present const bool bTitleMod = m_pTitleEd->IsModified(); @@ -685,7 +685,7 @@ bool SfxDocumentDescPage::FillItemSet(SfxItemSet &rSet) { pInfo->setDescription( m_pCommentEd->GetText() ); } - rSet.Put( SfxDocumentInfoItem( *pInfo ) ); + rSet->Put( SfxDocumentInfoItem( *pInfo ) ); if ( pInfo != m_pInfoItem ) { delete pInfo; @@ -928,7 +928,7 @@ void SfxDocumentPage::EnableUseUserData() -bool SfxDocumentPage::FillItemSet( SfxItemSet& rSet ) +bool SfxDocumentPage::FillItemSet( SfxItemSet* rSet ) { bool bRet = false; @@ -944,7 +944,7 @@ bool SfxDocumentPage::FillItemSet( SfxItemSet& rSet ) SfxDocumentInfoItem* m_pInfoItem = (SfxDocumentInfoItem*)pItem; bool bUseData = ( TRISTATE_TRUE == m_pUseUserDataCB->GetState() ); m_pInfoItem->SetUseUserData( bUseData ); - rSet.Put( SfxDocumentInfoItem( *m_pInfoItem ) ); + rSet->Put( SfxDocumentInfoItem( *m_pInfoItem ) ); bRet = true; } } @@ -965,20 +965,20 @@ bool SfxDocumentPage::FillItemSet( SfxItemSet& rSet ) newItem.SetUseUserData( TRISTATE_TRUE == m_pUseUserDataCB->GetState() ); newItem.SetDeleteUserData( true ); - rSet.Put( newItem ); + rSet->Put( newItem ); bRet = true; } } if ( m_pNameED->IsModified() && !m_pNameED->GetText().isEmpty() ) { - rSet.Put( SfxStringItem( ID_FILETP_TITLE, m_pNameED->GetText() ) ); + rSet->Put( SfxStringItem( ID_FILETP_TITLE, m_pNameED->GetText() ) ); bRet = true; } if ( /* m_pReadOnlyCB->IsModified() */ true ) { - rSet.Put( SfxBoolItem( ID_FILETP_READONLY, m_pReadOnlyCB->IsChecked() ) ); + rSet->Put( SfxBoolItem( ID_FILETP_READONLY, m_pReadOnlyCB->IsChecked() ) ); bRet = true; } @@ -2043,7 +2043,7 @@ IMPL_LINK_NOARG(SfxCustomPropertiesPage, AddHdl) return 0; } -bool SfxCustomPropertiesPage::FillItemSet( SfxItemSet& rSet ) +bool SfxCustomPropertiesPage::FillItemSet( SfxItemSet* rSet ) { bool bModified = false; const SfxPoolItem* pItem = NULL; @@ -2054,7 +2054,7 @@ bool SfxCustomPropertiesPage::FillItemSet( SfxItemSet& rSet ) { if ( SFX_ITEM_SET != GetTabDialog()->GetExampleSet()->GetItemState( SID_DOCINFO, true, &pItem ) ) - pInfo = &( SfxDocumentInfoItem& )rSet.Get( SID_DOCINFO ); + pInfo = &( SfxDocumentInfoItem& )rSet->Get( SID_DOCINFO ); else { bMustDelete = true; @@ -2087,7 +2087,7 @@ bool SfxCustomPropertiesPage::FillItemSet( SfxItemSet& rSet ) if (pInfo) { if ( bModified ) - rSet.Put( *pInfo ); + rSet->Put( *pInfo ); if ( bMustDelete ) delete pInfo; } @@ -2516,7 +2516,7 @@ SfxCmisPropertiesPage::SfxCmisPropertiesPage( Window* pParent, const SfxItemSet& { } -bool SfxCmisPropertiesPage::FillItemSet( SfxItemSet& rSet ) +bool SfxCmisPropertiesPage::FillItemSet( SfxItemSet* rSet ) { const SfxPoolItem* pItem = NULL; SfxDocumentInfoItem* pInfo = NULL; @@ -2526,7 +2526,7 @@ bool SfxCmisPropertiesPage::FillItemSet( SfxItemSet& rSet ) { if ( SFX_ITEM_SET != GetTabDialog()->GetExampleSet()->GetItemState( SID_DOCINFO, true, &pItem ) ) - pInfo = &( SfxDocumentInfoItem& )rSet.Get( SID_DOCINFO ); + pInfo = &( SfxDocumentInfoItem& )rSet->Get( SID_DOCINFO ); else { bMustDelete = true; @@ -2577,7 +2577,7 @@ bool SfxCmisPropertiesPage::FillItemSet( SfxItemSet& rSet ) pIter != changedProps.end( ); ++pIter ) aModifiedProps[ nCount++ ] = *pIter; pInfo->SetCmisProperties( aModifiedProps ); - rSet.Put( *pInfo ); + rSet->Put( *pInfo ); if ( bMustDelete ) delete pInfo; } diff --git a/sfx2/source/dialog/documentfontsdialog.cxx b/sfx2/source/dialog/documentfontsdialog.cxx index fa41757001e4..7bf4d3993175 100644 --- a/sfx2/source/dialog/documentfontsdialog.cxx +++ b/sfx2/source/dialog/documentfontsdialog.cxx @@ -53,7 +53,7 @@ void SfxDocumentFontsPage::Reset( const SfxItemSet& ) embedFontsCheckbox->Check( bVal ); } -bool SfxDocumentFontsPage::FillItemSet( SfxItemSet& ) +bool SfxDocumentFontsPage::FillItemSet( SfxItemSet* ) { bool bVal = embedFontsCheckbox->IsChecked(); SfxObjectShell* pDocSh = SfxObjectShell::Current(); diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx index 733abce27130..6855e62ecb27 100644 --- a/sfx2/source/dialog/mgetempl.cxx +++ b/sfx2/source/dialog/mgetempl.cxx @@ -352,7 +352,7 @@ IMPL_LINK_INLINE_END( SfxManageStyleSheetPage, LoseFocusHdl, Edit *, pEdit ) -bool SfxManageStyleSheetPage::FillItemSet( SfxItemSet& rSet ) +bool SfxManageStyleSheetPage::FillItemSet( SfxItemSet* rSet ) /* [Description] @@ -391,7 +391,7 @@ bool SfxManageStyleSheetPage::FillItemSet( SfxItemSet& rSet ) if(m_pAutoCB->IsVisible() && m_pAutoCB->IsValueChangedFromSaved()) { - rSet.Put(SfxBoolItem(SID_ATTR_AUTO_STYLE_UPDATE, m_pAutoCB->IsChecked())); + rSet->Put(SfxBoolItem(SID_ATTR_AUTO_STYLE_UPDATE, m_pAutoCB->IsChecked())); } return bModified; @@ -592,7 +592,7 @@ int SfxManageStyleSheetPage::DeactivatePage( SfxItemSet* pItemSet ) } if ( pItemSet ) - FillItemSet( *pItemSet ); + FillItemSet( pItemSet ); return nRet; } diff --git a/sfx2/source/dialog/printopt.cxx b/sfx2/source/dialog/printopt.cxx index 2cc667fd6913..792401c3ccf9 100644 --- a/sfx2/source/dialog/printopt.cxx +++ b/sfx2/source/dialog/printopt.cxx @@ -114,7 +114,7 @@ Window* SfxCommonPrintOptionsTabPage::GetParentLabelFor( const Window* pWindow ) return SfxTabPage::GetParentLabelFor( pWindow ); } -bool SfxCommonPrintOptionsTabPage::FillItemSet( SfxItemSet& /*rSet*/ ) +bool SfxCommonPrintOptionsTabPage::FillItemSet( SfxItemSet* /*rSet*/ ) { SvtPrintWarningOptions aWarnOptions; SvtPrinterOptions aPrinterOptions; @@ -162,7 +162,7 @@ void SfxCommonPrintOptionsTabPage::Reset( const SfxItemSet& /*rSet*/ ) int SfxCommonPrintOptionsTabPage::DeactivatePage( SfxItemSet* pItemSet ) { if( pItemSet ) - FillItemSet( *pItemSet ); + FillItemSet( pItemSet ); return LEAVE_PAGE; } diff --git a/sfx2/source/dialog/securitypage.cxx b/sfx2/source/dialog/securitypage.cxx index fe41bedc485e..ea2515d5675f 100644 --- a/sfx2/source/dialog/securitypage.cxx +++ b/sfx2/source/dialog/securitypage.cxx @@ -439,12 +439,12 @@ SfxSecurityPage::~SfxSecurityPage() } -bool SfxSecurityPage::FillItemSet( SfxItemSet & rItemSet ) +bool SfxSecurityPage::FillItemSet( SfxItemSet * rItemSet ) { bool bModified = false; DBG_ASSERT( m_pImpl.get(), "implementation pointer is 0. Still in c-tor?" ); if (m_pImpl.get() != 0) - bModified = m_pImpl->FillItemSet_Impl( rItemSet ); + bModified = m_pImpl->FillItemSet_Impl( *rItemSet ); return bModified; } diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index 7cdc84401841..98a9adc87251 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -204,9 +204,9 @@ SfxTabPage::~SfxTabPage() -bool SfxTabPage::FillItemSet( SfxItemSet& rSet ) +bool SfxTabPage::FillItemSet( SfxItemSet* rSet ) { - return pImpl->maItemConn.DoFillItemSet( rSet, GetItemSet() ); + return pImpl->maItemConn.DoFillItemSet( *rSet, GetItemSet() ); } @@ -882,13 +882,13 @@ short SfxTabDialog::Ok() { SfxItemSet& rSet = (SfxItemSet&)pTabPage->GetItemSet(); rSet.ClearItem(); - bModified |= pTabPage->FillItemSet( rSet ); + bModified |= pTabPage->FillItemSet( &rSet ); } else if ( pSet && !pTabPage->HasExchangeSupport() ) { SfxItemSet aTmp( *pSet->GetPool(), pSet->GetRanges() ); - if ( pTabPage->FillItemSet( aTmp ) ) + if ( pTabPage->FillItemSet( &aTmp ) ) { bModified |= true; if (pExampleSet) diff --git a/sfx2/source/inc/documentfontsdialog.hxx b/sfx2/source/inc/documentfontsdialog.hxx index 585e97dcdc7e..847baa6bbd22 100644 --- a/sfx2/source/inc/documentfontsdialog.hxx +++ b/sfx2/source/inc/documentfontsdialog.hxx @@ -33,7 +33,7 @@ public: SfxDocumentFontsPage( Window* parent, const SfxItemSet& set ); static SfxTabPage* Create( Window* parent, const SfxItemSet& set ); protected: - virtual bool FillItemSet( SfxItemSet& set ) SAL_OVERRIDE; + virtual bool FillItemSet( 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 bfaa3ed10c09..f37cc45672f3 100644 --- a/sfx2/source/view/printer.cxx +++ b/sfx2/source/view/printer.cxx @@ -239,7 +239,7 @@ short SfxPrintOptionsDialog::Execute() short nRet = ModalDialog::Execute(); if ( nRet == RET_OK ) - pPage->FillItemSet( *pOptions ); + pPage->FillItemSet( pOptions ); else pPage->Reset( *pOptions ); return nRet; diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx index 7efaa1fc9160..7c1a2b9689c6 100644 --- a/starmath/inc/dialog.hxx +++ b/starmath/inc/dialog.hxx @@ -63,7 +63,7 @@ class SmPrintOptionsTabPage : public SfxTabPage DECL_LINK(SizeButtonClickHdl, Button *); - virtual bool FillItemSet(SfxItemSet& rSet) SAL_OVERRIDE; + virtual bool FillItemSet(SfxItemSet* rSet) SAL_OVERRIDE; virtual void Reset(const SfxItemSet& rSet) SAL_OVERRIDE; public: diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx index c329140f3275..99a8dc9c93b6 100644 --- a/starmath/source/dialog.cxx +++ b/starmath/source/dialog.cxx @@ -178,7 +178,7 @@ SmPrintOptionsTabPage::SmPrintOptionsTabPage(Window *pParent, const SfxItemSet & } -bool SmPrintOptionsTabPage::FillItemSet(SfxItemSet& rSet) +bool SmPrintOptionsTabPage::FillItemSet(SfxItemSet* rSet) { sal_uInt16 nPrintSize; if (m_pSizeNormal->IsChecked()) @@ -188,13 +188,13 @@ bool SmPrintOptionsTabPage::FillItemSet(SfxItemSet& rSet) else nPrintSize = PRINT_SIZE_ZOOMED; - rSet.Put(SfxUInt16Item(GetWhich(SID_PRINTSIZE), (sal_uInt16) nPrintSize)); - rSet.Put(SfxUInt16Item(GetWhich(SID_PRINTZOOM), (sal_uInt16) m_pZoom->GetValue())); - rSet.Put(SfxBoolItem(GetWhich(SID_PRINTTITLE), m_pTitle->IsChecked())); - rSet.Put(SfxBoolItem(GetWhich(SID_PRINTTEXT), m_pText->IsChecked())); - rSet.Put(SfxBoolItem(GetWhich(SID_PRINTFRAME), m_pFrame->IsChecked())); - rSet.Put(SfxBoolItem(GetWhich(SID_NO_RIGHT_SPACES), m_pNoRightSpaces->IsChecked())); - rSet.Put(SfxBoolItem(GetWhich(SID_SAVE_ONLY_USED_SYMBOLS), m_pSaveOnlyUsedSymbols->IsChecked())); + rSet->Put(SfxUInt16Item(GetWhich(SID_PRINTSIZE), (sal_uInt16) nPrintSize)); + rSet->Put(SfxUInt16Item(GetWhich(SID_PRINTZOOM), (sal_uInt16) m_pZoom->GetValue())); + rSet->Put(SfxBoolItem(GetWhich(SID_PRINTTITLE), m_pTitle->IsChecked())); + rSet->Put(SfxBoolItem(GetWhich(SID_PRINTTEXT), m_pText->IsChecked())); + rSet->Put(SfxBoolItem(GetWhich(SID_PRINTFRAME), m_pFrame->IsChecked())); + rSet->Put(SfxBoolItem(GetWhich(SID_NO_RIGHT_SPACES), m_pNoRightSpaces->IsChecked())); + rSet->Put(SfxBoolItem(GetWhich(SID_SAVE_ONLY_USED_SYMBOLS), m_pSaveOnlyUsedSymbols->IsChecked())); return true; } diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx index 0b8831bcc690..99ddba702096 100644 --- a/svx/source/dialog/hdft.cxx +++ b/svx/source/dialog/hdft.cxx @@ -215,7 +215,7 @@ SvxHFPage::~SvxHFPage() -bool SvxHFPage::FillItemSet( SfxItemSet& rSet ) +bool SvxHFPage::FillItemSet( SfxItemSet* rSet ) { const sal_uInt16 nWSize = GetWhich( SID_ATTR_PAGE_SIZE ); const sal_uInt16 nWLRSpace = GetWhich( SID_ATTR_LRSPACE ); @@ -313,7 +313,7 @@ bool SvxHFPage::FillItemSet( SfxItemSet& rSet ) // Flush the SetItem SvxSetItem aSetItem( GetWhich( nId ), aSet ); - rSet.Put( aSetItem ); + rSet->Put( aSetItem ); return true; } @@ -873,7 +873,7 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet ) int SvxHFPage::DeactivatePage( SfxItemSet* _pSet ) { if ( _pSet ) - FillItemSet( *_pSet ); + FillItemSet( _pSet ); return LEAVE_PAGE; } diff --git a/svx/source/dialog/optgrid.cxx b/svx/source/dialog/optgrid.cxx index 8337461131d3..2ab8df62cd36 100644 --- a/svx/source/dialog/optgrid.cxx +++ b/svx/source/dialog/optgrid.cxx @@ -191,7 +191,7 @@ SfxTabPage* SvxGridTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet -bool SvxGridTabPage::FillItemSet( SfxItemSet& rCoreSet ) +bool SvxGridTabPage::FillItemSet( SfxItemSet* rCoreSet ) { if ( bAttrModified ) { @@ -202,7 +202,7 @@ bool SvxGridTabPage::FillItemSet( SfxItemSet& rCoreSet ) aGridItem.bGridVisible = pCbxGridVisible->IsChecked(); SfxMapUnit eUnit = - rCoreSet.GetPool()->GetMetric( GetWhich( SID_ATTR_GRID_OPTIONS ) ); + rCoreSet->GetPool()->GetMetric( GetWhich( SID_ATTR_GRID_OPTIONS ) ); long nX =GetCoreValue( *pMtrFldDrawX, eUnit ); long nY = GetCoreValue( *pMtrFldDrawY, eUnit ); @@ -211,7 +211,7 @@ bool SvxGridTabPage::FillItemSet( SfxItemSet& rCoreSet ) aGridItem.nFldDivisionX = static_cast<long>(pNumFldDivisionX->GetValue()-1); aGridItem.nFldDivisionY = static_cast<long>(pNumFldDivisionY->GetValue()-1); - rCoreSet.Put( aGridItem ); + rCoreSet->Put( aGridItem ); } return bAttrModified; } @@ -292,7 +292,7 @@ void SvxGridTabPage::ActivatePage( const SfxItemSet& rSet ) int SvxGridTabPage::DeactivatePage( SfxItemSet* _pSet ) { if ( _pSet ) - FillItemSet( *_pSet ); + FillItemSet( _pSet ); return( LEAVE_PAGE ); } diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx index 33bd0fbb4441..8797e1ca133c 100644 --- a/sw/source/ui/chrdlg/chardlg.cxx +++ b/sw/source/ui/chrdlg/chardlg.cxx @@ -233,7 +233,7 @@ void SwCharURLPage::Reset(const SfxItemSet& rSet) } } -bool SwCharURLPage::FillItemSet(SfxItemSet& rSet) +bool SwCharURLPage::FillItemSet(SfxItemSet* rSet) { OUString sURL = m_pURLED->GetText(); if(!sURL.isEmpty()) @@ -271,10 +271,10 @@ bool SwCharURLPage::FillItemSet(SfxItemSet& rSet) if(m_pTextED->IsModified()) { bModified = true; - rSet.Put(SfxStringItem(FN_PARAM_SELECTION, m_pTextED->GetText())); + rSet->Put(SfxStringItem(FN_PARAM_SELECTION, m_pTextED->GetText())); } if(bModified) - rSet.Put(aINetFmt); + rSet->Put(aINetFmt); return bModified; } diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx index 5edfda138434..adf11c0a13af 100644 --- a/sw/source/ui/chrdlg/drpcps.cxx +++ b/sw/source/ui/chrdlg/drpcps.cxx @@ -581,10 +581,10 @@ SfxTabPage* SwDropCapsPage::Create(Window *pParent, return new SwDropCapsPage(pParent, rSet); } -bool SwDropCapsPage::FillItemSet(SfxItemSet &rSet) +bool SwDropCapsPage::FillItemSet(SfxItemSet *rSet) { if(bModified) - FillSet(rSet); + FillSet(*rSet); return bModified; } diff --git a/sw/source/ui/chrdlg/numpara.cxx b/sw/source/ui/chrdlg/numpara.cxx index 240d5d704146..8dfdcb9b8b92 100644 --- a/sw/source/ui/chrdlg/numpara.cxx +++ b/sw/source/ui/chrdlg/numpara.cxx @@ -101,17 +101,17 @@ const sal_uInt16* SwParagraphNumTabPage::GetRanges() return aPageRg; } -bool SwParagraphNumTabPage::FillItemSet( SfxItemSet& rSet ) +bool SwParagraphNumTabPage::FillItemSet( SfxItemSet* rSet ) { if( m_pOutlineLvLB->IsValueChangedFromSaved()) { const sal_uInt16 aOutlineLv = m_pOutlineLvLB->GetSelectEntryPos(); - const SfxUInt16Item* pOldOutlineLv = (const SfxUInt16Item*)GetOldItem( rSet, SID_ATTR_PARA_OUTLINE_LEVEL); + const SfxUInt16Item* pOldOutlineLv = (const SfxUInt16Item*)GetOldItem( *rSet, SID_ATTR_PARA_OUTLINE_LEVEL); if (pOldOutlineLv) { SfxUInt16Item* pOutlineLv = (SfxUInt16Item*)pOldOutlineLv->Clone(); pOutlineLv->SetValue( aOutlineLv ); - rSet.Put(*pOutlineLv); + rSet->Put(*pOutlineLv); delete pOutlineLv; bModified = true; } @@ -122,12 +122,12 @@ bool SwParagraphNumTabPage::FillItemSet( SfxItemSet& rSet ) OUString aStyle; if(m_pNumberStyleLB->GetSelectEntryPos()) aStyle = m_pNumberStyleLB->GetSelectEntry(); - const SfxStringItem* pOldRule = (const SfxStringItem*)GetOldItem( rSet, SID_ATTR_PARA_NUMRULE); + const SfxStringItem* pOldRule = (const SfxStringItem*)GetOldItem( *rSet, SID_ATTR_PARA_NUMRULE); SfxStringItem* pRule = pOldRule ? (SfxStringItem*)pOldRule->Clone() : NULL; if (pRule) { pRule->SetValue(aStyle); - rSet.Put(*pRule); + rSet->Put(*pRule); delete pRule; bModified = true; } @@ -139,8 +139,8 @@ bool SwParagraphNumTabPage::FillItemSet( SfxItemSet& rSet ) bModified = true; bool bNewStartChecked = TRISTATE_TRUE == m_pNewStartCB->GetState(); bool bNumberNewStartChecked = TRISTATE_TRUE == m_pNewStartNumberCB->GetState(); - rSet.Put(SfxBoolItem(FN_NUMBER_NEWSTART, bNewStartChecked)); - rSet.Put(SfxUInt16Item(FN_NUMBER_NEWSTART_AT, + rSet->Put(SfxBoolItem(FN_NUMBER_NEWSTART, bNewStartChecked)); + rSet->Put(SfxUInt16Item(FN_NUMBER_NEWSTART_AT, bNumberNewStartChecked && bNewStartChecked ? (sal_uInt16)m_pNewStartNF->GetValue() : USHRT_MAX)); } @@ -152,7 +152,7 @@ bool SwParagraphNumTabPage::FillItemSet( SfxItemSet& rSet ) aFmt.SetStartValue( static_cast< sal_uLong >(m_pRestartParaCountCB->GetState() == TRISTATE_TRUE ? m_pRestartNF->GetValue() : 0 )); aFmt.SetCountLines( m_pCountParaCB->IsChecked() ); - rSet.Put(aFmt); + rSet->Put(aFmt); bModified = true; } return bModified; diff --git a/sw/source/ui/chrdlg/swuiccoll.cxx b/sw/source/ui/chrdlg/swuiccoll.cxx index e38941ac9a29..da29f85c9c8c 100644 --- a/sw/source/ui/chrdlg/swuiccoll.cxx +++ b/sw/source/ui/chrdlg/swuiccoll.cxx @@ -132,7 +132,7 @@ SwCondCollPage::~SwCondCollPage() int SwCondCollPage::DeactivatePage(SfxItemSet * _pSet) { if( _pSet ) - FillItemSet(*_pSet); + FillItemSet(_pSet); return LEAVE_PAGE; } @@ -142,7 +142,7 @@ SfxTabPage* SwCondCollPage::Create(Window *pParent, const SfxItemSet &rSet) return new SwCondCollPage(pParent, rSet); } -bool SwCondCollPage::FillItemSet(SfxItemSet &rSet) +bool SwCondCollPage::FillItemSet(SfxItemSet *rSet) { bool bModified = true; SwCondCollItem aCondItem; @@ -151,7 +151,7 @@ bool SwCondCollPage::FillItemSet(SfxItemSet &rSet) const OUString sEntry = m_pTbLinks->GetEntryText(i, 1); aCondItem.SetStyle( &sEntry, i); } - rSet.Put(aCondItem); + rSet->Put(aCondItem); return bModified; } diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx index aae0529109e6..5bf65b411cf3 100644 --- a/sw/source/ui/config/mailconfigpage.cxx +++ b/sw/source/ui/config/mailconfigpage.cxx @@ -143,7 +143,7 @@ SfxTabPage* SwMailConfigPage::Create( Window* pParent, const SfxItemSet& rAttrS return new SwMailConfigPage(pParent, rAttrSet); } -bool SwMailConfigPage::FillItemSet( SfxItemSet& /*rSet*/ ) +bool SwMailConfigPage::FillItemSet( SfxItemSet* /*rSet*/ ) { if(m_pDisplayNameED->IsValueChangedFromSaved()) m_pConfigItem->SetMailDisplayName(m_pDisplayNameED->GetText()); diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx index 5a5fb9cc0b9a..9dd4105dca11 100644 --- a/sw/source/ui/config/optcomp.cxx +++ b/sw/source/ui/config/optcomp.cxx @@ -405,7 +405,7 @@ SfxTabPage* SwCompatibilityOptPage::Create( Window* pParent, const SfxItemSet& r return new SwCompatibilityOptPage( pParent, rAttrSet ); } -bool SwCompatibilityOptPage::FillItemSet( SfxItemSet& ) +bool SwCompatibilityOptPage::FillItemSet( SfxItemSet* ) { bool bModified = false; if ( m_pWrtShell ) diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx index af52de99b9d4..dcfa398966f5 100644 --- a/sw/source/ui/config/optload.cxx +++ b/sw/source/ui/config/optload.cxx @@ -138,7 +138,7 @@ IMPL_LINK_NOARG(SwLoadOptPage, StandardizedPageCountCheckHdl) return 0; } -bool SwLoadOptPage::FillItemSet( SfxItemSet& rSet ) +bool SwLoadOptPage::FillItemSet( SfxItemSet* rSet ) { bool bRet = false; SwModule* pMod = SW_MOD(); @@ -180,13 +180,13 @@ bool SwLoadOptPage::FillItemSet( SfxItemSet& rSet ) { // Double-Cast for VA3.0 const sal_uInt16 nFieldUnit = (sal_uInt16)(sal_IntPtr)m_pMetricLB->GetEntryData( nMPos ); - rSet.Put( SfxUInt16Item( SID_ATTR_METRIC, nFieldUnit ) ); + rSet->Put( SfxUInt16Item( SID_ATTR_METRIC, nFieldUnit ) ); bRet = true; } if(m_pTabMF->IsVisible() && m_pTabMF->IsValueChangedFromSaved()) { - rSet.Put(SfxUInt16Item(SID_ATTR_DEFTABSTOP, + rSet->Put(SfxUInt16Item(SID_ATTR_DEFTABSTOP, (sal_uInt16)m_pTabMF->Denormalize(m_pTabMF->GetValue(FUNIT_TWIP)))); bRet = true; } @@ -196,7 +196,7 @@ bool SwLoadOptPage::FillItemSet( SfxItemSet& rSet ) bIsUseCharUnitFlag = bIsUseCharUnitFlag && aCJKOptions.IsAsianTypographyEnabled(); if( (bIsUseCharUnitFlag ? 1 : 0) != m_pUseCharUnit->GetSavedValue()) { - rSet.Put(SfxBoolItem(SID_ATTR_APPLYCHARUNIT, bIsUseCharUnitFlag )); + rSet->Put(SfxBoolItem(SID_ATTR_APPLYCHARUNIT, bIsUseCharUnitFlag )); bRet = true; } @@ -529,7 +529,7 @@ SfxTabPage* SwCaptionOptPage::Create( Window* pParent, return new SwCaptionOptPage(pParent, rAttrSet ); } -bool SwCaptionOptPage::FillItemSet( SfxItemSet& ) +bool SwCaptionOptPage::FillItemSet( SfxItemSet* ) { bool bRet = false; SwModuleOptions* pModOpt = SW_MOD()->GetModuleConfig(); diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index cf8f4fc4787f..460846e4b220 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -211,7 +211,7 @@ void SwContentOptPage::Reset(const SfxItemSet& rSet) AnyRulerHdl(m_pAnyRulerCB); } -bool SwContentOptPage::FillItemSet(SfxItemSet& rSet) +bool SwContentOptPage::FillItemSet(SfxItemSet* rSet) { const SwElemItem* pOldAttr = (const SwElemItem*) GetOldItem(GetItemSet(), FN_PARAM_ELEM); @@ -235,7 +235,7 @@ bool SwContentOptPage::FillItemSet(SfxItemSet& rSet) bool bRet = !pOldAttr || aElem != *pOldAttr; if(bRet) - bRet = 0 != rSet.Put(aElem); + bRet = 0 != rSet->Put(aElem); sal_Int32 nMPos = m_pMetricLB->GetSelectEntryPos(); sal_Int32 nGlobalMetricPos = nMPos; @@ -243,7 +243,7 @@ bool SwContentOptPage::FillItemSet(SfxItemSet& rSet) { // Double-Cast for VA3.0 const sal_uInt16 nFieldUnit = (sal_uInt16)(sal_IntPtr)m_pMetricLB->GetEntryData( nMPos ); - rSet.Put( SfxUInt16Item( SID_ATTR_METRIC, nFieldUnit ) ); + rSet->Put( SfxUInt16Item( SID_ATTR_METRIC, nFieldUnit ) ); bRet = true; } @@ -252,7 +252,7 @@ bool SwContentOptPage::FillItemSet(SfxItemSet& rSet) { // Double-Cast for VA3.0 const sal_uInt16 nFieldUnit = (sal_uInt16)(sal_IntPtr)m_pHMetric->GetEntryData( nMPos ); - rSet.Put( SfxUInt16Item( FN_HSCROLL_METRIC, nFieldUnit ) ); + rSet->Put( SfxUInt16Item( FN_HSCROLL_METRIC, nFieldUnit ) ); bRet = true; } nMPos = m_pVMetric->GetSelectEntryPos(); @@ -260,7 +260,7 @@ bool SwContentOptPage::FillItemSet(SfxItemSet& rSet) { // Double-Cast for VA3.0 const sal_uInt16 nFieldUnit = (sal_uInt16)(sal_IntPtr)m_pVMetric->GetEntryData( nMPos ); - rSet.Put( SfxUInt16Item( FN_VSCROLL_METRIC, nFieldUnit ) ); + rSet->Put( SfxUInt16Item( FN_VSCROLL_METRIC, nFieldUnit ) ); bRet = true; } return bRet; @@ -367,7 +367,7 @@ SfxTabPage* SwAddPrinterTabPage::Create( Window* pParent, return ( new SwAddPrinterTabPage( pParent, rAttrSet ) ); } -bool SwAddPrinterTabPage::FillItemSet( SfxItemSet& rCoreSet ) +bool SwAddPrinterTabPage::FillItemSet( SfxItemSet* rCoreSet ) { if ( bAttrModified ) { @@ -403,7 +403,7 @@ bool SwAddPrinterTabPage::FillItemSet( SfxItemSet& rCoreSet ) const OUString sFax = m_pFaxLB->GetSelectEntry(); aAddPrinterAttr.sFaxName = sNone == sFax ? aEmptyOUStr : sFax; - rCoreSet.Put(aAddPrinterAttr); + rCoreSet->Put(aAddPrinterAttr); } return bAttrModified; } @@ -614,7 +614,7 @@ static void lcl_SetColl(SwWrtShell* pWrtShell, sal_uInt16 nType, pColl->SetFmtAttr(SvxFontHeightItem(nHeight, 100, nFontHeightWhich)); } -bool SwStdFontTabPage::FillItemSet( SfxItemSet& ) +bool SwStdFontTabPage::FillItemSet( SfxItemSet* ) { bool bNotDocOnly = !pDocOnlyCB->IsChecked(); SW_MOD()->GetModuleConfig()->SetDefaultFontInCurrDocOnly(!bNotDocOnly); @@ -1097,7 +1097,7 @@ SfxTabPage* SwTableOptionsTabPage::Create( Window* pParent, return new SwTableOptionsTabPage(pParent, rAttrSet ); } -bool SwTableOptionsTabPage::FillItemSet( SfxItemSet& ) +bool SwTableOptionsTabPage::FillItemSet( SfxItemSet* ) { bool bRet = false; SwModuleOptions* pModOpt = SW_MOD()->GetModuleConfig(); @@ -1337,7 +1337,7 @@ void SwShdwCrsrOptionsTabPage::PageCreated( const SfxAllItemSet& aSet ) SetWrtShell(pWrtSh->GetValue()); } -bool SwShdwCrsrOptionsTabPage::FillItemSet( SfxItemSet& rSet ) +bool SwShdwCrsrOptionsTabPage::FillItemSet( SfxItemSet* rSet ) { SwShadowCursorItem aOpt; aOpt.SetOn( m_pOnOffCB->IsChecked() ); @@ -1355,10 +1355,10 @@ bool SwShdwCrsrOptionsTabPage::FillItemSet( SfxItemSet& rSet ) bool bRet = false; const SfxPoolItem* pItem = 0; - if( SFX_ITEM_SET != rSet.GetItemState( FN_PARAM_SHADOWCURSOR, false, &pItem ) + if( SFX_ITEM_SET != rSet->GetItemState( FN_PARAM_SHADOWCURSOR, false, &pItem ) || ((SwShadowCursorItem&)*pItem) != aOpt ) { - rSet.Put( aOpt ); + rSet->Put( aOpt ); bRet = true; } @@ -1370,7 +1370,7 @@ bool SwShdwCrsrOptionsTabPage::FillItemSet( SfxItemSet& rSet ) if( m_pCrsrInProtCB->IsValueChangedFromSaved()) { - rSet.Put(SfxBoolItem(FN_PARAM_CRSR_IN_PROTECTED, m_pCrsrInProtCB->IsChecked())); + rSet->Put(SfxBoolItem(FN_PARAM_CRSR_IN_PROTECTED, m_pCrsrInProtCB->IsChecked())); bRet = true; } @@ -1393,7 +1393,7 @@ bool SwShdwCrsrOptionsTabPage::FillItemSet( SfxItemSet& rSet ) bRet |= (!pOldAttr || aDisp != *pOldAttr); if(bRet) - bRet = 0 != rSet.Put(aDisp); + bRet = 0 != rSet->Put(aDisp); return bRet; } @@ -1733,7 +1733,7 @@ SfxTabPage* SwRedlineOptionsTabPage::Create( Window* pParent, const SfxItemSet& return new SwRedlineOptionsTabPage( pParent, rSet ); } -bool SwRedlineOptionsTabPage::FillItemSet( SfxItemSet& ) +bool SwRedlineOptionsTabPage::FillItemSet( SfxItemSet* ) { CharAttr *pAttr; SwModuleOptions *pOpt = SW_MOD()->GetModuleConfig(); @@ -2233,7 +2233,7 @@ SfxTabPage* SwCompareOptionsTabPage::Create( Window* pParent, const SfxItemSet& return new SwCompareOptionsTabPage( pParent, rAttrSet ); } -bool SwCompareOptionsTabPage::FillItemSet( SfxItemSet& ) +bool SwCompareOptionsTabPage::FillItemSet( SfxItemSet* ) { bool bRet = false; SwModuleOptions *pOpt = SW_MOD()->GetModuleConfig(); @@ -2358,7 +2358,7 @@ SfxTabPage* SwTestTabPage::Create( Window* pParent, return new SwTestTabPage(pParent, rAttrSet); } -bool SwTestTabPage::FillItemSet( SfxItemSet& rCoreSet ) +bool SwTestTabPage::FillItemSet( SfxItemSet* rCoreSet ) { if ( bAttrModified ) @@ -2374,7 +2374,7 @@ bool SwTestTabPage::FillItemSet( SfxItemSet& rCoreSet ) aTestItem.bTest8=m_pTest8CBox->IsChecked(); aTestItem.bTest9=m_pTest9CBox->IsChecked(); aTestItem.bTest10=m_pTest10CBox->IsChecked(); - rCoreSet.Put(aTestItem); + rCoreSet->Put(aTestItem); } return bAttrModified; } diff --git a/sw/source/ui/dialog/docstdlg.cxx b/sw/source/ui/dialog/docstdlg.cxx index 8dc93ddb9512..4d237209aeef 100644 --- a/sw/source/ui/dialog/docstdlg.cxx +++ b/sw/source/ui/dialog/docstdlg.cxx @@ -77,7 +77,7 @@ SwDocStatPage::SwDocStatPage(Window *pParent, const SfxItemSet &rSet) } // Description: fill ItemSet when changed -bool SwDocStatPage::FillItemSet(SfxItemSet & /*rSet*/) +bool SwDocStatPage::FillItemSet(SfxItemSet * /*rSet*/) { return false; } diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index a4f4fd0f1215..a43d048545aa 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -1572,7 +1572,7 @@ void SwInsertSectionTabPage::SetWrtShell(SwWrtShell& rSh) } } -bool SwInsertSectionTabPage::FillItemSet( SfxItemSet& ) +bool SwInsertSectionTabPage::FillItemSet( SfxItemSet* ) { SwSectionData aSection(CONTENT_SECTION, m_pCurName->GetText()); aSection.SetCondition(m_pConditionED->GetText()); @@ -1837,7 +1837,7 @@ SwSectionFtnEndTabPage::~SwSectionFtnEndTabPage() { } -bool SwSectionFtnEndTabPage::FillItemSet( SfxItemSet& rSet ) +bool SwSectionFtnEndTabPage::FillItemSet( SfxItemSet* rSet ) { SwFmtFtnAtTxtEnd aFtn( pFtnNtAtTextEndCB->IsChecked() ? ( pFtnNtNumCB->IsChecked() @@ -1881,8 +1881,8 @@ bool SwSectionFtnEndTabPage::FillItemSet( SfxItemSet& rSet ) // no break; } - rSet.Put( aFtn ); - rSet.Put( aEnd ); + rSet->Put( aFtn ); + rSet->Put( aEnd ); return true; } @@ -2098,7 +2098,7 @@ SwSectionIndentTabPage::~SwSectionIndentTabPage() { } -bool SwSectionIndentTabPage::FillItemSet( SfxItemSet& rSet) +bool SwSectionIndentTabPage::FillItemSet( SfxItemSet* rSet) { if(m_pBeforeMF->IsValueModified() || m_pAfterMF->IsValueModified()) @@ -2106,7 +2106,7 @@ bool SwSectionIndentTabPage::FillItemSet( SfxItemSet& rSet) SvxLRSpaceItem aLRSpace( static_cast< long >(m_pBeforeMF->Denormalize(m_pBeforeMF->GetValue(FUNIT_TWIP))) , static_cast< long >(m_pAfterMF->Denormalize(m_pAfterMF->GetValue(FUNIT_TWIP))), 0, 0, RES_LR_SPACE); - rSet.Put(aLRSpace); + rSet->Put(aLRSpace); } return true; } diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx index c816fe933972..6ec8cab83818 100644 --- a/sw/source/ui/envelp/envfmt.cxx +++ b/sw/source/ui/envelp/envfmt.cxx @@ -457,7 +457,7 @@ void SwEnvFmtPage::ActivatePage(const SfxItemSet& rSet) int SwEnvFmtPage::DeactivatePage(SfxItemSet* _pSet) { if( _pSet ) - FillItemSet(*_pSet); + FillItemSet(_pSet); return SfxTabPage::LEAVE_PAGE; } @@ -485,10 +485,10 @@ void SwEnvFmtPage::FillItem(SwEnvItem& rItem) } } -bool SwEnvFmtPage::FillItemSet(SfxItemSet& rSet) +bool SwEnvFmtPage::FillItemSet(SfxItemSet* rSet) { FillItem(GetParentSwEnvDlg()->aEnvItem); - rSet.Put(GetParentSwEnvDlg()->aEnvItem); + rSet->Put(GetParentSwEnvDlg()->aEnvItem); return true; } diff --git a/sw/source/ui/envelp/envfmt.hxx b/sw/source/ui/envelp/envfmt.hxx index 777cdf25d00b..28cc5cd395b7 100644 --- a/sw/source/ui/envelp/envfmt.hxx +++ b/sw/source/ui/envelp/envfmt.hxx @@ -65,7 +65,7 @@ public: virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; void FillItem(SwEnvItem& rItem); - virtual bool FillItemSet(SfxItemSet& rSet) SAL_OVERRIDE; + virtual bool FillItemSet(SfxItemSet* rSet) SAL_OVERRIDE; virtual void Reset(const SfxItemSet& rSet) SAL_OVERRIDE; }; diff --git a/sw/source/ui/envelp/envlop1.cxx b/sw/source/ui/envelp/envlop1.cxx index b4172fe81664..4e56860cfa4d 100644 --- a/sw/source/ui/envelp/envlop1.cxx +++ b/sw/source/ui/envelp/envlop1.cxx @@ -323,7 +323,7 @@ int SwEnvPage::DeactivatePage(SfxItemSet* _pSet) { FillItem(GetParentSwEnvDlg()->aEnvItem); if( _pSet ) - FillItemSet(*_pSet); + FillItemSet(_pSet); return SfxTabPage::LEAVE_PAGE; } @@ -334,10 +334,10 @@ void SwEnvPage::FillItem(SwEnvItem& rItem) rItem.aSendText = m_pSenderEdit->GetText(); } -bool SwEnvPage::FillItemSet(SfxItemSet& rSet) +bool SwEnvPage::FillItemSet(SfxItemSet* rSet) { FillItem(GetParentSwEnvDlg()->aEnvItem); - rSet.Put(GetParentSwEnvDlg()->aEnvItem); + rSet->Put(GetParentSwEnvDlg()->aEnvItem); return true; } diff --git a/sw/source/ui/envelp/envprt.cxx b/sw/source/ui/envelp/envprt.cxx index 252cf04ac0d9..304737608b33 100644 --- a/sw/source/ui/envelp/envprt.cxx +++ b/sw/source/ui/envelp/envprt.cxx @@ -141,7 +141,7 @@ void SwEnvPrtPage::ActivatePage(const SfxItemSet&) int SwEnvPrtPage::DeactivatePage(SfxItemSet* _pSet) { if( _pSet ) - FillItemSet(*_pSet); + FillItemSet(_pSet); return SfxTabPage::LEAVE_PAGE; } @@ -163,10 +163,10 @@ void SwEnvPrtPage::FillItem(SwEnvItem& rItem) rItem.lShiftDown = static_cast< sal_Int32 >(GetFldVal(*m_pDownField )); } -bool SwEnvPrtPage::FillItemSet(SfxItemSet& rSet) +bool SwEnvPrtPage::FillItemSet(SfxItemSet* rSet) { FillItem(GetParentSwEnvDlg()->aEnvItem); - rSet.Put(GetParentSwEnvDlg()->aEnvItem); + rSet->Put(GetParentSwEnvDlg()->aEnvItem); return true; } diff --git a/sw/source/ui/envelp/envprt.hxx b/sw/source/ui/envelp/envprt.hxx index 73eb2ddc5e45..9c937b75adbe 100644 --- a/sw/source/ui/envelp/envprt.hxx +++ b/sw/source/ui/envelp/envprt.hxx @@ -64,7 +64,7 @@ public: virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; void FillItem(SwEnvItem& rItem); - virtual bool FillItemSet(SfxItemSet& rSet) SAL_OVERRIDE; + virtual bool FillItemSet(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 db98aa82930a..7efb173754f5 100644 --- a/sw/source/ui/envelp/label1.cxx +++ b/sw/source/ui/envelp/label1.cxx @@ -473,7 +473,7 @@ void SwLabPage::ActivatePage(const SfxItemSet& rSet) int SwLabPage::DeactivatePage(SfxItemSet* _pSet) { if (_pSet) - FillItemSet(*_pSet); + FillItemSet(_pSet); return sal_True; } @@ -494,10 +494,10 @@ void SwLabPage::FillItem(SwLabItem& rItem) rItem.aLstType = m_pTypeBox->GetSelectEntry(); } -bool SwLabPage::FillItemSet(SfxItemSet& rSet) +bool SwLabPage::FillItemSet(SfxItemSet* rSet) { FillItem( aItem ); - rSet.Put( aItem ); + rSet->Put( aItem ); return true; } @@ -610,11 +610,11 @@ void SwVisitingCardPage::ActivatePage(const SfxItemSet& rSet) int SwVisitingCardPage::DeactivatePage(SfxItemSet* _pSet) { if (_pSet) - FillItemSet(*_pSet); + FillItemSet(_pSet); return LEAVE_PAGE; } -bool SwVisitingCardPage::FillItemSet(SfxItemSet& rSet) +bool SwVisitingCardPage::FillItemSet(SfxItemSet* rSet) { const OUString* pGroup = (const OUString*)m_pAutoTextGroupLB->GetEntryData( m_pAutoTextGroupLB->GetSelectEntryPos()); @@ -626,7 +626,7 @@ bool SwVisitingCardPage::FillItemSet(SfxItemSet& rSet) SvTreeListEntry* pSelEntry = m_pAutoTextLB->FirstSelected(); if(pSelEntry) aLabItem.sGlossaryBlockName = *(OUString*)pSelEntry->GetUserData(); - rSet.Put(aLabItem); + rSet->Put(aLabItem); return true; } @@ -743,11 +743,11 @@ void SwPrivateDataPage::ActivatePage(const SfxItemSet& rSet) int SwPrivateDataPage::DeactivatePage(SfxItemSet* _pSet) { if (_pSet) - FillItemSet(*_pSet); + FillItemSet(_pSet); return LEAVE_PAGE; } -bool SwPrivateDataPage::FillItemSet(SfxItemSet& rSet) +bool SwPrivateDataPage::FillItemSet(SfxItemSet* rSet) { SwLabItem aItem = (const SwLabItem&) GetTabDialog()->GetExampleSet()->Get(FN_LABEL); @@ -770,7 +770,7 @@ bool SwPrivateDataPage::FillItemSet(SfxItemSet& rSet) aItem.aPrivWWW = m_pHomePageED->GetText( ); aItem.aPrivMail = m_pMailED->GetText( ); - rSet.Put(aItem); + rSet->Put(aItem); return true; } @@ -831,11 +831,11 @@ void SwBusinessDataPage::ActivatePage(const SfxItemSet& rSet) int SwBusinessDataPage::DeactivatePage(SfxItemSet* _pSet) { if (_pSet) - FillItemSet(*_pSet); + FillItemSet(_pSet); return LEAVE_PAGE; } -bool SwBusinessDataPage::FillItemSet(SfxItemSet& rSet) +bool SwBusinessDataPage::FillItemSet(SfxItemSet* rSet) { SwLabItem aItem = (const SwLabItem&) GetTabDialog()->GetExampleSet()->Get(FN_LABEL); @@ -854,7 +854,7 @@ bool SwBusinessDataPage::FillItemSet(SfxItemSet& rSet) aItem.aCompWWW = m_pHomePageED->GetText(); aItem.aCompMail = m_pMailED->GetText(); - rSet.Put(aItem); + rSet->Put(aItem); return true; } diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx index 49593db120b8..d2cb08201325 100644 --- a/sw/source/ui/envelp/labfmt.cxx +++ b/sw/source/ui/envelp/labfmt.cxx @@ -478,7 +478,7 @@ void SwLabFmtPage::ActivatePage(const SfxItemSet& rSet) int SwLabFmtPage::DeactivatePage(SfxItemSet* _pSet) { if (_pSet) - FillItemSet(*_pSet); + FillItemSet(_pSet); return sal_True; } @@ -503,10 +503,10 @@ void SwLabFmtPage::FillItem(SwLabItem& rItem) } } -bool SwLabFmtPage::FillItemSet(SfxItemSet& rSet) +bool SwLabFmtPage::FillItemSet(SfxItemSet* rSet) { FillItem(aItem); - rSet.Put(aItem); + rSet->Put(aItem); return true; } diff --git a/sw/source/ui/envelp/labfmt.hxx b/sw/source/ui/envelp/labfmt.hxx index 27d93db4e9bb..d84ffc03c1f6 100644 --- a/sw/source/ui/envelp/labfmt.hxx +++ b/sw/source/ui/envelp/labfmt.hxx @@ -108,7 +108,7 @@ public: virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; void FillItem(SwLabItem& rItem); - virtual bool FillItemSet(SfxItemSet& rSet) SAL_OVERRIDE; + virtual bool FillItemSet(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 cc5a9e3c152a..65ddb7ebc746 100644 --- a/sw/source/ui/envelp/labprt.cxx +++ b/sw/source/ui/envelp/labprt.cxx @@ -107,7 +107,7 @@ void SwLabPrtPage::ActivatePage( const SfxItemSet& rSet ) int SwLabPrtPage::DeactivatePage(SfxItemSet* _pSet) { if ( _pSet ) - FillItemSet(*_pSet); + FillItemSet(_pSet); return sal_True; } @@ -120,12 +120,12 @@ void SwLabPrtPage::FillItem(SwLabItem& rItem) rItem.bSynchron = m_pSynchronCB->IsChecked() && m_pSynchronCB->IsEnabled(); } -bool SwLabPrtPage::FillItemSet(SfxItemSet& rSet) +bool SwLabPrtPage::FillItemSet(SfxItemSet* rSet) { SwLabItem aItem; GetParentSwLabDlg()->GetLabItem(aItem); FillItem(aItem); - rSet.Put(aItem); + rSet->Put(aItem); return true; } diff --git a/sw/source/ui/envelp/labprt.hxx b/sw/source/ui/envelp/labprt.hxx index 4cd62fbc3176..011ccea625ff 100644 --- a/sw/source/ui/envelp/labprt.hxx +++ b/sw/source/ui/envelp/labprt.hxx @@ -61,7 +61,7 @@ public: virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; void FillItem(SwLabItem& rItem); - virtual bool FillItemSet(SfxItemSet& rSet) SAL_OVERRIDE; + virtual bool FillItemSet(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 b00f6fd68f68..62436bd6bdc5 100644 --- a/sw/source/ui/envelp/swuilabimp.hxx +++ b/sw/source/ui/envelp/swuilabimp.hxx @@ -69,7 +69,7 @@ public: virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; void FillItem(SwLabItem& rItem); - virtual bool FillItemSet(SfxItemSet& rSet) SAL_OVERRIDE; + virtual bool FillItemSet(SfxItemSet* rSet) SAL_OVERRIDE; virtual void Reset(const SfxItemSet& rSet) SAL_OVERRIDE; SwLabDlg* GetParentSwLabDlg() {return (SwLabDlg*) GetParentDialog();} @@ -120,7 +120,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 bool FillItemSet(SfxItemSet* rSet) SAL_OVERRIDE; virtual void Reset(const SfxItemSet& rSet) SAL_OVERRIDE; }; @@ -158,7 +158,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 bool FillItemSet(SfxItemSet* rSet) SAL_OVERRIDE; virtual void Reset(const SfxItemSet& rSet) SAL_OVERRIDE; }; @@ -194,7 +194,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 bool FillItemSet(SfxItemSet* rSet) SAL_OVERRIDE; virtual void Reset(const SfxItemSet& rSet) SAL_OVERRIDE; }; diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx index 935403bbc76d..a302e4e8ec0b 100644 --- a/sw/source/ui/fldui/flddb.cxx +++ b/sw/source/ui/fldui/flddb.cxx @@ -178,7 +178,7 @@ void SwFldDBPage::Reset(const SfxItemSet&) } } -bool SwFldDBPage::FillItemSet(SfxItemSet& ) +bool SwFldDBPage::FillItemSet(SfxItemSet* ) { OUString sTableName; OUString sColumnName; diff --git a/sw/source/ui/fldui/flddb.hxx b/sw/source/ui/fldui/flddb.hxx index 4f2bf1ba6eed..90e5311965d4 100644 --- a/sw/source/ui/fldui/flddb.hxx +++ b/sw/source/ui/fldui/flddb.hxx @@ -74,7 +74,7 @@ public: static SfxTabPage* Create(Window* pParent, const SfxItemSet& rAttrSet); - virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; virtual void FillUserData() SAL_OVERRIDE; diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx index 5e18019f02e4..279dfab73df2 100644 --- a/sw/source/ui/fldui/flddinf.cxx +++ b/sw/source/ui/fldui/flddinf.cxx @@ -414,7 +414,7 @@ sal_Int32 SwFldDokInfPage::FillSelectionLB(sal_uInt16 nSubType) return nSize; } -bool SwFldDokInfPage::FillItemSet(SfxItemSet& ) +bool SwFldDokInfPage::FillItemSet(SfxItemSet* ) { if (!pSelEntry || (sal_uInt16)(sal_uLong)pSelEntry->GetUserData() == USHRT_MAX) return false; diff --git a/sw/source/ui/fldui/flddinf.hxx b/sw/source/ui/fldui/flddinf.hxx index 24ba93b89c9b..50e49f92aacc 100644 --- a/sw/source/ui/fldui/flddinf.hxx +++ b/sw/source/ui/fldui/flddinf.hxx @@ -65,7 +65,7 @@ public: static SfxTabPage* Create(Window* pParent, const SfxItemSet& rAttrSet); - virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( 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 7b265d170c1d..ab0c365b943b 100644 --- a/sw/source/ui/fldui/flddok.cxx +++ b/sw/source/ui/fldui/flddok.cxx @@ -540,7 +540,7 @@ IMPL_LINK_NOARG(SwFldDokPage, FormatHdl) return 0; } -bool SwFldDokPage::FillItemSet(SfxItemSet& ) +bool SwFldDokPage::FillItemSet(SfxItemSet* ) { sal_uInt16 nTypeId = (sal_uInt16)(sal_uLong)m_pTypeLB->GetEntryData(GetTypeSel()); diff --git a/sw/source/ui/fldui/flddok.hxx b/sw/source/ui/fldui/flddok.hxx index 4af41fdfe6d3..9e549b77d9eb 100644 --- a/sw/source/ui/fldui/flddok.hxx +++ b/sw/source/ui/fldui/flddok.hxx @@ -67,7 +67,7 @@ public: static SfxTabPage* Create(Window* pParent, const SfxItemSet& rAttrSet); - virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; virtual void FillUserData() SAL_OVERRIDE; diff --git a/sw/source/ui/fldui/fldedt.cxx b/sw/source/ui/fldui/fldedt.cxx index 54b938b48f7c..c69391281622 100644 --- a/sw/source/ui/fldui/fldedt.cxx +++ b/sw/source/ui/fldui/fldedt.cxx @@ -219,7 +219,7 @@ IMPL_LINK_NOARG(SwFldEditDlg, OKHdl) SfxTabPage* pTabPage = GetTabPage(); if (pTabPage) { - pTabPage->FillItemSet(*(SfxItemSet*)0); + pTabPage->FillItemSet(0); } EndDialog( RET_OK ); @@ -247,7 +247,7 @@ IMPL_LINK( SwFldEditDlg, NextPrevHdl, Button *, pButton ) //#112462# FillItemSet may delete the current field //that's why it has to be called before accessing the current field if( GetOKButton()->IsEnabled() ) - pTabPage->FillItemSet(*(SfxItemSet*)0); + pTabPage->FillItemSet(0); SwFldMgr& rMgr = pTabPage->GetFldMgr(); SwField *pCurFld = rMgr.GetCurFld(); diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx index 00a37dac4419..868d72fe6629 100644 --- a/sw/source/ui/fldui/fldfunc.cxx +++ b/sw/source/ui/fldui/fldfunc.cxx @@ -510,7 +510,7 @@ IMPL_LINK( SwFldFuncPage, MacroHdl, Button *, pBtn ) return 0; } -bool SwFldFuncPage::FillItemSet(SfxItemSet& ) +bool SwFldFuncPage::FillItemSet(SfxItemSet* ) { const sal_uInt16 nTypeId = (sal_uInt16)(sal_uLong)m_pTypeLB->GetEntryData(GetTypeSel()); diff --git a/sw/source/ui/fldui/fldfunc.hxx b/sw/source/ui/fldui/fldfunc.hxx index 434f884172c1..434999ebae54 100644 --- a/sw/source/ui/fldui/fldfunc.hxx +++ b/sw/source/ui/fldui/fldfunc.hxx @@ -89,7 +89,7 @@ public: static SfxTabPage* Create(Window* pParent, const SfxItemSet& rAttrSet); - virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; virtual void FillUserData() SAL_OVERRIDE; diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx index 65aa5df431b5..c1ebf3494478 100644 --- a/sw/source/ui/fldui/fldref.cxx +++ b/sw/source/ui/fldui/fldref.cxx @@ -756,7 +756,7 @@ IMPL_LINK_NOARG(SwFldRefPage, ModifyHdl) return 0; } -bool SwFldRefPage::FillItemSet(SfxItemSet& ) +bool SwFldRefPage::FillItemSet(SfxItemSet* ) { bool bModified = false; sal_uInt16 nTypeId = (sal_uInt16)(sal_uLong)m_pTypeLB->GetEntryData(GetTypeSel()); diff --git a/sw/source/ui/fldui/fldref.hxx b/sw/source/ui/fldui/fldref.hxx index a8102aa544d0..cb4ac98a8dfb 100644 --- a/sw/source/ui/fldui/fldref.hxx +++ b/sw/source/ui/fldui/fldref.hxx @@ -80,7 +80,7 @@ public: static SfxTabPage* Create(Window* pParent, const SfxItemSet& rAttrSet); - virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; virtual void FillUserData() SAL_OVERRIDE; diff --git a/sw/source/ui/fldui/fldtdlg.cxx b/sw/source/ui/fldui/fldtdlg.cxx index fe6829a999d5..536f0fee99bb 100644 --- a/sw/source/ui/fldui/fldtdlg.cxx +++ b/sw/source/ui/fldui/fldtdlg.cxx @@ -185,7 +185,7 @@ IMPL_LINK_NOARG(SwFldDlg, OKHdl) if (GetOKButton().IsEnabled()) { SfxTabPage* pPage = GetTabPage(GetCurPageId()); - pPage->FillItemSet(*(SfxItemSet*)0); + pPage->FillItemSet(0); GetOKButton().GrabFocus(); // because of InputField-Dlg } diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx index 1079a22bb483..f392afc0b88d 100644 --- a/sw/source/ui/fldui/fldvar.cxx +++ b/sw/source/ui/fldui/fldvar.cxx @@ -1089,7 +1089,7 @@ IMPL_LINK_NOARG(SwFldVarPage, SeparatorHdl) return 0; } -bool SwFldVarPage::FillItemSet(SfxItemSet& ) +bool SwFldVarPage::FillItemSet(SfxItemSet* ) { const sal_uInt16 nTypeId = (sal_uInt16)(sal_uLong)m_pTypeLB->GetEntryData(GetTypeSel()); diff --git a/sw/source/ui/fldui/fldvar.hxx b/sw/source/ui/fldui/fldvar.hxx index ab4222e4245b..203882935813 100644 --- a/sw/source/ui/fldui/fldvar.hxx +++ b/sw/source/ui/fldui/fldvar.hxx @@ -96,7 +96,7 @@ public: static SfxTabPage* Create(Window* pParent, const SfxItemSet& rAttrSet); - virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( 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 ab22c2824587..2fd3c2beb24f 100644 --- a/sw/source/ui/frmdlg/column.cxx +++ b/sw/source/ui/frmdlg/column.cxx @@ -247,7 +247,7 @@ IMPL_LINK(SwColumnDlg, ObjectHdl, ListBox*, pBox) } if(pBox) { - pTabPage->FillItemSet(*pSet); + pTabPage->FillItemSet(pSet); } nOldSelection = (sal_IntPtr)m_pApplyToLB->GetEntryData(m_pApplyToLB->GetSelectEntryPos()); long nWidth = nSelectionWidth; @@ -309,7 +309,7 @@ IMPL_LINK_NOARG(SwColumnDlg, OkHdl) bFrameChanged = true; break; } - pTabPage->FillItemSet(*pSet); + pTabPage->FillItemSet(pSet); if(pSelectionSet && SFX_ITEM_SET == pSelectionSet->GetItemState(RES_COL)) { @@ -627,7 +627,7 @@ SfxTabPage* SwColumnPage::Create(Window *pParent, const SfxItemSet &rSet) return new SwColumnPage(pParent, rSet); } // stuff attributes into the Set when OK -bool SwColumnPage::FillItemSet(SfxItemSet &rSet) +bool SwColumnPage::FillItemSet(SfxItemSet *rSet) { if(m_pCLNrEdt->HasChildPathFocus()) m_pCLNrEdt->GetDownHdl().Call(m_pCLNrEdt); @@ -636,13 +636,13 @@ bool SwColumnPage::FillItemSet(SfxItemSet &rSet) const SfxPoolItem* pOldItem; const SwFmtCol& rCol = pColMgr->GetColumns(); - if(0 == (pOldItem = GetOldItem( rSet, RES_COL )) || + if(0 == (pOldItem = GetOldItem( *rSet, RES_COL )) || rCol != *pOldItem ) - rSet.Put(rCol); + rSet->Put(rCol); if(m_pBalanceColsCB->IsVisible() ) { - rSet.Put(SwFmtNoBalancedColumns(!m_pBalanceColsCB->IsChecked() )); + rSet->Put(SwFmtNoBalancedColumns(!m_pBalanceColsCB->IsChecked() )); } if( m_pTextDirectionLB->IsVisible()) { @@ -650,7 +650,7 @@ bool SwColumnPage::FillItemSet(SfxItemSet &rSet) if ( m_pTextDirectionLB->IsValueChangedFromSaved() ) { sal_uInt32 nDirection = (sal_uInt32)(sal_IntPtr)m_pTextDirectionLB->GetEntryData( nPos ); - rSet.Put( SvxFrameDirectionItem( (SvxFrameDirection)nDirection, RES_FRAMEDIR)); + rSet->Put( SvxFrameDirectionItem( (SvxFrameDirection)nDirection, RES_FRAMEDIR)); } } return true; @@ -1229,7 +1229,7 @@ void SwColumnPage::ActivatePage(const SfxItemSet& rSet) int SwColumnPage::DeactivatePage(SfxItemSet *_pSet) { if(_pSet) - FillItemSet(*_pSet); + FillItemSet(_pSet); return sal_True; } diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index b96ed9ad5fe5..4558f73d8629 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -1024,7 +1024,7 @@ void SwFrmPage::Reset( const SfxItemSet &rSet ) } // stuff attributes into the set when OK -bool SwFrmPage::FillItemSet(SfxItemSet &rSet) +bool SwFrmPage::FillItemSet(SfxItemSet *rSet) { bool bRet = false; SwWrtShell* pSh = bFormat ? ::GetActiveWrtShell() @@ -1037,11 +1037,11 @@ bool SwFrmPage::FillItemSet(SfxItemSet &rSet) if ( !bFormat ) { - pOldItem = GetOldItem(rSet, RES_ANCHOR); + pOldItem = GetOldItem(*rSet, RES_ANCHOR); if (bNew || !pOldItem || eAnchorId != ((const SwFmtAnchor*)pOldItem)->GetAnchorId()) { SwFmtAnchor aAnc( eAnchorId, pSh->GetPhyPageNum() ); - bRet = 0 != rSet.Put( aAnc ); + bRet = 0 != rSet->Put( aAnc ); } } @@ -1068,7 +1068,7 @@ bool SwFrmPage::FillItemSet(SfxItemSet &rSet) aHoriOrient.SetPos( nX ); } - pOldItem = GetOldItem(rSet, FN_HORI_ORIENT); + pOldItem = GetOldItem(*rSet, FN_HORI_ORIENT); bool bSame = false; if ((bNew == bFormat) && pOldItem) { @@ -1076,7 +1076,7 @@ bool SwFrmPage::FillItemSet(SfxItemSet &rSet) } if ((bNew && !bFormat) || ((bAtHorzPosModified || bMod) && !bSame)) { - bRet |= 0 != rSet.Put( aHoriOrient ); + bRet |= 0 != rSet->Put( aHoriOrient ); } } @@ -1107,7 +1107,7 @@ bool SwFrmPage::FillItemSet(SfxItemSet &rSet) } aVertOrient.SetPos( nY ); } - pOldItem = GetOldItem(rSet, FN_VERT_ORIENT); + pOldItem = GetOldItem(*rSet, FN_VERT_ORIENT); bool bSame = false; if((bNew == bFormat) && pOldItem) { @@ -1119,7 +1119,7 @@ bool SwFrmPage::FillItemSet(SfxItemSet &rSet) } if( ( bNew && !bFormat ) || ((bAtVertPosModified || bMod) && !bSame )) { - bRet |= 0 != rSet.Put( aVertOrient ); + bRet |= 0 != rSet->Put( aVertOrient ); } } @@ -1198,9 +1198,9 @@ bool SwFrmPage::FillItemSet(SfxItemSet &rSet) } } if( !bFormat && m_pFixedRatioCB->IsValueChangedFromSaved() ) - bRet |= 0 != rSet.Put(SfxBoolItem(FN_KEEP_ASPECT_RATIO, m_pFixedRatioCB->IsChecked())); + bRet |= 0 != rSet->Put(SfxBoolItem(FN_KEEP_ASPECT_RATIO, m_pFixedRatioCB->IsChecked())); - pOldItem = GetOldItem(rSet, RES_FRM_SIZE); + pOldItem = GetOldItem(*rSet, RES_FRM_SIZE); if ((pOldItem && aSz != *pOldItem) || (!pOldItem && !bFormat) || (bFormat && @@ -1210,11 +1210,11 @@ bool SwFrmPage::FillItemSet(SfxItemSet &rSet) if (aSz.GetHeightSizeType() == ATT_VAR_SIZE) // there is no VAR_SIZE in frames aSz.SetHeightSizeType(ATT_MIN_SIZE); - bRet |= 0 != rSet.Put( aSz ); + bRet |= 0 != rSet->Put( aSz ); } if(m_pFollowTextFlowCB->IsValueChangedFromSaved()) { - bRet |= 0 != rSet.Put(SwFmtFollowTextFlow(m_pFollowTextFlowCB->IsChecked())); + bRet |= 0 != rSet->Put(SwFmtFollowTextFlow(m_pFollowTextFlowCB->IsChecked())); } return bRet; } @@ -1710,7 +1710,7 @@ int SwFrmPage::DeactivatePage(SfxItemSet * _pSet) { if ( _pSet ) { - FillItemSet( *_pSet ); + FillItemSet( _pSet ); //FillItemSet doesn't set the anchor into the set when it matches //the original. But for the other pages we need the current anchor. @@ -2485,7 +2485,7 @@ void SwGrfExtPage::ActivatePage(const SfxItemSet& rSet) m_pBmpWin->Invalidate(); } -bool SwGrfExtPage::FillItemSet( SfxItemSet &rSet ) +bool SwGrfExtPage::FillItemSet( SfxItemSet *rSet ) { bool bModified = false; if ( m_pMirrorHorzBox->IsValueChangedFromSaved() || @@ -2511,14 +2511,14 @@ bool SwGrfExtPage::FillItemSet( SfxItemSet &rSet ) bool bMirror = !m_pAllPagesRB->IsChecked(); SwMirrorGrf aMirror( eMirror ); aMirror.SetGrfToggle(bMirror ); - rSet.Put( aMirror ); + rSet->Put( aMirror ); } if( aGrfName != aNewGrfName || m_pConnectED->IsModified() ) { bModified = true; aGrfName = m_pConnectED->GetText(); - rSet.Put( SvxBrushItem( aGrfName, aFilterName, GPOS_LT, + rSet->Put( SvxBrushItem( aGrfName, aFilterName, GPOS_LT, SID_ATTR_GRAF_GRAPHIC )); } return bModified; @@ -2527,7 +2527,7 @@ bool SwGrfExtPage::FillItemSet( SfxItemSet &rSet ) int SwGrfExtPage::DeactivatePage(SfxItemSet *_pSet) { if( _pSet ) - FillItemSet( *_pSet ); + FillItemSet( _pSet ); return sal_True; } @@ -2752,10 +2752,10 @@ void SwFrmURLPage::Reset( const SfxItemSet &rSet ) pClientCB->SaveValue(); } -bool SwFrmURLPage::FillItemSet(SfxItemSet &rSet) +bool SwFrmURLPage::FillItemSet(SfxItemSet *rSet) { bool bModified = false; - const SwFmtURL* pOldURL = (SwFmtURL*)GetOldItem(rSet, RES_URL); + const SwFmtURL* pOldURL = (SwFmtURL*)GetOldItem(*rSet, RES_URL); boost::scoped_ptr<SwFmtURL> pFmtURL; if(pOldURL) pFmtURL.reset((SwFmtURL*)pOldURL->Clone()); @@ -2786,7 +2786,7 @@ bool SwFrmURLPage::FillItemSet(SfxItemSet &rSet) pFmtURL->SetTargetFrameName(pFrameCB->GetText()); bModified = true; } - rSet.Put(*pFmtURL); + rSet->Put(*pFmtURL); return bModified; } @@ -3043,28 +3043,28 @@ void SwFrmAddPage::Reset(const SfxItemSet &rSet ) m_pVertAlignLB->SaveValue(); } -bool SwFrmAddPage::FillItemSet(SfxItemSet &rSet) +bool SwFrmAddPage::FillItemSet(SfxItemSet *rSet) { bool bRet = false; if (pNameED->IsValueChangedFromSaved()) - bRet |= 0 != rSet.Put(SfxStringItem(FN_SET_FRM_NAME, pNameED->GetText())); + bRet |= 0 != rSet->Put(SfxStringItem(FN_SET_FRM_NAME, pNameED->GetText())); if (pAltNameED->IsValueChangedFromSaved()) - bRet |= 0 != rSet.Put(SfxStringItem(FN_SET_FRM_ALT_NAME, pAltNameED->GetText())); + bRet |= 0 != rSet->Put(SfxStringItem(FN_SET_FRM_ALT_NAME, pAltNameED->GetText())); const SfxPoolItem* pOldItem; SvxProtectItem aProt ( (const SvxProtectItem& )GetItemSet().Get(RES_PROTECT) ); aProt.SetCntntProtect( pProtectContentCB->IsChecked() ); aProt.SetSizeProtect ( pProtectSizeCB->IsChecked() ); aProt.SetPosProtect ( pProtectFrameCB->IsChecked() ); - if ( 0 == (pOldItem = GetOldItem(rSet, FN_SET_PROTECT)) || + if ( 0 == (pOldItem = GetOldItem(*rSet, FN_SET_PROTECT)) || aProt != *pOldItem ) - bRet |= 0 != rSet.Put( aProt); + bRet |= 0 != rSet->Put( aProt); if ( pEditInReadonlyCB->IsValueChangedFromSaved() ) - bRet |= 0 != rSet.Put( SwFmtEditInReadonly( RES_EDIT_IN_READONLY, pEditInReadonlyCB->IsChecked())); + bRet |= 0 != rSet->Put( SwFmtEditInReadonly( RES_EDIT_IN_READONLY, pEditInReadonlyCB->IsChecked())); if ( pPrintFrameCB->IsValueChangedFromSaved() ) - bRet |= 0 != rSet.Put( SvxPrintItem( RES_PRINT, pPrintFrameCB->IsChecked())); + bRet |= 0 != rSet->Put( SvxPrintItem( RES_PRINT, pPrintFrameCB->IsChecked())); // textflow if( pTextFlowLB->IsVisible() ) @@ -3073,7 +3073,7 @@ bool SwFrmAddPage::FillItemSet(SfxItemSet &rSet) if( pTextFlowLB->IsValueChangedFromSaved() ) { sal_uInt16 nData = (sal_uInt16)(sal_IntPtr)pTextFlowLB->GetEntryData( nPos ); - bRet |= 0 != rSet.Put( SvxFrameDirectionItem( + bRet |= 0 != rSet->Put( SvxFrameDirectionItem( (SvxFrameDirection)nData, RES_FRAMEDIR )); } } @@ -3096,9 +3096,9 @@ bool SwFrmAddPage::FillItemSet(SfxItemSet &rSet) if ((pFlyFmt = rChain.GetNext()) != 0) sNextChain = pFlyFmt->GetName(); if(sPrevChain != sCurrentPrevChain) - bRet |= 0 != rSet.Put(SfxStringItem(FN_PARAM_CHAIN_PREVIOUS, sCurrentPrevChain)); + bRet |= 0 != rSet->Put(SfxStringItem(FN_PARAM_CHAIN_PREVIOUS, sCurrentPrevChain)); if(sNextChain != sCurrentNextChain) - bRet |= 0 != rSet.Put(SfxStringItem(FN_PARAM_CHAIN_NEXT, sCurrentNextChain)); + bRet |= 0 != rSet->Put(SfxStringItem(FN_PARAM_CHAIN_NEXT, sCurrentNextChain)); } } @@ -3112,7 +3112,7 @@ bool SwFrmAddPage::FillItemSet(SfxItemSet &rSet) case 1 : nAdjust = SDRTEXTVERTADJUST_CENTER; break; case 2 : nAdjust = SDRTEXTVERTADJUST_BOTTOM; break; } - bRet |= 0 != rSet.Put(SdrTextVertAdjustItem(nAdjust, RES_TEXT_VERT_ADJUST)); + bRet |= 0 != rSet->Put(SdrTextVertAdjustItem(nAdjust, RES_TEXT_VERT_ADJUST)); } return bRet; diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx index a1b72dbcf44d..f396d331947d 100644 --- a/sw/source/ui/frmdlg/wrap.cxx +++ b/sw/source/ui/frmdlg/wrap.cxx @@ -269,7 +269,7 @@ void SwWrapTabPage::Reset(const SfxItemSet &rSet) } // stuff attributes into the set when OK -bool SwWrapTabPage::FillItemSet(SfxItemSet &rSet) +bool SwWrapTabPage::FillItemSet(SfxItemSet *rSet) { bool bModified = false; const SfxPoolItem* pOldItem; @@ -309,19 +309,19 @@ bool SwWrapTabPage::FillItemSet(SfxItemSet &rSet) if ( bContour ) aSur.SetOutside(m_pWrapOutsideCB->IsChecked()); - if(0 == (pOldItem = GetOldItem( rSet, RES_SURROUND )) || + if(0 == (pOldItem = GetOldItem( *rSet, RES_SURROUND )) || aSur != *pOldItem ) { - rSet.Put(aSur); + rSet->Put(aSur); bModified = true; } if (!bDrawMode) { - if(0 == (pOldItem = GetOldItem( rSet, FN_OPAQUE )) || + if(0 == (pOldItem = GetOldItem( *rSet, FN_OPAQUE )) || aOp != *pOldItem ) { - rSet.Put(aOp); + rSet->Put(aOp); bModified = true; } } @@ -335,10 +335,10 @@ bool SwWrapTabPage::FillItemSet(SfxItemSet &rSet) if ( bTopMod || bBottomMod ) { - if(0 == (pOldItem = GetOldItem(rSet, RES_UL_SPACE)) || + if(0 == (pOldItem = GetOldItem(*rSet, RES_UL_SPACE)) || aUL != *pOldItem ) { - rSet.Put( aUL, RES_UL_SPACE ); + rSet->Put( aUL, RES_UL_SPACE ); bModified = true; } } @@ -352,10 +352,10 @@ bool SwWrapTabPage::FillItemSet(SfxItemSet &rSet) if ( bLeftMod || bRightMod ) { - if( 0 == (pOldItem = GetOldItem(rSet, RES_LR_SPACE)) || + if( 0 == (pOldItem = GetOldItem(*rSet, RES_LR_SPACE)) || aLR != *pOldItem ) { - rSet.Put(aLR, RES_LR_SPACE); + rSet->Put(aLR, RES_LR_SPACE); bModified = true; } } @@ -364,7 +364,7 @@ bool SwWrapTabPage::FillItemSet(SfxItemSet &rSet) { bool bChecked = m_pWrapTransparentCB->IsChecked() && m_pWrapTransparentCB->IsEnabled(); if ((m_pWrapTransparentCB->GetSavedValue() == 1) != bChecked) - bModified |= 0 != rSet.Put(SfxInt16Item(FN_DRAW_WRAP_DLG, bChecked ? 0 : 1)); + bModified |= 0 != rSet->Put(SfxInt16Item(FN_DRAW_WRAP_DLG, bChecked ? 0 : 1)); } return bModified; @@ -559,7 +559,7 @@ void SwWrapTabPage::ActivatePage(const SfxItemSet& rSet) int SwWrapTabPage::DeactivatePage(SfxItemSet* _pSet) { if(_pSet) - FillItemSet(*_pSet); + FillItemSet(_pSet); return sal_True; } diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 0589d6b470b7..74f167cc8b90 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -902,7 +902,7 @@ void SwTOXSelectTabPage::SetWrtShell(SwWrtShell& rSh) } } -bool SwTOXSelectTabPage::FillItemSet( SfxItemSet& ) +bool SwTOXSelectTabPage::FillItemSet( SfxItemSet* ) { return true; } @@ -1894,7 +1894,7 @@ SwTOXEntryTabPage::~SwTOXEntryTabPage() { } -bool SwTOXEntryTabPage::FillItemSet( SfxItemSet& ) +bool SwTOXEntryTabPage::FillItemSet( SfxItemSet* ) { // nothing to do return true; @@ -3512,7 +3512,7 @@ SwTOXStylesTabPage::~SwTOXStylesTabPage() delete m_pCurrentForm; } -bool SwTOXStylesTabPage::FillItemSet( SfxItemSet& ) +bool SwTOXStylesTabPage::FillItemSet( SfxItemSet* ) { return true; } diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx index 7b9f5d246513..86c99c966613 100644 --- a/sw/source/ui/misc/docfnote.cxx +++ b/sw/source/ui/misc/docfnote.cxx @@ -61,10 +61,10 @@ IMPL_LINK( SwFootNoteOptionDlg, OkHdl, Button *, pBtn ) SfxItemSet aDummySet(rSh.GetAttrPool(), 1, 1 ); SfxTabPage *pPage = GetTabPage( m_nFootNoteId ); if ( pPage ) - pPage->FillItemSet( aDummySet ); + pPage->FillItemSet( &aDummySet ); pPage = GetTabPage( m_nEndNoteId ); if ( pPage ) - pPage->FillItemSet( aDummySet ); + pPage->FillItemSet( &aDummySet ); aOldOkHdl.Call( pBtn ); return 0; } @@ -344,7 +344,7 @@ static SwCharFmt* lcl_GetCharFormat( SwWrtShell* pSh, const OUString& rCharFmtNa return pFmt; } -bool SwEndNoteOptionPage::FillItemSet( SfxItemSet & ) +bool SwEndNoteOptionPage::FillItemSet( SfxItemSet * ) { boost::scoped_ptr<SwEndNoteInfo> pInf(bEndNote ? new SwEndNoteInfo() : new SwFtnInfo()); diff --git a/sw/source/ui/misc/impfnote.hxx b/sw/source/ui/misc/impfnote.hxx index 19b26e1090dc..349a43194e51 100644 --- a/sw/source/ui/misc/impfnote.hxx +++ b/sw/source/ui/misc/impfnote.hxx @@ -72,7 +72,7 @@ public: virtual ~SwEndNoteOptionPage(); static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet); - virtual bool FillItemSet(SfxItemSet &rSet) SAL_OVERRIDE; + virtual bool FillItemSet(SfxItemSet *rSet) 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 d81d767c04ca..1bf0db625ce6 100644 --- a/sw/source/ui/misc/num.cxx +++ b/sw/source/ui/misc/num.cxx @@ -402,20 +402,20 @@ int SwNumPositionTabPage::DeactivatePage(SfxItemSet *_pSet) { SwOutlineTabDialog::SetActNumLevel(nActNumLvl); if(_pSet) - FillItemSet(*_pSet); + FillItemSet(_pSet); return sal_True; } -bool SwNumPositionTabPage::FillItemSet( SfxItemSet& rSet ) +bool SwNumPositionTabPage::FillItemSet( SfxItemSet* rSet ) { if(pOutlineDlg) *pOutlineDlg->GetNumRule() = *pActNum; else if(bModified && pActNum) { *pSaveNum = *pActNum; - rSet.Put(SwUINumRuleItem( *pSaveNum )); - rSet.Put(SfxBoolItem(FN_PARAM_NUM_PRESET, false)); + rSet->Put(SwUINumRuleItem( *pSaveNum )); + rSet->Put(SfxBoolItem(FN_PARAM_NUM_PRESET, false)); } return bModified; } diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx index 50ccf9ea16be..a7ce9a4d4028 100644 --- a/sw/source/ui/misc/outline.cxx +++ b/sw/source/ui/misc/outline.cxx @@ -817,7 +817,7 @@ int SwOutlineSettingsTabPage::DeactivatePage(SfxItemSet*) return LEAVE_PAGE; } -bool SwOutlineSettingsTabPage::FillItemSet( SfxItemSet& ) +bool SwOutlineSettingsTabPage::FillItemSet( SfxItemSet* ) { return true; } diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx index 29704905edb6..600905f847c9 100644 --- a/sw/source/ui/misc/pgfnote.cxx +++ b/sw/source/ui/misc/pgfnote.cxx @@ -254,7 +254,7 @@ void SwFootNotePage::Reset(const SfxItemSet &rSet) } // stuff attributes into the set, when OK -bool SwFootNotePage::FillItemSet(SfxItemSet &rSet) +bool SwFootNotePage::FillItemSet(SfxItemSet *rSet) { SwPageFtnInfoItem aItem((const SwPageFtnInfoItem&)GetItemSet().Get(FN_PARAM_FTN_INFO)); @@ -294,9 +294,9 @@ bool SwFootNotePage::FillItemSet(SfxItemSet &rSet) rFtnInfo.SetWidth(Fraction( static_cast< long >(m_pLineLengthEdit->GetValue()), 100)); const SfxPoolItem* pOldItem; - if(0 == (pOldItem = GetOldItem( rSet, FN_PARAM_FTN_INFO )) || + if(0 == (pOldItem = GetOldItem( *rSet, FN_PARAM_FTN_INFO )) || aItem != *pOldItem ) - rSet.Put(aItem); + rSet->Put(aItem); return true; } @@ -352,7 +352,7 @@ void SwFootNotePage::ActivatePage(const SfxItemSet& rSet) int SwFootNotePage::DeactivatePage( SfxItemSet* _pSet) { if(_pSet) - FillItemSet(*_pSet); + FillItemSet(_pSet); return sal_True; } diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx index a0539e93ae6b..017d2a530a42 100644 --- a/sw/source/ui/misc/pggrid.cxx +++ b/sw/source/ui/misc/pggrid.cxx @@ -158,7 +158,7 @@ SfxTabPage *SwTextGridPage::Create(Window *pParent, const SfxItemSet &rSet) return new SwTextGridPage(pParent, rSet); } -bool SwTextGridPage::FillItemSet(SfxItemSet &rSet) +bool SwTextGridPage::FillItemSet(SfxItemSet *rSet) { bool bRet = false; if(m_pNoGridRB->IsValueChangedFromSaved() || @@ -174,7 +174,7 @@ bool SwTextGridPage::FillItemSet(SfxItemSet &rSet) m_pPrintCB->IsValueChangedFromSaved() || m_pColorLB->IsValueChangedFromSaved()) { - PutGridItem(rSet); + PutGridItem(*rSet); bRet = true; } diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx index f102f15a2599..fd0211cc5406 100644 --- a/sw/source/ui/table/tabledlg.cxx +++ b/sw/source/ui/table/tabledlg.cxx @@ -374,7 +374,7 @@ SfxTabPage* SwFormatTablePage::Create( Window* pParent, return new SwFormatTablePage( pParent, rAttrSet ); } -bool SwFormatTablePage::FillItemSet( SfxItemSet& rCoreSet ) +bool SwFormatTablePage::FillItemSet( SfxItemSet* rCoreSet ) { //Test if one of the controls still has the focus if (m_aWidthMF.HasFocus()) @@ -396,13 +396,13 @@ bool SwFormatTablePage::FillItemSet( SfxItemSet& rCoreSet ) SvxULSpaceItem aULSpace(RES_UL_SPACE); aULSpace.SetUpper( m_pTopMF->Denormalize(m_pTopMF->GetValue( FUNIT_TWIP ))); aULSpace.SetLower( m_pBottomMF->Denormalize(m_pBottomMF->GetValue( FUNIT_TWIP ))); - rCoreSet.Put(aULSpace); + rCoreSet->Put(aULSpace); } } if(m_pNameED->IsValueChangedFromSaved()) { - rCoreSet.Put(SfxStringItem( FN_PARAM_TABLE_NAME, m_pNameED->GetText())); + rCoreSet->Put(SfxStringItem( FN_PARAM_TABLE_NAME, m_pNameED->GetText())); bModified = true; } @@ -413,7 +413,7 @@ bool SwFormatTablePage::FillItemSet( SfxItemSet& rCoreSet ) { const sal_uInt32 nDirection = (sal_uInt32)(sal_uIntPtr)m_pTextDirectionLB->GetEntryData( nPos ); - rCoreSet.Put( SvxFrameDirectionItem( (SvxFrameDirection)nDirection, RES_FRAMEDIR)); + rCoreSet->Put( SvxFrameDirectionItem( (SvxFrameDirection)nDirection, RES_FRAMEDIR)); bModified = true; } } @@ -609,7 +609,7 @@ int SwFormatTablePage::DeactivatePage( SfxItemSet* _pSet ) } if(_pSet) { - FillItemSet(*_pSet); + FillItemSet(_pSet); if(bModified) { SwTwips lLeft = static_cast< SwTwips >(m_aLeftMF.DenormalizePercent(m_aLeftMF.GetValue( FUNIT_TWIP ))); @@ -906,7 +906,7 @@ IMPL_LINK( SwTableColumnPage, ModeHdl, CheckBox*, pBox ) return 0; } -bool SwTableColumnPage::FillItemSet( SfxItemSet& ) +bool SwTableColumnPage::FillItemSet( SfxItemSet* ) { for( sal_uInt16 i = 0; i < MET_FIELDS; i++ ) { @@ -1109,7 +1109,7 @@ int SwTableColumnPage::DeactivatePage( SfxItemSet* _pSet ) { if(_pSet) { - FillItemSet(*_pSet); + FillItemSet(_pSet); if(text::HoriOrientation::FULL != pTblData->GetAlign() && pTblData->GetWidth() != nTableWidth) { pTblData->SetWidth(nTableWidth); @@ -1321,7 +1321,7 @@ SfxTabPage* SwTextFlowPage::Create( Window* pParent, return new SwTextFlowPage(pParent, rAttrSet); } -bool SwTextFlowPage::FillItemSet( SfxItemSet& rSet ) +bool SwTextFlowPage::FillItemSet( SfxItemSet* rSet ) { bool bModified = false; @@ -1329,20 +1329,20 @@ bool SwTextFlowPage::FillItemSet( SfxItemSet& rSet ) if(m_pHeadLineCB->IsValueChangedFromSaved() || m_pRepeatHeaderNF->IsValueChangedFromSaved() ) { - bModified |= 0 != rSet.Put( + bModified |= 0 != rSet->Put( SfxUInt16Item(FN_PARAM_TABLE_HEADLINE, m_pHeadLineCB->IsChecked()? sal_uInt16(m_pRepeatHeaderNF->GetValue()) : 0 )); } if(m_pKeepCB->IsValueChangedFromSaved()) - bModified |= 0 != rSet.Put( SvxFmtKeepItem( m_pKeepCB->IsChecked(), RES_KEEP)); + bModified |= 0 != rSet->Put( SvxFmtKeepItem( m_pKeepCB->IsChecked(), RES_KEEP)); if(m_pSplitCB->IsValueChangedFromSaved()) - bModified |= 0 != rSet.Put( SwFmtLayoutSplit( m_pSplitCB->IsChecked())); + bModified |= 0 != rSet->Put( SwFmtLayoutSplit( m_pSplitCB->IsChecked())); if(m_pSplitRowCB->IsValueChangedFromSaved()) - bModified |= 0 != rSet.Put( SwFmtRowSplit( m_pSplitRowCB->IsChecked())); + bModified |= 0 != rSet->Put( SwFmtRowSplit( m_pSplitRowCB->IsChecked())); - const SvxFmtBreakItem* pBreak = (const SvxFmtBreakItem*)GetOldItem( rSet, RES_BREAK ); - const SwFmtPageDesc* pDesc = (const SwFmtPageDesc*) GetOldItem( rSet, RES_PAGEDESC ); + const SvxFmtBreakItem* pBreak = (const SvxFmtBreakItem*)GetOldItem( *rSet, RES_BREAK ); + const SwFmtPageDesc* pDesc = (const SwFmtPageDesc*) GetOldItem( *rSet, RES_PAGEDESC ); bool bState = m_pPageCollCB->IsChecked(); @@ -1366,7 +1366,7 @@ bool SwTextFlowPage::FillItemSet( SfxItemSet& rSet ) { SwFmtPageDesc aFmt( pShell->FindPageDescByName( sPage, true ) ); aFmt.SetNumOffset(bState ? nPgNum : 0); - bModified |= 0 != rSet.Put( aFmt ); + bModified |= 0 != rSet->Put( aFmt ); bPageItemPut = bState; } } @@ -1406,13 +1406,13 @@ bool SwTextFlowPage::FillItemSet( SfxItemSet& rSet ) if ( !pBreak || !( *(const SvxFmtBreakItem*)pBreak == aBreak ) ) { - bModified |= 0 != rSet.Put( aBreak ); + bModified |= 0 != rSet->Put( aBreak ); } } if(m_pTextDirectionLB->IsValueChangedFromSaved()) { - bModified |= 0 != rSet.Put( + bModified |= 0 != rSet->Put( SvxFrameDirectionItem( (SvxFrameDirection)(sal_uLong)m_pTextDirectionLB->GetEntryData(m_pTextDirectionLB->GetSelectEntryPos()) , FN_TABLE_BOX_TEXTORIENTATION)); @@ -1428,7 +1428,7 @@ bool SwTextFlowPage::FillItemSet( SfxItemSet& rSet ) case 2 : nOrient = text::VertOrientation::BOTTOM; break; } if(nOrient != USHRT_MAX) - bModified |= 0 != rSet.Put(SfxUInt16Item(FN_TABLE_SET_VERT_ALIGN, nOrient)); + bModified |= 0 != rSet->Put(SfxUInt16Item(FN_TABLE_SET_VERT_ALIGN, nOrient)); } return bModified; diff --git a/sw/source/uibase/inc/chrdlg.hxx b/sw/source/uibase/inc/chrdlg.hxx index 50770d7f7f55..1ffd7ed11ae1 100644 --- a/sw/source/uibase/inc/chrdlg.hxx +++ b/sw/source/uibase/inc/chrdlg.hxx @@ -85,7 +85,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; }; diff --git a/sw/source/uibase/inc/column.hxx b/sw/source/uibase/inc/column.hxx index 84c428478562..1e6f3a6499bc 100644 --- a/sw/source/uibase/inc/column.hxx +++ b/sw/source/uibase/inc/column.hxx @@ -175,7 +175,7 @@ public: static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet); static const sal_uInt16* GetRanges(); - virtual bool FillItemSet(SfxItemSet &rSet) SAL_OVERRIDE; + virtual bool FillItemSet(SfxItemSet *rSet) SAL_OVERRIDE; virtual void Reset(const SfxItemSet &rSet) SAL_OVERRIDE; void SetFrmMode(bool bMod); diff --git a/sw/source/uibase/inc/docstdlg.hxx b/sw/source/uibase/inc/docstdlg.hxx index ec28d0de6874..06ab49936336 100644 --- a/sw/source/uibase/inc/docstdlg.hxx +++ b/sw/source/uibase/inc/docstdlg.hxx @@ -36,7 +36,7 @@ public: static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet); protected: - virtual bool FillItemSet( SfxItemSet &rSet) SAL_OVERRIDE; + virtual bool FillItemSet( 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 a906419e00a9..e6e35e6a5edd 100644 --- a/sw/source/uibase/inc/drpcps.hxx +++ b/sw/source/uibase/inc/drpcps.hxx @@ -85,7 +85,7 @@ public: static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet); static const sal_uInt16* GetRanges(); - virtual bool FillItemSet( SfxItemSet &rSet) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet *rSet) SAL_OVERRIDE; virtual void Reset (const SfxItemSet &rSet) SAL_OVERRIDE; void SetFormat(bool bSet){bFormat = bSet;} diff --git a/sw/source/uibase/inc/envlop.hxx b/sw/source/uibase/inc/envlop.hxx index 9af6f3e761ae..7195d645f0ec 100644 --- a/sw/source/uibase/inc/envlop.hxx +++ b/sw/source/uibase/inc/envlop.hxx @@ -110,7 +110,7 @@ public: virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; void FillItem(SwEnvItem& rItem); - virtual bool FillItemSet(SfxItemSet& rSet) SAL_OVERRIDE; + virtual bool FillItemSet(SfxItemSet* rSet) SAL_OVERRIDE; virtual void Reset(const SfxItemSet& rSet) SAL_OVERRIDE; }; diff --git a/sw/source/uibase/inc/frmpage.hxx b/sw/source/uibase/inc/frmpage.hxx index edffb7ebd7fc..2a4b5bc47e29 100644 --- a/sw/source/uibase/inc/frmpage.hxx +++ b/sw/source/uibase/inc/frmpage.hxx @@ -188,7 +188,7 @@ public: static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet); static const sal_uInt16* GetRanges(); - virtual bool FillItemSet(SfxItemSet &rSet) SAL_OVERRIDE; + virtual bool FillItemSet(SfxItemSet *rSet) SAL_OVERRIDE; virtual void Reset(const SfxItemSet &rSet) SAL_OVERRIDE; void SetNewFrame(bool bNewFrame) { bNew = bNewFrame; } @@ -234,7 +234,7 @@ public: static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet); - virtual bool FillItemSet(SfxItemSet &rSet) SAL_OVERRIDE; + virtual bool FillItemSet(SfxItemSet *rSet) SAL_OVERRIDE; virtual void Reset(const SfxItemSet &rSet) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; }; @@ -263,7 +263,7 @@ public: static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet); - virtual bool FillItemSet(SfxItemSet &rSet) SAL_OVERRIDE; + virtual bool FillItemSet(SfxItemSet *rSet) SAL_OVERRIDE; virtual void Reset(const SfxItemSet &rSet) SAL_OVERRIDE; }; @@ -311,7 +311,7 @@ public: static SfxTabPage* Create(Window *pParent, const SfxItemSet &rSet); static const sal_uInt16* GetRanges(); - virtual bool FillItemSet(SfxItemSet &rSet) SAL_OVERRIDE; + virtual bool FillItemSet(SfxItemSet *rSet) SAL_OVERRIDE; virtual void Reset(const SfxItemSet &rSet) SAL_OVERRIDE; void SetFormatUsed(bool bFmt); diff --git a/sw/source/uibase/inc/mailconfigpage.hxx b/sw/source/uibase/inc/mailconfigpage.hxx index 4872c61919e6..948c255a74e7 100644 --- a/sw/source/uibase/inc/mailconfigpage.hxx +++ b/sw/source/uibase/inc/mailconfigpage.hxx @@ -61,7 +61,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( 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 63a8a6dd20d2..64088e5ece94 100644 --- a/sw/source/uibase/inc/num.hxx +++ b/sw/source/uibase/inc/num.hxx @@ -121,7 +121,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 bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; static SfxTabPage* Create( Window* pParent, diff --git a/sw/source/uibase/inc/numpara.hxx b/sw/source/uibase/inc/numpara.hxx index 872c015d5f08..4042001c19cb 100644 --- a/sw/source/uibase/inc/numpara.hxx +++ b/sw/source/uibase/inc/numpara.hxx @@ -67,7 +67,7 @@ public: const SfxItemSet& rSet ); static const sal_uInt16* GetRanges(); - virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; void EnableNewStart(); diff --git a/sw/source/uibase/inc/optcomp.hxx b/sw/source/uibase/inc/optcomp.hxx index 2cd02b60fde8..dd437c072e36 100644 --- a/sw/source/uibase/inc/optcomp.hxx +++ b/sw/source/uibase/inc/optcomp.hxx @@ -65,7 +65,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; }; diff --git a/sw/source/uibase/inc/optload.hxx b/sw/source/uibase/inc/optload.hxx index e6a09bb1e4ac..5f3ea8703738 100644 --- a/sw/source/uibase/inc/optload.hxx +++ b/sw/source/uibase/inc/optload.hxx @@ -68,7 +68,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; }; @@ -169,7 +169,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; }; diff --git a/sw/source/uibase/inc/optpage.hxx b/sw/source/uibase/inc/optpage.hxx index 17dc981d8cc7..15e0ccec95dd 100644 --- a/sw/source/uibase/inc/optpage.hxx +++ b/sw/source/uibase/inc/optpage.hxx @@ -74,7 +74,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; }; @@ -122,7 +122,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; void SetFax( const std::vector<OUString>& ); void SelectFax( const OUString& ); @@ -194,7 +194,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; void SetFontMode(sal_uInt8 nGroup) {nFontGroup = nGroup;} @@ -236,7 +236,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; void SetWrtShell(SwWrtShell* pSh) {pWrtShell = pSh;} @@ -280,7 +280,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; void SetWrtShell( SwWrtShell * pSh ) { m_pWrtShell = pSh; } @@ -360,7 +360,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; }; @@ -377,7 +377,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; private: @@ -420,7 +420,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; }; diff --git a/sw/source/uibase/inc/outline.hxx b/sw/source/uibase/inc/outline.hxx index 41bbd0a85f9f..829cf853406a 100644 --- a/sw/source/uibase/inc/outline.hxx +++ b/sw/source/uibase/inc/outline.hxx @@ -127,7 +127,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 bool FillItemSet( 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 1e96c857c85f..9c4ba3bdaf46 100644 --- a/sw/source/uibase/inc/pgfnote.hxx +++ b/sw/source/uibase/inc/pgfnote.hxx @@ -35,7 +35,7 @@ public: static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet); static const sal_uInt16* GetRanges(); - virtual bool FillItemSet(SfxItemSet &rSet) SAL_OVERRIDE; + virtual bool FillItemSet(SfxItemSet *rSet) SAL_OVERRIDE; virtual void Reset(const SfxItemSet &rSet) SAL_OVERRIDE; private: diff --git a/sw/source/uibase/inc/pggrid.hxx b/sw/source/uibase/inc/pggrid.hxx index 58664756b0dd..a68e12313a82 100644 --- a/sw/source/uibase/inc/pggrid.hxx +++ b/sw/source/uibase/inc/pggrid.hxx @@ -87,7 +87,7 @@ public: static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet); static const sal_uInt16* GetRanges(); - virtual bool FillItemSet(SfxItemSet &rSet) SAL_OVERRIDE; + virtual bool FillItemSet(SfxItemSet *rSet) SAL_OVERRIDE; virtual void Reset(const SfxItemSet &rSet) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/regionsw.hxx b/sw/source/uibase/inc/regionsw.hxx index 20b200632c7a..51f56256fcd3 100644 --- a/sw/source/uibase/inc/regionsw.hxx +++ b/sw/source/uibase/inc/regionsw.hxx @@ -187,7 +187,7 @@ public: void SetWrtShell(SwWrtShell& rSh); - virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE; static SfxTabPage* Create( Window* pParent, @@ -229,7 +229,7 @@ public: SwSectionFtnEndTabPage( Window *pParent, const SfxItemSet &rAttrSet ); virtual ~SwSectionFtnEndTabPage(); - virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE; static SfxTabPage* Create( Window* pParent, @@ -247,7 +247,7 @@ public: SwSectionIndentTabPage( Window *pParent, const SfxItemSet &rAttrSet ); virtual ~SwSectionIndentTabPage(); - virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE; static SfxTabPage* Create( Window* pParent, diff --git a/sw/source/uibase/inc/swuiccoll.hxx b/sw/source/uibase/inc/swuiccoll.hxx index 275ae6c99484..8aacddc39ba1 100644 --- a/sw/source/uibase/inc/swuiccoll.hxx +++ b/sw/source/uibase/inc/swuiccoll.hxx @@ -64,7 +64,7 @@ public: static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet); static const sal_uInt16* GetRanges(); - virtual bool FillItemSet( SfxItemSet &rSet) SAL_OVERRIDE; + virtual bool FillItemSet( 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 aa1387b893fa..2acce7ddb705 100644 --- a/sw/source/uibase/inc/swuicnttab.hxx +++ b/sw/source/uibase/inc/swuicnttab.hxx @@ -222,7 +222,7 @@ public: SwTOXSelectTabPage(Window* pParent, const SfxItemSet& rAttrSet); virtual ~SwTOXSelectTabPage(); - virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; @@ -435,7 +435,7 @@ public: SwTOXEntryTabPage(Window* pParent, const SfxItemSet& rAttrSet); virtual ~SwTOXEntryTabPage(); - virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual bool FillItemSet( 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; @@ -481,7 +481,7 @@ public: SwTOXStylesTabPage(Window* pParent, const SfxItemSet& rAttrSet); virtual ~SwTOXStylesTabPage(); - virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/wrap.hxx b/sw/source/uibase/inc/wrap.hxx index 5efcdababe7c..71439d3c9ede 100644 --- a/sw/source/uibase/inc/wrap.hxx +++ b/sw/source/uibase/inc/wrap.hxx @@ -99,7 +99,7 @@ public: static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet); - virtual bool FillItemSet(SfxItemSet &rSet) SAL_OVERRIDE; + virtual bool FillItemSet(SfxItemSet *rSet) SAL_OVERRIDE; virtual void Reset(const SfxItemSet &rSet) SAL_OVERRIDE; static const sal_uInt16* GetRanges(); diff --git a/sw/source/uibase/table/tablepg.hxx b/sw/source/uibase/table/tablepg.hxx index 8583214a92aa..e71c6b9f67a5 100644 --- a/sw/source/uibase/table/tablepg.hxx +++ b/sw/source/uibase/table/tablepg.hxx @@ -83,7 +83,7 @@ public: SwFormatTablePage( Window* pParent, const SfxItemSet& rSet ); static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( 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; @@ -133,7 +133,7 @@ public: virtual ~SwTableColumnPage(); static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( 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; @@ -182,7 +182,7 @@ class SwTextFlowPage : public SfxTabPage public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; void SetShell(SwWrtShell* pSh); |