mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change SfxTabPage::FillItemSet param from ref to pointer

Browse Source 
...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
This commit is contained in:
Stephan Bergmann 2014-06-10 17:23:12 +02:00
parent 2f8fd888b4
commit 4dbeadb9c1
282 changed files with 1261 additions and 1261 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx
View File

@ -45,7 +45,7 @@ void DataLabelsDialog::Reset()
void DataLabelsDialog::FillItemSet(SfxItemSet& rOutAttrs)
{
m_apDataLabelResources->FillItemSet(rOutAttrs);
m_apDataLabelResources->FillItemSet(&rOutAttrs);
}
} //namespace chart

26
chart2/source/controller/dialogs/res_DataLabel.cxx
View File

@ -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;

2
chart2/source/controller/dialogs/res_DataLabel.hxx
View File

@ -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 );

22
chart2/source/controller/dialogs/res_Trendline.cxx
View File

@ -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;
}

2
chart2/source/controller/dialogs/res_Trendline.hxx
View File

@ -38,7 +38,7 @@ public:
virtual ~TrendlineResources();
void Reset(const SfxItemSet& rInAttrs);
bool FillItemSet(SfxItemSet& rOutAttrs) const;
bool FillItemSet(SfxItemSet* rOutAttrs) const;
void FillValueSets();

16
chart2/source/controller/dialogs/tp_AxisLabel.cxx
View File

@ -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;
}

2
chart2/source/controller/dialogs/tp_AxisLabel.hxx
View File

@ -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 );

16
chart2/source/controller/dialogs/tp_AxisPositions.cxx
View File

@ -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;
}

2
chart2/source/controller/dialogs/tp_AxisPositions.hxx
View File

@ -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;

2
chart2/source/controller/dialogs/tp_DataLabel.cxx
View File

@ -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);
}

2
chart2/source/controller/dialogs/tp_DataLabel.hxx
View File

@ -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;

4
chart2/source/controller/dialogs/tp_ErrorBars.cxx
View File

@ -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 )

2
chart2/source/controller/dialogs/tp_ErrorBars.hxx
View File

@ -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;

6
chart2/source/controller/dialogs/tp_LegendPosition.cxx
View File

@ -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;
}

2
chart2/source/controller/dialogs/tp_LegendPosition.hxx
View File

@ -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;
};

6
chart2/source/controller/dialogs/tp_PointGeometry.cxx
View File

@ -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;
}

2
chart2/source/controller/dialogs/tp_PointGeometry.hxx
View File

@ -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:

8
chart2/source/controller/dialogs/tp_PolarOptions.cxx
View File

@ -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;
}

2
chart2/source/controller/dialogs/tp_PolarOptions.hxx
View File

@ -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:

40
chart2/source/controller/dialogs/tp_Scale.cxx
View File

@ -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;
}

2
chart2/source/controller/dialogs/tp_Scale.hxx
View File

@ -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;

22
chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
View File

@ -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;
}

2
chart2/source/controller/dialogs/tp_SeriesToAxis.hxx
View File

@ -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 );

8
chart2/source/controller/dialogs/tp_TitleRotation.cxx
View File

@ -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;
}

2
chart2/source/controller/dialogs/tp_TitleRotation.hxx
View File

@ -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;
};

2
chart2/source/controller/dialogs/tp_Trendline.cxx
View File

@ -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 );
}

2
chart2/source/controller/dialogs/tp_Trendline.hxx
View File

@ -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;

2
cui/source/customize/acccfg.cxx
View File

@ -1425,7 +1425,7 @@ void SfxAcceleratorConfigPage::StartFileDialog( WinBits nBits, const OUString& r
}
bool SfxAcceleratorConfigPage::FillItemSet( SfxItemSet& )
bool SfxAcceleratorConfigPage::FillItemSet( SfxItemSet* )
{
Apply(m_xAct);
try

2
cui/source/customize/cfg.cxx
View File

@ -1823,7 +1823,7 @@ OUString SvxConfigPage::GetFrameWithDefaultAndIdentify( uno::Reference< frame::X
return sModuleID;
}
bool SvxConfigPage::FillItemSet( SfxItemSet& )
bool SvxConfigPage::FillItemSet( SfxItemSet* )
{
bool result = false;

2
cui/source/customize/eventdlg.cxx
View File

@ -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 );
}

2
cui/source/customize/eventdlg.hxx
View File

@ -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();

4
cui/source/customize/macropg.cxx
View File

@ -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;
}

2
cui/source/dialogs/cuigaldlg.cxx
View File

@ -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;

2
cui/source/dialogs/cuihyperdlg.cxx
View File

@ -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);

4
cui/source/dialogs/hltpbase.cxx
View File

@ -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;
}

4
cui/source/dialogs/iconcdlg.cxx
View File

@ -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 );

2
cui/source/inc/acccfg.hxx
View File

@ -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);

2
cui/source/inc/align.hxx
View File

