summaryrefslogtreecommitdiff
path: root/dbaccess/source/ui/dlg
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2016-11-04 12:29:35 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2016-11-04 13:15:41 +0000
commitc1805c48ae6057d370a35f2e059f3ee82396c407 (patch)
tree2da65ded84bbcfee66db65a24f71750ceb5e77f3 /dbaccess/source/ui/dlg
parent2dfc4c0845c72b3a1cf19546a1606907f36eea42 (diff)
loplugin:oncevar in dbaccess
Change-Id: I956063bb354fbbd002e922bb06d0b3863a2750fc Reviewed-on: https://gerrit.libreoffice.org/30565 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'dbaccess/source/ui/dlg')
-rw-r--r--dbaccess/source/ui/dlg/indexdialog.cxx16
-rw-r--r--dbaccess/source/ui/dlg/queryfilter.cxx3
-rw-r--r--dbaccess/source/ui/dlg/queryorder.cxx6
-rw-r--r--dbaccess/source/ui/dlg/tablespage.cxx3
4 files changed, 9 insertions, 19 deletions
diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx
index d2758b0d51ac..d094ae91da98 100644
--- a/dbaccess/source/ui/dlg/indexdialog.cxx
+++ b/dbaccess/source/ui/dlg/indexdialog.cxx
@@ -37,12 +37,6 @@
#include <connectivity/dbtools.hxx>
#include <osl/diagnose.h>
-const char INDEX_NEW_CMD[] = ".index:createNew";
-const char INDEX_DROP_CMD[] = ".index:dropCurrent";
-const char INDEX_RENAME_CMD[] = ".index:renameCurrent";
-const char INDEX_SAVE_CMD[] = ".index:saveCurrent";
-const char INDEX_RESET_CMD[] = ".index:resetCurrent";
-
namespace dbaui
{
@@ -175,11 +169,11 @@ namespace dbaui
{
get(m_pActions, "ACTIONS");
- mnNewCmdId = m_pActions->GetItemId(INDEX_NEW_CMD);
- mnDropCmdId = m_pActions->GetItemId(INDEX_DROP_CMD);
- mnRenameCmdId = m_pActions->GetItemId(INDEX_RENAME_CMD);
- mnSaveCmdId = m_pActions->GetItemId(INDEX_SAVE_CMD);
- mnResetCmdId = m_pActions->GetItemId(INDEX_RESET_CMD);
+ mnNewCmdId = m_pActions->GetItemId(".index:createNew");
+ mnDropCmdId = m_pActions->GetItemId(".index:dropCurrent");
+ mnRenameCmdId = m_pActions->GetItemId(".index:renameCurrent");
+ mnSaveCmdId = m_pActions->GetItemId(".index:saveCurrent");
+ mnResetCmdId = m_pActions->GetItemId(".index:resetCurrent");
maScNewCmdImg = m_pActions->GetItemImage(mnNewCmdId);
maScDropCmdImg = m_pActions->GetItemImage(mnDropCmdId);
diff --git a/dbaccess/source/ui/dlg/queryfilter.cxx b/dbaccess/source/ui/dlg/queryfilter.cxx
index 710c5329ec56..acfc9376d32a 100644
--- a/dbaccess/source/ui/dlg/queryfilter.cxx
+++ b/dbaccess/source/ui/dlg/queryfilter.cxx
@@ -348,8 +348,7 @@ bool DlgFilterCrit::getCondition(const ListBox& _rField,const ListBox& _rComp,co
_rFilter.Name = ::dbtools::quoteName(aQuote,_rFilter.Name);
if ( !sTableName.isEmpty() )
{
- static const char sSep[] = ".";
- sTableName += sSep;
+ sTableName += ".";
sTableName += _rFilter.Name;
_rFilter.Name = sTableName;
}
diff --git a/dbaccess/source/ui/dlg/queryorder.cxx b/dbaccess/source/ui/dlg/queryorder.cxx
index b4952833a769..5e3c1205a07c 100644
--- a/dbaccess/source/ui/dlg/queryorder.cxx
+++ b/dbaccess/source/ui/dlg/queryorder.cxx
@@ -216,8 +216,6 @@ OUString DlgOrderCrit::GetOrderList( ) const
{
Reference<XDatabaseMetaData> xMetaData = m_xConnection->getMetaData();
OUString sQuote = xMetaData.is() ? xMetaData->getIdentifierQuoteString() : OUString();
- static const char sDESC[] = " DESC ";
- static const char sASC[] = " ASC ";
Reference< XNameAccess> xColumns = Reference< XColumnsSupplier >(m_xQueryComposer,UNO_QUERY)->getColumns();
@@ -232,9 +230,9 @@ OUString DlgOrderCrit::GetOrderList( ) const
OUString sName = m_aColumnList[i]->GetSelectEntry();
sOrder += ::dbtools::quoteName(sQuote,sName);
if(m_aValueList[i]->GetSelectEntryPos())
- sOrder += sDESC;
+ sOrder += " DESC ";
else
- sOrder += sASC;
+ sOrder += " ASC ";
}
}
return sOrder;
diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx
index 7886c4483a81..365716964d6c 100644
--- a/dbaccess/source/ui/dlg/tablespage.cxx
+++ b/dbaccess/source/ui/dlg/tablespage.cxx
@@ -440,7 +440,6 @@ namespace dbaui
Sequence< OUString > OTableSubscriptionPage::collectDetailedSelection() const
{
Sequence< OUString > aTableFilter;
- static const char sDot[] = ".";
static const char sWildcard[] = "%";
OUString sComposedName;
@@ -494,7 +493,7 @@ namespace dbaui
}
}
bSchemaWildcard = OTableTreeListBox::isWildcardChecked(pSchema);
- sComposedName += m_pTablesList->GetEntryText( pSchema ) + sDot;
+ sComposedName += m_pTablesList->GetEntryText( pSchema ) + ".";
}
if (bSchemaWildcard)