[Libreoffice-commits] core.git: reportdesign/source svx/source vcl/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Sun Dec 9 08:19:12 UTC 2018
reportdesign/source/ui/dlg/Navigator.cxx | 4 ++--
svx/source/form/filtnav.cxx | 4 ++--
svx/source/form/navigatortree.cxx | 4 ++--
vcl/source/control/field.cxx | 18 +++++++++---------
4 files changed, 15 insertions(+), 15 deletions(-)
New commits:
commit 51eeee9b3fc6ad58eb4ef8ffa6460148fb9f6e7e
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
AuthorDate: Wed Dec 5 22:20:49 2018 +0100
Commit: Julien Nabet <serval2412 at yahoo.fr>
CommitDate: Sun Dec 9 09:18:51 2018 +0100
Fix typos in code
It passed "make check" on Linux
Change-Id: I8cfe93e58bb5a006d69ea7420b5f2aa07a0864c2
Reviewed-on: https://gerrit.libreoffice.org/64739
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx
index b28fb5ed7fcb..e766a13cc6a9 100644
--- a/reportdesign/source/ui/dlg/Navigator.cxx
+++ b/reportdesign/source/ui/dlg/Navigator.cxx
@@ -395,8 +395,8 @@ sal_Int8 NavigatorTree::AcceptDrop( const AcceptDropEvent& _rEvt )
}
else
{
- SvTreeListEntry* pDropppedOn = GetEntry(aDropPos);
- if (pDropppedOn && (GetChildCount(pDropppedOn) > 0) && !IsExpanded(pDropppedOn))
+ SvTreeListEntry* pDroppedOn = GetEntry(aDropPos);
+ if (pDroppedOn && (GetChildCount(pDroppedOn) > 0) && !IsExpanded(pDroppedOn))
{
m_aDropActionType = DA_EXPANDNODE;
bNeedTrigger = true;
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index 8a30a1cab344..97e414984b12 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -1228,8 +1228,8 @@ sal_Int8 FmFilterNavigator::AcceptDrop( const AcceptDropEvent& rEvt )
}
else
{ // is it an entry with children, and not yet expanded?
- SvTreeListEntry* pDropppedOn = GetEntry(aDropPos);
- if (pDropppedOn && (GetChildCount(pDropppedOn) > 0) && !IsExpanded(pDropppedOn))
+ SvTreeListEntry* pDroppedOn = GetEntry(aDropPos);
+ if (pDroppedOn && (GetChildCount(pDroppedOn) > 0) && !IsExpanded(pDroppedOn))
{
// -> expand
m_aDropActionType = DA_EXPANDNODE;
diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx
index 555bd5c94367..bdf2a97b0aa4 100644
--- a/svx/source/form/navigatortree.cxx
+++ b/svx/source/form/navigatortree.cxx
@@ -853,8 +853,8 @@ namespace svxform
bNeedTrigger = true;
} else
{ // on an entry with children, not swang open
- SvTreeListEntry* pDropppedOn = GetEntry(aDropPos);
- if (pDropppedOn && (GetChildCount(pDropppedOn) > 0) && !IsExpanded(pDropppedOn))
+ SvTreeListEntry* pDroppedOn = GetEntry(aDropPos);
+ if (pDroppedOn && (GetChildCount(pDroppedOn) > 0) && !IsExpanded(pDroppedOn))
{
// -> swing open
m_aDropActionType = DA_EXPANDNODE;
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index 7e70ddb554f6..6801c0a7a5d8 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -58,7 +58,7 @@ sal_Int64 ImplPower10( sal_uInt16 n )
bool ImplNumericProcessKeyInput( const KeyEvent& rKEvt,
bool bStrictFormat, bool bThousandSep,
- const LocaleDataWrapper& rLocaleDataWrappper )
+ const LocaleDataWrapper& rLocaleDataWrapper )
{
if ( !bStrictFormat )
return false;
@@ -71,15 +71,15 @@ bool ImplNumericProcessKeyInput( const KeyEvent& rKEvt,
(nGroup == KEYGROUP_CURSOR) ||
(nGroup == KEYGROUP_MISC) ||
((cChar >= '0') && (cChar <= '9')) ||
- string::equals(rLocaleDataWrappper.getNumDecimalSep(), cChar) ||
- (bThousandSep && string::equals(rLocaleDataWrappper.getNumThousandSep(), cChar)) ||
- string::equals(rLocaleDataWrappper.getNumDecimalSepAlt(), cChar) ||
+ string::equals(rLocaleDataWrapper.getNumDecimalSep(), cChar) ||
+ (bThousandSep && string::equals(rLocaleDataWrapper.getNumThousandSep(), cChar)) ||
+ string::equals(rLocaleDataWrapper.getNumDecimalSepAlt(), cChar) ||
(cChar == '-'));
}
}
bool ImplNumericGetValue( const OUString& rStr, sal_Int64& rValue,
- sal_uInt16 nDecDigits, const LocaleDataWrapper& rLocaleDataWrappper,
+ sal_uInt16 nDecDigits, const LocaleDataWrapper& rLocaleDataWrapper,
bool bCurrency = false )
{
OUString aStr = rStr;
@@ -98,9 +98,9 @@ bool ImplNumericGetValue( const OUString& rStr, sal_Int64& rValue,
// find position of decimal point
- nDecPos = aStr.indexOf( rLocaleDataWrappper.getNumDecimalSep() );
- if (nDecPos < 0 && !rLocaleDataWrappper.getNumDecimalSepAlt().isEmpty())
- nDecPos = aStr.indexOf( rLocaleDataWrappper.getNumDecimalSepAlt() );
+ nDecPos = aStr.indexOf( rLocaleDataWrapper.getNumDecimalSep() );
+ if (nDecPos < 0 && !rLocaleDataWrapper.getNumDecimalSepAlt().isEmpty())
+ nDecPos = aStr.indexOf( rLocaleDataWrapper.getNumDecimalSepAlt() );
// find position of fraction
nFracDivPos = aStr.indexOf( '/' );
@@ -154,7 +154,7 @@ bool ImplNumericGetValue( const OUString& rStr, sal_Int64& rValue,
}
if (!bNegative && !aStr.isEmpty())
{
- sal_uInt16 nFormat = rLocaleDataWrappper.getCurrNegativeFormat();
+ sal_uInt16 nFormat = rLocaleDataWrapper.getCurrNegativeFormat();
if ( (nFormat == 3) || (nFormat == 6) || // $1- || 1-$
(nFormat == 7) || (nFormat == 10) ) // 1$- || 1 $-
{
More information about the Libreoffice-commits
mailing list