@ -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;

14
cui/source/inc/autocdlg.hxx
View File

@ -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;
};

2
cui/source/inc/backgrnd.hxx
View File

@ -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;

2
cui/source/inc/border.hxx
View File

@ -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();

2
cui/source/inc/cfg.hxx
View File

@ -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;

8
cui/source/inc/chardlg.hxx
View File

@ -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;

2
cui/source/inc/connect.hxx
View File

@ -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();

4
cui/source/inc/cuigaldlg.hxx
View File

@ -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();

2
cui/source/inc/cuioptgenrl.hxx
View File

@ -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;
};

14
cui/source/inc/cuitabarea.hxx
View File

@ -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;

6
cui/source/inc/cuitabline.hxx
View File

@ -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;

2
cui/source/inc/dbregister.hxx
View File

@ -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;
};

2
cui/source/inc/dstribut.hxx
View File

@ -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;

2
cui/source/inc/grfpage.hxx
View File

@ -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;
};

2
cui/source/inc/hltpbase.hxx
View File

@ -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;

2
cui/source/inc/iconcdlg.hxx
View File

@ -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; }

2
cui/source/inc/labdlg.hxx
View File

@ -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 )

2
cui/source/inc/macroass.hxx
View File

@ -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;

2
cui/source/inc/macropg.hxx
View File

@ -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;

2
cui/source/inc/measure.hxx
View File

@ -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;

2
cui/source/inc/numfmt.hxx
View File

@ -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;

12
cui/source/inc/numpages.hxx
View File

@ -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,

2
cui/source/inc/optasian.hxx
View File

@ -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;
};

2
cui/source/inc/optlingu.hxx
View File

@ -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 );

2
cui/source/inc/optpath.hxx
View File

@ -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;
};

2
cui/source/inc/page.hxx
View File

@ -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;

8
cui/source/inc/paragrph.hxx
View File

@ -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;
};

2
cui/source/inc/swpossizetabpage.hxx
View File

@ -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;

2
cui/source/inc/tabstpge.hxx
View File

@ -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 );

2
cui/source/inc/textanim.hxx
View File

@ -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();

2
cui/source/inc/textattr.hxx
View File

@ -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;

6
cui/source/inc/transfrm.hxx
View File

@ -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;

6
cui/source/options/connpooloptions.cxx
View File

@ -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;
}

2
cui/source/options/connpooloptions.hxx
View File

@ -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;

4
cui/source/options/dbregister.cxx
View File

@ -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;
}

2
cui/source/options/fontsubs.cxx
View File

@ -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

2
cui/source/options/fontsubs.hxx
View File

@ -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;
};

2
cui/source/options/optaccessibility.cxx
View File

@ -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

2
cui/source/options/optaccessibility.hxx
View File

@ -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;
};

2
cui/source/options/optasian.cxx
View File

@ -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())
{

2
cui/source/options/optbasic.cxx
View File

@ -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() );

2
cui/source/options/optbasic.hxx
View File

@ -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;
};

4
cui/source/options/optchart.cxx
View File

@ -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;
}

2
cui/source/options/optchart.hxx
View File

@ -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;
};

4
cui/source/options/optcolor.cxx
View File

@ -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 );
}

2
cui/source/options/optcolor.hxx
View File

@ -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;

2
cui/source/options/optctl.cxx
View File

@ -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;

2
cui/source/options/optctl.hxx
View File

@ -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;
};

4
cui/source/options/optfltr.cxx
View File

@ -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();

4
cui/source/options/optfltr.hxx
View File

@ -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;
};

20
cui/source/options/optgdlg.cxx
View File

@ -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));
}
}

6
cui/source/options/optgdlg.hxx
View File

@ -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

4
cui/source/options/optgenrl.cxx
View File

@ -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;
}

2
cui/source/options/opthtml.cxx
View File

@ -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())

2
cui/source/options/opthtml.hxx
View File

@ -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;
};

10
cui/source/options/optinet2.cxx
View File

@ -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())

8
cui/source/options/optinet2.hxx
View File

@ -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;
};

2
cui/source/options/optjava.cxx
View File

@ -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;

2
cui/source/options/optjava.hxx
View File

@ -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;
};

2
cui/source/options/optjsearch.cxx
View File

@ -211,7 +211,7 @@ void SvxJSearchOptionsPage::Reset( const SfxItemSet& )
}
bool SvxJSearchOptionsPage::FillItemSet( SfxItemSet& )
bool SvxJSearchOptionsPage::FillItemSet( SfxItemSet* )
{
sal_Int32 nOldVal = nTransliterationFlags;
nTransliterationFlags = GetTransliterationFlags_Impl();

2
cui/source/options/optjsearch.hxx
View File

@ -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; }

8
cui/source/options/optlingu.cxx
View File

@ -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;
}

6
cui/source/options/optmemory.cxx
View File

@ -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;
}

Some files were not shown because too many files have changed in this diff Show More