summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2013-11-13 16:08:17 +0200
committerNoel Grandin <noel@peralex.com>2013-11-14 08:17:30 +0200
commit531c2dc791098d3d335abc0ddd055780fe3b7f2a (patch)
tree2509589de29c4b593e2827e983db0a7853b96e65
parent3cabbf37b965a11e7d63de05eaacfbdb29b67b74 (diff)
remove unnecessary sal_Unicode casts in SW module
Change-Id: I9e67d4f5e680a29718c4e7be7292913602cd9311
-rw-r--r--sw/qa/core/uwriter.cxx2
-rw-r--r--sw/source/core/unocore/XMLRangeHelper.cxx8
-rw-r--r--sw/source/core/unocore/unoobj.cxx2
-rw-r--r--sw/source/filter/ww8/docxattributeoutput.cxx8
-rw-r--r--sw/source/filter/xml/xmlexpit.cxx18
-rw-r--r--sw/source/filter/xml/xmlimpit.cxx10
-rw-r--r--sw/source/ui/app/docsh2.cxx2
-rw-r--r--sw/source/ui/shells/textsh.cxx2
-rw-r--r--sw/source/ui/vba/vbalisthelper.cxx88
-rw-r--r--sw/source/ui/vba/vbaoptions.cxx4
-rw-r--r--sw/source/ui/vba/vbatemplate.cxx4
11 files changed, 74 insertions, 74 deletions
diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx
index c1a7d5f9640d..504e9e4819cf 100644
--- a/sw/qa/core/uwriter.cxx
+++ b/sw/qa/core/uwriter.cxx
@@ -733,7 +733,7 @@ getRandString()
int j = getRand(aText.getLength() - s);
OUString aRet(aText.copy(s, j));
if (!getRand(5))
- aRet += OUString(sal_Unicode('\n'));
+ aRet += OUString('\n');
// fprintf (stderr, "rand string '%s'\n", OUStringToOString(aRet, RTL_TEXTENCODING_UTF8).getStr());
return aRet;
}
diff --git a/sw/source/core/unocore/XMLRangeHelper.cxx b/sw/source/core/unocore/XMLRangeHelper.cxx
index 372074866fe0..c90348d77fd3 100644
--- a/sw/source/core/unocore/XMLRangeHelper.cxx
+++ b/sw/source/core/unocore/XMLRangeHelper.cxx
@@ -85,9 +85,9 @@ void lcl_getXMLStringForCell( const /*::chart::*/XMLRangeHelper::Cell & rCell, O
return;
sal_Int32 nCol = rCell.nColumn;
- output->append( (sal_Unicode)'.' );
+ output->append( '.' );
if( ! rCell.bRelativeColumn )
- output->append( (sal_Unicode)'$' );
+ output->append( '$' );
// get A, B, C, ..., AA, AB, ... representation of column number
if( nCol < 26 )
@@ -106,7 +106,7 @@ void lcl_getXMLStringForCell( const /*::chart::*/XMLRangeHelper::Cell & rCell, O
// write row number as number
if( ! rCell.bRelativeRow )
- output->append( (sal_Unicode)'$' );
+ output->append( '$' );
output->append( rCell.nRow + (sal_Int32)1 );
}
@@ -388,7 +388,7 @@ OUString getXMLStringFromCellRange( const CellRange & rRange )
if( ! rRange.aLowerRight.empty())
{
// we have a range (not a single cell)
- aBuffer.append( sal_Unicode( ':' ));
+ aBuffer.append( ':' );
lcl_getXMLStringForCell( rRange.aLowerRight, &aBuffer );
}
diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx
index 6e20bf02e0df..77a8025e7af5 100644
--- a/sw/source/core/unocore/unoobj.cxx
+++ b/sw/source/core/unocore/unoobj.cxx
@@ -2745,7 +2745,7 @@ sal_Bool SwUnoCursorHelper::ConvertSortProperties(
}
else if ( rPropName == "Delimiter" )
{
- sal_Unicode uChar = sal_Unicode();
+ sal_Unicode uChar;
if (aValue >>= uChar)
{
rSortOpt.cDeli = uChar;
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 2712f75e0b98..cb16233320cc 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -1213,7 +1213,7 @@ static void impl_WriteRunText( FSHelperPtr pSerializer, sal_Int32 nTextToken,
return; // we want to write at least one character
// we have to add 'preserve' when starting/ending with space
- if ( *pBegin == sal_Unicode( ' ' ) || *( pEnd - 1 ) == sal_Unicode( ' ' ) )
+ if ( *pBegin == ' ' || *( pEnd - 1 ) == ' ' )
{
pSerializer->startElementNS( XML_w, nTextToken, FSNS( XML_xml, XML_space ), "preserve", FSEND );
}
@@ -5327,13 +5327,13 @@ static void impl_WriteTabElement( FSHelperPtr pSerializer,
sal_Unicode cFillChar = rTab.GetFill();
- if (sal_Unicode('.') == cFillChar )
+ if ('.' == cFillChar )
pTabElementAttrList->add( FSNS( XML_w, XML_leader ), OString( (sal_Char *) "dot" ) );
- else if ( sal_Unicode('-') == cFillChar )
+ else if ( '-' == cFillChar )
pTabElementAttrList->add( FSNS( XML_w, XML_leader ), OString( (sal_Char *) "hyphen" ) );
else if ( sal_Unicode(0xB7) == cFillChar ) // middle dot
pTabElementAttrList->add( FSNS( XML_w, XML_leader ), OString( (sal_Char *) "middleDot" ) );
- else if ( sal_Unicode('_') == cFillChar )
+ else if ( '_' == cFillChar )
pTabElementAttrList->add( FSNS( XML_w, XML_leader ), OString( (sal_Char *) "underscore" ) );
else
pTabElementAttrList->add( FSNS( XML_w, XML_leader ), OString( (sal_Char *) "none" ) );
diff --git a/sw/source/filter/xml/xmlexpit.cxx b/sw/source/filter/xml/xmlexpit.cxx
index c215a7bb93a7..abe355de4f77 100644
--- a/sw/source/filter/xml/xmlexpit.cxx
+++ b/sw/source/filter/xml/xmlexpit.cxx
@@ -177,14 +177,14 @@ void SvXMLExportItemMapper::exportXML( const SvXMLExport& rExport,
pNewNamespaceMap->Add( sPrefix, sNamespace );
sName.append( GetXMLToken(XML_XMLNS) );
- sName.append( sal_Unicode(':') );
+ sName.append( ':' );
sName.append( sPrefix );
rAttrList.AddAttribute( sName.makeStringAndClear(),
sNamespace );
}
sName.append( sPrefix );
- sName.append( sal_Unicode(':') );
+ sName.append( ':' );
}
sName.append( pUnknown->GetAttrLName( i ) );
@@ -524,9 +524,9 @@ bool SvXMLExportItemMapper::QueryXMLValue(
nY *= pShadow->GetWidth();
::sax::Converter::convertColor(aOut, pShadow->GetColor().GetColor());
- aOut.append( sal_Unicode(' ') );
+ aOut.append( ' ' );
rUnitConverter.convertMeasureToXML( aOut, nX );
- aOut.append( sal_Unicode(' ') );
+ aOut.append( ' ' );
rUnitConverter.convertMeasureToXML( aOut, nY );
bOk = true;
@@ -773,9 +773,9 @@ bool SvXMLExportItemMapper::QueryXMLValue(
::sax::Converter::convertMeasure(aOut, nWidth,
util::MeasureUnit::TWIP,
util::MeasureUnit::POINT);
- aOut.append( sal_Unicode( ' ' ) );
+ aOut.append( ' ' );
aOut.append( GetXMLToken( eStyle ) );
- aOut.append( sal_Unicode( ' ' ) );
+ aOut.append( ' ' );
::sax::Converter::convertColor(aOut,
pLine->GetColor().GetColor());
}
@@ -813,9 +813,9 @@ bool SvXMLExportItemMapper::QueryXMLValue(
return false;
}
rUnitConverter.convertMeasureToXML( aOut, pLine->GetInWidth() );
- aOut.append( sal_Unicode( ' ' ) );
+ aOut.append( ' ' );
rUnitConverter.convertMeasureToXML( aOut, pLine->GetDistance() );
- aOut.append( sal_Unicode( ' ' ) );
+ aOut.append( ' ' );
rUnitConverter.convertMeasureToXML( aOut, pLine->GetOutWidth() );
break;
}
@@ -944,7 +944,7 @@ bool SvXMLExportItemMapper::QueryXMLValue(
if( bOk )
{
- aOut.append( sal_Unicode( ' ' ) );
+ aOut.append( ' ' );
switch( pBrush->GetGraphicPos() )
{
diff --git a/sw/source/filter/xml/xmlimpit.cxx b/sw/source/filter/xml/xmlimpit.cxx
index 5e1dabf46562..edd06c1da78c 100644
--- a/sw/source/filter/xml/xmlimpit.cxx
+++ b/sw/source/filter/xml/xmlimpit.cxx
@@ -276,7 +276,7 @@ bool SvXMLImportItemMapper::PutXMLValue(
sal_Int32 nProp = 100;
sal_Int32 nAbs = 0;
- if( rValue.indexOf( sal_Unicode('%') ) != -1 )
+ if( rValue.indexOf( '%' ) != -1 )
bOk = ::sax::Converter::convertPercent(nProp, rValue);
else
bOk = rUnitConverter.convertMeasureToCore(nAbs, rValue);
@@ -300,7 +300,7 @@ bool SvXMLImportItemMapper::PutXMLValue(
sal_Int32 nProp = 100;
sal_Int32 nAbs = 0;
- if( rValue.indexOf( sal_Unicode('%') ) != -1 )
+ if( rValue.indexOf( '%' ) != -1 )
bOk = ::sax::Converter::convertPercent(nProp, rValue);
else
bOk = rUnitConverter.convertMeasureToCore(nAbs, rValue,
@@ -332,7 +332,7 @@ bool SvXMLImportItemMapper::PutXMLValue(
sal_Int32 nProp = 100;
sal_Int32 nAbs = 0;
- if( rValue.indexOf( sal_Unicode('%') ) != -1 )
+ if( rValue.indexOf( '%' ) != -1 )
bOk = ::sax::Converter::convertPercent( nProp, rValue );
else
bOk = rUnitConverter.convertMeasureToCore( nAbs, rValue );
@@ -708,7 +708,7 @@ bool SvXMLImportItemMapper::PutXMLValue(
{
bOk = false;
}
- else if( -1 != aToken.indexOf( sal_Unicode('%') ) )
+ else if( -1 != aToken.indexOf( '%' ) )
{
sal_Int32 nPrc = 50;
if (::sax::Converter::convertPercent(nPrc, aToken))
@@ -905,7 +905,7 @@ bool SvXMLImportItemMapper::PutXMLValue(
break;
case MID_FRMSIZE_REL_COL_WIDTH:
{
- sal_Int32 nPos = rValue.indexOf( (sal_Unicode)'*' );
+ sal_Int32 nPos = rValue.indexOf( '*' );
if( -1L != nPos )
{
sal_Int32 nValue = rValue.toInt32();
diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx
index 4e449e198d5b..80ecc7dd97b8 100644
--- a/sw/source/ui/app/docsh2.cxx
+++ b/sw/source/ui/app/docsh2.cxx
@@ -1008,7 +1008,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
OUString sTmpl;
aTemplateValue >>= sTmpl;
- sal_Int32 nColonPos = sTmpl.indexOf( sal_Unicode(':') );
+ sal_Int32 nColonPos = sTmpl.indexOf( ':' );
OUString sPrefix = sTmpl.copy( 0L, nColonPos );
if ( sPrefix == "Style" )
{
diff --git a/sw/source/ui/shells/textsh.cxx b/sw/source/ui/shells/textsh.cxx
index bbbb1b713f25..65b6b222d516 100644
--- a/sw/source/ui/shells/textsh.cxx
+++ b/sw/source/ui/shells/textsh.cxx
@@ -405,7 +405,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
{
SwFrmFmt* pTblFmt = GetShell().GetTableFmt();
aRangeString = pTblFmt->GetName();
- aRangeString += OUString( sal_Unicode('.') );
+ aRangeString += OUString( '.' );
aRangeString += GetShell().GetBoxNms();
// get table data provider
diff --git a/sw/source/ui/vba/vbalisthelper.cxx b/sw/source/ui/vba/vbalisthelper.cxx
index a25cb89bf5e1..b600e41296c2 100644
--- a/sw/source/ui/vba/vbalisthelper.cxx
+++ b/sw/source/ui/vba/vbalisthelper.cxx
@@ -204,43 +204,43 @@ void SwVbaListHelper::CreateNumberListTemplate() throw( css::uno::RuntimeExcepti
case 1:
{
nNumberingType = style::NumberingType::ARABIC;
- sSuffix = OUString( sal_Unicode('.') );
+ sSuffix = OUString( '.' );
break;
}
case 2:
{
nNumberingType = style::NumberingType::ARABIC;
- sSuffix = OUString( sal_Unicode(')') );
+ sSuffix = OUString( ')' );
break;
}
case 3:
{
nNumberingType = style::NumberingType::ROMAN_UPPER;
- sSuffix = OUString( sal_Unicode('.') );
+ sSuffix = OUString( '.' );
break;
}
case 4:
{
nNumberingType = style::NumberingType::CHARS_UPPER_LETTER;
- sSuffix = OUString( sal_Unicode('.') );
+ sSuffix = OUString( '.' );
break;
}
case 5:
{
nNumberingType = style::NumberingType::CHARS_LOWER_LETTER;
- sSuffix = OUString( sal_Unicode(')') );
+ sSuffix = OUString( ')' );
break;
}
case 6:
{
nNumberingType = style::NumberingType::CHARS_LOWER_LETTER;
- sSuffix = OUString( sal_Unicode('.') );
+ sSuffix = OUString( '.' );
break;
}
case 7:
{
nNumberingType = style::NumberingType::ROMAN_LOWER;
- sSuffix = OUString( sal_Unicode('.') );
+ sSuffix = OUString( '.' );
break;
}
default:
@@ -319,56 +319,56 @@ void SwVbaListHelper::CreateOutlineNumberForType1() throw( css::uno::RuntimeExce
{
nNumberingType = style::NumberingType::ARABIC;
sPrefix = OUString();
- sSuffix = OUString( sal_Unicode(')') );
+ sSuffix = OUString( ')' );
break;
}
case 2:
{
nNumberingType = style::NumberingType::ROMAN_LOWER;
sPrefix = OUString();
- sSuffix = OUString( sal_Unicode(')') );
+ sSuffix = OUString( ')' );
break;
}
case 3:
{
nNumberingType = style::NumberingType::ARABIC;
- sPrefix = OUString( sal_Unicode('(') );
- sSuffix = OUString( sal_Unicode(')') );
+ sPrefix = OUString( '(' );
+ sSuffix = OUString( ')' );
break;
}
case 4:
{
nNumberingType = style::NumberingType::CHARS_LOWER_LETTER;
- sPrefix = OUString( sal_Unicode('(') );
- sSuffix = OUString( sal_Unicode(')') );
+ sPrefix = OUString( '(' );
+ sSuffix = OUString( ')' );
break;
}
case 5:
{
nNumberingType = style::NumberingType::ROMAN_LOWER;
- sPrefix = OUString( sal_Unicode('(') );
- sSuffix = OUString( sal_Unicode(')') );
+ sPrefix = OUString( '(' );
+ sSuffix = OUString( ')' );
break;
}
case 6:
{
nNumberingType = style::NumberingType::ARABIC;
sPrefix = OUString();
- sSuffix = OUString( sal_Unicode('.') );
+ sSuffix = OUString( '.' );
break;
}
case 7:
{
nNumberingType = style::NumberingType::CHARS_LOWER_LETTER;
sPrefix = OUString();
- sSuffix = OUString( sal_Unicode('.') );
+ sSuffix = OUString( '.' );
break;
}
case 8:
{
nNumberingType = style::NumberingType::ROMAN_LOWER;
sPrefix = OUString();
- sSuffix = OUString( sal_Unicode('.') );
+ sSuffix = OUString( '.' );
break;
}
default:
@@ -387,7 +387,7 @@ void SwVbaListHelper::CreateOutlineNumberForType2() throw( css::uno::RuntimeExce
{
sal_Int16 nNumberingType = style::NumberingType::ARABIC;
sal_Int16 nParentNumbering = 0;
- OUString sSuffix = OUString( sal_Unicode('.') );
+ OUString sSuffix = OUString( '.' );
uno::Sequence< beans::PropertyValue > aPropertyValues;
for( sal_Int32 nLevel = 0; nLevel < LIST_LEVEL_COUNT; nLevel++ )
@@ -473,14 +473,14 @@ void SwVbaListHelper::CreateOutlineNumberForType4() throw( css::uno::RuntimeExce
{
nNumberingType = style::NumberingType::ROMAN_UPPER;
sPrefix = OUString();
- sSuffix = OUString( sal_Unicode('.') );
+ sSuffix = OUString( '.' );
break;
}
case 1:
{
nNumberingType = style::NumberingType::ARABIC;
sPrefix = OUString();
- sSuffix = OUString( sal_Unicode('.') );
+ sSuffix = OUString( '.' );
sal_Int16 nParentNumbering = 0;
setOrAppendPropertyValue( aPropertyValues, OUString(UNO_NAME_PARENT_NUMBERING ), uno::makeAny( nParentNumbering ) );
break;
@@ -488,50 +488,50 @@ void SwVbaListHelper::CreateOutlineNumberForType4() throw( css::uno::RuntimeExce
case 2:
{
nNumberingType = style::NumberingType::CHARS_LOWER_LETTER;
- sPrefix = OUString( sal_Unicode('(') );
- sSuffix = OUString( sal_Unicode(')') );
+ sPrefix = OUString( '(' );
+ sSuffix = OUString( ')' );
break;
}
case 3:
{
nNumberingType = style::NumberingType::ROMAN_LOWER;
- sPrefix = OUString( sal_Unicode('(') );
- sSuffix = OUString( sal_Unicode(')') );
+ sPrefix = OUString( '(' );
+ sSuffix = OUString( ')' );
break;
}
case 4:
{
nNumberingType = style::NumberingType::ARABIC;
sPrefix = OUString();
- sSuffix = OUString( sal_Unicode(')') );
+ sSuffix = OUString( ')' );
break;
}
case 5:
{
nNumberingType = style::NumberingType::CHARS_LOWER_LETTER;
sPrefix = OUString();
- sSuffix = OUString( sal_Unicode(')') );
+ sSuffix = OUString( ')' );
break;
}
case 6:
{
nNumberingType = style::NumberingType::ROMAN_LOWER;
sPrefix = OUString();
- sSuffix = OUString( sal_Unicode(')') );
+ sSuffix = OUString( ')' );
break;
}
case 7:
{
nNumberingType = style::NumberingType::CHARS_LOWER_LETTER;
sPrefix = OUString();
- sSuffix = OUString( sal_Unicode('.') );
+ sSuffix = OUString( '.' );
break;
}
case 8:
{
nNumberingType = style::NumberingType::ROMAN_LOWER;
sPrefix = OUString();
- sSuffix = OUString( sal_Unicode('.') );
+ sSuffix = OUString( '.' );
break;
}
default:
@@ -581,63 +581,63 @@ void SwVbaListHelper::CreateOutlineNumberForType6() throw( css::uno::RuntimeExce
{
nNumberingType = style::NumberingType::ROMAN_UPPER;
sPrefix = OUString();
- sSuffix = OUString( sal_Unicode('.') );
+ sSuffix = OUString( '.' );
break;
}
case 1:
{
nNumberingType = style::NumberingType::CHARS_UPPER_LETTER;
sPrefix = OUString();
- sSuffix = OUString( sal_Unicode('.') );
+ sSuffix = OUString( '.' );
break;
}
case 2:
{
nNumberingType = style::NumberingType::ARABIC;
sPrefix = OUString();
- sSuffix = OUString( sal_Unicode(')') );
+ sSuffix = OUString( ')' );
break;
}
case 3:
{
nNumberingType = style::NumberingType::CHARS_LOWER_LETTER;
sPrefix = OUString();
- sSuffix = OUString( sal_Unicode(')') );
+ sSuffix = OUString( ')' );
break;
}
case 4:
{
nNumberingType = style::NumberingType::ARABIC;
- sPrefix = OUString( sal_Unicode('(') );
- sSuffix = OUString( sal_Unicode(')') );
+ sPrefix = OUString( '(' );
+ sSuffix = OUString( ')' );
break;
}
case 5:
{
nNumberingType = style::NumberingType::CHARS_LOWER_LETTER;
- sPrefix = OUString( sal_Unicode('(') );
- sSuffix = OUString( sal_Unicode(')') );
+ sPrefix = OUString( '(' );
+ sSuffix = OUString( ')' );
break;
}
case 6:
{
nNumberingType = style::NumberingType::ROMAN_LOWER;
- sPrefix = OUString( sal_Unicode('(') );
- sSuffix = OUString( sal_Unicode(')') );
+ sPrefix = OUString( '(' );
+ sSuffix = OUString( ')' );
break;
}
case 7:
{
nNumberingType = style::NumberingType::CHARS_LOWER_LETTER;
- sPrefix = OUString( sal_Unicode('(') );
- sSuffix = OUString( sal_Unicode('.') );
+ sPrefix = OUString( '(' );
+ sSuffix = OUString( '.' );
break;
}
case 8:
{
nNumberingType = style::NumberingType::ROMAN_LOWER;
- sPrefix = OUString( sal_Unicode('(') );
- sSuffix = OUString( sal_Unicode('.') );
+ sPrefix = OUString( '(' );
+ sSuffix = OUString( '.' );
break;
}
default:
diff --git a/sw/source/ui/vba/vbaoptions.cxx b/sw/source/ui/vba/vbaoptions.cxx
index 0dcd5df92b06..6969248f3088 100644
--- a/sw/source/ui/vba/vbaoptions.cxx
+++ b/sw/source/ui/vba/vbaoptions.cxx
@@ -100,7 +100,7 @@ void SwVbaOptions::setValueEvent( const uno::Any& value )
xPathSettings->getPropertyValue( msDefaultFilePath ) >>= sOldPathUrl;
// path could be a multipath, Microsoft doesn't support this feature in Word currently
// only the last path is from interest.
- sal_Int32 nIndex = sOldPathUrl.lastIndexOf( sal_Unicode(';') );
+ sal_Int32 nIndex = sOldPathUrl.lastIndexOf( ';' );
if( nIndex != -1 )
{
sNewPathUrl = sOldPathUrl.copy( 0, nIndex + 1 ).concat( sNewPathUrl );
@@ -115,7 +115,7 @@ uno::Any SwVbaOptions::getValueEvent()
xPathSettings->getPropertyValue( msDefaultFilePath ) >>= sPathUrl;
// path could be a multipath, Microsoft doesn't support this feature in Word currently
// only the last path is from interest.
- sal_Int32 nIndex = sPathUrl.lastIndexOf( sal_Unicode(';') );
+ sal_Int32 nIndex = sPathUrl.lastIndexOf( ';' );
if( nIndex != -1 )
{
sPathUrl = sPathUrl.copy( nIndex + 1 );
diff --git a/sw/source/ui/vba/vbatemplate.cxx b/sw/source/ui/vba/vbatemplate.cxx
index 0da51fd934d9..696947b7e3fd 100644
--- a/sw/source/ui/vba/vbatemplate.cxx
+++ b/sw/source/ui/vba/vbatemplate.cxx
@@ -91,10 +91,10 @@ SwVbaTemplate::AutoTextEntries( const uno::Any& index ) throw (uno::RuntimeExcep
// the default template is "Normal.dot" in Word.
OUString sGroup("Normal");
OUString sName = getName();
- sal_Int32 nIndex = sName.lastIndexOf( sal_Unicode('.') );
+ sal_Int32 nIndex = sName.lastIndexOf( '.' );
if( nIndex > 0 )
{
- sGroup = sName.copy( 0, sName.lastIndexOf( sal_Unicode('.') ) );
+ sGroup = sName.copy( 0, sName.lastIndexOf( '.' ) );
}
OUString sNewGroup = lcl_CheckGroupName( sGroup );