svx/inc/svdibrow.hxx | 6 +++--- svx/source/svdraw/svdibrow.cxx | 20 ++++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-)
New commits: commit 24491ce945f428f2da4a7c33d699604c3b5ae28a Author: Johnny_M <[email protected]> Date: Sat Mar 3 22:47:53 2018 +0100 Translate German variable and function names Akt -> Current in svdibrow Change-Id: I099858e917dcc725cd02c1b99f0fa61d5c769ae1 Reviewed-on: https://gerrit.libreoffice.org/50703 Tested-by: Jenkins <[email protected]> Reviewed-by: Michael Stahl <[email protected]> diff --git a/svx/inc/svdibrow.hxx b/svx/inc/svdibrow.hxx index a9cea4f085a9..c62289e83751 100644 --- a/svx/inc/svdibrow.hxx +++ b/svx/inc/svdibrow.hxx @@ -34,12 +34,12 @@ class SdrItemBrowserControl final : public BrowseBox { friend class ImpItemEdit; std::vector<std::unique_ptr<ImpItemListRow>> aList; - long nAktPaintRow; + long nCurrentPaintRow; VclPtr<Edit> pEditControl; OUString aWNamMerk; Link<SdrItemBrowserControl&,void> aEntryChangedHdl; Link<SdrItemBrowserControl&,void> aSetDirtyHdl; - ImpItemListRow* pAktChangeEntry; + ImpItemListRow* pCurrentChangeEntry; long nLastWhichOfs; sal_uInt16 nLastWhich; bool bWhichesButNames; @@ -83,7 +83,7 @@ public: */ virtual OUString GetCellText(long _nRow, sal_uInt16 _nColId) const override; - const ImpItemListRow* GetAktChangeEntry() const { return pAktChangeEntry; } + const ImpItemListRow* GetCurrentChangeEntry() const { return pCurrentChangeEntry; } OUString GetNewEntryValue() const { return pEditControl->GetText(); } void SetEntryChangedHdl(const Link<SdrItemBrowserControl&,void>& rLink) { aEntryChangedHdl=rLink; } void SetSetDirtyHdl(const Link<SdrItemBrowserControl&,void>& rLink) { aSetDirtyHdl=rLink; } diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx index e96176ed7071..7f98fbc746ae 100644 --- a/svx/source/svdraw/svdibrow.cxx +++ b/svx/source/svdraw/svdibrow.cxx @@ -220,7 +220,7 @@ void SdrItemBrowserControl::dispose() { pEditControl.disposeAndClear(); - delete pAktChangeEntry; + delete pCurrentChangeEntry; Clear(); BrowseBox::dispose(); @@ -229,7 +229,7 @@ void SdrItemBrowserControl::dispose() void SdrItemBrowserControl::ImpCtor() { pEditControl = nullptr; - pAktChangeEntry = nullptr; + pCurrentChangeEntry = nullptr; nLastWhichOfs = 0; nLastWhich = 0; bWhichesButNames = false; @@ -284,7 +284,7 @@ long SdrItemBrowserControl::GetRowCount() const bool SdrItemBrowserControl::SeekRow(long nRow) { - nAktPaintRow = nRow; + nCurrentPaintRow = nRow; return true; } @@ -329,12 +329,12 @@ OUString SdrItemBrowserControl::GetCellText(long _nRow, sal_uInt16 _nColId) cons void SdrItemBrowserControl::PaintField(OutputDevice& rDev, const tools::Rectangle& rRect, sal_uInt16 nColumnId) const { - if (nAktPaintRow<0 || static_cast<std::size_t>(nAktPaintRow)>=aList.size()) { + if (nCurrentPaintRow<0 || static_cast<std::size_t>(nCurrentPaintRow)>=aList.size()) { return; } tools::Rectangle aR(rRect); aR.AdjustBottom( 1 ); - auto& pEntry=aList[nAktPaintRow]; + auto& pEntry=aList[nCurrentPaintRow]; if (pEntry->bComment) { if (nColumnId==ITEMBROWSER_NAMECOL_ID) @@ -348,7 +348,7 @@ void SdrItemBrowserControl::PaintField(OutputDevice& rDev, const tools::Rectangl } } else { rDev.SetClipRegion(vcl::Region(aR)); - rDev.DrawText(aR.TopLeft(),GetCellText(nAktPaintRow,nColumnId)); + rDev.DrawText(aR.TopLeft(),GetCellText(nCurrentPaintRow,nColumnId)); rDev.SetClipRegion(); } } @@ -501,7 +501,7 @@ bool SdrItemBrowserControl::BeginChangeEntry(std::size_t nPos) } aNeuNam += " - Type 'del' to reset to default."; pParent->SetText(aNeuNam); - pAktChangeEntry=new ImpItemListRow(*pEntry); + pCurrentChangeEntry=new ImpItemListRow(*pEntry); bRet = true; } return bRet; @@ -520,8 +520,8 @@ void SdrItemBrowserControl::BreakChangeEntry() { if (pEditControl!=nullptr) { pEditControl.disposeAndClear(); - delete pAktChangeEntry; - pAktChangeEntry=nullptr; + delete pCurrentChangeEntry; + pCurrentChangeEntry=nullptr; vcl::Window* pParent=GetParent(); pParent->SetText(aWNamMerk); SetMode(MYBROWSEMODE); @@ -1110,7 +1110,7 @@ IMPL_LINK_NOARG(SdrItemBrowser, IdleHdl, Timer *, void) IMPL_LINK(SdrItemBrowser, ChangedHdl, SdrItemBrowserControl&, rBrowse, void) { - const ImpItemListRow* pEntry = rBrowse.GetAktChangeEntry(); + const ImpItemListRow* pEntry = rBrowse.GetCurrentChangeEntry(); if (pEntry!=nullptr) { SfxItemSet aSet(pView->GetModel()->GetItemPool()); _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
