diff options
Diffstat (limited to 'sw/source/core/bastyp')
| -rw-r--r-- | sw/source/core/bastyp/calc.cxx | 8 | ||||
| -rw-r--r-- | sw/source/core/bastyp/init.cxx | 6 | ||||
| -rw-r--r-- | sw/source/core/bastyp/swtypes.cxx | 22 |
3 files changed, 18 insertions, 18 deletions
diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx index 7864657a54e0..f03a943cc74f 100644 --- a/sw/source/core/bastyp/calc.cxx +++ b/sw/source/core/bastyp/calc.cxx @@ -629,18 +629,18 @@ void SwCalc::VarChange( const OUString& rStr, const SwSbxValue& rValue ) bool SwCalc::Push( const SwUserFieldType* pUserFieldType ) { - if( aRekurStk.end() != std::find(aRekurStk.begin(), aRekurStk.end(), pUserFieldType ) ) + if( aRekurStack.end() != std::find(aRekurStack.begin(), aRekurStack.end(), pUserFieldType ) ) return false; - aRekurStk.push_back( pUserFieldType ); + aRekurStack.push_back( pUserFieldType ); return true; } void SwCalc::Pop() { - OSL_ENSURE( aRekurStk.size(), "SwCalc: Pop on an invalid pointer" ); + OSL_ENSURE( aRekurStack.size(), "SwCalc: Pop on an invalid pointer" ); - aRekurStk.pop_back(); + aRekurStack.pop_back(); } SwCalcOper SwCalc::GetToken() diff --git a/sw/source/core/bastyp/init.cxx b/sw/source/core/bastyp/init.cxx index 35c59bffc556..f82193b32177 100644 --- a/sw/source/core/bastyp/init.cxx +++ b/sw/source/core/bastyp/init.cxx @@ -573,7 +573,7 @@ void _InitCore() aAttrTab[ RES_PARATR_LIST_ISCOUNTED - POOLATTR_BEGIN ] = new SfxBoolItem( RES_PARATR_LIST_ISCOUNTED, true ); aAttrTab[ RES_FILL_ORDER- POOLATTR_BEGIN ] = new SwFormatFillOrder; - aAttrTab[ RES_FRM_SIZE- POOLATTR_BEGIN ] = new SwFormatFrmSize; + aAttrTab[ RES_FRM_SIZE- POOLATTR_BEGIN ] = new SwFormatFrameSize; aAttrTab[ RES_PAPER_BIN- POOLATTR_BEGIN ] = new SvxPaperBinItem( RES_PAPER_BIN ); aAttrTab[ RES_LR_SPACE- POOLATTR_BEGIN ] = new SvxLRSpaceItem( RES_LR_SPACE ); aAttrTab[ RES_UL_SPACE- POOLATTR_BEGIN ] = new SvxULSpaceItem( RES_UL_SPACE ); @@ -733,7 +733,7 @@ void _InitCore() SwBreakIt::_Create( ::comphelper::getProcessComponentContext() ); pCheckIt = nullptr; - _FrmInit(); + _FrameInit(); _TextInit(); SwSelPaintRects::s_pMapMode = new MapMode; @@ -755,7 +755,7 @@ void _InitCore() void _FinitCore() { - _FrmFinit(); + _FrameFinit(); _TextFinit(); sw::proofreadingiterator::dispose(); diff --git a/sw/source/core/bastyp/swtypes.cxx b/sw/source/core/bastyp/swtypes.cxx index 0910dd967beb..8446e63ddb42 100644 --- a/sw/source/core/bastyp/swtypes.cxx +++ b/sw/source/core/bastyp/swtypes.cxx @@ -57,22 +57,22 @@ IMPL_FIXEDMEMPOOL_NEWDEL( SwUndoDelete ) IMPL_FIXEDMEMPOOL_NEWDEL( SwUndoInsert ) IMPL_FIXEDMEMPOOL_NEWDEL( SwPaM ) IMPL_FIXEDMEMPOOL_NEWDEL( SwCursor ) -IMPL_FIXEDMEMPOOL_NEWDEL( SwShellCrsr ) +IMPL_FIXEDMEMPOOL_NEWDEL( SwShellCursor ) IMPL_FIXEDMEMPOOL_NEWDEL( SwTextNode ) IMPL_FIXEDMEMPOOL_NEWDEL( SwpHints ) IMPL_FIXEDMEMPOOL_NEWDEL( SwFntObj ) IMPL_FIXEDMEMPOOL_NEWDEL( SwFontObj ) IMPL_FIXEDMEMPOOL_NEWDEL( SwBorderAttrs ) -IMPL_FIXEDMEMPOOL_NEWDEL( SwCellFrm ) -IMPL_FIXEDMEMPOOL_NEWDEL( SwRowFrm ) -IMPL_FIXEDMEMPOOL_NEWDEL( SwColumnFrm ) -IMPL_FIXEDMEMPOOL_NEWDEL( SwSectionFrm ) -IMPL_FIXEDMEMPOOL_NEWDEL( SwTabFrm ) -IMPL_FIXEDMEMPOOL_NEWDEL( SwPageFrm ) -IMPL_FIXEDMEMPOOL_NEWDEL( SwBodyFrm ) -IMPL_FIXEDMEMPOOL_NEWDEL( SwHeaderFrm ) -IMPL_FIXEDMEMPOOL_NEWDEL( SwFooterFrm ) -IMPL_FIXEDMEMPOOL_NEWDEL( SwTextFrm ) +IMPL_FIXEDMEMPOOL_NEWDEL( SwCellFrame ) +IMPL_FIXEDMEMPOOL_NEWDEL( SwRowFrame ) +IMPL_FIXEDMEMPOOL_NEWDEL( SwColumnFrame ) +IMPL_FIXEDMEMPOOL_NEWDEL( SwSectionFrame ) +IMPL_FIXEDMEMPOOL_NEWDEL( SwTabFrame ) +IMPL_FIXEDMEMPOOL_NEWDEL( SwPageFrame ) +IMPL_FIXEDMEMPOOL_NEWDEL( SwBodyFrame ) +IMPL_FIXEDMEMPOOL_NEWDEL( SwHeaderFrame ) +IMPL_FIXEDMEMPOOL_NEWDEL( SwFooterFrame ) +IMPL_FIXEDMEMPOOL_NEWDEL( SwTextFrame ) IMPL_FIXEDMEMPOOL_NEWDEL( SwTableFormat ) IMPL_FIXEDMEMPOOL_NEWDEL( SwTableLineFormat ) IMPL_FIXEDMEMPOOL_NEWDEL( SwTableBoxFormat ) |