mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove unnecessary sal_Unicode casts in DBACCESS module

Browse Source 
Change-Id: I4c4ab5d672e994b1e8e3beac027d3f4e8f700714
This commit is contained in:
Noel Grandin
2013-11-13 16:14:08 +02:00
parent 531c2dc791
commit d9648d3567
10 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dbaccess/source/core/dataaccess/documentcontainer.cxx
View File

@@ -642,7 +642,7 @@ OUString SAL_CALL ODocumentContainer::composeHierarchicalName( const OUString& i
{ {
OUStringBuffer aBuffer; OUStringBuffer aBuffer;
aBuffer.append( getHierarchicalName() ); aBuffer.append( getHierarchicalName() );
aBuffer.append( sal_Unicode( '/' ) ); aBuffer.append( '/' );
aBuffer.append( i_rRelativeName ); aBuffer.append( i_rRelativeName );
return aBuffer.makeStringAndClear(); return aBuffer.makeStringAndClear();
} }

4
dbaccess/source/core/dataaccess/documentdefinition.cxx
View File

@@ -521,7 +521,7 @@ void SAL_CALL ODocumentDefinition::getFastPropertyValue( Any& o_rValue, sal_Int3
{ {
OUStringBuffer aBuffer; OUStringBuffer aBuffer;
aBuffer.append( ODatabaseModelImpl::getObjectContainerStorageName( m_bForm ? ODatabaseModelImpl::E_FORM : ODatabaseModelImpl::E_REPORT ) ); aBuffer.append( ODatabaseModelImpl::getObjectContainerStorageName( m_bForm ? ODatabaseModelImpl::E_FORM : ODatabaseModelImpl::E_REPORT ) );
aBuffer.append( sal_Unicode( '/' ) ); aBuffer.append( '/' );
aBuffer.append( m_pImpl->m_aProps.sPersistentName ); aBuffer.append( m_pImpl->m_aProps.sPersistentName );
sPersistentPath = aBuffer.makeStringAndClear(); sPersistentPath = aBuffer.makeStringAndClear();
} }
@@ -1936,7 +1936,7 @@ OUString SAL_CALL ODocumentDefinition::composeHierarchicalName( const OUString&
{ {
OUStringBuffer aBuffer; OUStringBuffer aBuffer;
aBuffer.append( getHierarchicalName() ); aBuffer.append( getHierarchicalName() );
aBuffer.append( sal_Unicode( '/' ) ); aBuffer.append( '/' );
aBuffer.append( i_rRelativeName ); aBuffer.append( i_rRelativeName );
return aBuffer.makeStringAndClear(); return aBuffer.makeStringAndClear();
} }

8
dbaccess/source/core/recovery/dbdocrecovery.cxx
View File

@@ -79,15 +79,15 @@ namespace dbaccess
static void lcl_getPersistentRepresentation( const MapStringToCompDesc::value_type& i_rComponentDesc, OUStringBuffer& o_rBuffer ) static void lcl_getPersistentRepresentation( const MapStringToCompDesc::value_type& i_rComponentDesc, OUStringBuffer& o_rBuffer )
{ {
o_rBuffer.append( i_rComponentDesc.first ); o_rBuffer.append( i_rComponentDesc.first );
o_rBuffer.append( sal_Unicode( '=' ) ); o_rBuffer.append( '=' );
o_rBuffer.append( i_rComponentDesc.second.sName ); o_rBuffer.append( i_rComponentDesc.second.sName );
o_rBuffer.append( sal_Unicode( ',' ) ); o_rBuffer.append( ',' );
o_rBuffer.append( sal_Unicode( i_rComponentDesc.second.bForEditing ? '1' : '0' ) ); o_rBuffer.append( sal_Unicode( i_rComponentDesc.second.bForEditing ? '1' : '0' ) );
} }
static bool lcl_extractCompDesc( const OUString& i_rIniLine, OUString& o_rStorName, SubComponentDescriptor& o_rCompDesc ) static bool lcl_extractCompDesc( const OUString& i_rIniLine, OUString& o_rStorName, SubComponentDescriptor& o_rCompDesc )
{ {
const sal_Int32 nEqualSignPos = i_rIniLine.indexOf( sal_Unicode( '=' ) ); const sal_Int32 nEqualSignPos = i_rIniLine.indexOf( '=' );
if ( nEqualSignPos < 1 ) if ( nEqualSignPos < 1 )
{ {
OSL_FAIL( "lcl_extractCompDesc: invalid map file entry - unexpected pos of '='" ); OSL_FAIL( "lcl_extractCompDesc: invalid map file entry - unexpected pos of '='" );
@@ -95,7 +95,7 @@ namespace dbaccess
} }
o_rStorName = i_rIniLine.copy( 0, nEqualSignPos ); o_rStorName = i_rIniLine.copy( 0, nEqualSignPos );
const sal_Int32 nCommaPos = i_rIniLine.lastIndexOf( sal_Unicode( ',' ) ); const sal_Int32 nCommaPos = i_rIniLine.lastIndexOf( ',' );
if ( nCommaPos != i_rIniLine.getLength() - 2 ) if ( nCommaPos != i_rIniLine.getLength() - 2 )
{ {
OSL_FAIL( "lcl_extractCompDesc: invalid map file entry - unexpected pos of ','" ); OSL_FAIL( "lcl_extractCompDesc: invalid map file entry - unexpected pos of ','" );

2
dbaccess/source/core/recovery/storagetextstream.cxx
View File

@@ -60,7 +60,7 @@ namespace dbaccess
static const OUString& lcl_getLineFeed() static const OUString& lcl_getLineFeed()
{ {
static const OUString s_sLineFeed( sal_Unicode( '\n' ) ); static const OUString s_sLineFeed( '\n' );
return s_sLineFeed; return s_sLineFeed;
} }
} }

12
dbaccess/source/ext/macromigration/migrationlog.cxx
View File

@@ -363,18 +363,18 @@ namespace dbmm
++error ++error
) )
{ {
_rBuffer.append( sal_Unicode( '-' ) ); _rBuffer.append( '-' );
_rBuffer.append( sal_Unicode( ' ' ) ); _rBuffer.append( ' ' );
lcl_appendErrorDescription( _rBuffer, *error ); lcl_appendErrorDescription( _rBuffer, *error );
_rBuffer.append( sal_Unicode( '\n' ) ); _rBuffer.append( '\n' );
if ( !error->aCaughtException.hasValue() ) if ( !error->aCaughtException.hasValue() )
continue; continue;
_rBuffer.append( sException ); _rBuffer.append( sException );
_rBuffer.append( ::comphelper::anyToString( error->aCaughtException ) ); _rBuffer.append( ::comphelper::anyToString( error->aCaughtException ) );
_rBuffer.append( sal_Unicode( '\n' ) ); _rBuffer.append( '\n' );
_rBuffer.append( sal_Unicode( '\n' ) ); _rBuffer.append( '\n' );
} }
} }
} }
@@ -440,7 +440,7 @@ namespace dbmm
aBuffer.append( sMovedLib + "\n" ); aBuffer.append( sMovedLib + "\n" );
} }
aBuffer.append( sal_Unicode( '\n' ) ); aBuffer.append( '\n' );
} }
} }

