diff options
author | Johnny_M <klasse@partyheld.de> | 2018-02-10 15:12:26 +0100 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2018-02-12 11:07:42 +0100 |
commit | 499bff1f06b3a4660ff408a2bd54c64ad8fb5f05 (patch) | |
tree | 64dbd92d37efa00fd21c0e10e87535adc7ce468d | |
parent | 040c13b4b5195b801b38a96638abb87a73cae2ae (diff) |
Translate German variable names
Akt -> Current in SwDoc and SwTable
Change-Id: Ie8c5194b81e8dc5078616603215726a0a51b1617
Reviewed-on: https://gerrit.libreoffice.org/49537
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
-rw-r--r-- | sw/inc/doc.hxx | 4 | ||||
-rw-r--r-- | sw/inc/swtable.hxx | 4 | ||||
-rw-r--r-- | sw/source/core/doc/tblrwcl.cxx | 42 | ||||
-rw-r--r-- | sw/source/core/docnode/ndtbl.cxx | 8 |
4 files changed, 29 insertions, 29 deletions
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index 7eb5bf067c5a..331132911936 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -1254,7 +1254,7 @@ public: void AppendUndoForInsertFromDB( const SwPaM& rPam, bool bIsTable ); - bool SetColRowWidthHeight( SwTableBox& rAktBox, TableChgWidthHeightType eType, + bool SetColRowWidthHeight( SwTableBox& rCurrentBox, TableChgWidthHeightType eType, SwTwips nAbsDiff, SwTwips nRelDiff ); SwTableBoxFormat* MakeTableBoxFormat(); SwTableLineFormat* MakeTableLineFormat(); @@ -1262,7 +1262,7 @@ public: // helper function: cleanup before checking number value bool IsNumberFormat( const OUString& rString, sal_uInt32& F_Index, double& fOutNumber); // Check if box has numerical value. Change format of box if required. - void ChkBoxNumFormat( SwTableBox& rAktBox, bool bCallUpdate ); + void ChkBoxNumFormat( SwTableBox& rCurrentBox, bool bCallUpdate ); void SetTableBoxFormulaAttrs( SwTableBox& rBox, const SfxItemSet& rSet ); void ClearBoxNumAttrs( const SwNodeIndex& rNode ); void ClearLineNumAttrs( SwPosition const & rPos ); diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx index b41e9990f502..619d37dd432e 100644 --- a/sw/inc/swtable.hxx +++ b/sw/inc/swtable.hxx @@ -332,9 +332,9 @@ public: TableChgMode GetTableChgMode() const { return m_eTableChgMode; } void SetTableChgMode( TableChgMode eMode ) { m_eTableChgMode = eMode; } - bool SetColWidth( SwTableBox& rAktBox, TableChgWidthHeightType eType, + bool SetColWidth( SwTableBox& rCurrentBox, TableChgWidthHeightType eType, SwTwips nAbsDiff, SwTwips nRelDiff, SwUndo** ppUndo ); - bool SetRowHeight( SwTableBox& rAktBox, TableChgWidthHeightType eType, + bool SetRowHeight( SwTableBox& rCurrentBox, TableChgWidthHeightType eType, SwTwips nAbsDiff, SwTwips nRelDiff, SwUndo** ppUndo ); void RegisterToFormat( SwFormat& rFormat ); #ifdef DBG_UTIL diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx index e15078e58628..22df3ed0b8dc 100644 --- a/sw/source/core/doc/tblrwcl.cxx +++ b/sw/source/core/doc/tblrwcl.cxx @@ -84,8 +84,8 @@ struct CpyTabFrame } Value; SwTableBoxFormat *pNewFrameFormat; - explicit CpyTabFrame(SwFrameFormat* pAktFrameFormat) : pNewFrameFormat( nullptr ) - { Value.pFrameFormat = pAktFrameFormat; } + explicit CpyTabFrame(SwFrameFormat* pCurrentFrameFormat) : pNewFrameFormat( nullptr ) + { Value.pFrameFormat = pCurrentFrameFormat; } bool operator==( const CpyTabFrame& rCpyTabFrame ) const { return static_cast<sal_uLong>(Value.nSize) == static_cast<sal_uLong>(rCpyTabFrame.Value.nSize); } @@ -3302,19 +3302,19 @@ void CheckBoxWidth( const SwTableLine& rLine, SwTwips nSize ) { const SwTableBoxes& rBoxes = rLine.GetTabBoxes(); - SwTwips nAktSize = 0; + SwTwips nCurrentSize = 0; // See if the tables have a correct width for (SwTableBoxes::const_iterator i(rBoxes.begin()); i != rBoxes.end(); ++i) { const SwTableBox* pBox = *i; const SwTwips nBoxW = pBox->GetFrameFormat()->GetFrameSize().GetWidth(); - nAktSize += nBoxW; + nCurrentSize += nBoxW; for( auto pLn : pBox->GetTabLines() ) CheckBoxWidth( *pLn, nBoxW ); } - if (sal::static_int_cast< unsigned long >(std::abs(nAktSize - nSize)) > + if (sal::static_int_cast< unsigned long >(std::abs(nCurrentSize - nSize)) > (COLFUZZY * rBoxes.size())) { OSL_FAIL( "Line's Boxes are too small or too large" ); @@ -3370,7 +3370,7 @@ static FndBox_* lcl_SaveInsDelData( CR_SetBoxWidth& rParam, SwUndo** ppUndo, return pFndBox; } -bool SwTable::SetColWidth( SwTableBox& rAktBox, TableChgWidthHeightType eType, +bool SwTable::SetColWidth( SwTableBox& rCurrentBox, TableChgWidthHeightType eType, SwTwips nAbsDiff, SwTwips nRelDiff, SwUndo** ppUndo ) { SetHTMLTableLayout(std::shared_ptr<SwHTMLTableLayout>()); // Delete HTML Layout @@ -3385,15 +3385,15 @@ bool SwTable::SetColWidth( SwTableBox& rAktBox, TableChgWidthHeightType eType, bLeft = TableChgWidthHeightType::ColLeft == extractPosition( eType ) || TableChgWidthHeightType::CellLeft == extractPosition( eType ), bInsDel = bool(eType & TableChgWidthHeightType::InsertDeleteMode ); - sal_uLong nBoxIdx = rAktBox.GetSttIdx(); + sal_uLong nBoxIdx = rCurrentBox.GetSttIdx(); // Get the current Box's edge // Only needed for manipulating the width - const SwTwips nDist = ::lcl_GetDistance( &rAktBox, bLeft ); + const SwTwips nDist = ::lcl_GetDistance( &rCurrentBox, bLeft ); SwTwips nDistStt = 0; CR_SetBoxWidth aParam( eType, nRelDiff, nDist, rSz.GetWidth(), bLeft ? nDist : rSz.GetWidth() - nDist, - const_cast<SwTableNode*>(rAktBox.GetSttNd()->FindTableNode()) ); + const_cast<SwTableNode*>(rCurrentBox.GetSttNd()->FindTableNode()) ); bBigger = aParam.bBigger; FN_lcl_SetBoxWidth fnSelBox, fnOtherBox; @@ -3403,7 +3403,7 @@ bool SwTable::SetColWidth( SwTableBox& rAktBox, TableChgWidthHeightType eType, { fnSelBox = lcl_DelSelBox; fnOtherBox = lcl_DelOtherBox; - aParam.nBoxWidth = static_cast<sal_uInt16>(rAktBox.GetFrameFormat()->GetFrameSize().GetWidth()); + aParam.nBoxWidth = static_cast<sal_uInt16>(rCurrentBox.GetFrameFormat()->GetFrameSize().GetWidth()); if( bLeft ) nDistStt = rSz.GetWidth(); } @@ -3458,7 +3458,7 @@ bool SwTable::SetColWidth( SwTableBox& rAktBox, TableChgWidthHeightType eType, TableChgMode eOld = m_eTableChgMode; m_eTableChgMode = TableChgMode::FixedWidthChangeProp; - bRet = SetColWidth( rAktBox, eType, nAbsDiff, nRelDiff, + bRet = SetColWidth( rCurrentBox, eType, nAbsDiff, nRelDiff, ppUndo ); m_eTableChgMode = eOld; return bRet; @@ -3633,7 +3633,7 @@ bool SwTable::SetColWidth( SwTableBox& rAktBox, TableChgWidthHeightType eType, bRet = false; } - if( !bRet && rAktBox.GetFrameFormat()->GetFrameSize().GetWidth() + if( !bRet && rCurrentBox.GetFrameFormat()->GetFrameSize().GetWidth() - nRelDiff > COLFUZZY + ( 567 / 2 /*leave room for at least 0.5 cm*/) ) { @@ -3731,7 +3731,7 @@ bool SwTable::SetColWidth( SwTableBox& rAktBox, TableChgWidthHeightType eType, TableChgMode eOld = m_eTableChgMode; m_eTableChgMode = TableChgMode::FixedWidthChangeAbs; - bRet = SetColWidth( rAktBox, eType, nAbsDiff, nRelDiff, + bRet = SetColWidth( rCurrentBox, eType, nAbsDiff, nRelDiff, ppUndo ); m_eTableChgMode = eOld; return bRet; @@ -3743,8 +3743,8 @@ bool SwTable::SetColWidth( SwTableBox& rAktBox, TableChgWidthHeightType eType, aParam.bBigger = !bBigger; // First, see if there is enough room at all - SwTableBox* pBox = &rAktBox; - SwTableLine* pLine = rAktBox.GetUpper(); + SwTableBox* pBox = &rCurrentBox; + SwTableLine* pLine = rCurrentBox.GetUpper(); while( pLine->GetUpper() ) { const SwTableBoxes::size_type nPos = pLine->GetBoxPos( pBox ); @@ -3778,7 +3778,7 @@ bool SwTable::SetColWidth( SwTableBox& rAktBox, TableChgWidthHeightType eType, bRet = false; } - if( !bRet && !aParam.bBigger && rAktBox.GetFrameFormat()-> + if( !bRet && !aParam.bBigger && rCurrentBox.GetFrameFormat()-> GetFrameSize().GetWidth() - nRelDiff > COLFUZZY + ( 567 / 2 /*leave room for at least 0.5 cm*/) ) { @@ -4103,10 +4103,10 @@ static bool lcl_InsDelSelLine( SwTableLine* pLine, CR_SetLineHeight& rParam, return true; } -bool SwTable::SetRowHeight( SwTableBox& rAktBox, TableChgWidthHeightType eType, +bool SwTable::SetRowHeight( SwTableBox& rCurrentBox, TableChgWidthHeightType eType, SwTwips nAbsDiff, SwTwips nRelDiff,SwUndo** ppUndo ) { - SwTableLine* pLine = rAktBox.GetUpper(); + SwTableLine* pLine = rCurrentBox.GetUpper(); SwTableLine* pBaseLine = pLine; while( pBaseLine->GetUpper() ) @@ -4120,10 +4120,10 @@ bool SwTable::SetRowHeight( SwTableBox& rAktBox, TableChgWidthHeightType eType, TableChgWidthHeightType::CellTop == extractPosition( eType ), bInsDel = bool(eType & TableChgWidthHeightType::InsertDeleteMode ); sal_uInt16 nBaseLinePos = GetTabLines().GetPos( pBaseLine ); - sal_uLong nBoxIdx = rAktBox.GetSttIdx(); + sal_uLong nBoxIdx = rCurrentBox.GetSttIdx(); CR_SetLineHeight aParam( eType, - const_cast<SwTableNode*>(rAktBox.GetSttNd()->FindTableNode()) ); + const_cast<SwTableNode*>(rCurrentBox.GetSttNd()->FindTableNode()) ); bBigger = aParam.bBigger; FN_lcl_SetLineHeight fnSelLine, fnOtherLine = lcl_SetOtherLineHeight; @@ -4302,7 +4302,7 @@ bool SwTable::SetRowHeight( SwTableBox& rAktBox, TableChgWidthHeightType eType, TableChgMode eOld = m_eTableChgMode; m_eTableChgMode = TableChgMode::VarWidthChangeAbs; - bRet = SetRowHeight( rAktBox, eType, nAbsDiff, + bRet = SetRowHeight( rCurrentBox, eType, nAbsDiff, nRelDiff, ppUndo ); m_eTableChgMode = eOld; diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx index d1a990b45a19..4fc498d41cb8 100644 --- a/sw/source/core/docnode/ndtbl.cxx +++ b/sw/source/core/docnode/ndtbl.cxx @@ -3941,10 +3941,10 @@ SwTableFormat* SwDoc::FindTableFormatByName( const OUString& rName, bool bAll ) return const_cast<SwTableFormat*>(static_cast<const SwTableFormat*>(pRet)); } -bool SwDoc::SetColRowWidthHeight( SwTableBox& rAktBox, TableChgWidthHeightType eType, +bool SwDoc::SetColRowWidthHeight( SwTableBox& rCurrentBox, TableChgWidthHeightType eType, SwTwips nAbsDiff, SwTwips nRelDiff ) { - SwTableNode* pTableNd = const_cast<SwTableNode*>(rAktBox.GetSttNd()->FindTableNode()); + SwTableNode* pTableNd = const_cast<SwTableNode*>(rCurrentBox.GetSttNd()->FindTableNode()); SwUndo* pUndo = nullptr; if( (TableChgWidthHeightType::InsertDeleteMode & eType) && dynamic_cast<const SwDDETable*>( &pTableNd->GetTable()) != nullptr) @@ -3963,7 +3963,7 @@ bool SwDoc::SetColRowWidthHeight( SwTableBox& rAktBox, TableChgWidthHeightType e case TableChgWidthHeightType::CellLeft: case TableChgWidthHeightType::CellRight: { - bRet = pTableNd->GetTable().SetColWidth( rAktBox, + bRet = pTableNd->GetTable().SetColWidth( rCurrentBox, eType, nAbsDiff, nRelDiff, bUndo ? &pUndo : nullptr ); } @@ -3972,7 +3972,7 @@ bool SwDoc::SetColRowWidthHeight( SwTableBox& rAktBox, TableChgWidthHeightType e case TableChgWidthHeightType::RowBottom: case TableChgWidthHeightType::CellTop: case TableChgWidthHeightType::CellBottom: - bRet = pTableNd->GetTable().SetRowHeight( rAktBox, + bRet = pTableNd->GetTable().SetRowHeight( rCurrentBox, eType, nAbsDiff, nRelDiff, bUndo ? &pUndo : nullptr ); break; |