summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
Diffstat (limited to 'sc')
-rw-r--r--sc/source/filter/excel/xecontent.cxx2
-rw-r--r--sc/source/filter/excel/xeformula.cxx2
-rw-r--r--sc/source/filter/html/htmlpars.cxx8
-rw-r--r--sc/source/filter/inc/richstringcontext.hxx2
-rw-r--r--sc/source/filter/oox/querytablebuffer.cxx4
-rw-r--r--sc/source/filter/oox/sheetdatabuffer.cxx2
-rw-r--r--sc/source/filter/oox/stylesbuffer.cxx8
-rw-r--r--sc/source/filter/oox/viewsettings.cxx2
-rw-r--r--sc/source/filter/oox/workbookfragment.cxx2
-rw-r--r--sc/source/filter/xcl97/xcl97rec.cxx2
10 files changed, 17 insertions, 17 deletions
diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx
index c7d6d97ea6de..3d95f28269c2 100644
--- a/sc/source/filter/excel/xecontent.cxx
+++ b/sc/source/filter/excel/xecontent.cxx
@@ -119,7 +119,7 @@ XclExpSstImpl::XclExpSstImpl() :
sal_uInt32 XclExpSstImpl::Insert( XclExpStringRef xString )
{
- OSL_ENSURE( xString.get(), "XclExpSstImpl::Insert - empty pointer not allowed" );
+ OSL_ENSURE( xString, "XclExpSstImpl::Insert - empty pointer not allowed" );
if( !xString )
xString.reset( new XclExpString );
diff --git a/sc/source/filter/excel/xeformula.cxx b/sc/source/filter/excel/xeformula.cxx
index 66525e1d0a43..052079812b7b 100644
--- a/sc/source/filter/excel/xeformula.cxx
+++ b/sc/source/filter/excel/xeformula.cxx
@@ -2217,7 +2217,7 @@ void XclExpFmlaCompImpl::PushOperandPos( sal_uInt16 nTokPos )
void XclExpFmlaCompImpl::PushOperatorPos( sal_uInt16 nTokPos, const XclExpOperandListRef& rxOperands )
{
PushOperandPos( nTokPos );
- OSL_ENSURE( rxOperands.get(), "XclExpFmlaCompImpl::AppendOperatorTokenId - missing operand list" );
+ OSL_ENSURE( rxOperands, "XclExpFmlaCompImpl::AppendOperatorTokenId - missing operand list" );
if( mxData->maOpListVec.size() <= nTokPos )
mxData->maOpListVec.resize( nTokPos + 1, XclExpOperandListRef() );
mxData->maOpListVec[ nTokPos ] = rxOperands;
diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx
index 4232fa45ad23..67df16696434 100644
--- a/sc/source/filter/html/htmlpars.cxx
+++ b/sc/source/filter/html/htmlpars.cxx
@@ -1910,14 +1910,14 @@ ScHTMLTable* ScHTMLTable::FindNestedTable( ScHTMLTableId nTableId ) const
void ScHTMLTable::PutItem( const SfxPoolItem& rItem )
{
- OSL_ENSURE( mxCurrEntry.get(), "ScHTMLTable::PutItem - no current entry" );
+ OSL_ENSURE( mxCurrEntry, "ScHTMLTable::PutItem - no current entry" );
if( mxCurrEntry && mxCurrEntry->IsEmpty() )
mxCurrEntry->GetItemSet().Put( rItem );
}
void ScHTMLTable::PutText( const HtmlImportInfo& rInfo )
{
- OSL_ENSURE( mxCurrEntry.get(), "ScHTMLTable::PutText - no current entry" );
+ OSL_ENSURE( mxCurrEntry, "ScHTMLTable::PutText - no current entry" );
if( mxCurrEntry )
{
if( !mxCurrEntry->HasContents() && IsSpaceCharInfo( rInfo ) )
@@ -1956,7 +1956,7 @@ void ScHTMLTable::InsertLeadingEmptyLine()
void ScHTMLTable::AnchorOn()
{
- OSL_ENSURE( mxCurrEntry.get(), "ScHTMLTable::AnchorOn - no current entry" );
+ OSL_ENSURE( mxCurrEntry, "ScHTMLTable::AnchorOn - no current entry" );
// don't skip entries with single hyperlinks
if( mxCurrEntry )
mxCurrEntry->SetImportAlways();
@@ -2332,7 +2332,7 @@ bool ScHTMLTable::PushEntry( ScHTMLEntryPtr& rxEntry )
bool ScHTMLTable::PushEntry( const HtmlImportInfo& rInfo, bool bLastInCell )
{
- OSL_ENSURE( mxCurrEntry.get(), "ScHTMLTable::PushEntry - no current entry" );
+ OSL_ENSURE( mxCurrEntry, "ScHTMLTable::PushEntry - no current entry" );
bool bPushed = false;
if( mxCurrEntry )
{
diff --git a/sc/source/filter/inc/richstringcontext.hxx b/sc/source/filter/inc/richstringcontext.hxx
index 43ddb9aa0dab..9ddd0a993f55 100644
--- a/sc/source/filter/inc/richstringcontext.hxx
+++ b/sc/source/filter/inc/richstringcontext.hxx
@@ -49,7 +49,7 @@ RichStringContext::RichStringContext( ParentType& rParent, RichStringRef xString
mxString( xString )
{
mbEnableTrimSpace = false;
- OSL_ENSURE( mxString.get(), "RichStringContext::RichStringContext - missing string object" );
+ OSL_ENSURE( mxString, "RichStringContext::RichStringContext - missing string object" );
}
} // namespace xls
diff --git a/sc/source/filter/oox/querytablebuffer.cxx b/sc/source/filter/oox/querytablebuffer.cxx
index 3e82ae71c028..268d7a929629 100644
--- a/sc/source/filter/oox/querytablebuffer.cxx
+++ b/sc/source/filter/oox/querytablebuffer.cxx
@@ -213,7 +213,7 @@ void QueryTable::importQueryTable( SequenceInputStream& rStrm )
void QueryTable::finalizeImport()
{
ConnectionRef xConnection = getConnections().getConnection( maModel.mnConnId );
- OSL_ENSURE( xConnection.get(), "QueryTable::finalizeImport - missing connection object" );
+ OSL_ENSURE( xConnection, "QueryTable::finalizeImport - missing connection object" );
if( xConnection && (xConnection->getConnectionType() == BIFF12_CONNECTION_HTML) )
{
// check that valid web query properties exist
@@ -226,7 +226,7 @@ void QueryTable::finalizeImport()
// resolve destination cell range (stored as defined name containing the range)
OUString aDefName = maModel.maDefName.replace( ' ', '_' ).replace( '-', '_' );
DefinedNameRef xDefName = getDefinedNames().getByModelName( aDefName, getSheetIndex() );
- OSL_ENSURE( xDefName.get(), "QueryTable::finalizeImport - missing defined name" );
+ OSL_ENSURE( xDefName, "QueryTable::finalizeImport - missing defined name" );
if( xDefName )
{
ScRange aDestRange;
diff --git a/sc/source/filter/oox/sheetdatabuffer.cxx b/sc/source/filter/oox/sheetdatabuffer.cxx
index 7c3264c18dc7..fd4b760c41be 100644
--- a/sc/source/filter/oox/sheetdatabuffer.cxx
+++ b/sc/source/filter/oox/sheetdatabuffer.cxx
@@ -141,7 +141,7 @@ void SheetDataBuffer::setStringCell( const CellModel& rModel, const OUString& rT
void SheetDataBuffer::setStringCell( const CellModel& rModel, const RichStringRef& rxString )
{
- OSL_ENSURE( rxString.get(), "SheetDataBuffer::setStringCell - missing rich string object" );
+ OSL_ENSURE( rxString, "SheetDataBuffer::setStringCell - missing rich string object" );
const oox::xls::Font* pFirstPortionFont = getStyles().getFontFromCellXf( rModel.mnXfId ).get();
OUString aText;
if( rxString->extractPlainString( aText, pFirstPortionFont ) )
diff --git a/sc/source/filter/oox/stylesbuffer.cxx b/sc/source/filter/oox/stylesbuffer.cxx
index cd1515914663..802e515f09b0 100644
--- a/sc/source/filter/oox/stylesbuffer.cxx
+++ b/sc/source/filter/oox/stylesbuffer.cxx
@@ -1712,7 +1712,7 @@ void Fill::importPatternFill( const AttributeList& rAttribs )
void Fill::importFgColor( const AttributeList& rAttribs )
{
- OSL_ENSURE( mxPatternModel.get(), "Fill::importFgColor - missing pattern data" );
+ OSL_ENSURE( mxPatternModel, "Fill::importFgColor - missing pattern data" );
if( mxPatternModel )
{
mxPatternModel->maPatternColor.importColor( rAttribs );
@@ -1722,7 +1722,7 @@ void Fill::importFgColor( const AttributeList& rAttribs )
void Fill::importBgColor( const AttributeList& rAttribs )
{
- OSL_ENSURE( mxPatternModel.get(), "Fill::importBgColor - missing pattern data" );
+ OSL_ENSURE( mxPatternModel, "Fill::importBgColor - missing pattern data" );
if( mxPatternModel )
{
mxPatternModel->maFillColor.importColor( rAttribs );
@@ -1743,7 +1743,7 @@ void Fill::importGradientFill( const AttributeList& rAttribs )
void Fill::importColor( const AttributeList& rAttribs, double fPosition )
{
- OSL_ENSURE( mxGradientModel.get(), "Fill::importColor - missing gradient data" );
+ OSL_ENSURE( mxGradientModel, "Fill::importColor - missing gradient data" );
if( mxGradientModel && (fPosition >= 0.0) )
mxGradientModel->maColors[ fPosition ].importColor( rAttribs );
}
@@ -2853,7 +2853,7 @@ FontRef StylesBuffer::getDefaultFont() const
// no font from styles - try first loaded font (e.g. BIFF2)
if( !xDefFont )
xDefFont = maFonts.get( 0 );
- OSL_ENSURE( xDefFont.get(), "StylesBuffer::getDefaultFont - no default font found" );
+ OSL_ENSURE( xDefFont, "StylesBuffer::getDefaultFont - no default font found" );
return xDefFont;
}
diff --git a/sc/source/filter/oox/viewsettings.cxx b/sc/source/filter/oox/viewsettings.cxx
index f70e7a91c9a7..215c7ce71f1e 100644
--- a/sc/source/filter/oox/viewsettings.cxx
+++ b/sc/source/filter/oox/viewsettings.cxx
@@ -559,7 +559,7 @@ void ViewSettings::finalizeImport()
// use active sheet to set sheet properties that are document-global in Calc
sal_Int16 nActiveSheet = getActiveCalcSheet();
SheetViewModelRef& rxActiveSheetView = maSheetViews[ nActiveSheet ];
- OSL_ENSURE( rxActiveSheetView.get(), "ViewSettings::finalizeImport - missing active sheet view settings" );
+ OSL_ENSURE( rxActiveSheetView, "ViewSettings::finalizeImport - missing active sheet view settings" );
if( !rxActiveSheetView )
rxActiveSheetView = std::make_shared<SheetViewModel>();
diff --git a/sc/source/filter/oox/workbookfragment.cxx b/sc/source/filter/oox/workbookfragment.cxx
index 969a0a6c29ec..e6a531d88e1e 100644
--- a/sc/source/filter/oox/workbookfragment.cxx
+++ b/sc/source/filter/oox/workbookfragment.cxx
@@ -421,7 +421,7 @@ void WorkbookFragment::finalizeImport()
{
// create the WorksheetGlobals object
WorksheetGlobalsRef xSheetGlob = WorksheetHelper::constructGlobals( *this, xSheetSegment, eSheetType, nCalcSheet );
- OSL_ENSURE( xSheetGlob.get(), "WorkbookFragment::finalizeImport - missing sheet in document" );
+ OSL_ENSURE( xSheetGlob, "WorkbookFragment::finalizeImport - missing sheet in document" );
if( xSheetGlob )
{
// create the sheet fragment handler
diff --git a/sc/source/filter/xcl97/xcl97rec.cxx b/sc/source/filter/xcl97/xcl97rec.cxx
index 88cdd82cdcd6..0580e30bbbae 100644
--- a/sc/source/filter/xcl97/xcl97rec.cxx
+++ b/sc/source/filter/xcl97/xcl97rec.cxx
@@ -908,7 +908,7 @@ XclTxo::XclTxo( const XclExpRoot& rRoot, const EditTextObject& rEditObj, SdrObje
void XclTxo::SaveCont( XclExpStream& rStrm )
{
- OSL_ENSURE( mpString.get(), "XclTxo::SaveCont - missing string" );
+ OSL_ENSURE( mpString, "XclTxo::SaveCont - missing string" );
// #i96858# do not save existing string formatting if text is empty
sal_uInt16 nRunLen = mpString->IsEmpty() ? 0 : (8 * mpString->GetFormatsCount());
generated by cgit (git 2.34.1) at 2024-07-25 23:57:47 +0000