summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-08-28 01:03:37 +0100
committerCaolán McNamara <caolanm@redhat.com>2011-08-29 09:56:07 +0100
commit0ab7b0f6e724a3a5a7eadf79f9efc71e0fc1acf0 (patch)
tree348ba07f193acf41c16a1d4b2aba1a94e6a8729a
parent5c3424f471f4683a8bfb6ee774ddb4f20cb17800 (diff)
tweak for change
-rw-r--r--basctl/source/basicide/baside2b.cxx2
-rw-r--r--cui/source/options/optinet2.cxx4
-rw-r--r--sc/source/ui/app/inputwin.cxx2
-rw-r--r--sc/source/ui/unoobj/docuno.cxx2
-rw-r--r--sc/source/ui/view/tabvwsh3.cxx2
-rw-r--r--sd/source/filter/ppt/pptin.cxx4
-rw-r--r--sd/source/ui/dlg/tpoption.cxx4
-rw-r--r--sw/source/core/doc/docnum.cxx4
8 files changed, 12 insertions, 12 deletions
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index 42aadbfd5bc2..8f348d2d38f7 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -269,7 +269,7 @@ void EditorWindow::RequestHelp( const HelpEvent& rHEvt )
TextPaM aCursor = GetEditView()->GetTextEngine()->GetPaM( aDocPos, sal_False );
TextPaM aStartOfWord;
String aWord = GetEditView()->GetTextEngine()->GetWord( aCursor, &aStartOfWord );
- if ( aWord.Len() && !comphelper::string::isAsciiDecimalString(aWord) )
+ if ( aWord.Len() && !comphelper::string::isdigitAsciiString(aWord) )
{
sal_uInt16 nLastChar =aWord.Len()-1;
if ( strchr( cSuffixes, aWord.GetChar( nLastChar ) ) )
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index 4b80409e2f36..9e046968dffd 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -165,7 +165,7 @@ void SvxNoSpaceEdit::Modify()
{
XubString aValue = GetText();
- if ( !comphelper::string::isAsciiDecimalString(aValue) || (long)aValue.ToInt32() > USHRT_MAX )
+ if ( !comphelper::string::isdigitAsciiString(aValue) || (long)aValue.ToInt32() > USHRT_MAX )
// der H�chstwert einer Portnummer ist USHRT_MAX
ErrorBox( this, CUI_RES( RID_SVXERR_OPT_PROXYPORTS ) ).Execute();
}
@@ -629,7 +629,7 @@ IMPL_LINK( SvxProxyTabPage, LoseFocusHdl_Impl, Edit *, pEdit )
{
XubString aValue = pEdit->GetText();
- if ( !comphelper::string::isAsciiDecimalString(aValue) || (long)aValue.ToInt32() > USHRT_MAX )
+ if ( !comphelper::string::isdigitAsciiString(aValue) || (long)aValue.ToInt32() > USHRT_MAX )
pEdit->SetText( '0' );
return 0;
}
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index e8edcbed86ed..005f6c5ee126 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -1790,7 +1790,7 @@ ScNameInputType lcl_GetInputType( const String& rText )
eRet = SC_NAME_INPUT_NAMEDRANGE;
else if ( aRangeUtil.MakeRangeFromName( rText, pDoc, nTab, aRange, RUTL_DBASE, eConv ) )
eRet = SC_NAME_INPUT_DATABASE;
- else if ( comphelper::string::isAsciiDecimalString( rText ) &&
+ else if ( comphelper::string::isdigitAsciiString( rText ) &&
( nNumeric = rText.ToInt32() ) > 0 && nNumeric <= MAXROW+1 )
eRet = SC_NAME_INPUT_ROW;
else if ( pDoc->GetTable( rText, nNameTab ) )
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 24e3d5c90da3..acc443d9bfc5 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -702,7 +702,7 @@ bool lcl_ParseTarget( const String& rTarget, ScRange& rTargetRange, Rectangle& r
{
bRangeValid = true; // named range or database range
}
- else if ( comphelper::string::isAsciiDecimalString(rTarget) &&
+ else if ( comphelper::string::isdigitAsciiString(rTarget) &&
( nNumeric = rTarget.ToInt32() ) > 0 && nNumeric <= MAXROW+1 )
{
// row number is always mapped to cell A(row) on the same sheet
diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx
index 06265d49e6a4..cc19a93cf674 100644
--- a/sc/source/ui/view/tabvwsh3.cxx
+++ b/sc/source/ui/view/tabvwsh3.cxx
@@ -328,7 +328,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
}
}
- if ( !(nResult & SCA_VALID) && comphelper::string::isAsciiDecimalString(aAddress) )
+ if ( !(nResult & SCA_VALID) && comphelper::string::isdigitAsciiString(aAddress) )
{
sal_Int32 nNumeric = aAddress.ToInt32();
if ( nNumeric > 0 && nNumeric <= MAXROW+1 )
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 5a441b4ef611..0f4c8824758f 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -446,7 +446,7 @@ sal_Bool ImplSdPPTImport::Import()
// first pass, searching for a SlideId
for( nToken = 0; nToken < nTokenCount; nToken++ )
{
- if (comphelper::string::isAsciiDecimalString(aStringAry[nToken]))
+ if (comphelper::string::isdigitAsciiString(aStringAry[nToken]))
{
sal_Int32 nNumber = aStringAry[ nToken ].toInt32();
if ( nNumber & ~0xff )
@@ -484,7 +484,7 @@ sal_Bool ImplSdPPTImport::Import()
{ // third pass, searching for a slide number
for ( nToken = 0; nToken < nTokenCount; nToken++ )
{
- if (comphelper::string::isAsciiDecimalString(aStringAry[nToken]))
+ if (comphelper::string::isdigitAsciiString(aStringAry[nToken]))
{
sal_Int32 nNumber = aStringAry[ nToken ].toInt32();
if ( ( nNumber & ~0xff ) == 0 )
diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx
index e12cd976ea7c..ca7790e94f9d 100644
--- a/sd/source/ui/dlg/tpoption.cxx
+++ b/sd/source/ui/dlg/tpoption.cxx
@@ -704,7 +704,7 @@ sal_Bool SdTpOptionsMisc::SetScale( const String& aScale, sal_Int32& rX, sal_Int
return( sal_False );
rtl::OUString aTmp(aScale.GetToken( 0, TOKEN ));
- if (!comphelper::string::isAsciiDecimalString(aTmp))
+ if (!comphelper::string::isdigitAsciiString(aTmp))
return sal_False;
rX = (long) aTmp.toInt32();
@@ -712,7 +712,7 @@ sal_Bool SdTpOptionsMisc::SetScale( const String& aScale, sal_Int32& rX, sal_Int
return( sal_False );
aTmp = aScale.GetToken( 1, TOKEN );
- if (!comphelper::string::isAsciiDecimalString(aTmp))
+ if (!comphelper::string::isdigitAsciiString(aTmp))
return sal_False;
rY = (long) aTmp.toInt32();
diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx
index 51d0eceeeada..acbef13a474b 100644
--- a/sw/source/core/doc/docnum.cxx
+++ b/sw/source/core/doc/docnum.cxx
@@ -642,7 +642,7 @@ sal_uInt16 lcl_FindOutlineNum( const SwNodes& rNds, String& rName )
nPos = 0;
sNum = sName.GetToken( 0, '.', nPos );
// #i4533# without this check all parts delimited by a dot are treated as outline numbers
- if(!comphelper::string::isAsciiDecimalString(sNum))
+ if(!comphelper::string::isdigitAsciiString(sNum))
nPos = STRING_NOTFOUND;
}
rName = sName; // das ist der nachfolgende Text.
@@ -728,7 +728,7 @@ sal_Bool SwDoc::GotoOutline( SwPosition& rPos, const String& rName ) const
String sTempNum;
while(sExpandedText.Len() && (sTempNum = sExpandedText.GetToken(0, '.', nPos)).Len() &&
STRING_NOTFOUND != nPos &&
- comphelper::string::isAsciiDecimalString(sTempNum))
+ comphelper::string::isdigitAsciiString(sTempNum))
{
sExpandedText.Erase(0, nPos);
nPos = 0;