[Libreoffice-commits] core.git: cui/source
Johnny_M
klasse at partyheld.de
Sat Mar 3 14:44:21 UTC 2018
cui/source/inc/tabstpge.hxx | 2 -
cui/source/tabpages/tabstpge.cxx | 60 +++++++++++++++++++--------------------
2 files changed, 31 insertions(+), 31 deletions(-)
New commits:
commit ef97d58c52d9c2859fbdbb1246c082aa623775e8
Author: Johnny_M <klasse at partyheld.de>
Date: Sat Mar 3 12:11:29 2018 +0100
Translate German variable names
Akt -> Current in tabstpge
Change-Id: I36c8b772f4bc5d1aa6df4b759d1afabfe116e13a
Reviewed-on: https://gerrit.libreoffice.org/50669
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Michael Stahl <mstahl at redhat.com>
diff --git a/cui/source/inc/tabstpge.hxx b/cui/source/inc/tabstpge.hxx
index 264a6478c3f7..e5e1f7d17ef9 100644
--- a/cui/source/inc/tabstpge.hxx
+++ b/cui/source/inc/tabstpge.hxx
@@ -97,7 +97,7 @@ private:
VclPtr<VclContainer> m_pFillFrame;
// local variables, internal functions
- SvxTabStop aAktTab;
+ SvxTabStop aCurrentTab;
SvxTabStopItem aNewTabs;
long nDefDist;
FieldUnit eDefUnit;
diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx
index b36af8cb8024..d66e4e550c2f 100644
--- a/cui/source/tabpages/tabstpge.cxx
+++ b/cui/source/tabpages/tabstpge.cxx
@@ -90,7 +90,7 @@ void TabWin_Impl::Paint(vcl::RenderContext& rRenderContext, const ::tools::Recta
SvxTabulatorTabPage::SvxTabulatorTabPage(vcl::Window* pParent, const SfxItemSet& rAttr)
: SfxTabPage(pParent, "ParagraphTabsPage","cui/ui/paratabspage.ui", &rAttr)
- , aAktTab(0)
+ , aCurrentTab(0)
, aNewTabs(0, 0, SvxTabAdjust::Left, GetWhich(SID_ATTR_TABSTOP))
, nDefDist(0)
, eDefUnit(FUNIT_100TH_MM)
@@ -170,7 +170,7 @@ SvxTabulatorTabPage::SvxTabulatorTabPage(vcl::Window* pParent, const SfxItemSet&
// Get the default decimal char from the system
const LocaleDataWrapper& rLocaleWrapper( Application::GetSettings().GetLocaleDataWrapper() );
- aAktTab.GetDecimal() = rLocaleWrapper.getNumDecimalSep()[0];
+ aCurrentTab.GetDecimal() = rLocaleWrapper.getNumDecimalSep()[0];
}
SvxTabulatorTabPage::~SvxTabulatorTabPage()
@@ -399,7 +399,7 @@ void SvxTabulatorTabPage::InitTabPos_Impl( sal_uInt16 nTabPos )
if( m_pTabBox->GetEntryCount() > 0 )
{
m_pTabBox->SetText( m_pTabBox->GetEntry( nTabPos ) );
- aAktTab = aNewTabs[nTabPos];
+ aCurrentTab = aNewTabs[nTabPos];
SetFillAndTabType_Impl();
m_pNewBtn->Disable();
@@ -422,18 +422,18 @@ void SvxTabulatorTabPage::SetFillAndTabType_Impl()
m_pDezChar->Disable();
m_pDezCharLabel->Disable();
- if ( aAktTab.GetAdjustment() == SvxTabAdjust::Left )
+ if ( aCurrentTab.GetAdjustment() == SvxTabAdjust::Left )
pTypeBtn = m_pLeftTab;
- else if ( aAktTab.GetAdjustment() == SvxTabAdjust::Right )
+ else if ( aCurrentTab.GetAdjustment() == SvxTabAdjust::Right )
pTypeBtn = m_pRightTab;
- else if ( aAktTab.GetAdjustment() == SvxTabAdjust::Decimal )
+ else if ( aCurrentTab.GetAdjustment() == SvxTabAdjust::Decimal )
{
pTypeBtn = m_pDezTab;
m_pDezChar->Enable();
m_pDezCharLabel->Enable();
- m_pDezChar->SetText( OUString( aAktTab.GetDecimal() ) );
+ m_pDezChar->SetText( OUString( aCurrentTab.GetDecimal() ) );
}
- else if ( aAktTab.GetAdjustment() == SvxTabAdjust::Center )
+ else if ( aCurrentTab.GetAdjustment() == SvxTabAdjust::Center )
pTypeBtn = m_pCenterTab;
if ( pTypeBtn )
@@ -442,19 +442,19 @@ void SvxTabulatorTabPage::SetFillAndTabType_Impl()
m_pFillChar->Disable();
m_pFillChar->SetText( "" );
- if ( aAktTab.GetFill() == ' ' )
+ if ( aCurrentTab.GetFill() == ' ' )
pFillBtn = m_pNoFillChar;
- else if ( aAktTab.GetFill() == '-' )
+ else if ( aCurrentTab.GetFill() == '-' )
pFillBtn = m_pFillDashLine;
- else if ( aAktTab.GetFill() == '_' )
+ else if ( aCurrentTab.GetFill() == '_' )
pFillBtn = m_pFillSolidLine;
- else if ( aAktTab.GetFill() == '.' )
+ else if ( aCurrentTab.GetFill() == '.' )
pFillBtn = m_pFillPoints;
else
{
pFillBtn = m_pFillSpecial;
m_pFillChar->Enable();
- m_pFillChar->SetText( OUString( aAktTab.GetFill() ) );
+ m_pFillChar->SetText( OUString( aCurrentTab.GetFill() ) );
}
pFillBtn->Check();
}
@@ -491,7 +491,7 @@ IMPL_LINK( SvxTabulatorTabPage, NewHdl_Impl, Button *, pBtn, void )
// Make ListBox entry
m_pTabBox->InsertValue( m_pTabBox->Normalize( nVal ), eDefUnit, i );
- aAktTab.GetTabPos() = nReal;
+ aCurrentTab.GetTabPos() = nReal;
SvxTabAdjust eAdj = SvxTabAdjust::Left;
if ( m_pRightTab->IsChecked() )
@@ -501,8 +501,8 @@ IMPL_LINK( SvxTabulatorTabPage, NewHdl_Impl, Button *, pBtn, void )
else if ( m_pDezTab->IsChecked() )
eAdj = SvxTabAdjust::Decimal;
- aAktTab.GetAdjustment() = eAdj;
- aNewTabs.Insert( aAktTab );
+ aCurrentTab.GetAdjustment() = eAdj;
+ aNewTabs.Insert( aCurrentTab );
m_pNewBtn->Disable();
m_pDelBtn->Enable();
@@ -529,7 +529,7 @@ IMPL_LINK_NOARG(SvxTabulatorTabPage, DelHdl_Impl, Button*, void)
m_pTabBox->RemoveEntryAt(nPos);
aNewTabs.Remove( nPos );
- // Reset aAktTab
+ // Reset aCurrentTab
const sal_uInt16 nSize = aNewTabs.Count();
if ( nSize > 0 )
@@ -537,7 +537,7 @@ IMPL_LINK_NOARG(SvxTabulatorTabPage, DelHdl_Impl, Button*, void)
// Correct Pos
nPos = ( ( nSize - 1 ) >= nPos) ? nPos : nPos - 1;
m_pTabBox->SetValue( m_pTabBox->GetValue( nPos ) );
- aAktTab = aNewTabs[nPos];
+ aCurrentTab = aNewTabs[nPos];
}
// If no Tabs Enable Disable Controls
@@ -576,16 +576,16 @@ IMPL_LINK( SvxTabulatorTabPage, TabTypeCheckHdl_Impl, Button *, pBox, void )
eAdj = SvxTabAdjust::Decimal;
m_pDezChar->Enable();
m_pDezCharLabel->Enable();
- m_pDezChar->SetText( OUString( aAktTab.GetDecimal() ) );
+ m_pDezChar->SetText( OUString( aCurrentTab.GetDecimal() ) );
}
- aAktTab.GetAdjustment() = eAdj;
+ aCurrentTab.GetAdjustment() = eAdj;
sal_Int32 nPos = m_pTabBox->GetValuePos( m_pTabBox->GetValue( eDefUnit ), eDefUnit );
if ( nPos != COMBOBOX_ENTRY_NOTFOUND )
{
aNewTabs.Remove( nPos );
- aNewTabs.Insert( aAktTab );
+ aNewTabs.Insert( aCurrentTab );
}
}
@@ -606,13 +606,13 @@ IMPL_LINK( SvxTabulatorTabPage, FillTypeCheckHdl_Impl, Button *, pBox, void )
else if ( pBox == m_pFillDashLine )
cFill = '-';
- aAktTab.GetFill() = cFill;
+ aCurrentTab.GetFill() = cFill;
sal_Int32 nPos = m_pTabBox->GetValuePos( m_pTabBox->GetValue( eDefUnit ), eDefUnit );
if ( nPos != COMBOBOX_ENTRY_NOTFOUND )
{
aNewTabs.Remove( nPos );
- aNewTabs.Insert( aAktTab );
+ aNewTabs.Insert( aCurrentTab );
}
}
@@ -621,13 +621,13 @@ IMPL_LINK( SvxTabulatorTabPage, GetFillCharHdl_Impl, Control&, rControl, void )
OUString aChar( static_cast<Edit&>(rControl).GetText() );
if ( !aChar.isEmpty() )
- aAktTab.GetFill() = aChar[0];
+ aCurrentTab.GetFill() = aChar[0];
const sal_Int32 nPos = m_pTabBox->GetValuePos( m_pTabBox->GetValue( eDefUnit ), eDefUnit);
if ( nPos != COMBOBOX_ENTRY_NOTFOUND )
{
aNewTabs.Remove( nPos );
- aNewTabs.Insert( aAktTab );
+ aNewTabs.Insert( aCurrentTab );
}
}
@@ -635,13 +635,13 @@ IMPL_LINK( SvxTabulatorTabPage, GetDezCharHdl_Impl, Control&, rControl, void )
{
OUString aChar( static_cast<Edit*>(&rControl)->GetText() );
if ( !aChar.isEmpty() && ( aChar[0] >= ' '))
- aAktTab.GetDecimal() = aChar[0];
+ aCurrentTab.GetDecimal() = aChar[0];
sal_Int32 nPos = m_pTabBox->GetValuePos( m_pTabBox->GetValue( eDefUnit ), eDefUnit );
if ( nPos != COMBOBOX_ENTRY_NOTFOUND )
{
aNewTabs.Remove( nPos );
- aNewTabs.Insert( aAktTab );
+ aNewTabs.Insert( aCurrentTab );
}
}
@@ -650,7 +650,7 @@ IMPL_LINK_NOARG(SvxTabulatorTabPage, SelectHdl_Impl, ComboBox&, void)
sal_Int32 nPos = m_pTabBox->GetValuePos( m_pTabBox->GetValue( eDefUnit ), eDefUnit );
if ( nPos != COMBOBOX_ENTRY_NOTFOUND )
{
- aAktTab = aNewTabs[nPos];
+ aCurrentTab = aNewTabs[nPos];
m_pNewBtn->Disable();
SetFillAndTabType_Impl();
}
@@ -661,10 +661,10 @@ IMPL_LINK_NOARG(SvxTabulatorTabPage, ModifyHdl_Impl, Edit&, void)
sal_Int32 nPos = m_pTabBox->GetValuePos( m_pTabBox->GetValue( eDefUnit ), eDefUnit );
if ( nPos != COMBOBOX_ENTRY_NOTFOUND )
{
- aAktTab = aNewTabs[nPos];
+ aCurrentTab = aNewTabs[nPos];
SetFillAndTabType_Impl();
- aAktTab.GetTabPos() =
+ aCurrentTab.GetTabPos() =
static_cast<long>(m_pTabBox->Denormalize( m_pTabBox->GetValue( eDefUnit ) ));
m_pNewBtn->Disable();
More information about the Libreoffice-commits
mailing list