ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

loplugin:stringloop cui,dbaccess

Browse Source 
Change-Id: I32b63d2435d36b869823ea022ebd7f8347a46ea0
Reviewed-on: https://gerrit.libreoffice.org/58211
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2018-07-28 17:22:52 +02:00
parent fa87224130
commit d407304544
19 changed files with 126 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cppcanvas/source/mtfrenderer/implrenderer.cxx
+4 -4
View File
@@ -978,9 +978,9 @@ namespace cppcanvas
nMaxWidth += nWidth + 1;
long nFullStrikeoutWidth = 0;
OUString aStrikeoutText;
OUStringBuffer aStrikeoutText;
while( (nFullStrikeoutWidth+=nStrikeoutWidth ) < nMaxWidth+1 )
aStrikeoutText += OUStringLiteral1(pChars[0]);
aStrikeoutText.append(pChars[0]);
sal_Int32 nLen = aStrikeoutText.getLength();
@@ -1008,9 +1008,9 @@ namespace cppcanvas
aShadowOffset,
aShadowColor,
aTextFillColor,
aStrikeoutText,
aStrikeoutText.makeStringAndClear(),
0/*nStartPos*/,
aStrikeoutText.getLength(),
nLen,
pStrikeoutCharWidths,
rParms.mrVDev,
rParms.mrCanvas,
cui/source/customize/cfg.cxx
+3 -3
View File
@@ -3345,16 +3345,16 @@ void SvxIconSelectorDialog::ImportGraphics(
if ( rejectedCount != 0 )
{
OUString message;
OUStringBuffer message;
OUString fPath;
if (rejectedCount > 1)
fPath = rPaths[0].copy(8) + "/";
for ( sal_Int32 i = 0; i < rejectedCount; ++i )
{
message += fPath + rejected[i] + "\n";
message.append(fPath).append(rejected[i]).append("\n");
}
SvxIconChangeDialog aDialog(GetFrameWeld(), message);
SvxIconChangeDialog aDialog(GetFrameWeld(), message.makeStringAndClear());
(void)aDialog.run();
}
}
cui/source/dialogs/FontFeaturesDialog.cxx
+8 -8
View File
@@ -177,7 +177,7 @@ IMPL_LINK_NOARG(FontFeaturesDialog, ComboBoxSelectedHdl, ComboBox&, void) { upda
OUString FontFeaturesDialog::createFontNameWithFeatures()
{
OUString sResultFontName;
OUString sNameSuffix;
OUStringBuffer sNameSuffix;
bool bFirst = true;
for (FontFeatureItem& rItem : m_aFeatureItems)
@@ -187,11 +187,11 @@ OUString FontFeaturesDialog::createFontNameWithFeatures()
if (rItem.m_pCheck->IsChecked())
{
if (!bFirst)
sNameSuffix += OUString(vcl::font::FeatureSeparator);
sNameSuffix.append(OUString(vcl::font::FeatureSeparator));
else
bFirst = false;
sNameSuffix += vcl::font::featureCodeAsString(rItem.m_aFeatureCode);
sNameSuffix.append(vcl::font::featureCodeAsString(rItem.m_aFeatureCode));
}
}
else if (rItem.m_pCombo && rItem.m_pText)
@@ -200,19 +200,19 @@ OUString FontFeaturesDialog::createFontNameWithFeatures()
if (nSelection > 0)
{
if (!bFirst)
sNameSuffix += OUString(vcl::font::FeatureSeparator);
sNameSuffix.append(OUString(vcl::font::FeatureSeparator));
else
bFirst = false;
sNameSuffix += vcl::font::featureCodeAsString(rItem.m_aFeatureCode);
sNameSuffix += "=";
sNameSuffix += OUString::number(nSelection);
sNameSuffix.append(vcl::font::featureCodeAsString(rItem.m_aFeatureCode));
sNameSuffix.append("=");
sNameSuffix.append(OUString::number(nSelection));
}
}
}
sResultFontName = vcl::font::trimFontNameFeatures(m_sFontName);
if (!sNameSuffix.isEmpty())
sResultFontName += OUString(vcl::font::FeaturePrefix) + sNameSuffix;
sResultFontName += OUString(vcl::font::FeaturePrefix) + sNameSuffix.makeStringAndClear();
return sResultFontName;
}
cui/source/dialogs/SpellDialog.cxx
+8 -8
View File
@@ -1034,14 +1034,14 @@ bool SpellDialog::GetNextSentence_Impl(bool bUseSavedSentence, bool bRecheck)
if(!aSentence.empty())
{
OUString sText;
OUStringBuffer sText;
for (auto const& elem : aSentence)
{
// hidden text has to be ignored
if(!elem.bIsHidden)
sText += elem.sText;
sText.append(elem.sText);
}
m_pSentenceED->SetText(sText);
m_pSentenceED->SetText(sText.makeStringAndClear());
sal_Int32 nStartPosition = 0;
sal_Int32 nEndPosition = 0;
@@ -1882,22 +1882,22 @@ svx::SpellPortions SentenceEditWindow_Impl::CreateSpellPortions() const
const sal_uInt32 nPara = pTextEngine->GetParagraphCount();
if (nPara > 1)
{
OUString aLeftOverText;
OUStringBuffer aLeftOverText;
for (sal_uInt32 i = 1; i < nPara; ++i)
{
aLeftOverText += "\x0a"; // the manual line break...
aLeftOverText += pTextEngine->GetText(i);
aLeftOverText.append("\x0a"); // the manual line break...
aLeftOverText.append(pTextEngine->GetText(i));
}
if (pError)
{ // we need to add a new portion containing the left-over text
svx::SpellPortion aPortion2;
aPortion2.eLanguage = eLang;
aPortion2.sText = aLeftOverText;
aPortion2.sText = aLeftOverText.makeStringAndClear();
aRet.push_back( aPortion2 );
}
else
{ // we just need to append the left-over text to the last portion (which had no errors)
aRet[ aRet.size() - 1 ].sText += aLeftOverText;
aRet[ aRet.size() - 1 ].sText += aLeftOverText.makeStringAndClear();
}
}
}
cui/source/dialogs/multipat.cxx
+10 -10
View File
@@ -246,7 +246,7 @@ void SvxMultiPathDialog::dispose()
OUString SvxMultiPathDialog::GetPath() const
{
OUString sNewPath;
OUStringBuffer sNewPath;
sal_Unicode cDelim = SVT_SEARCHPATH_DELIMITER;
OUString sWritable;
@@ -258,29 +258,29 @@ OUString SvxMultiPathDialog::GetPath() const
else
{
if ( !sNewPath.isEmpty() )
sNewPath += OUStringLiteral1(cDelim);
sNewPath += *static_cast<OUString*>(pEntry->GetUserData());
sNewPath.append(cDelim);
sNewPath.append( *static_cast<OUString*>(pEntry->GetUserData()) );
}
}
if ( !sNewPath.isEmpty() )
sNewPath += OUStringLiteral1(cDelim);
sNewPath += sWritable;
sNewPath.append(cDelim);
sNewPath.append(sWritable);
return sNewPath;
return sNewPath.makeStringAndClear();
}
OUString SvxPathSelectDialog::GetPath() const
{
OUString sNewPath;
OUStringBuffer sNewPath;
for (int i = 0; i < m_xPathLB->n_children(); ++i)
{
if ( !sNewPath.isEmpty() )
sNewPath += OUStringLiteral1(SVT_SEARCHPATH_DELIMITER);
sNewPath += m_xPathLB->get_id(i);
sNewPath.append(SVT_SEARCHPATH_DELIMITER);
sNewPath.append( m_xPathLB->get_id(i));
}
return sNewPath;
return sNewPath.makeStringAndClear();
}
void SvxMultiPathDialog::SetPath( const OUString& rPath )
cui/source/dialogs/screenshotannotationdlg.cxx
+3 -3
View File
@@ -599,14 +599,14 @@ IMPL_LINK(ScreenshotAnnotationDlg_Impl, pictureFrameListener, VclWindowEvent&, r
maSelected.insert(mpHilighted);
}
OUString aBookmarks;
OUStringBuffer aBookmarks(maMainMarkupText);
for (auto&& rCandidate : maSelected)
{
OUString aHelpId = OStringToOUString( rCandidate->GetHelpId(), RTL_TEXTENCODING_UTF8 );
aBookmarks += lcl_Bookmark( aHelpId );
aBookmarks.append(lcl_Bookmark( aHelpId ));
}
mpText->SetText( maMainMarkupText + aBookmarks );
mpText->SetText( aBookmarks.makeStringAndClear() );
bRepaint = true;
}
break;
cui/source/dialogs/scriptdlg.cxx
+5 -5
View File
@@ -1090,12 +1090,12 @@ bool SvxScriptOrgDialog::getBoolProperty( Reference< beans::XPropertySet > const
OUString SvxScriptOrgDialog::getListOfChildren( const Reference< browse::XBrowseNode >& node, int depth )
{
OUString result = "\n";
OUStringBuffer result = "\n";
for( int i=0;i<=depth;i++ )
{
result += "\t";
result.append("\t");
}
result += node->getName();
result.append(node->getName());
try
{
@@ -1105,7 +1105,7 @@ OUString SvxScriptOrgDialog::getListOfChildren( const Reference< browse::XBrowse
= node->getChildNodes();
for ( sal_Int32 n = 0; n < children.getLength(); n++ )
{
result += getListOfChildren( children[ n ] , depth+1 );
result.append( getListOfChildren( children[ n ] , depth+1 ) );
}
}
}
@@ -1114,7 +1114,7 @@ OUString SvxScriptOrgDialog::getListOfChildren( const Reference< browse::XBrowse
// ignore, will return an empty string
}
return result;
return result.makeStringAndClear();
}
Selection_hash SvxScriptOrgDialog::m_lastSelection;
cui/source/options/optaboutconfig.cxx
+19 -19
View File
@@ -310,7 +310,7 @@ void CuiAboutConfigTabPage::FillItems(const Reference< XNameAccess >& xNameAcces
);
OUString sType = aNode.getValueTypeName();
OUString sValue;
OUStringBuffer sValue;
if (it != m_modifiedPrefBoxEntries.end())
sValue = static_cast< SvLBoxString& >( (*it)->GetItem(4) ).GetText();
@@ -347,9 +347,9 @@ void CuiAboutConfigTabPage::FillItems(const Reference< XNameAccess >& xNameAcces
{
if( j != 0 )
{
sValue += ",";
sValue.append(",");
}
sValue += OUString::boolean( seq[j] );
sValue.append(OUString::boolean( seq[j] ));
}
}
else if( sType == "[]byte" )
@@ -361,9 +361,9 @@ void CuiAboutConfigTabPage::FillItems(const Reference< XNameAccess >& xNameAcces
static_cast<sal_uInt8>(seq[j]), 16 );
if( s.getLength() == 1 )
{
sValue += "0";
sValue.append("0");
}
sValue += s.toAsciiUpperCase();
sValue.append(s.toAsciiUpperCase());
}
}
else if( sType == "[][]byte" )
@@ -373,7 +373,7 @@ void CuiAboutConfigTabPage::FillItems(const Reference< XNameAccess >& xNameAcces
{
if( j != 0 )
{
sValue += ",";
sValue.append(",");
}
for( sal_Int32 k = 0; k != seq[j].getLength(); ++k )
{
@@ -381,9 +381,9 @@ void CuiAboutConfigTabPage::FillItems(const Reference< XNameAccess >& xNameAcces
static_cast<sal_uInt8>(seq[j][k]), 16 );
if( s.getLength() == 1 )
{
sValue += "0";
sValue.append("0");
}
sValue += s.toAsciiUpperCase();
sValue.append(s.toAsciiUpperCase());
}
}
}
@@ -394,9 +394,9 @@ void CuiAboutConfigTabPage::FillItems(const Reference< XNameAccess >& xNameAcces
{
if( j != 0 )
{
sValue += ",";
sValue.append(",");
}
sValue += OUString::number( seq[j] );
sValue.append(OUString::number( seq[j] ));
}
}
else if( sType == "[]long" )
@@ -406,9 +406,9 @@ void CuiAboutConfigTabPage::FillItems(const Reference< XNameAccess >& xNameAcces
{
if( j != 0 )
{
sValue += ",";
sValue.append(",");
}
sValue += OUString::number( seq[j] );
sValue.append(OUString::number( seq[j] ));
}
}
else if( sType == "[]hyper" )
@@ -418,9 +418,9 @@ void CuiAboutConfigTabPage::FillItems(const Reference< XNameAccess >& xNameAcces
{
if( j != 0 )
{
sValue += ",";
sValue.append(",");
}
sValue += OUString::number( seq[j] );
sValue.append(OUString::number( seq[j] ));
}
}
else if( sType == "[]double" )
@@ -430,9 +430,9 @@ void CuiAboutConfigTabPage::FillItems(const Reference< XNameAccess >& xNameAcces
{
if( j != 0 )
{
sValue += ",";
sValue.append(",");
}
sValue += OUString::number( seq[j] );
sValue.append(OUString::number( seq[j] ));
}
}
else if( sType == "[]string" )
@@ -442,9 +442,9 @@ void CuiAboutConfigTabPage::FillItems(const Reference< XNameAccess >& xNameAcces
{
if( j != 0 )
{
sValue += ",";
sValue.append(",");
}
sValue += seq[j];
sValue.append(seq[j]);
}
}
else
@@ -470,7 +470,7 @@ void CuiAboutConfigTabPage::FillItems(const Reference< XNameAccess >& xNameAcces
for(int j = 1; j < lineage; ++j)
index = sPath.indexOf("/", index + 1);
InsertEntry(sPath, sPath.copy(index+1), seqItems[i], sType, sValue, pParentEntry, !bLoadAll);
InsertEntry(sPath, sPath.copy(index+1), seqItems[i], sType, sValue.makeStringAndClear(), pParentEntry, !bLoadAll);
}
}
}
cui/source/options/optjava.cxx
+4 -4
View File
@@ -984,15 +984,15 @@ bool SvxJavaClassPathDlg::IsPathDuplicate( const OUString& _rPath )
OUString SvxJavaClassPathDlg::GetClassPath() const
{
OUString sPath;
OUStringBuffer sPath;
int nCount = m_xPathList->n_children();
for (int i = 0; i < nCount; ++i)
{
if (!sPath.isEmpty())
sPath += OUStringLiteral1(CLASSPATH_DELIMITER);
sPath += m_xPathList->get_text(i);
sPath.append(CLASSPATH_DELIMITER);
sPath.append(m_xPathList->get_text(i));
}
return sPath;
return sPath.makeStringAndClear();
}
void SvxJavaClassPathDlg::SetClassPath( const OUString& _rPath )
cui/source/options/optpath.cxx
+10 -10
View File
@@ -147,24 +147,23 @@ static OUString getCfgName_Impl( sal_uInt16 _nHandle )
static OUString Convert_Impl( const OUString& rValue )
{
OUString aReturn;
if (rValue.isEmpty())
return aReturn;
return OUString();
sal_Int32 nPos = 0;
OUStringBuffer aReturn;
for (;;)
{
OUString aValue = rValue.getToken( 0, MULTIPATH_DELIMITER, nPos );
INetURLObject aObj( aValue );
if ( aObj.GetProtocol() == INetProtocol::File )
aReturn += aObj.PathToFileName();
aReturn.append(aObj.PathToFileName());
if ( nPos < 0 )
break;
aReturn += OUStringLiteral1(MULTIPATH_DELIMITER);
aReturn.append(MULTIPATH_DELIMITER);
}
return aReturn;
return aReturn.makeStringAndClear();
}
// functions -------------------------------------------------------------
@@ -438,7 +437,8 @@ IMPL_LINK_NOARG(SvxPathTabPage, StandardHdl_Impl, Button*, void)
}
while ( nOldPos >= 0 );
OUString sUserPath, sWritablePath;
OUString sWritablePath;
OUStringBuffer sUserPath;
if ( !sTemp.isEmpty() )
{
sal_Int32 nNextPos = 0;
@@ -452,13 +452,13 @@ IMPL_LINK_NOARG(SvxPathTabPage, StandardHdl_Impl, Button*, void)
break;
}
if ( !sUserPath.isEmpty() )
sUserPath += OUStringLiteral1(MULTIPATH_DELIMITER);
sUserPath += sToken;
sUserPath.append(MULTIPATH_DELIMITER);
sUserPath.append(sToken);
}
}
pPathBox->SetEntryText( Convert_Impl( sTemp ), pEntry, 1 );
pPathImpl->eState = SfxItemState::SET;
pPathImpl->sUserPath = sUserPath;
pPathImpl->sUserPath = sUserPath.makeStringAndClear();
pPathImpl->sWritablePath = sWritablePath;
}
pEntry = pPathBox->NextSelected( pEntry );
dbaccess/source/core/api/KeySet.cxx
+4 -6
View File
@@ -714,10 +714,8 @@ void OKeySet::executeInsert( const ORowSetRow& _rInsertRow,const OUString& i_sSQ
if ( i_sTableName.isEmpty() && !bAutoValuesFetched && m_bInserted )
{
// first check if all key column values were set
const OUString sMax(" MAX(");
const OUString sMaxEnd("),");
const OUString sQuote = getIdentifierQuoteString();
OUString sMaxStmt;
OUStringBuffer sMaxStmt;
auto aEnd = m_pKeyColumnNames->end();
for (auto const& autoColumn : m_aAutoColumns)
{
@@ -725,14 +723,14 @@ void OKeySet::executeInsert( const ORowSetRow& _rInsertRow,const OUString& i_sSQ
SelectColumnsMetaData::const_iterator aFind = m_pKeyColumnNames->find(autoColumn);
if ( aFind != aEnd )
{
sMaxStmt += sMax + ::dbtools::quoteName( sQuote,aFind->second.sRealName) + sMaxEnd;
sMaxStmt.append(" MAX(").append(::dbtools::quoteName( sQuote,aFind->second.sRealName)).append("),");
}
}
if(!sMaxStmt.isEmpty())
{
sMaxStmt = sMaxStmt.replaceAt(sMaxStmt.getLength()-1,1," ");
OUString sStmt = "SELECT " + sMaxStmt + "FROM ";
sMaxStmt[sMaxStmt.getLength()-1] = ' ';
OUString sStmt = "SELECT " + sMaxStmt.makeStringAndClear() + "FROM ";
OUString sCatalog,sSchema,sTable;
::dbtools::qualifiedNameComponents(m_xConnection->getMetaData(),m_sUpdateTableName,sCatalog,sSchema,sTable,::dbtools::EComposeRule::InDataManipulation);
sStmt += ::dbtools::composeTableNameForSelect( m_xConnection, sCatalog, sSchema, sTable );
dbaccess/source/ui/dlg/directsql.cxx
+3 -3
View File
@@ -259,7 +259,7 @@ namespace dbaui
while (xRS->next())
{
// initialise the output line for each row
OUString out("");
OUStringBuffer out;
// work along the columns until that are none left
try
{
@@ -267,7 +267,7 @@ namespace dbaui
for (;;)
{
// be dumb, treat everything as a string
out += xRow->getString(i) + ",";
out.append(xRow->getString(i)).append(",");
i++;
}
}
@@ -276,7 +276,7 @@ namespace dbaui
{
}
// report the output
addOutputText(out);
addOutputText(out.makeStringAndClear());
}
}
dbaccess/source/ui/dlg/queryfilter.cxx
+11 -12
View File
@@ -98,11 +98,10 @@ DlgFilterCrit::DlgFilterCrit(vcl::Window * pParent,
m_pLB_WHERECOMP2->set_width_request(aSize.Width());
m_pLB_WHERECOMP3->set_width_request(aSize.Width());
const sal_Int32 nEntryCount = m_pLB_WHERECOMP1->GetEntryCount();
m_aSTR_COMPARE_OPERATORS.resize(nEntryCount);
for (sal_Int32 i = 0; i < nEntryCount; ++i)
{
if (i > 0)
m_aSTR_COMPARE_OPERATORS += ";";
m_aSTR_COMPARE_OPERATORS += m_pLB_WHERECOMP1->GetEntry(i);
m_aSTR_COMPARE_OPERATORS[i] = m_pLB_WHERECOMP1->GetEntry(i);
}
m_pLB_WHERECOMP1->Clear();
@@ -218,8 +217,8 @@ void DlgFilterCrit::dispose()
sal_Int32 DlgFilterCrit::GetOSQLPredicateType( const OUString& _rSelectedPredicate ) const
{
sal_Int32 nPredicateIndex = -1;
for ( sal_Int32 i=0; i < comphelper::string::getTokenCount(m_aSTR_COMPARE_OPERATORS, ';'); ++i)
if ( m_aSTR_COMPARE_OPERATORS.getToken(i, ';') == _rSelectedPredicate )
for ( size_t i=0; i < m_aSTR_COMPARE_OPERATORS.size(); ++i)
if ( m_aSTR_COMPARE_OPERATORS[i] == _rSelectedPredicate )
{
nPredicateIndex = i;
break;
@@ -675,21 +674,21 @@ IMPL_LINK( DlgFilterCrit, ListSelectHdl, ListBox&, rListBox, void )
if(eColumnSearch == ColumnSearch::FULL)
{
for(sal_Int32 i=0;i < comphelper::string::getTokenCount(m_aSTR_COMPARE_OPERATORS, ';');i++)
pComp->InsertEntry(m_aSTR_COMPARE_OPERATORS.getToken(i, ';'));
for(size_t i=0;i < m_aSTR_COMPARE_OPERATORS.size(); i++)
pComp->InsertEntry(m_aSTR_COMPARE_OPERATORS[i]);
}
else if(eColumnSearch == ColumnSearch::CHAR)
{
for(sal_Int32 i=6; i<10; i++)
pComp->InsertEntry(m_aSTR_COMPARE_OPERATORS.getToken(i, ';'));
pComp->InsertEntry(m_aSTR_COMPARE_OPERATORS[i]);
}
else if(eColumnSearch == ColumnSearch::BASIC)
{
sal_Int32 i;
size_t i;
for( i = 0; i < 6; i++ )
pComp->InsertEntry(m_aSTR_COMPARE_OPERATORS.getToken(i, ';'));
for(i=8; i < comphelper::string::getTokenCount(m_aSTR_COMPARE_OPERATORS, ';'); ++i)
pComp->InsertEntry(m_aSTR_COMPARE_OPERATORS.getToken(i, ';'));
pComp->InsertEntry(m_aSTR_COMPARE_OPERATORS[i]);
for(i=8; i < m_aSTR_COMPARE_OPERATORS.size(); ++i)
pComp->InsertEntry(m_aSTR_COMPARE_OPERATORS[i]);
}
else
{
dbaccess/source/ui/dlg/queryorder.cxx
+6 -6
View File
@@ -219,23 +219,23 @@ OUString DlgOrderCrit::GetOrderList( ) const
Reference< XNameAccess> xColumns = Reference< XColumnsSupplier >(m_xQueryComposer,UNO_QUERY)->getColumns();
OUString sOrder;
OUStringBuffer sOrder;
for( sal_uInt16 i=0 ; i<DOG_ROWS; i++ )
{
if(m_aColumnList[i]->GetSelectedEntryPos() != 0)
{
if(!sOrder.isEmpty())
sOrder += ",";
sOrder.append(",");
OUString sName = m_aColumnList[i]->GetSelectedEntry();
sOrder += ::dbtools::quoteName(sQuote,sName);
sOrder.append(::dbtools::quoteName(sQuote,sName));
if(m_aValueList[i]->GetSelectedEntryPos())
sOrder += " DESC ";
sOrder.append(" DESC ");
else
sOrder += " ASC ";
sOrder.append(" ASC ");
}
}
return sOrder;
return sOrder.makeStringAndClear();
}
void DlgOrderCrit::BuildOrderPart()
dbaccess/source/ui/dlg/tablespage.cxx
+8 -11
View File
@@ -437,7 +437,6 @@ namespace dbaui
Sequence< OUString > aTableFilter;
static const char sWildcard[] = "%";
OUString sComposedName;
const SvTreeListEntry* pAllObjectsEntry = m_pTablesList->getAllObjectsEntry();
if (!pAllObjectsEntry)
return aTableFilter;
@@ -451,6 +450,7 @@ namespace dbaui
if (m_pTablesList->GetCheckButtonState(pEntry) == SvButtonState::Checked && !m_pTablesList->GetModel()->HasChildren(pEntry))
{ // checked and a leaf, which means it's no catalog, no schema, but a real table
OUStringBuffer sComposedName;
OUString sCatalog;
if(m_pTablesList->GetModel()->HasParent(pEntry))
{
@@ -473,9 +473,9 @@ namespace dbaui
bCatalogWildcard = OTableTreeListBox::isWildcardChecked(pCatalog);
if (m_bCatalogAtStart)
{
sComposedName += m_pTablesList->GetEntryText( pCatalog ) + m_sCatalogSeparator;
sComposedName.append(m_pTablesList->GetEntryText( pCatalog )).append(m_sCatalogSeparator);
if (bCatalogWildcard)
sComposedName += sWildcard;
sComposedName.append(sWildcard);
}
else
{
@@ -488,26 +488,23 @@ namespace dbaui
}
}
bSchemaWildcard = OTableTreeListBox::isWildcardChecked(pSchema);
sComposedName += m_pTablesList->GetEntryText( pSchema ) + ".";
sComposedName.append(m_pTablesList->GetEntryText( pSchema )).append(".");
}
if (bSchemaWildcard)
sComposedName += sWildcard;
sComposedName.append(sWildcard);
}
if (!bSchemaWildcard && !bCatalogWildcard)
sComposedName += m_pTablesList->GetEntryText( pEntry );
sComposedName.append(m_pTablesList->GetEntryText( pEntry ));
if (!m_bCatalogAtStart && !bCatalogWildcard)
sComposedName += sCatalog;
sComposedName.append(sCatalog);
// need some space
sal_Int32 nOldLen = aTableFilter.getLength();
aTableFilter.realloc(nOldLen + 1);
// add the new name
aTableFilter[nOldLen] = sComposedName;
// reset the composed name
sComposedName.clear();
aTableFilter[nOldLen] = sComposedName.makeStringAndClear();
}
if (bCatalogWildcard)
dbaccess/source/ui/inc/queryfilter.hxx
+1 -1
View File
@@ -81,7 +81,7 @@ namespace dbaui
VclPtr<ListBox> m_pLB_WHERECOMP3;
VclPtr<Edit> m_pET_WHEREVALUE3;
OUString m_aSTR_COMPARE_OPERATORS;
std::vector<OUString> m_aSTR_COMPARE_OPERATORS;
css::uno::Reference< css::sdb::XSingleSelectQueryComposer> m_xQueryComposer;
css::uno::Reference< css::container::XNameAccess> m_xColumns;
dbaccess/source/ui/misc/DExport.cxx
+9 -9
View File
@@ -804,12 +804,12 @@ Reference< XPreparedStatement > ODatabaseExport::createPreparedStatment( const R
{
OUString sComposedTableName = ::dbtools::composeTableName( _xMetaData, _xDestTable, ::dbtools::EComposeRule::InDataManipulation, true );
OUString aSql = "INSERT INTO "
OUStringBuffer aSql = "INSERT INTO "
+ sComposedTableName
+ " ( ";
// set values and column names
OUString aValues(" VALUES ( ");
OUStringBuffer aValues(" VALUES ( ");
OUString aQuote;
if ( _xMetaData.is() )
@@ -843,18 +843,18 @@ Reference< XPreparedStatement > ODatabaseExport::createPreparedStatment( const R
{
if ( !elem.isEmpty() )
{
aSql += elem;
aSql += ",";
aValues += "?,";
aSql.append(elem);
aSql.append(",");
aValues.append("?,");
}
}
aSql = aSql.replaceAt(aSql.getLength()-1, 1, ")");
aValues = aValues.replaceAt(aValues.getLength()-1, 1, ")");
aSql[aSql.getLength()-1] = ')';
aValues[aValues.getLength()-1] = ')';
aSql += aValues;
aSql.append(aValues);
// now create,fill and execute the prepared statement
return _xMetaData->getConnection()->prepareStatement(aSql);
return _xMetaData->getConnection()->prepareStatement(aSql.makeStringAndClear());
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
dbaccess/source/ui/misc/HtmlReader.cxx
+4 -4
View File
@@ -339,7 +339,7 @@ void OHTMLReader::TableFontOn(FontDescriptor& _rFont, Color &_rTextColor)
case HtmlOptionId::FACE :
{
const OUString& rFace = rOption.GetString();
OUString aFontName;
OUStringBuffer aFontName;
sal_Int32 nPos = 0;
while( nPos != -1 )
{
@@ -347,11 +347,11 @@ void OHTMLReader::TableFontOn(FontDescriptor& _rFont, Color &_rTextColor)
OUString aFName = rFace.getToken( 0, ',', nPos );
aFName = comphelper::string::strip(aFName, ' ');
if( !aFontName.isEmpty() )
aFontName += ";";
aFontName += aFName;
aFontName.append(";");
aFontName.append(aFName);
}
if ( !aFontName.isEmpty() )
_rFont.Name = aFontName;
_rFont.Name = aFontName.makeStringAndClear();
}
break;
case HtmlOptionId::SIZE :
dbaccess/source/ui/misc/WCopyTable.cxx
+6 -8
View File
@@ -158,7 +158,7 @@ void ObjectCopySource::copyFilterAndSortingTo( const Reference< XConnection >& _
const OUString sTargetName = ::dbtools::composeTableNameForSelect(_xConnection,_rxObject);
const OUString sTargetNameTemp = sTargetName + ".";
OUString sStatement = "SELECT * FROM " + sTargetName + " WHERE 0=1";
OUStringBuffer sStatement = "SELECT * FROM " + sTargetName + " WHERE 0=1";
for (const std::pair<OUString,OUString> & aPropertie : aProperties)
{
@@ -168,17 +168,17 @@ void ObjectCopySource::copyFilterAndSortingTo( const Reference< XConnection >& _
m_xObject->getPropertyValue( aPropertie.first ) >>= sFilter;
if ( !sFilter.isEmpty() )
{
sStatement += aPropertie.second;
sStatement.append(aPropertie.second);
OUString sReplace = sFilter;
sReplace = sReplace.replaceFirst(sSourceName,sTargetNameTemp);
sFilter = sReplace;
_rxObject->setPropertyValue( aPropertie.first, makeAny(sFilter) );
sStatement += sFilter;
sStatement.append(sFilter);
}
}
}
_xConnection->createStatement()->executeQuery(sStatement);
_xConnection->createStatement()->executeQuery(sStatement.makeStringAndClear());
if ( m_xObjectPSI->hasPropertyByName( PROPERTY_APPLYFILTER ) )
_rxObject->setPropertyValue( PROPERTY_APPLYFILTER, m_xObject->getPropertyValue( PROPERTY_APPLYFILTER ) );
@@ -1384,8 +1384,7 @@ OUString OCopyTableWizard::convertColumnName(const TColumnFindFunctor& _rCmpFu
while(_rCmpFunctor(sName))
{
sName = sAlias;
sName += OUString::number(++nPos);
sName = sAlias + OUString::number(++nPos);
}
sAlias = sName;
// we have to check again, it could happen that the name is already to long
@@ -1521,8 +1520,7 @@ OUString OCopyTableWizard::createUniqueName(const OUString& _sName)
sal_Int32 nPos = 0;
while(m_vSourceColumns.find(sName) != m_vSourceColumns.end())
{
sName = _sName;
sName += OUString::number(++nPos);
sName = _sName + OUString::number(++nPos);
}
}
}