[PATCH 31/31] boost shared_ptr doesn't have an is() method
Nigel Hawkins
n.hawkins at gmx.com
Fri Nov 19 07:04:06 PST 2010
---
sc/source/filter/excel/xechart.cxx | 46 ++++----
sc/source/filter/excel/xeescher.cxx | 4 +-
sc/source/filter/excel/xeformula.cxx | 2 +-
sc/source/filter/excel/xehelper.cxx | 4 +-
sc/source/filter/excel/xelink.cxx | 18 ++--
sc/source/filter/excel/xename.cxx | 10 +-
sc/source/filter/excel/xepivot.cxx | 4 +-
sc/source/filter/excel/xestream.cxx | 2 +-
sc/source/filter/excel/xetable.cxx | 20 ++--
sc/source/filter/excel/xichart.cxx | 184 +++++++++++++-------------
sc/source/filter/excel/xicontent.cxx | 4 +-
sc/source/filter/excel/xiescher.cxx | 30 ++--
sc/source/filter/excel/xipivot.cxx | 12 +-
sc/source/filter/excel/xistream.cxx | 6 +-
sc/source/filter/excel/xistyle.cxx | 2 +-
sc/source/filter/excel/xlchart.cxx | 2 +-
sc/source/filter/excel/xlformula.cxx | 2 +-
sc/source/filter/inc/ftools.hxx | 2 +-
sc/source/filter/inc/xechart.hxx | 6 +-
sc/source/filter/inc/xichart.hxx | 26 ++--
sc/source/filter/inc/xiescher.hxx | 4 +-
sc/source/filter/xcl97/XclExpChangeTrack.cxx | 2 +-
22 files changed, 196 insertions(+), 196 deletions(-)
diff --git a/sc/source/filter/excel/xechart.cxx b/sc/source/filter/excel/xechart.cxx
index dd54764..599d1f0 100644
--- a/sc/source/filter/excel/xechart.cxx
+++ b/sc/source/filter/excel/xechart.cxx
@@ -134,7 +134,7 @@ XclExpStream& operator<<( XclExpStream& rStrm, const XclChRectangle& rRect )
inline void lclSaveRecord( XclExpStream& rStrm, XclExpRecordRef xRec )
{
- if( xRec.is() )
+ if( xRec.get() )
xRec->Save( rStrm );
}
@@ -142,7 +142,7 @@ inline void lclSaveRecord( XclExpStream& rStrm, XclExpRecordRef xRec )
template< typename Type >
void lclSaveRecord( XclExpStream& rStrm, XclExpRecordRef xRec, sal_uInt16 nRecId, Type nValue )
{
- if( xRec.is() )
+ if( xRec.get() )
{
XclExpValueRecord< Type >( nRecId, nValue ).Save( rStrm );
xRec->Save( rStrm );
@@ -639,12 +639,12 @@ void XclExpChEscherFormat::Convert( const ScfPropertySet& rPropSet, XclChObjectT
bool XclExpChEscherFormat::IsValid() const
{
- return maData.mxEscherSet.is();
+ return maData.mxEscherSet.get();
}
void XclExpChEscherFormat::Save( XclExpStream& rStrm )
{
- if( maData.mxEscherSet.is() )
+ if( maData.mxEscherSet.get() )
{
// replace RGB colors with palette indexes in the Escher container
const XclExpPalette& rPal = GetPalette();
@@ -672,7 +672,7 @@ void XclExpChEscherFormat::WriteSubRecords( XclExpStream& rStrm )
sal_uInt32 XclExpChEscherFormat::RegisterColor( sal_uInt16 nPropId )
{
sal_uInt32 nBGRValue;
- if( maData.mxEscherSet.is() && maData.mxEscherSet->GetOpt( nPropId, nBGRValue ) )
+ if( maData.mxEscherSet.get() && maData.mxEscherSet->GetOpt( nPropId, nBGRValue ) )
{
// swap red and blue
Color aColor( RGB_COLORDATA(
@@ -1020,7 +1020,7 @@ void XclExpChSourceLink::ConvertNumFmt( const ScfPropertySet& rPropSet, bool bPe
void XclExpChSourceLink::AppendString( const String& rStr )
{
- if (!mxString.is())
+ if (!mxString.get())
return;
XclExpStringHelper::AppendString( *mxString, GetRoot(), rStr );
}
@@ -1028,7 +1028,7 @@ void XclExpChSourceLink::AppendString( const String& rStr )
void XclExpChSourceLink::Save( XclExpStream& rStrm )
{
// CHFORMATRUNS record
- if( mxString.is() && mxString->IsRich() )
+ if( mxString.get() && mxString->IsRich() )
{
sal_Size nRecSize = (1 + mxString->GetFormatsCount()) * ((GetBiff() == EXC_BIFF8) ? 2 : 1);
rStrm.StartRecord( EXC_ID_CHFORMATRUNS, nRecSize );
@@ -1038,7 +1038,7 @@ void XclExpChSourceLink::Save( XclExpStream& rStrm )
// CHSOURCELINK record
XclExpRecord::Save( rStrm );
// CHSTRING record
- if( mxString.is() && !mxString->IsEmpty() )
+ if( mxString.get() && !mxString->IsEmpty() )
{
rStrm.StartRecord( EXC_ID_CHSTRING, 2 + mxString->GetSize() );
rStrm << sal_uInt16( 0 ) << *mxString;
@@ -1861,7 +1861,7 @@ bool XclExpChSeries::ConvertDataSeries(
maData.mnCategCount = mxCategLink->ConvertDataSequence( xXValueSeq, false, maData.mnValueCount );
// size values of bubble charts
- if( mxBubbleLink.is() )
+ if( mxBubbleLink.get() )
mxBubbleLink->ConvertDataSequence( xBubbleSeq, false, maData.mnValueCount );
// series formatting
@@ -2042,7 +2042,7 @@ void XclExpChSeries::CreateTrendLines( XDataSeriesRef xDataSeries )
for( const Reference< XRegressionCurve >* pIt = pBeg; pIt != pEnd; ++pIt )
{
XclExpChSeriesRef xSeries = GetChartData().CreateSeries();
- if( xSeries.is() && !xSeries->ConvertTrendLine( *this, *pIt ) )
+ if( xSeries.get() && !xSeries->ConvertTrendLine( *this, *pIt ) )
GetChartData().RemoveLastSeries();
}
}
@@ -2066,7 +2066,7 @@ void XclExpChSeries::CreateErrorBar( const ScfPropertySet& rPropSet,
if( rPropSet.GetBoolProperty( rShowPropName ) )
{
XclExpChSeriesRef xSeries = GetChartData().CreateSeries();
- if( xSeries.is() && !xSeries->ConvertErrorBar( *this, rPropSet, nBarId ) )
+ if( xSeries.get() && !xSeries->ConvertErrorBar( *this, rPropSet, nBarId ) )
GetChartData().RemoveLastSeries();
}
}
@@ -2486,7 +2486,7 @@ void XclExpChTypeGroup::CreateDataSeries(
{
// let chart create series object with correct series index
XclExpChSeriesRef xSeries = GetChartData().CreateSeries();
- if( xSeries.is() )
+ if( xSeries.get() )
{
if( xSeries->ConvertDataSeries( xDiagram, xDataSeries, maTypeInfo, GetGroupIdx(), GetFreeFormatIdx() ) )
maSeries.AppendRecord( xSeries );
@@ -2538,7 +2538,7 @@ bool XclExpChTypeGroup::CreateStockSeries( Reference< XDataSeries > xDataSeries,
bool bOk = false;
// let chart create series object with correct series index
XclExpChSeriesRef xSeries = GetChartData().CreateSeries();
- if( xSeries.is() )
+ if( xSeries.get() )
{
bOk = xSeries->ConvertStockSeries( xDataSeries,
rValueRole, GetGroupIdx(), GetFreeFormatIdx(), bCloseSymbol );
@@ -2794,13 +2794,13 @@ XclExpChAxis::XclExpChAxis( const XclExpChRoot& rRoot, sal_uInt16 nAxisType ) :
void XclExpChAxis::SetFont( XclExpChFontRef xFont, const Color& rColor, sal_uInt32 nColorId )
{
mxFont = xFont;
- if( mxTick.is() )
+ if( mxTick.get() )
mxTick->SetFontColor( rColor, nColorId );
}
void XclExpChAxis::SetRotation( sal_uInt16 nRotation )
{
- if( mxTick.is() )
+ if( mxTick.get() )
mxTick->SetRotation( nRotation );
}
@@ -2986,7 +2986,7 @@ sal_uInt16 XclExpChAxesSet::Convert( Reference< XDiagram > xDiagram, sal_uInt16
chart with existing type groups, insert all series into last
contained chart type group instead of creating a new group. */
XclExpChTypeGroupRef xLastGroup = GetLastTypeGroup();
- if( xLastGroup.is() && !(xTypeGroup->IsCombinable2d() && xLastGroup->IsCombinable2d()) )
+ if( xLastGroup.get() && !(xTypeGroup->IsCombinable2d() && xLastGroup->IsCombinable2d()) )
{
xLastGroup->ConvertSeries( xDiagram, *pIt, nApiAxesSetIdx, bPercent, bConnectBars );
}
@@ -3041,12 +3041,12 @@ sal_uInt16 XclExpChAxesSet::Convert( Reference< XDiagram > xDiagram, sal_uInt16
if( xDiagram.is() && (GetAxesSetId() == EXC_CHAXESSET_PRIMARY) )
{
XclExpChTypeGroupRef xTypeGroup = GetFirstTypeGroup();
- if( xTypeGroup.is() && xTypeGroup->Is3dWallChart() )
+ if( xTypeGroup.get() && xTypeGroup->Is3dWallChart() )
{
// wall/floor formatting (3D charts)
- if( mxXAxis.is() )
+ if( mxXAxis.get() )
mxXAxis->ConvertWall( xDiagram );
- if( mxYAxis.is() )
+ if( mxYAxis.get() )
mxYAxis->ConvertWall( xDiagram );
}
else
@@ -3086,7 +3086,7 @@ sal_uInt16 XclExpChAxesSet::Convert( Reference< XDiagram > xDiagram, sal_uInt16
bool XclExpChAxesSet::Is3dChart() const
{
XclExpChTypeGroupRef xTypeGroup = GetFirstTypeGroup();
- return xTypeGroup.is() && xTypeGroup->Is3dChart();
+ return xTypeGroup.get() && xTypeGroup->Is3dChart();
}
void XclExpChAxesSet::WriteSubRecords( XclExpStream& rStrm )
@@ -3098,7 +3098,7 @@ void XclExpChAxesSet::WriteSubRecords( XclExpStream& rStrm )
lclSaveRecord( rStrm, mxXAxisTitle );
lclSaveRecord( rStrm, mxYAxisTitle );
lclSaveRecord( rStrm, mxZAxisTitle );
- if( mxPlotFrame.is() )
+ if( mxPlotFrame.get() )
{
XclExpEmptyRecord( EXC_ID_CHPLOTFRAME ).Save( rStrm );
mxPlotFrame->Save( rStrm );
@@ -3245,7 +3245,7 @@ void XclExpChChart::RemoveLastSeries()
void XclExpChChart::SetDataLabel( XclExpChTextRef xText )
{
- if( xText.is() )
+ if( xText.get() )
maLabels.AppendRecord( xText );
}
@@ -3318,7 +3318,7 @@ XclExpChartDrawing::~XclExpChartDrawing()
void XclExpChartDrawing::Save( XclExpStream& rStrm )
{
- if( mxObjRecs.is() )
+ if( mxObjRecs.get() )
mxObjRecs->Save( rStrm );
}
diff --git a/sc/source/filter/excel/xeescher.cxx b/sc/source/filter/excel/xeescher.cxx
index 52ad675..7b9dee2 100644
--- a/sc/source/filter/excel/xeescher.cxx
+++ b/sc/source/filter/excel/xeescher.cxx
@@ -1359,7 +1359,7 @@ void XclExpNote::WriteXml( sal_Int32 nAuthorId, XclExpXmlStream& rStrm )
rComments->writeEscaped( XclXmlUtils::ToOUString( maOrigNoteText ) );
rComments->endElement ( XML_t );
#else
- if( mpNoteContents.is() )
+ if( mpNoteContents.get() )
mpNoteContents->WriteXml( rStrm );
#endif
rComments->endElement( XML_text );
@@ -1412,7 +1412,7 @@ XclMacroHelper::~XclMacroHelper()
void XclMacroHelper::WriteMacroSubRec( XclExpStream& rStrm )
{
- if( mxMacroLink.is() )
+ if( mxMacroLink.get() )
WriteFormulaSubRec( rStrm, EXC_ID_OBJMACRO, *mxMacroLink );
}
diff --git a/sc/source/filter/excel/xeformula.cxx b/sc/source/filter/excel/xeformula.cxx
index dce97c8..9bc49f6 100644
--- a/sc/source/filter/excel/xeformula.cxx
+++ b/sc/source/filter/excel/xeformula.cxx
@@ -635,7 +635,7 @@ void XclExpFmlaCompImpl::Init( XclFormulaType eType, const ScTokenArray& rScTokA
mxData->mpLinkMgr = mxData->mrCfg.mbLocalLinkMgr ? &GetLocalLinkManager() : &GetGlobalLinkManager();
// token array iterator (use cloned token array if present)
- mxData->maTokArrIt.Init( mxData->mxOwnScTokArr.is() ? *mxData->mxOwnScTokArr : rScTokArr, false );
+ mxData->maTokArrIt.Init( mxData->mxOwnScTokArr.get() ? *mxData->mxOwnScTokArr : rScTokArr, false );
mxData->mpRefLog = pRefLog;
}
}
diff --git a/sc/source/filter/excel/xehelper.cxx b/sc/source/filter/excel/xehelper.cxx
index 335f3d0..7ceeea2 100644
--- a/sc/source/filter/excel/xehelper.cxx
+++ b/sc/source/filter/excel/xehelper.cxx
@@ -318,7 +318,7 @@ String XclExpHyperlinkHelper::ProcessUrlField( const SvxURLField& rUrlField )
if( GetBiff() == EXC_BIFF8 ) // no HLINK records in BIFF2-BIFF7
{
// there was/is already a HLINK record
- mbMultipleUrls = mxLinkRec.is();
+ mbMultipleUrls = mxLinkRec.get();
mxLinkRec.reset( new XclExpHyperlink( GetRoot(), rUrlField, maScPos ) );
@@ -335,7 +335,7 @@ String XclExpHyperlinkHelper::ProcessUrlField( const SvxURLField& rUrlField )
bool XclExpHyperlinkHelper::HasLinkRecord() const
{
- return !mbMultipleUrls && mxLinkRec.is();
+ return !mbMultipleUrls && mxLinkRec.get();
}
XclExpHyperlinkHelper::XclExpHyperlinkRef XclExpHyperlinkHelper::GetLinkRecord()
diff --git a/sc/source/filter/excel/xelink.cxx b/sc/source/filter/excel/xelink.cxx
index bdd7441..40b6cd2 100644
--- a/sc/source/filter/excel/xelink.cxx
+++ b/sc/source/filter/excel/xelink.cxx
@@ -936,7 +936,7 @@ XclExpExtNameDde::XclExpExtNameDde( const XclExpRoot& rRoot,
void XclExpExtNameDde::WriteAddData( XclExpStream& rStrm )
{
- if( mxMatrix.is() )
+ if( mxMatrix.get() )
mxMatrix->Save( rStrm );
}
@@ -1232,7 +1232,7 @@ public:
bool XclExpCrnList::InsertValue( SCCOL nScCol, SCROW nScRow, const Any& rValue )
{
RecordRefType xLastRec = GetLastRecord();
- if( xLastRec.is() && xLastRec->InsertValue( nScCol, nScRow, rValue ) )
+ if( xLastRec.get() && xLastRec->InsertValue( nScCol, nScRow, rValue ) )
return true;
if( GetSize() == SAL_MAX_UINT16 )
return false;
@@ -1326,7 +1326,7 @@ XclExpExtNameBuffer& XclExpExternSheetBase::GetExtNameBuffer()
void XclExpExternSheetBase::WriteExtNameBuffer( XclExpStream& rStrm )
{
- if( mxExtNameBfr.is() )
+ if( mxExtNameBfr.get() )
mxExtNameBfr->Save( rStrm );
}
@@ -1530,7 +1530,7 @@ void XclExpSupbook::Save( XclExpStream& rStrm )
const XclExpString* XclExpSupbook::GetTabName( sal_uInt16 nSBTab ) const
{
XclExpXctRef xXct = maXctList.GetRecord( nSBTab );
- return xXct.is() ? &xXct->GetTabName() : 0;
+ return xXct.get() ? &xXct->GetTabName() : 0;
}
void XclExpSupbook::WriteBody( XclExpStream& rStrm )
@@ -1611,7 +1611,7 @@ XclExpXti XclExpSupbookBuffer::GetXti( sal_uInt16 nFirstXclTab, sal_uInt16 nLast
pRefLogEntry->mnFirstXclTab = nFirstXclTab;
pRefLogEntry->mnLastXclTab = nLastXclTab;
XclExpSupbookRef xSupbook = maSupbookList.GetRecord( aXti.mnSupbook );
- if( xSupbook.is() )
+ if( xSupbook.get() )
xSupbook->FillRefLogEntry( *pRefLogEntry, aXti.mnFirstSBTab, aXti.mnLastSBTab );
}
}
@@ -1633,8 +1633,8 @@ void XclExpSupbookBuffer::StoreCellRange( const ScRange& rRange )
{
const XclExpSBIndex& rSBIndex = maSBIndexVec[ nXclTab ];
XclExpSupbookRef xSupbook = maSupbookList.GetRecord( rSBIndex.mnSupbook );
- DBG_ASSERT( xSupbook.is(), "XclExpSupbookBuffer::StoreCellRange - missing SUPBOOK record" );
- if( xSupbook.is() )
+ DBG_ASSERT( xSupbook.get() , "XclExpSupbookBuffer::StoreCellRange - missing SUPBOOK record" );
+ if( xSupbook.get() )
xSupbook->StoreCellRange( rRange, rSBIndex.mnSBTab );
}
}
@@ -1874,7 +1874,7 @@ XclExpXti XclExpSupbookBuffer::GetXti( sal_uInt16 nFileId, const String& rTabNam
{
pRefLogEntry->mnFirstXclTab = 0;
pRefLogEntry->mnLastXclTab = 0;
- if (xSupbook.is())
+ if (xSupbook.get() )
xSupbook->FillRefLogEntry(*pRefLogEntry, aXti.mnFirstSBTab, aXti.mnLastSBTab);
}
@@ -1989,7 +1989,7 @@ bool XclExpLinkManagerImpl5::InsertAddIn(
sal_uInt16& rnExtSheet, sal_uInt16& rnExtName, const String& rName )
{
XclExpExtSheetRef xExtSheet = FindInternal( rnExtSheet, EXC_EXTSH_ADDIN );
- if( xExtSheet.is() )
+ if( xExtSheet.get() )
{
rnExtName = xExtSheet->InsertAddIn( rName );
return rnExtName > 0;
diff --git a/sc/source/filter/excel/xename.cxx b/sc/source/filter/excel/xename.cxx
index 0d2056a..f2eee20 100644
--- a/sc/source/filter/excel/xename.cxx
+++ b/sc/source/filter/excel/xename.cxx
@@ -293,7 +293,7 @@ void XclExpName::SetSymbol( String sSymbol )
bool XclExpName::IsVolatile() const
{
- return mxTokArr.is() && mxTokArr->IsVolatile();
+ return mxTokArr.get() && mxTokArr->IsVolatile();
}
bool XclExpName::IsHidden() const
@@ -312,7 +312,7 @@ void XclExpName::Save( XclExpStream& rStrm )
{
DBG_ASSERT( mxName.is() && (mxName->Len() > 0), "XclExpName::Save - missing name" );
DBG_ASSERT( !(IsGlobal() && ::get_flag( mnFlags, EXC_NAME_BUILTIN )), "XclExpName::Save - global built-in name" );
- SetRecSize( 11 + mxName->GetSize() + (mxTokArr.is() ? mxTokArr->GetSize() : 2) );
+ SetRecSize( 11 + mxName->GetSize() + (mxTokArr.get() ? mxTokArr->GetSize() : 2) );
XclExpRecord::Save( rStrm );
}
@@ -346,7 +346,7 @@ void XclExpName::SaveXml( XclExpXmlStream& rStrm )
void XclExpName::WriteBody( XclExpStream& rStrm )
{
- sal_uInt16 nFmlaSize = mxTokArr.is() ? mxTokArr->GetSize() : 0;
+ sal_uInt16 nFmlaSize = mxTokArr.get() ? mxTokArr->GetSize() : 0;
rStrm << mnFlags // flags
<< sal_uInt8( 0 ); // keyboard shortcut
@@ -357,7 +357,7 @@ void XclExpName::WriteBody( XclExpStream& rStrm )
<< sal_uInt32( 0 ); // length of menu/descr/help/status text
mxName->WriteFlagField( rStrm ); // BIFF8 flag field (no-op in <=BIFF7)
mxName->WriteBuffer( rStrm ); // character array of the name
- if( mxTokArr.is() )
+ if( mxTokArr.get() )
mxTokArr->WriteArray( rStrm ); // token array without size
}
@@ -505,7 +505,7 @@ sal_uInt16 XclExpNameManagerImpl::FindBuiltInNameIdx(
if( xName->GetBuiltInName() == cBuiltIn )
{
XclTokenArrayRef xTokArr = xName->GetTokenArray();
- if( xTokArr.is() && (*xTokArr == rTokArr) )
+ if( xTokArr.get() && (*xTokArr == rTokArr) )
return static_cast< sal_uInt16 >( nPos + 1 );
}
}
diff --git a/sc/source/filter/excel/xepivot.cxx b/sc/source/filter/excel/xepivot.cxx
index 15a41a2..51574a7 100644
--- a/sc/source/filter/excel/xepivot.cxx
+++ b/sc/source/filter/excel/xepivot.cxx
@@ -1685,7 +1685,7 @@ void XclExpPivotTable::WriteSxpi( XclExpStream& rStrm ) const
for( ScfUInt16Vec::const_iterator aIt = maPageFields.begin(), aEnd = maPageFields.end(); aIt != aEnd; ++aIt )
{
XclExpPTFieldRef xField = maFieldList.GetRecord( *aIt );
- if( xField.is() )
+ if( xField.get() )
xField->WriteSxpiEntry( rStrm );
}
rStrm.EndRecord();
@@ -1697,7 +1697,7 @@ void XclExpPivotTable::WriteSxdiList( XclExpStream& rStrm ) const
for( XclPTDataFieldPosVec::const_iterator aIt = maDataFields.begin(), aEnd = maDataFields.end(); aIt != aEnd; ++aIt )
{
XclExpPTFieldRef xField = maFieldList.GetRecord( aIt->first );
- if( xField.is() )
+ if( xField.get() )
xField->WriteSxdi( rStrm, aIt->second );
}
}
diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx
index 51d655d..c1e4eb8 100644
--- a/sc/source/filter/excel/xestream.cxx
+++ b/sc/source/filter/excel/xestream.cxx
@@ -369,7 +369,7 @@ void XclExpStream::SetEncrypter( XclExpEncrypterRef xEncrypter )
bool XclExpStream::HasValidEncrypter() const
{
- return mxEncrypter.is() && mxEncrypter->IsValid();
+ return mxEncrypter.get() && mxEncrypter->IsValid();
}
void XclExpStream::EnableEncryption( bool bEnable )
diff --git a/sc/source/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxx
index df1273f..76f4a9a 100644
--- a/sc/source/filter/excel/xetable.cxx
+++ b/sc/source/filter/excel/xetable.cxx
@@ -864,7 +864,7 @@ XclExpFormulaCell::XclExpFormulaCell(
void XclExpFormulaCell::Save( XclExpStream& rStrm )
{
// create token array for FORMULA cells with additional record
- if( mxAddRec.is() )
+ if( mxAddRec.get() )
mxTokArr = mxAddRec->CreateCellTokenArray( rStrm.GetRoot() );
// FORMULA record itself
@@ -875,11 +875,11 @@ void XclExpFormulaCell::Save( XclExpStream& rStrm )
XclExpSingleCellBase::Save( rStrm );
// additional record (ARRAY, SHRFMLA, or TABLEOP), only for first FORMULA record
- if( mxAddRec.is() && mxAddRec->IsBasePos( GetXclCol(), GetXclRow() ) )
+ if( mxAddRec.get() && mxAddRec->IsBasePos( GetXclCol(), GetXclRow() ) )
mxAddRec->Save( rStrm );
// STRING record for string result
- if( mxStringRec.is() )
+ if( mxStringRec.get() )
mxStringRec->Save( rStrm );
}
@@ -899,7 +899,7 @@ void XclExpFormulaCell::SaveXml( XclExpXmlStream& rStrm )
rWorksheet->startElement( XML_f,
// OOXTODO: XML_t, ST_CellFormulaType
- XML_aca, XclXmlUtils::ToPsz( (mxTokArr.is() && mxTokArr->IsVolatile()) || (mxAddRec.is() && mxAddRec->IsVolatile()) ),
+ XML_aca, XclXmlUtils::ToPsz( (mxTokArr.get() && mxTokArr->IsVolatile()) || (mxAddRec.get() && mxAddRec->IsVolatile()) ),
// OOXTODO: XML_ref, ST_Ref
// OOXTODO: XML_dt2D, bool
// OOXTODO: XML_dtr, bool
@@ -979,8 +979,8 @@ void XclExpFormulaCell::WriteContents( XclExpStream& rStrm )
// flags and formula token array
sal_uInt16 nFlags = EXC_FORMULA_DEFAULTFLAGS;
- ::set_flag( nFlags, EXC_FORMULA_RECALC_ALWAYS, mxTokArr->IsVolatile() || (mxAddRec.is() && mxAddRec->IsVolatile()) );
- ::set_flag( nFlags, EXC_FORMULA_SHARED, mxAddRec.is() && (mxAddRec->GetRecId() == EXC_ID_SHRFMLA) );
+ ::set_flag( nFlags, EXC_FORMULA_RECALC_ALWAYS, mxTokArr->IsVolatile() || (mxAddRec.get() && mxAddRec->IsVolatile()) );
+ ::set_flag( nFlags, EXC_FORMULA_SHARED, mxAddRec.get() && (mxAddRec->GetRecId() == EXC_ID_SHRFMLA) );
rStrm << nFlags << sal_uInt32( 0 ) << *mxTokArr;
}
@@ -1946,7 +1946,7 @@ void XclExpRow::InsertCell( XclExpCellRef xCell, size_t nPos, bool bIsMergedBase
// try to merge with previous cell, insert the new cell if not successful
XclExpCellRef xPrevCell = maCellList.GetRecord( nPos - 1 );
- if( xPrevCell.is() && xPrevCell->TryMerge( *xCell ) )
+ if( xPrevCell.get() && xPrevCell->TryMerge( *xCell ) )
xCell = xPrevCell;
else
maCellList.InsertRecord( xCell, nPos++ );
@@ -1954,7 +1954,7 @@ void XclExpRow::InsertCell( XclExpCellRef xCell, size_t nPos, bool bIsMergedBase
// try to merge with following cell, remove it if successful
XclExpCellRef xNextCell = maCellList.GetRecord( nPos );
- if( xNextCell.is() && xCell->TryMerge( *xNextCell ) )
+ if( xNextCell.get() && xCell->TryMerge( *xNextCell ) )
maCellList.RemoveRecord( nPos );
}
@@ -2339,7 +2339,7 @@ XclExpCellTable::XclExpCellTable( const XclExpRoot& rRoot ) :
}
// insert the cell into the current row
- if( xCell.is() )
+ if( xCell.get() )
maRowBfr.AppendCell( xCell, bIsMergedBase );
// notes
@@ -2359,7 +2359,7 @@ XclExpCellTable::XclExpCellTable( const XclExpRoot& rRoot ) :
ScRange aScRange( aScPos );
aScRange.aEnd.IncCol( rMergeItem.GetColMerge() - 1 );
aScRange.aEnd.IncRow( rMergeItem.GetRowMerge() - 1 );
- sal_uInt32 nXFId = xCell.is() ? xCell->GetFirstXFId() : EXC_XFID_NOTFOUND;
+ sal_uInt32 nXFId = xCell.get() ? xCell->GetFirstXFId() : EXC_XFID_NOTFOUND;
// #120156# blank cells merged vertically may occur repeatedly
DBG_ASSERT( (aScRange.aStart.Col() == aScRange.aEnd.Col()) || (nScCol == nLastScCol),
"XclExpCellTable::XclExpCellTable - invalid repeated blank merged cell" );
diff --git a/sc/source/filter/excel/xichart.cxx b/sc/source/filter/excel/xichart.cxx
index 19374ea..89799ea 100644
--- a/sc/source/filter/excel/xichart.cxx
+++ b/sc/source/filter/excel/xichart.cxx
@@ -559,7 +559,7 @@ void XclImpChFrameBase::ReadSubRecord( XclImpStream& rStrm )
void XclImpChFrameBase::ConvertLineBase( const XclImpChRoot& rRoot,
ScfPropertySet& rPropSet, XclChObjectType eObjType, sal_uInt16 nFormatIdx ) const
{
- if( mxLineFmt.is() )
+ if( mxLineFmt.get() )
mxLineFmt->Convert( rRoot, rPropSet, eObjType, nFormatIdx );
}
@@ -569,9 +569,9 @@ void XclImpChFrameBase::ConvertAreaBase( const XclImpChRoot& rRoot,
if( rRoot.GetFormatInfo( eObjType ).mbIsFrame )
{
// CHESCHERFORMAT overrides CHAREAFORMAT (even if it is auto)
- if( mxEscherFmt.is() )
+ if( mxEscherFmt.get() )
mxEscherFmt->Convert( rRoot, rPropSet, eObjType );
- else if( mxAreaFmt.is() )
+ else if( mxAreaFmt.get() )
mxAreaFmt->Convert( rRoot, rPropSet, eObjType, nFormatIdx );
}
}
@@ -659,7 +659,7 @@ Reference< XLabeledDataSequence > lclCreateLabeledDataSequence(
{
// create data sequence for values and title
Reference< XDataSequence > xValueSeq;
- if( xValueLink.is() )
+ if( xValueLink.get() )
xValueSeq = xValueLink->CreateDataSequence( rValueRole );
Reference< XDataSequence > xTitleSeq;
if( pTitleLink )
@@ -729,14 +729,14 @@ void XclImpChSourceLink::SetString( const String& rString )
void XclImpChSourceLink::SetTextFormats( const XclFormatRunVec& rFormats )
{
- if( mxString.is() )
+ if( mxString.get() )
mxString->SetFormats( rFormats );
}
sal_uInt16 XclImpChSourceLink::GetCellCount() const
{
sal_uInt32 nCellCount = 0;
- if( mxTokenArray.is() )
+ if( mxTokenArray.get() )
{
mxTokenArray->Reset();
for( const FormulaToken* pToken = mxTokenArray->First(); pToken; pToken = mxTokenArray->Next() )
@@ -784,7 +784,7 @@ Reference< XDataSequence > XclImpChSourceLink::CreateDataSequence( const OUStrin
{
Reference< XDataSequence > xDataSeq;
Reference< XDataProvider > xDataProv = GetDataProvider();
- if( xDataProv.is() && mxTokenArray.is() )
+ if( xDataProv.is() && mxTokenArray.get() )
{
ScCompiler aComp( GetDocPtr(), ScAddress(), *mxTokenArray );
aComp.SetGrammar( ::formula::FormulaGrammar::GRAM_ENGLISH );
@@ -809,7 +809,7 @@ Sequence< Reference< XFormattedString > > XclImpChSourceLink::CreateStringSequen
const XclImpChRoot& rRoot, sal_uInt16 nLeadFontIdx, const Color& rLeadFontColor ) const
{
::std::vector< Reference< XFormattedString > > aStringVec;
- if( mxString.is() )
+ if( mxString.get() )
{
for( XclImpStringIterator aIt( *mxString ); aIt.Is(); ++aIt )
{
@@ -839,7 +839,7 @@ Sequence< Reference< XFormattedString > > XclImpChSourceLink::CreateStringSequen
void XclImpChSourceLink::FillSourceLink( ::std::vector< ScSharedTokenRef >& rTokens ) const
{
- if( !mxTokenArray.is() )
+ if( !mxTokenArray.get() )
// no links to fill.
return;
@@ -944,7 +944,7 @@ void XclImpChText::ReadSubRecord( XclImpStream& rStrm )
ReadChFrLabelProps( rStrm );
break;
case EXC_ID_CHEND:
- if( mxSrcLink.is() && !maFormats.empty() )
+ if( mxSrcLink.get() && !maFormats.empty() )
mxSrcLink->SetTextFormats( maFormats );
break;
}
@@ -952,7 +952,7 @@ void XclImpChText::ReadSubRecord( XclImpStream& rStrm )
sal_uInt16 XclImpChText::GetFontIndex() const
{
- return mxFont.is() ? mxFont->GetFontIndex() : EXC_FONT_NOTFOUND;
+ return mxFont.get() ? mxFont->GetFontIndex() : EXC_FONT_NOTFOUND;
}
Color XclImpChText::GetFontColor() const
@@ -1010,24 +1010,24 @@ void XclImpChText::ConvertRotation( ScfPropertySet& rPropSet, bool bSupportsStac
void XclImpChText::ConvertFrame( ScfPropertySet& rPropSet ) const
{
- if( mxFrame.is() )
+ if( mxFrame.get() )
mxFrame->Convert( rPropSet );
}
void XclImpChText::ConvertNumFmt( ScfPropertySet& rPropSet, bool bPercent ) const
{
- if( mxSrcLink.is() )
+ if( mxSrcLink.get() )
mxSrcLink->ConvertNumFmt( rPropSet, bPercent );
}
void XclImpChText::ConvertDataLabel( ScfPropertySet& rPropSet, const XclChTypeInfo& rTypeInfo ) const
{
// existing CHFRLABELPROPS record wins over flags from CHTEXT
- sal_uInt16 nShowFlags = mxLabelProps.is() ? mxLabelProps->mnFlags : maData.mnFlags;
- sal_uInt16 SHOWANYCATEG = mxLabelProps.is() ? EXC_CHFRLABELPROPS_SHOWCATEG : (EXC_CHTEXT_SHOWCATEGPERC | EXC_CHTEXT_SHOWCATEG);
- sal_uInt16 SHOWANYVALUE = mxLabelProps.is() ? EXC_CHFRLABELPROPS_SHOWVALUE : EXC_CHTEXT_SHOWVALUE;
- sal_uInt16 SHOWANYPERCENT = mxLabelProps.is() ? EXC_CHFRLABELPROPS_SHOWPERCENT : (EXC_CHTEXT_SHOWPERCENT | EXC_CHTEXT_SHOWCATEGPERC);
- sal_uInt16 SHOWANYBUBBLE = mxLabelProps.is() ? EXC_CHFRLABELPROPS_SHOWBUBBLE : EXC_CHTEXT_SHOWBUBBLE;
+ sal_uInt16 nShowFlags = mxLabelProps.get() ? mxLabelProps->mnFlags : maData.mnFlags;
+ sal_uInt16 SHOWANYCATEG = mxLabelProps.get() ? EXC_CHFRLABELPROPS_SHOWCATEG : (EXC_CHTEXT_SHOWCATEGPERC | EXC_CHTEXT_SHOWCATEG);
+ sal_uInt16 SHOWANYVALUE = mxLabelProps.get() ? EXC_CHFRLABELPROPS_SHOWVALUE : EXC_CHTEXT_SHOWVALUE;
+ sal_uInt16 SHOWANYPERCENT = mxLabelProps.get() ? EXC_CHFRLABELPROPS_SHOWPERCENT : (EXC_CHTEXT_SHOWPERCENT | EXC_CHTEXT_SHOWCATEGPERC);
+ sal_uInt16 SHOWANYBUBBLE = mxLabelProps.get() ? EXC_CHFRLABELPROPS_SHOWBUBBLE : EXC_CHTEXT_SHOWBUBBLE;
// get raw flags for label values
bool bShowNone = IsDeleted();
@@ -1047,7 +1047,7 @@ void XclImpChText::ConvertDataLabel( ScfPropertySet& rPropSet, const XclChTypeIn
// create API struct for label values, set API label separator
cssc2::DataPointLabel aPointLabel( bShowValue, bShowPercent, bShowCateg, bShowSymbol );
rPropSet.SetProperty( EXC_CHPROP_LABEL, aPointLabel );
- String aSep = mxLabelProps.is() ? mxLabelProps->maSeparator : String( sal_Unicode( '\n' ) );
+ String aSep = mxLabelProps.get() ? mxLabelProps->maSeparator : String( sal_Unicode( '\n' ) );
if( aSep.Len() == 0 )
aSep = CREATE_STRING( "; " );
rPropSet.SetStringProperty( EXC_CHPROP_LABELSEPARATOR, aSep );
@@ -1083,7 +1083,7 @@ void XclImpChText::ConvertDataLabel( ScfPropertySet& rPropSet, const XclChTypeIn
Reference< XTitle > XclImpChText::CreateTitle() const
{
Reference< XTitle > xTitle;
- if( mxSrcLink.is() && mxSrcLink->HasString() )
+ if( mxSrcLink.get() && mxSrcLink->HasString() )
{
// create the formatted strings
Sequence< Reference< XFormattedString > > aStringSeq(
@@ -1179,7 +1179,7 @@ namespace {
void lclUpdateText( XclImpChTextRef& rxText, XclImpChTextRef xDefText )
{
- if( rxText.is() )
+ if( rxText.get() )
rxText->UpdateText( xDefText.get() );
else
rxText = xDefText;
@@ -1189,7 +1189,7 @@ void lclFinalizeTitle( XclImpChTextRef& rxTitle, XclImpChTextRef xDefText, const
{
/* Do not update a title, if it is not visible (if rxTitle is null).
Existing reference indicates enabled title. */
- if( rxTitle.is() )
+ if( rxTitle.get() )
{
if( !rxTitle->HasString() )
rxTitle->SetString( rAutoTitle );
@@ -1318,7 +1318,7 @@ XclImpChTextRef XclImpChAttachedLabel::CreateDataLabel( XclImpChTextRef xParent
const sal_uInt16 EXC_CHATTLABEL_SHOWANYPERCENT = EXC_CHATTLABEL_SHOWPERCENT | EXC_CHATTLABEL_SHOWCATEGPERC;
const sal_uInt16 EXC_CHATTLABEL_SHOWANYCATEG = EXC_CHATTLABEL_SHOWCATEG | EXC_CHATTLABEL_SHOWCATEGPERC;
- XclImpChTextRef xLabel( xParent.is() ? new XclImpChText( *xParent ) : new XclImpChText( GetChRoot() ) );
+ XclImpChTextRef xLabel( xParent.get() ? new XclImpChText( *xParent ) : new XclImpChText( GetChRoot() ) );
xLabel->UpdateDataLabel(
::get_flag( mnFlags, EXC_CHATTLABEL_SHOWANYCATEG ),
::get_flag( mnFlags, EXC_CHATTLABEL_SHOWANYVALUE ),
@@ -1468,18 +1468,18 @@ void XclImpChDataFormat::Convert( ScfPropertySet& rPropSet, const XclChExtTypeIn
ConvertFrameBase( GetChRoot(), rPropSet, rTypeInfo.GetSeriesObjectType(), maData.mnFormatIdx );
#if EXC_CHART2_3DBAR_HAIRLINES_ONLY
// #i83151# only hair lines in 3D charts with filled data points
- if( rTypeInfo.mb3dChart && rTypeInfo.IsSeriesFrameFormat() && mxLineFmt.is() && mxLineFmt->HasLine() )
+ if( rTypeInfo.mb3dChart && rTypeInfo.IsSeriesFrameFormat() && mxLineFmt.get() && mxLineFmt->HasLine() )
rPropSet.SetProperty< sal_Int32 >( CREATE_OUSTRING( "BorderWidth" ), 0 );
#endif
// other formatting
- if( mxMarkerFmt.is() )
+ if( mxMarkerFmt.get() )
mxMarkerFmt->Convert( GetChRoot(), rPropSet, maData.mnFormatIdx, GetLineWeight() );
- if( mxPieFmt.is() )
+ if( mxPieFmt.get() )
mxPieFmt->Convert( rPropSet );
- if( mx3dDataFmt.is() )
+ if( mx3dDataFmt.get() )
mx3dDataFmt->Convert( rPropSet );
- if( mxLabel.is() )
+ if( mxLabel.get() )
mxLabel->ConvertDataLabel( rPropSet, rTypeInfo );
// 3D settings
@@ -1488,7 +1488,7 @@ void XclImpChDataFormat::Convert( ScfPropertySet& rPropSet, const XclChExtTypeIn
/* Special case: set marker color as line color, if series line is not
visible. This makes the color visible in the marker area.
TODO: remove this if OOChart supports own colors in markers. */
- if( !rTypeInfo.IsSeriesFrameFormat() && !HasLine() && mxMarkerFmt.is() )
+ if( !rTypeInfo.IsSeriesFrameFormat() && !HasLine() && mxMarkerFmt.get() )
mxMarkerFmt->ConvertColor( GetChRoot(), rPropSet, maData.mnFormatIdx );
}
@@ -1527,9 +1527,9 @@ void XclImpChDataFormat::UpdateDataLabel( const XclImpChDataFormat* pParentFmt )
xDefText = pParentFmt->GetDataLabel();
if( !xDefText )
xDefText = GetChartData().GetDefaultText( EXC_CHTEXTTYPE_DATALABEL );
- if( mxLabel.is() )
+ if( mxLabel.get() )
mxLabel->UpdateText( xDefText.get() );
- else if( mxAttLabel.is() )
+ else if( mxAttLabel.get() )
mxLabel = mxAttLabel->CreateDataLabel( xDefText );
}
@@ -1577,7 +1577,7 @@ Reference< XRegressionCurve > XclImpChSerTrendLine::CreateRegressionCurve() cons
xRegCurve.set( ScfApiHelper::CreateInstance( aService ), UNO_QUERY );
// trend line formatting
- if( xRegCurve.is() && mxDataFmt.is() )
+ if( xRegCurve.is() && mxDataFmt.get() )
{
ScfPropertySet aPropSet( xRegCurve );
mxDataFmt->ConvertLine( aPropSet, EXC_CHOBJTYPE_TRENDLINE );
@@ -1699,7 +1699,7 @@ Reference< XPropertySet > XclImpChSerErrorBar::CreateErrorBar( const XclImpChSer
}
// error bar formatting
- if( pPrimaryBar->mxDataFmt.is() && xErrorBar.is() )
+ if( pPrimaryBar->mxDataFmt.get() && xErrorBar.is() )
pPrimaryBar->mxDataFmt->ConvertLine( aBarProp, EXC_CHOBJTYPE_ERRORBAR );
}
@@ -1750,7 +1750,7 @@ void XclImpChSeries::ReadSubRecord( XclImpStream& rStrm )
void XclImpChSeries::SetDataFormat( XclImpChDataFormatRef xDataFmt )
{
- if( xDataFmt.is() )
+ if( xDataFmt.get() )
{
XclImpChDataFormatRef* pxDataFmt = GetDataFormatRef( xDataFmt->GetPointPos().mnPointIdx );
// do not overwrite existing data format
@@ -1767,7 +1767,7 @@ void XclImpChSeries::SetDataFormat( XclImpChDataFormatRef xDataFmt )
void XclImpChSeries::SetDataLabel( XclImpChTextRef xLabel )
{
- if( xLabel.is() )
+ if( xLabel.get() )
{
XclImpChTextRef* pxLabel = GetDataLabelRef( xLabel->GetPointPos().mnPointIdx );
if( pxLabel && !*pxLabel )
@@ -1796,7 +1796,7 @@ void XclImpChSeries::FinalizeDataFormats()
if( !mxSeriesFmt )
mxSeriesFmt = CreateDataFormat( EXC_CHDATAFORMAT_ALLPOINTS, 0 );
- if( mxSeriesFmt.is() )
+ if( mxSeriesFmt.get() )
{
// #i83100# set text label format, e.g. for trend line equations
mxSeriesFmt->SetDataLabel( maLabels.get( EXC_CHDATAFORMAT_ALLPOINTS ) );
@@ -1834,7 +1834,7 @@ void XclImpChSeries::FinalizeDataFormats()
}
// update series format (copy missing formatting from group default format)
- if( mxSeriesFmt.is() )
+ if( mxSeriesFmt.get() )
mxSeriesFmt->UpdateSeriesFormat( pTypeGroup->GetTypeInfo(), pTypeGroup->GetGroupFormat().get() );
// update data point formats (removes unchanged automatic formatting)
@@ -1916,7 +1916,7 @@ Reference< XDataSeries > XclImpChSeries::CreateDataSeries() const
// series formatting
ScfPropertySet aSeriesProp( xDataSeries );
- if( mxSeriesFmt.is() )
+ if( mxSeriesFmt.get() )
mxSeriesFmt->Convert( aSeriesProp, rTypeInfo );
// trend lines
@@ -1938,7 +1938,7 @@ Reference< XDataSeries > XclImpChSeries::CreateDataSeries() const
aSeriesProp.SetBoolProperty( EXC_CHPROP_VARYCOLORSBY, rTypeInfo.meTypeCateg == EXC_CHTYPECATEG_PIE );
#endif
// #i91271# always set area formatting for every point in pie/doughnut charts
- if( mxSeriesFmt.is() && ((bVarPointFmt && mxSeriesFmt->IsAutoArea()) || (rTypeInfo.meTypeCateg == EXC_CHTYPECATEG_PIE)) )
+ if( mxSeriesFmt.get() && ((bVarPointFmt && mxSeriesFmt->IsAutoArea()) || (rTypeInfo.meTypeCateg == EXC_CHTYPECATEG_PIE)) )
{
for( sal_uInt16 nPointIdx = 0, nPointCount = mxValueLink->GetCellCount(); nPointIdx < nPointCount; ++nPointIdx )
{
@@ -1959,13 +1959,13 @@ Reference< XDataSeries > XclImpChSeries::CreateDataSeries() const
void XclImpChSeries::FillAllSourceLinks( ::std::vector< ScSharedTokenRef >& rTokens ) const
{
- if( mxValueLink.is() )
+ if( mxValueLink.get() )
mxValueLink->FillSourceLink( rTokens );
- if( mxCategLink.is() )
+ if( mxCategLink.get() )
mxCategLink->FillSourceLink( rTokens );
- if( mxTitleLink.is() )
+ if( mxTitleLink.get() )
mxTitleLink->FillSourceLink( rTokens );
- if( mxBubbleLink.is() )
+ if( mxBubbleLink.get() )
mxBubbleLink->FillSourceLink( rTokens );
}
@@ -2413,10 +2413,10 @@ Reference< XLegend > XclImpChLegend::CreateLegend() const
aLegendProp.SetBoolProperty( EXC_CHPROP_SHOW, true );
// frame properties
- if( mxFrame.is() )
+ if( mxFrame.get() )
mxFrame->Convert( aLegendProp );
// text properties
- if( mxText.is() )
+ if( mxText.get() )
mxText->ConvertFont( aLegendProp );
/* Legend position and size. Default positions are used only if the
@@ -2438,7 +2438,7 @@ Reference< XLegend > XclImpChLegend::CreateLegend() const
// no automatic position: try to find the correct position and size
if( eApiPos == cssc2::LegendPosition_CUSTOM )
{
- const XclChFramePos* pFramePos = mxFramePos.is() ? &mxFramePos->GetFramePosData() : 0;
+ const XclChFramePos* pFramePos = mxFramePos.get() ? &mxFramePos->GetFramePosData() : 0;
/* Legend position. Only the settings from the CHFRAMEPOS record
are used by Excel, the position in the CHLEGEND record will be
@@ -2567,20 +2567,20 @@ void XclImpChTypeGroup::Finalize()
maType.Finalize( bStockChart );
// extended type info
- maTypeInfo.Set( maType.GetTypeInfo(), mxChart3d.is(), false );
+ maTypeInfo.Set( maType.GetTypeInfo(), mxChart3d.get(), false );
// reverse series order for some unstacked 2D chart types
if( maTypeInfo.mbReverseSeries && !Is3dChart() && !maType.IsStacked() && !maType.IsPercent() )
::std::reverse( maSeries.begin(), maSeries.end() );
// update chart type group format, may depend on chart type finalized above
- if( mxGroupFmt.is() )
+ if( mxGroupFmt.get() )
mxGroupFmt->UpdateGroupFormat( maTypeInfo );
}
void XclImpChTypeGroup::AddSeries( XclImpChSeriesRef xSeries )
{
- if( xSeries.is() )
+ if( xSeries.get() )
maSeries.push_back( xSeries );
// store first inserted series separately, series order may be reversed later
if( !mxFirstSeries )
@@ -2613,20 +2613,20 @@ bool XclImpChTypeGroup::HasConnectorLines() const
// existence of connector lines (only in stacked bar charts)
bool bAnyStacked = maType.IsStacked() || maType.IsPercent();
XclImpChLineFormatRef xConnLine = maChartLines.get( EXC_CHCHARTLINE_CONNECT );
- return bAnyStacked && (maTypeInfo.meTypeCateg == EXC_CHTYPECATEG_BAR) && xConnLine.is() && xConnLine->HasLine();
+ return bAnyStacked && (maTypeInfo.meTypeCateg == EXC_CHTYPECATEG_BAR) && xConnLine.get() && xConnLine->HasLine();
}
const String& XclImpChTypeGroup::GetSingleSeriesTitle() const
{
// no automatic title for series with trendlines or error bars
// pie charts always show an automatic title, even if more series exist
- return (mxFirstSeries.is() && !mxFirstSeries->HasChildSeries() && (maTypeInfo.mbSingleSeriesVis || (maSeries.size() == 1))) ?
+ return (mxFirstSeries.get() && !mxFirstSeries->HasChildSeries() && (maTypeInfo.mbSingleSeriesVis || (maSeries.size() == 1))) ?
mxFirstSeries->GetTitle() : String::EmptyString();
}
void XclImpChTypeGroup::ConvertChart3d( ScfPropertySet& rPropSet ) const
{
- if( mxChart3d.is() )
+ if( mxChart3d.get() )
mxChart3d->Convert( rPropSet, Is3dWallChart() );
}
@@ -2663,7 +2663,7 @@ Reference< XLabeledDataSequence > XclImpChTypeGroup::CreateCategSequence() const
{
Reference< XLabeledDataSequence > xLabeledSeq;
// create category sequence from first visible series
- if( mxFirstSeries.is() )
+ if( mxFirstSeries.get() )
xLabeledSeq = mxFirstSeries->CreateCategSequence( EXC_CHPROP_ROLE_CATEG );
return xLabeledSeq;
}
@@ -2793,7 +2793,7 @@ void XclImpChTypeGroup::CreateStockSeries( Reference< XChartType > xChartType, s
aTypeProp.SetBoolProperty( EXC_CHPROP_SHOWHIGHLOW, true );
// hi-lo line format
XclImpChLineFormatRef xHiLoLine = maChartLines.get( EXC_CHCHARTLINE_HILO );
- if( xHiLoLine.is() )
+ if( xHiLoLine.get() )
{
ScfPropertySet aSeriesProp( xDataSeries );
xHiLoLine->Convert( GetChRoot(), aSeriesProp, EXC_CHOBJTYPE_HILOLINE );
@@ -2801,7 +2801,7 @@ void XclImpChTypeGroup::CreateStockSeries( Reference< XChartType > xChartType, s
// white dropbar format
XclImpChDropBarRef xUpBar = maDropBars.get( EXC_CHDROPBAR_UP );
Reference< XPropertySet > xWhitePropSet;
- if( xUpBar.is() && aTypeProp.GetProperty( xWhitePropSet, EXC_CHPROP_WHITEDAY ) )
+ if( xUpBar.get() && aTypeProp.GetProperty( xWhitePropSet, EXC_CHPROP_WHITEDAY ) )
{
ScfPropertySet aBarProp( xWhitePropSet );
xUpBar->Convert( GetChRoot(), aBarProp );
@@ -2809,7 +2809,7 @@ void XclImpChTypeGroup::CreateStockSeries( Reference< XChartType > xChartType, s
// black dropbar format
XclImpChDropBarRef xDownBar = maDropBars.get( EXC_CHDROPBAR_DOWN );
Reference< XPropertySet > xBlackPropSet;
- if( xDownBar.is() && aTypeProp.GetProperty( xBlackPropSet, EXC_CHPROP_BLACKDAY ) )
+ if( xDownBar.get() && aTypeProp.GetProperty( xBlackPropSet, EXC_CHPROP_BLACKDAY ) )
{
ScfPropertySet aBarProp( xBlackPropSet );
xDownBar->Convert( GetChRoot(), aBarProp );
@@ -3065,9 +3065,9 @@ void XclImpChAxis::Finalize()
if( !mxValueRange )
mxValueRange.reset( new XclImpChValueRange( GetChRoot() ) );
// remove invisible grid lines completely
- if( mxMajorGrid.is() && !mxMajorGrid->HasLine() )
+ if( mxMajorGrid.get() && !mxMajorGrid->HasLine() )
mxMajorGrid.reset();
- if( mxMinorGrid.is() && !mxMinorGrid->HasLine() )
+ if( mxMinorGrid.get() && !mxMinorGrid->HasLine() )
mxMinorGrid.reset();
// default tick settings different in OOChart and Excel
if( !mxTick )
@@ -3087,17 +3087,17 @@ void XclImpChAxis::Finalize()
sal_uInt16 XclImpChAxis::GetFontIndex() const
{
- return mxFont.is() ? mxFont->GetFontIndex() : EXC_FONT_NOTFOUND;
+ return mxFont.get() ? mxFont->GetFontIndex() : EXC_FONT_NOTFOUND;
}
Color XclImpChAxis::GetFontColor() const
{
- return mxTick.is() ? mxTick->GetFontColor() : GetFontAutoColor();
+ return mxTick.get() ? mxTick->GetFontColor() : GetFontAutoColor();
}
sal_uInt16 XclImpChAxis::GetRotation() const
{
- return mxTick.is() ? mxTick->GetRotation() : EXC_CHART_AUTOROTATION;
+ return mxTick.get() ? mxTick->GetRotation() : EXC_CHART_AUTOROTATION;
}
Reference< XAxis > XclImpChAxis::CreateAxis( const XclImpChTypeGroup& rTypeGroup, const XclImpChAxis* pCrossingAxis ) const
@@ -3111,10 +3111,10 @@ Reference< XAxis > XclImpChAxis::CreateAxis( const XclImpChTypeGroup& rTypeGroup
aAxisProp.SetBoolProperty( EXC_CHPROP_SHOW, IsActivated() );
// axis line properties
- if( mxAxisLine.is() )
+ if( mxAxisLine.get() )
mxAxisLine->Convert( GetChRoot(), aAxisProp, EXC_CHOBJTYPE_AXISLINE );
// axis ticks properties
- if( mxTick.is() )
+ if( mxTick.get() )
mxTick->Convert( aAxisProp );
// axis caption text --------------------------------------------------
@@ -3126,7 +3126,7 @@ Reference< XAxis > XclImpChAxis::CreateAxis( const XclImpChTypeGroup& rTypeGroup
if( bHasLabels )
{
// font settings from CHFONT record or from default text
- if( mxFont.is() )
+ if( mxFont.get() )
ConvertFontBase( GetChRoot(), aAxisProp );
else if( const XclImpChText* pDefText = GetChartData().GetDefaultText( EXC_CHTEXTTYPE_AXISLABEL ).get() )
pDefText->ConvertFont( aAxisProp );
@@ -3191,7 +3191,7 @@ Reference< XAxis > XclImpChAxis::CreateAxis( const XclImpChTypeGroup& rTypeGroup
// main grid
ScfPropertySet aGridProp( xAxis->getGridProperties() );
aGridProp.SetBoolProperty( EXC_CHPROP_SHOW, HasMajorGrid() );
- if( mxMajorGrid.is() )
+ if( mxMajorGrid.get() )
mxMajorGrid->Convert( GetChRoot(), aGridProp, EXC_CHOBJTYPE_GRIDLINE );
// sub grid
Sequence< Reference< XPropertySet > > aSubGridPropSeq = xAxis->getSubGridProperties();
@@ -3199,7 +3199,7 @@ Reference< XAxis > XclImpChAxis::CreateAxis( const XclImpChTypeGroup& rTypeGroup
{
ScfPropertySet aSubGridProp( aSubGridPropSeq[ 0 ] );
aSubGridProp.SetBoolProperty( EXC_CHPROP_SHOW, HasMinorGrid() );
- if( mxMinorGrid.is() )
+ if( mxMinorGrid.get() )
mxMinorGrid->Convert( GetChRoot(), aSubGridProp, EXC_CHOBJTYPE_GRIDLINE );
}
@@ -3213,7 +3213,7 @@ Reference< XAxis > XclImpChAxis::CreateAxis( const XclImpChTypeGroup& rTypeGroup
void XclImpChAxis::ConvertWall( ScfPropertySet& rPropSet ) const
{
- if( mxWallFrame.is() )
+ if( mxWallFrame.get() )
mxWallFrame->Convert( rPropSet );
}
@@ -3254,7 +3254,7 @@ void XclImpChAxis::ReadChAxisLine( XclImpStream& rStrm )
pxLineFmt->reset( new XclImpChLineFormat );
(*pxLineFmt)->ReadChLineFormat( rStrm );
}
- else if( bWallFrame && mxWallFrame.is() )
+ else if( bWallFrame && mxWallFrame.get() )
{
mxWallFrame->ReadSubRecord( rStrm );
}
@@ -3341,9 +3341,9 @@ void XclImpChAxesSet::Finalize()
mxZAxis.reset( new XclImpChAxis( GetChRoot(), EXC_CHAXIS_Z ) );
// finalize axes
- if( mxXAxis.is() ) mxXAxis->Finalize();
- if( mxYAxis.is() ) mxYAxis->Finalize();
- if( mxZAxis.is() ) mxZAxis->Finalize();
+ if( mxXAxis.get() ) mxXAxis->Finalize();
+ if( mxYAxis.get() ) mxYAxis->Finalize();
+ if( mxZAxis.get() ) mxZAxis->Finalize();
// finalize axis titles
XclImpChTextRef xDefText = GetChartData().GetDefaultText( EXC_CHTEXTTYPE_AXISTITLE );
@@ -3414,11 +3414,11 @@ void XclImpChAxesSet::Convert( Reference< XDiagram > xDiagram ) const
void XclImpChAxesSet::ConvertTitlePositions() const
{
- if( mxXAxisTitle.is() )
+ if( mxXAxisTitle.get() )
mxXAxisTitle->ConvertTitlePosition( XclChTextKey( EXC_CHTEXTTYPE_AXISTITLE, maData.mnAxesSetId, EXC_CHAXIS_X ) );
- if( mxYAxisTitle.is() )
+ if( mxYAxisTitle.get() )
mxYAxisTitle->ConvertTitlePosition( XclChTextKey( EXC_CHTEXTTYPE_AXISTITLE, maData.mnAxesSetId, EXC_CHAXIS_Y ) );
- if( mxZAxisTitle.is() )
+ if( mxZAxisTitle.get() )
mxZAxisTitle->ConvertTitlePosition( XclChTextKey( EXC_CHTEXTTYPE_AXISTITLE, maData.mnAxesSetId, EXC_CHAXIS_Z ) );
}
@@ -3484,7 +3484,7 @@ Reference< XCoordinateSystem > XclImpChAxesSet::CreateCoordSystem( Reference< XD
if( !xCoordSystem.is() )
{
XclImpChTypeGroupRef xTypeGroup = GetFirstTypeGroup();
- if( xTypeGroup.is() )
+ if( xTypeGroup.get() )
{
xCoordSystem = xTypeGroup->CreateCoordSystem();
// convert 3d chart settings
@@ -3521,14 +3521,14 @@ void XclImpChAxesSet::ConvertAxis(
XclImpChAxisRef xChAxis, XclImpChTextRef xChAxisTitle,
Reference< XCoordinateSystem > xCoordSystem, const XclImpChAxis* pCrossingAxis ) const
{
- if( xChAxis.is() )
+ if( xChAxis.get() )
{
// create and attach the axis object
Reference< XAxis > xAxis = CreateAxis( *xChAxis, pCrossingAxis );
if( xAxis.is() )
{
// create and attach the axis title
- if( xChAxisTitle.is() ) try
+ if( xChAxisTitle.get() ) try
{
Reference< XTitled > xTitled( xAxis, UNO_QUERY_THROW );
Reference< XTitle > xTitle( xChAxisTitle->CreateTitle(), UNO_SET_THROW );
@@ -3565,21 +3565,21 @@ Reference< XAxis > XclImpChAxesSet::CreateAxis( const XclImpChAxis& rChAxis, con
void XclImpChAxesSet::ConvertBackground( Reference< XDiagram > xDiagram ) const
{
XclImpChTypeGroupRef xTypeGroup = GetFirstTypeGroup();
- if( xTypeGroup.is() && xTypeGroup->Is3dWallChart() )
+ if( xTypeGroup.get() && xTypeGroup->Is3dWallChart() )
{
// wall/floor formatting (3D charts)
- if( mxXAxis.is() )
+ if( mxXAxis.get() )
{
ScfPropertySet aWallProp( xDiagram->getWall() );
mxXAxis->ConvertWall( aWallProp );
}
- if( mxYAxis.is() )
+ if( mxYAxis.get() )
{
ScfPropertySet aFloorProp( xDiagram->getFloor() );
mxYAxis->ConvertWall( aFloorProp );
}
}
- else if( mxPlotFrame.is() )
+ else if( mxPlotFrame.get() )
{
// diagram background formatting
ScfPropertySet aWallProp( xDiagram->getWall() );
@@ -3703,14 +3703,14 @@ void XclImpChChart::Convert( Reference< XChartDocument > xChartDoc,
InitConversion( xChartDoc, rChartRect );
// chart frame formatting
- if( mxFrame.is() )
+ if( mxFrame.get() )
{
ScfPropertySet aFrameProp( xChartDoc->getPageBackground() );
mxFrame->Convert( aFrameProp );
}
// chart title
- if( mxTitle.is() ) try
+ if( mxTitle.get() ) try
{
Reference< XTitled > xTitled( xChartDoc, UNO_QUERY_THROW );
Reference< XTitle > xTitle( mxTitle->CreateTitle(), UNO_SET_THROW );
@@ -3730,7 +3730,7 @@ void XclImpChChart::Convert( Reference< XChartDocument > xChartDoc,
mxSecnAxesSet->Convert( xDiagram );
// legend
- if( xDiagram.is() && mxLegend.is() )
+ if( xDiagram.is() && mxLegend.get() )
xDiagram->setLegend( mxLegend->CreateLegend() );
/* Following all conversions needing the old Chart1 API that involves full
@@ -3749,7 +3749,7 @@ void XclImpChChart::Convert( Reference< XChartDocument > xChartDoc,
// plot area position and size (there is no real automatic mode in BIFF5 charts)
XclImpChFramePosRef xPlotAreaPos = mxPrimAxesSet->GetPlotAreaFramePos();
- if( IsManualPlotArea() && xPlotAreaPos.is() ) try
+ if( IsManualPlotArea() && xPlotAreaPos.get() ) try
{
const XclChFramePos& rFramePos = xPlotAreaPos->GetFramePosData();
if( (rFramePos.mnTLMode == EXC_CHFRAMEPOS_PARENT) && (rFramePos.mnBRMode == EXC_CHFRAMEPOS_PARENT) )
@@ -3771,7 +3771,7 @@ void XclImpChChart::Convert( Reference< XChartDocument > xChartDoc,
}
// positions of all title objects
- if( mxTitle.is() )
+ if( mxTitle.get() )
mxTitle->ConvertTitlePosition( XclChTextKey( EXC_CHTEXTTYPE_TITLE ) );
mxPrimAxesSet->ConvertTitlePositions();
mxSecnAxesSet->ConvertTitlePositions();
@@ -3848,7 +3848,7 @@ void XclImpChChart::Finalize()
mxLegend = mxPrimAxesSet->GetLegend();
if( !mxLegend )
mxLegend = mxSecnAxesSet->GetLegend();
- if( mxLegend.is() )
+ if( mxLegend.get() )
mxLegend->Finalize();
// axes sets, updates chart type group default formats -> must be called before FinalizeDataFormats()
mxPrimAxesSet->Finalize();
@@ -3916,7 +3916,7 @@ void XclImpChChart::FinalizeTitle()
// automatic title from first series name (if there are no series on secondary axes set)
if( !mxSecnAxesSet->IsValidAxesSet() )
aAutoTitle = mxPrimAxesSet->GetSingleSeriesTitle();
- if( mxTitle.is() || (aAutoTitle.Len() > 0) )
+ if( mxTitle.get() || (aAutoTitle.Len() > 0) )
{
if( !mxTitle )
mxTitle.reset( new XclImpChText( GetChRoot() ) );
@@ -4115,8 +4115,8 @@ void XclImpChart::UpdateObjFrame( const XclObjLineData& rLineData, const XclObjF
sal_Size XclImpChart::GetProgressSize() const
{
return
- (mxChartData.is() ? mxChartData->GetProgressSize() : 0) +
- (mxChartDrawing.is() ? mxChartDrawing->GetProgressSize() : 0);
+ (mxChartData.get() ? mxChartData->GetProgressSize() : 0) +
+ (mxChartDrawing.get() ? mxChartDrawing->GetProgressSize() : 0);
}
void XclImpChart::Convert( Reference< XModel > xModel, XclImpDffConverter& rDffConv, const OUString& rObjName, const Rectangle& rChartRect ) const
@@ -4124,9 +4124,9 @@ void XclImpChart::Convert( Reference< XModel > xModel, XclImpDffConverter& rDffC
Reference< XChartDocument > xChartDoc( xModel, UNO_QUERY );
if( xChartDoc.is() )
{
- if( mxChartData.is() )
+ if( mxChartData.get() )
mxChartData->Convert( xChartDoc, rDffConv, rObjName, rChartRect );
- if( mxChartDrawing.is() )
+ if( mxChartDrawing.get() )
mxChartDrawing->ConvertObjects( rDffConv, xModel, rChartRect );
}
}
diff --git a/sc/source/filter/excel/xicontent.cxx b/sc/source/filter/excel/xicontent.cxx
index 2d9f909..cf4896a 100644
--- a/sc/source/filter/excel/xicontent.cxx
+++ b/sc/source/filter/excel/xicontent.cxx
@@ -1124,11 +1124,11 @@ ErrCode XclImpDecryptHelper::ReadFilepass( XclImpStream& rStrm )
rStrm.SetDecrypter( xDecr );
// request and verify a password (decrypter implements IDocPasswordVerifier)
- if( xDecr.is() )
+ if( xDecr.get() )
rStrm.GetRoot().RequestPassword( *xDecr );
// return error code (success, wrong password, etc.)
- return xDecr.is() ? xDecr->GetError() : EXC_ENCR_ERROR_UNSUPP_CRYPT;
+ return xDecr.get() ? xDecr->GetError() : EXC_ENCR_ERROR_UNSUPP_CRYPT;
}
// Document protection ========================================================
diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx
index 879320e..601b3f0 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -1323,7 +1323,7 @@ void XclImpObjTextData::ReadByteString( XclImpStream& rStrm )
void XclImpObjTextData::ReadFormats( XclImpStream& rStrm )
{
- if( mxString.is() )
+ if( mxString.get() )
mxString->ReadObjFormats( rStrm, maData.mnFormatSize );
else
rStrm.Ignore( maData.mnFormatSize );
@@ -1385,7 +1385,7 @@ void XclImpTextObj::DoPreProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject&
// set text data
if( SdrTextObj* pTextObj = dynamic_cast< SdrTextObj* >( &rSdrObj ) )
{
- if( maTextData.mxString.is() )
+ if( maTextData.mxString.get() )
{
if( maTextData.mxString->IsRich() )
{
@@ -1570,7 +1570,7 @@ void XclImpChartObj::DoReadObj3( XclImpStream& rStrm, sal_uInt16 nMacroSize )
rStrm.Ignore( 18 );
ReadMacro3( rStrm, nMacroSize );
// set frame format from OBJ record, it is used if chart itself is transparent
- if( mxChart.is() )
+ if( mxChart.get() )
mxChart->UpdateObjFrame( maLineData, maFillData );
}
@@ -1581,7 +1581,7 @@ void XclImpChartObj::DoReadObj4( XclImpStream& rStrm, sal_uInt16 nMacroSize )
rStrm.Ignore( 18 );
ReadMacro4( rStrm, nMacroSize );
// set frame format from OBJ record, it is used if chart itself is transparent
- if( mxChart.is() )
+ if( mxChart.get() )
mxChart->UpdateObjFrame( maLineData, maFillData );
}
@@ -1594,7 +1594,7 @@ void XclImpChartObj::DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_u
ReadMacro5( rStrm, nMacroSize );
ReadChartSubStream( rStrm );
// set frame format from OBJ record, it is used if chart itself is transparent
- if( mxChart.is() )
+ if( mxChart.get() )
mxChart->UpdateObjFrame( maLineData, maFillData );
}
@@ -1614,14 +1614,14 @@ void XclImpChartObj::DoReadObj8SubRec( XclImpStream& rStrm, sal_uInt16 nSubRecId
sal_Size XclImpChartObj::DoGetProgressSize() const
{
- return mxChart.is() ? mxChart->GetProgressSize() : 1;
+ return mxChart.get() ? mxChart->GetProgressSize() : 1;
}
SdrObject* XclImpChartObj::DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const
{
SdrObjectPtr xSdrObj;
SfxObjectShell* pDocShell = GetDocShell();
- if( rDffConv.SupportsOleObjects() && SvtModuleOptions().IsChart() && pDocShell && mxChart.is() && !mxChart->IsPivotChart() )
+ if( rDffConv.SupportsOleObjects() && SvtModuleOptions().IsChart() && pDocShell && mxChart.get() && !mxChart->IsPivotChart() )
{
// create embedded chart object
OUString aEmbObjName;
@@ -1647,7 +1647,7 @@ SdrObject* XclImpChartObj::DoCreateSdrObj( XclImpDffConverter& rDffConv, const R
void XclImpChartObj::DoPostProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject& rSdrObj ) const
{
const SdrOle2Obj* pSdrOleObj = dynamic_cast< const SdrOle2Obj* >( &rSdrObj );
- if( mxChart.is() && pSdrOleObj )
+ if( mxChart.get() && pSdrOleObj )
{
Reference< XEmbeddedObject > xEmbObj = pSdrOleObj->GetObjRef();
if( xEmbObj.is() && ::svt::EmbeddedObjectRef::TryRunningState( xEmbObj ) ) try
@@ -1774,7 +1774,7 @@ void XclImpControlHelper::ApplySheetLinkProps() const
if( xFactory.is() )
{
// cell link
- if( mxCellLink.is() ) try
+ if( mxCellLink.get() ) try
{
Reference< XBindableValue > xBindable( xCtrlModel, UNO_QUERY_THROW );
@@ -1805,7 +1805,7 @@ void XclImpControlHelper::ApplySheetLinkProps() const
}
// source range
- if( mxSrcRange.is() ) try
+ if( mxSrcRange.get() ) try
{
Reference< XListEntrySink > xEntrySink( xCtrlModel, UNO_QUERY_THROW );
@@ -1948,7 +1948,7 @@ bool XclImpTbxObjBase::FillMacroDescriptor( ScriptEventDescriptor& rDescriptor )
void XclImpTbxObjBase::ConvertFont( ScfPropertySet& rPropSet ) const
{
- if( maTextData.mxString.is() )
+ if( maTextData.mxString.get() )
{
const XclFormatRunVec& rFormatRuns = maTextData.mxString->GetFormats();
if( rFormatRuns.empty() )
@@ -1960,7 +1960,7 @@ void XclImpTbxObjBase::ConvertFont( ScfPropertySet& rPropSet ) const
void XclImpTbxObjBase::ConvertLabel( ScfPropertySet& rPropSet ) const
{
- if( maTextData.mxString.is() )
+ if( maTextData.mxString.get() )
{
String aLabel = maTextData.mxString->GetText();
if( maTextData.maData.mnShortcut > 0 )
@@ -2378,7 +2378,7 @@ void XclImpEditObj::DoReadObj8SubRec( XclImpStream& rStrm, sal_uInt16 nSubRecId,
void XclImpEditObj::DoProcessControl( ScfPropertySet& rPropSet ) const
{
- if( maTextData.mxString.is() )
+ if( maTextData.mxString.get() )
{
OUString aText = maTextData.mxString->GetText();
if( IsNumeric() )
@@ -2712,7 +2712,7 @@ void XclImpDropDownObj::DoProcessControl( ScfPropertySet& rPropSet ) const
if( GetDropDownType() == EXC_OBJ_DROPDOWN_COMBOBOX )
{
// text of editable combobox
- if( maTextData.mxString.is() )
+ if( maTextData.mxString.get() )
rPropSet.SetStringProperty( CREATE_OUSTRING( "DefaultText" ), maTextData.mxString->GetText() );
}
else
@@ -3739,7 +3739,7 @@ void XclImpDrawing::ReadObj( XclImpStream& rStrm )
DBG_ERROR_BIFF();
}
- if( xDrawObj.is() )
+ if( xDrawObj.get() )
{
// insert into maRawObjs or into the last open group object
maRawObjs.InsertGrouped( xDrawObj );
diff --git a/sc/source/filter/excel/xipivot.cxx b/sc/source/filter/excel/xipivot.cxx
index 5d4132c..fea03f1 100644
--- a/sc/source/filter/excel/xipivot.cxx
+++ b/sc/source/filter/excel/xipivot.cxx
@@ -785,7 +785,7 @@ void XclImpPivotCache::ReadPivotCacheStream( XclImpStream& rStrm )
case EXC_ID_SXSTRING:
case EXC_ID_SXDATETIME:
case EXC_ID_SXEMPTY:
- if( xCurrField.is() ) // inline items
+ if( xCurrField.get() ) // inline items
{
xCurrField->ReadItem( aPCStrm );
}
@@ -810,12 +810,12 @@ void XclImpPivotCache::ReadPivotCacheStream( XclImpStream& rStrm )
break;
case EXC_ID_SXNUMGROUP:
- if( xCurrField.is() )
+ if( xCurrField.get() )
xCurrField->ReadSxnumgroup( aPCStrm );
break;
case EXC_ID_SXGROUPINFO:
- if( xCurrField.is() )
+ if( xCurrField.get() )
xCurrField->ReadSxgroupinfo( aPCStrm );
break;
@@ -909,7 +909,7 @@ XclImpPTField::XclImpPTField( const XclImpPivotTable& rPTable, sal_uInt16 nCache
const XclImpPCField* XclImpPTField::GetCacheField() const
{
XclImpPivotCacheRef xPCache = mrPTable.GetPivotCache();
- return xPCache.is() ? xPCache->GetField( maFieldInfo.mnCacheIdx ) : 0;
+ return xPCache.get() ? xPCache->GetField( maFieldInfo.mnCacheIdx ) : 0;
}
const String& XclImpPTField::GetFieldName() const
@@ -1256,13 +1256,13 @@ void XclImpPivotTable::ReadSxvd( XclImpStream& rStrm )
void XclImpPivotTable::ReadSxvi( XclImpStream& rStrm )
{
- if( mxCurrField.is() )
+ if( mxCurrField.get() )
mxCurrField->ReadSxvi( rStrm );
}
void XclImpPivotTable::ReadSxvdex( XclImpStream& rStrm )
{
- if( mxCurrField.is() )
+ if( mxCurrField.get() )
mxCurrField->ReadSxvdex( rStrm );
}
diff --git a/sc/source/filter/excel/xistream.cxx b/sc/source/filter/excel/xistream.cxx
index a07dd0b..f7f83ae 100644
--- a/sc/source/filter/excel/xistream.cxx
+++ b/sc/source/filter/excel/xistream.cxx
@@ -442,14 +442,14 @@ void XclImpStream::SetDecrypter( XclImpDecrypterRef xDecrypter )
void XclImpStream::CopyDecrypterFrom( const XclImpStream& rStrm )
{
XclImpDecrypterRef xNewDecr;
- if( rStrm.mxDecrypter.is() )
+ if( rStrm.mxDecrypter.get() )
xNewDecr = rStrm.mxDecrypter->Clone();
SetDecrypter( xNewDecr );
}
bool XclImpStream::HasValidDecrypter() const
{
- return mxDecrypter.is() && mxDecrypter->IsValid();
+ return mxDecrypter.get() && mxDecrypter->IsValid();
}
void XclImpStream::EnableDecryption( bool bEnable )
@@ -998,7 +998,7 @@ bool XclImpStream::ReadNextRawRecHeader()
void XclImpStream::SetupDecrypter()
{
- if( mxDecrypter.is() )
+ if( mxDecrypter.get() )
mxDecrypter->Update( mrStrm, mnRawRecSize );
}
diff --git a/sc/source/filter/excel/xistyle.cxx b/sc/source/filter/excel/xistyle.cxx
index 6693d6f..f15a6dd 100644
--- a/sc/source/filter/excel/xistyle.cxx
+++ b/sc/source/filter/excel/xistyle.cxx
@@ -1871,7 +1871,7 @@ void XclImpXFRangeBuffer::Finalize()
for( XclImpXFRangeColumnVec::const_iterator aVBeg = maColumns.begin(), aVEnd = maColumns.end(), aVIt = aVBeg; aVIt != aVEnd; ++aVIt )
{
// apply all cell styles of an existing column
- if( aVIt->is() )
+ if( aVIt->get() )
{
XclImpXFRangeColumn& rColumn = **aVIt;
SCCOL nScCol = static_cast< SCCOL >( aVIt - aVBeg );
diff --git a/sc/source/filter/excel/xlchart.cxx b/sc/source/filter/excel/xlchart.cxx
index c1f0a1e..8e9d1b8 100644
--- a/sc/source/filter/excel/xlchart.cxx
+++ b/sc/source/filter/excel/xlchart.cxx
@@ -1054,7 +1054,7 @@ void XclChPropSetHelper::WriteEscherProperties( ScfPropertySet& rPropSet,
const XclChEscherFormat& rEscherFmt, const XclChPicFormat& rPicFmt,
XclChPropertyMode ePropMode )
{
- if( rEscherFmt.mxItemSet.is() )
+ if( rEscherFmt.mxItemSet.get() )
{
if( const XFillStyleItem* pStyleItem = static_cast< const XFillStyleItem* >( rEscherFmt.mxItemSet->GetItem( XATTR_FILLSTYLE, FALSE ) ) )
{
diff --git a/sc/source/filter/excel/xlformula.cxx b/sc/source/filter/excel/xlformula.cxx
index e52f0b8..571cac7 100644
--- a/sc/source/filter/excel/xlformula.cxx
+++ b/sc/source/filter/excel/xlformula.cxx
@@ -563,7 +563,7 @@ XclExpStream& operator<<( XclExpStream& rStrm, const XclTokenArray& rTokArr )
XclExpStream& operator<<( XclExpStream& rStrm, const XclTokenArrayRef& rxTokArr )
{
- if( rxTokArr.is() )
+ if( rxTokArr.get() )
rxTokArr->Write( rStrm );
else
rStrm << sal_uInt16( 0 );
diff --git a/sc/source/filter/inc/ftools.hxx b/sc/source/filter/inc/ftools.hxx
index 0438556..bb20a09 100644
--- a/sc/source/filter/inc/ftools.hxx
+++ b/sc/source/filter/inc/ftools.hxx
@@ -153,7 +153,7 @@ public:
inline bool has( key_type nKey ) const
{
typename map_type::const_iterator aIt = find( nKey );
- return (aIt != this->end()) && aIt->second.is();
+ return (aIt != this->end()) && aIt->second.get();
}
/** Returns a reference to the object accossiated to the passed key, or 0 on error. */
diff --git a/sc/source/filter/inc/xechart.hxx b/sc/source/filter/inc/xechart.hxx
index cd7432a..2762b91 100644
--- a/sc/source/filter/inc/xechart.hxx
+++ b/sc/source/filter/inc/xechart.hxx
@@ -423,7 +423,7 @@ public:
void AppendString( const String& rStr );
/** Returns true, if this source link contains explicit string data. */
- inline bool HasString() const { return mxString.is() && !mxString->IsEmpty(); }
+ inline bool HasString() const { return mxString.get() && !mxString->IsEmpty(); }
/** Writes the CHSOURCELINK record and optionally a CHSTRING record with explicit string data. */
virtual void Save( XclExpStream& rStrm );
@@ -543,7 +543,7 @@ public:
void ConvertTrendLineEquation( const ScfPropertySet& rPropSet, const XclChDataPointPos& rPointPos );
/** Returns true, if the string object does not contain any text data. */
- inline bool HasString() const { return mxSrcLink.is() && mxSrcLink->HasString(); }
+ inline bool HasString() const { return mxSrcLink.get() && mxSrcLink->HasString(); }
/** Returns the flags needed for the CHATTACHEDLABEL record. */
sal_uInt16 GetAttLabelFlags() const;
@@ -968,7 +968,7 @@ public:
/** Returns true, if chart type supports wall and floor format. */
inline bool Is3dWallChart() const { return Is3dChart() && (maTypeInfo.meTypeCateg != EXC_CHTYPECATEG_PIE); }
/** Returns true, if the series in this chart type group are ordered on the Z axis. */
- inline bool Is3dDeepChart() const { return Is3dWallChart() && mxChart3d.is() && !mxChart3d->IsClustered(); }
+ inline bool Is3dDeepChart() const { return Is3dWallChart() && mxChart3d.get() && !mxChart3d->IsClustered(); }
/** Returns true, if this chart type can be combined with other types. */
inline bool IsCombinable2d() const { return !Is3dChart() && maTypeInfo.mbCombinable2d; }
diff --git a/sc/source/filter/inc/xichart.hxx b/sc/source/filter/inc/xichart.hxx
index 0ebf51c..5147c0d 100644
--- a/sc/source/filter/inc/xichart.hxx
+++ b/sc/source/filter/inc/xichart.hxx
@@ -330,12 +330,12 @@ public:
/** Returns true, if the line style is set to something visible. */
inline bool HasLine() const { return IsAutoLine() || mxLineFmt->HasLine(); }
/** Returns the line weight used for this frame. */
- inline sal_Int16 GetLineWeight() const { return mxLineFmt.is() ? mxLineFmt->GetWeight() : EXC_CHLINEFORMAT_SINGLE; }
+ inline sal_Int16 GetLineWeight() const { return mxLineFmt.get() ? mxLineFmt->GetWeight() : EXC_CHLINEFORMAT_SINGLE; }
/** Returns true, if the area format is set to automatic. */
inline bool IsAutoArea() const { return !mxEscherFmt && (!mxAreaFmt || mxAreaFmt->IsAuto()); }
/** Returns true, if the area style is set to something visible. */
- inline bool HasArea() const { return mxEscherFmt.is() || IsAutoArea() || mxAreaFmt->HasArea(); }
+ inline bool HasArea() const { return mxEscherFmt.get() || IsAutoArea() || mxAreaFmt->HasArea(); }
protected:
/** Converts and writes the contained line formatting to the passed property set. */
@@ -414,9 +414,9 @@ public:
inline sal_uInt8 GetLinkType() const { return maData.mnLinkType; }
/** Returns true, if the source link contains explicit string data. */
- inline bool HasString() const { return mxString.is() && !mxString->IsEmpty(); }
+ inline bool HasString() const { return mxString.get() && !mxString->IsEmpty(); }
/** Returns explicit string data or an empty string. */
- inline const String& GetString() const { return mxString.is() ? mxString->GetText() : String::EmptyString(); }
+ inline const String& GetString() const { return mxString.get() ? mxString->GetText() : String::EmptyString(); }
/** Returns the number of data points of this source link. */
sal_uInt16 GetCellCount() const;
@@ -518,7 +518,7 @@ public:
/** Returns the position of the data point label this text is linked to. */
inline const XclChDataPointPos& GetPointPos() const { return maObjLink.maPointPos; }
/** Returns true, if this text group contains string data. */
- inline bool HasString() const { return mxSrcLink.is() && mxSrcLink->HasString(); }
+ inline bool HasString() const { return mxSrcLink.get() && mxSrcLink->HasString(); }
/** Returns true, if the text object is marked as deleted. */
inline bool IsDeleted() const { return ::get_flag( maData.mnFlags, EXC_CHTEXT_DELETED ); }
@@ -693,7 +693,7 @@ public:
/** Returns true, if markers are set to automatic format. */
inline bool IsAutoMarker() const { return !mxMarkerFmt || mxMarkerFmt->IsAuto(); }
/** Returns true, if the series line is smoothed. */
- inline bool HasSpline() const { return mxSeriesFmt.is() && mxSeriesFmt->HasSpline(); }
+ inline bool HasSpline() const { return mxSeriesFmt.get() && mxSeriesFmt->HasSpline(); }
/** Returns the data label text object. */
inline XclImpChTextRef GetDataLabel() const { return mxLabel; }
@@ -824,16 +824,16 @@ public:
/** Returns the 0-based index of the parent series (e.g. of a trend line). */
inline sal_uInt16 GetParentIdx() const { return mnParentIdx; }
/** Returns the format index of the series used for automatic line and area colors. */
- inline sal_uInt16 GetFormatIdx() const { return mxSeriesFmt.is() ? mxSeriesFmt->GetFormatIdx() : EXC_CHDATAFORMAT_DEFAULT; }
+ inline sal_uInt16 GetFormatIdx() const { return mxSeriesFmt.get() ? mxSeriesFmt->GetFormatIdx() : EXC_CHDATAFORMAT_DEFAULT; }
/** Returns true, if the series is child of another series (e.g. trend line). */
inline bool HasParentSeries() const { return mnParentIdx != EXC_CHSERIES_INVALID; }
/** Returns true, if the series contains child series (e.g. trend lines). */
inline bool HasChildSeries() const { return !maTrendLines.empty() || !maErrorBars.empty(); }
/** Returns series title or an empty string, if the series does not contain a title. */
- inline const String& GetTitle() const { return mxTitleLink.is() ? mxTitleLink->GetString() : String::EmptyString(); }
+ inline const String& GetTitle() const { return mxTitleLink.get() ? mxTitleLink->GetString() : String::EmptyString(); }
/** Returns true, if the series line is smoothed. */
- inline bool HasSpline() const { return mxSeriesFmt.is() && mxSeriesFmt->HasSpline(); }
+ inline bool HasSpline() const { return mxSeriesFmt.get() && mxSeriesFmt->HasSpline(); }
/** Creates a labeled data sequence object from value data link. */
XLabeledDataSeqRef CreateValueSequence( const ::rtl::OUString& rValueRole ) const;
@@ -1055,11 +1055,11 @@ public:
/** Returns true, if the series in this chart type group are stacked on each other as percentage. */
inline bool IsPercent() const { return maType.IsPercent(); }
/** Returns true, if the chart is three-dimensional. */
- inline bool Is3dChart() const { return mxChart3d.is() && maTypeInfo.mbSupports3d; }
+ inline bool Is3dChart() const { return mxChart3d.get() && maTypeInfo.mbSupports3d; }
/** Returns true, if chart type supports wall and floor format in 3d mode. */
inline bool Is3dWallChart() const { return Is3dChart() && (maTypeInfo.meTypeCateg != EXC_CHTYPECATEG_PIE); }
/** Returns true, if the series in this chart type group are ordered on the Z axis. */
- inline bool Is3dDeepChart() const { return Is3dWallChart() && mxChart3d.is() && !mxChart3d->IsClustered(); }
+ inline bool Is3dDeepChart() const { return Is3dWallChart() && mxChart3d.get() && !mxChart3d->IsClustered(); }
/** Returns true, if category (X axis) labels are enabled (may be disabled in radar charts). */
inline bool HasCategoryLabels() const { return maType.HasCategoryLabels(); }
/** Returns true, if points of a series show varying automatic area format. */
@@ -1233,9 +1233,9 @@ public:
/** Returns true, if the axis contains caption labels. */
inline bool HasLabels() const { return !mxTick || mxTick->HasLabels(); }
/** Returns true, if the axis shows its major grid lines. */
- inline bool HasMajorGrid() const { return mxMajorGrid.is(); }
+ inline bool HasMajorGrid() const { return mxMajorGrid.get(); }
/** Returns true, if the axis shows its minor grid lines. */
- inline bool HasMinorGrid() const { return mxMinorGrid.is(); }
+ inline bool HasMinorGrid() const { return mxMinorGrid.get(); }
/** Creates an API axis object. */
XAxisRef CreateAxis( const XclImpChTypeGroup& rTypeGroup, const XclImpChAxis* pCrossingAxis ) const;
diff --git a/sc/source/filter/inc/xiescher.hxx b/sc/source/filter/inc/xiescher.hxx
index 2014482..8a200bd 100644
--- a/sc/source/filter/inc/xiescher.hxx
+++ b/sc/source/filter/inc/xiescher.hxx
@@ -485,9 +485,9 @@ public:
virtual ~XclImpControlHelper();
/** Returns true, if a linked cell address is present. */
- inline bool HasCellLink() const { return mxCellLink.is(); }
+ inline bool HasCellLink() const { return mxCellLink.get() != 0; }
/** Returns true, if a linked source cell range is present. */
- inline bool HasSourceRange() const { return mxSrcRange.is(); }
+ inline bool HasSourceRange() const { return mxSrcRange.get() != 0; }
/** Returns the SdrObject from the passed control shape and sets the bounding rectangle. */
SdrObject* CreateSdrObjectFromShape(
diff --git a/sc/source/filter/xcl97/XclExpChangeTrack.cxx b/sc/source/filter/xcl97/XclExpChangeTrack.cxx
index 08f7656..af7c503 100644
--- a/sc/source/filter/xcl97/XclExpChangeTrack.cxx
+++ b/sc/source/filter/xcl97/XclExpChangeTrack.cxx
@@ -1000,7 +1000,7 @@ static void lcl_WriteCell( XclExpXmlStream& rStrm, sal_Int32 nElement, const ScA
break;
case EXC_CHTR_TYPE_STRING:
pStream->startElement( XML_is, FSEND );
- if( pData->mpFormattedString.is() )
+ if( pData->mpFormattedString.get() != 0)
pData->mpFormattedString->WriteXml( rStrm );
else
pData->pString->WriteXml( rStrm );
--
1.7.0.4
--=-qLwfU1BKYMIcJNs5pkFI--
More information about the LibreOffice
mailing list