2
dbaccess/source/ui/app/AppDetailPageHelper.cxx
View File

@@ -394,7 +394,7 @@ void OAppDetailPageHelper::describeCurrentSelectionForType( const ElementType _e
{ {
OUStringBuffer buffer; OUStringBuffer buffer;
buffer.append( pList->GetEntryText( pParent ) ); buffer.append( pList->GetEntryText( pParent ) );
buffer.append( sal_Unicode( '/' ) ); buffer.append( '/' );
buffer.append( sName ); buffer.append( sName );
sName = buffer.makeStringAndClear(); sName = buffer.makeStringAndClear();

2
dbaccess/source/ui/browser/unodatbr.cxx
View File

@@ -2570,7 +2570,7 @@ bool SbaTableQueryBrowser::implSelect( SvTreeListEntry* _pEntry )
SvTreeListEntry* pTemp = pContainer; SvTreeListEntry* pTemp = pContainer;
while( m_pTreeModel->GetParent(pTemp) != pConnection ) while( m_pTreeModel->GetParent(pTemp) != pConnection )
{ {
sNameBuffer.insert(0,sal_Unicode('/')); sNameBuffer.insert(0,'/');
pString = (SvLBoxString*)pTemp->GetFirstItem(SV_ITEM_ID_BOLDLBSTRING); pString = (SvLBoxString*)pTemp->GetFirstItem(SV_ITEM_ID_BOLDLBSTRING);
OSL_ENSURE(pString,"There must be a string item!"); OSL_ENSURE(pString,"There must be a string item!");
sNameBuffer.insert(0,pString->GetText()); sNameBuffer.insert(0,pString->GetText());

4
dbaccess/source/ui/control/tabletree.cxx
View File

@@ -500,7 +500,7 @@ NamedDatabaseObject OTableTreeListBox::describeObject( SvTreeListEntry* _pEntry
if ( nParentEntryType == DatabaseObjectContainer::SCHEMA ) if ( nParentEntryType == DatabaseObjectContainer::SCHEMA )
{ {
buffer.append( GetEntryText( pParent ) ); buffer.append( GetEntryText( pParent ) );
buffer.append( sal_Unicode( '.' ) ); buffer.append( '.' );
} }
buffer.append( GetEntryText( _pEntry ) ); buffer.append( GetEntryText( _pEntry ) );
} }
@@ -509,7 +509,7 @@ NamedDatabaseObject OTableTreeListBox::describeObject( SvTreeListEntry* _pEntry
if ( nParentEntryType == DatabaseObjectContainer::CATALOG ) if ( nParentEntryType == DatabaseObjectContainer::CATALOG )
{ {
buffer.append( GetEntryText( pParent ) ); buffer.append( GetEntryText( pParent ) );
buffer.append( sal_Unicode( '.' ) ); buffer.append( '.' );
} }
buffer.append( GetEntryText( _pEntry ) ); buffer.append( GetEntryText( _pEntry ) );
} }

8
dbaccess/source/ui/querydesign/QueryDesignView.cxx
View File

@@ -860,7 +860,7 @@ namespace
if (!rRetStr.isEmpty()) // are there conditions on the field? if (!rRetStr.isEmpty()) // are there conditions on the field?
rRetStr.append(C_OR); rRetStr.append(C_OR);
else // open bracket for the OR branch else // open bracket for the OR branch
rRetStr.append(sal_Unicode('(')); rRetStr.append('(');
rRetStr.append(aWhereStr); rRetStr.append(aWhereStr);
} }
if (!aHavingStr.isEmpty()) if (!aHavingStr.isEmpty())
@@ -869,15 +869,15 @@ namespace
if (!rHavingStr.isEmpty()) // are there conditions on the field? if (!rHavingStr.isEmpty()) // are there conditions on the field?
rHavingStr.append(C_OR); rHavingStr.append(C_OR);
else // Open bracket for the OR branch else // Open bracket for the OR branch
rHavingStr.append(sal_Unicode('(')); rHavingStr.append('(');
rHavingStr.append(aHavingStr); rHavingStr.append(aHavingStr);
} }
} }
if (!rRetStr.isEmpty()) if (!rRetStr.isEmpty())
rRetStr.append(sal_Unicode(')')); // close bracket for the OR branch rRetStr.append(')'); // close bracket for the OR branch
if (!rHavingStr.isEmpty()) if (!rHavingStr.isEmpty())
rHavingStr.append(sal_Unicode(')')); // close bracket for the OR branch rHavingStr.append(')'); // close bracket for the OR branch
} }
catch(SQLException&) catch(SQLException&)
{ {

4
dbaccess/source/ui/querydesign/querycontroller.cxx
View File

@@ -1733,11 +1733,11 @@ static OUString concatComment( const OUString& rQuery, const ::std::vector< Comm
for ( ; i < nComments; ++i) for ( ; i < nComments; ++i)
{ {
if (!bNewLine) if (!bNewLine)
aBuf.append( sal_Unicode(' ')); aBuf.append( ' ');
aBuf.append( rComments[i].maComment); aBuf.append( rComments[i].maComment);
if (rComments[i].mbLastOnLine) if (rComments[i].mbLastOnLine)
{ {
aBuf.append( sal_Unicode('\n')); aBuf.append( '\n');
bNewLine = true; bNewLine = true;
} }
else else