diff options
Diffstat (limited to 'sc/source/filter/oox')
-rw-r--r-- | sc/source/filter/oox/condformatbuffer.cxx | 8 | ||||
-rw-r--r-- | sc/source/filter/oox/extlstcontext.cxx | 2 | ||||
-rw-r--r-- | sc/source/filter/oox/worksheetfragment.cxx | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/sc/source/filter/oox/condformatbuffer.cxx b/sc/source/filter/oox/condformatbuffer.cxx index 1655dbfd9af9..82c920203b61 100644 --- a/sc/source/filter/oox/condformatbuffer.cxx +++ b/sc/source/filter/oox/condformatbuffer.cxx @@ -306,8 +306,8 @@ void DataBarRule::importAttribs( const AttributeList& rAttribs ) void DataBarRule::SetData( ScDataBarFormat* pFormat, ScDocument* pDoc, const ScAddress& rAddr ) { - ScColorScaleEntry* pUpperEntry = ConvertToModel( *mpUpperLimit.get(), pDoc, rAddr); - ScColorScaleEntry* pLowerEntry = ConvertToModel( *mpLowerLimit.get(), pDoc, rAddr); + ScColorScaleEntry* pUpperEntry = ConvertToModel(*mpUpperLimit, pDoc, rAddr); + ScColorScaleEntry* pLowerEntry = ConvertToModel(*mpLowerLimit, pDoc, rAddr); mxFormat->mpUpperLimit.reset( pUpperEntry ); mxFormat->mpLowerLimit.reset( pLowerEntry ); @@ -860,8 +860,8 @@ void CondFormatRule::finalizeImport() if( maModel.maFormulas.size() >= 2) { pTokenArray2.reset(new ScTokenArray()); - ScTokenConversion::ConvertToTokenArray( rDoc, *pTokenArray2.get(), maModel.maFormulas[ 1 ] ); - rDoc.CheckLinkFormulaNeedingCheck( *pTokenArray2.get()); + ScTokenConversion::ConvertToTokenArray(rDoc, *pTokenArray2, maModel.maFormulas[1]); + rDoc.CheckLinkFormulaNeedingCheck(*pTokenArray2); } ScTokenArray aTokenArray; diff --git a/sc/source/filter/oox/extlstcontext.cxx b/sc/source/filter/oox/extlstcontext.cxx index ebf2e06e9955..a4c779087c75 100644 --- a/sc/source/filter/oox/extlstcontext.cxx +++ b/sc/source/filter/oox/extlstcontext.cxx @@ -86,7 +86,7 @@ ContextHandlerRef ExtConditionalFormattingContext::onCreateContext(sal_Int32 nEl { if (mpCurrentRule) { - ScFormatEntry& rFormat = *maEntries.rbegin()->get(); + ScFormatEntry& rFormat = **maEntries.rbegin(); assert(rFormat.GetType() == ScFormatEntry::Type::Iconset); ScIconSetFormat& rIconSet = static_cast<ScIconSetFormat&>(rFormat); ScDocument* pDoc = &getScDocument(); diff --git a/sc/source/filter/oox/worksheetfragment.cxx b/sc/source/filter/oox/worksheetfragment.cxx index e910f6bda5c1..e0ff875fe1fb 100644 --- a/sc/source/filter/oox/worksheetfragment.cxx +++ b/sc/source/filter/oox/worksheetfragment.cxx @@ -78,7 +78,7 @@ const sal_uInt16 BIFF12_OLEOBJECT_AUTOLOAD = 0x0002; void DataValidationsContextBase::SetValidation( WorksheetHelper& rTarget ) { - if (!mxValModel.get()) + if (!mxValModel) return; rTarget.getAddressConverter().convertToCellRangeList(mxValModel->maRanges, maSqref, rTarget.getSheetIndex(), true); |