summaryrefslogtreecommitdiff
path: root/sw/source/ui/dbui
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2021-06-10 00:02:28 +0200
committerJulien Nabet <serval2412@yahoo.fr>2021-06-11 14:54:36 +0200
commit76a69fb0bb1d849a2a7e76e209a30db149d79cdd (patch)
treea0358b5c8f8ba9865d82cdea3756a3438c7766ba /sw/source/ui/dbui
parentb1fe17f280b24e78e7ee55d4762dc64a98d6f302 (diff)
Simplify Sequences initializations (sw)
Change-Id: I02647bdb720620afe20284a069a71c19dbfcea05 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116944 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Diffstat (limited to 'sw/source/ui/dbui')
-rw-r--r--sw/source/ui/dbui/dbinsdlg.cxx27
1 files changed, 11 insertions, 16 deletions
diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx
index 50a7d212b42d..c057865aa1d2 100644
--- a/sw/source/ui/dbui/dbinsdlg.cxx
+++ b/sw/source/ui/dbui/dbinsdlg.cxx
@@ -1442,15 +1442,15 @@ static Sequence<OUString> lcl_createSourceNames(std::u16string_view rNodeName)
static Sequence<OUString> lcl_CreateSubNames(std::u16string_view rSubNodeName)
{
- Sequence<OUString> aSubSourceNames(6);
- OUString* pNames = aSubSourceNames.getArray();
- pNames[0] = OUString::Concat(rSubNodeName) + "/ColumnName";
- pNames[1] = OUString::Concat(rSubNodeName) + "/ColumnIndex";
- pNames[2] = OUString::Concat(rSubNodeName) + "/IsNumberFormat";
- pNames[3] = OUString::Concat(rSubNodeName) + "/IsNumberFormatFromDataBase";
- pNames[4] = OUString::Concat(rSubNodeName) + "/NumberFormat";
- pNames[5] = OUString::Concat(rSubNodeName) + "/NumberFormatLocale";
- return aSubSourceNames;
+ return
+ {
+ OUString::Concat(rSubNodeName) + "/ColumnName",
+ OUString::Concat(rSubNodeName) + "/ColumnIndex",
+ OUString::Concat(rSubNodeName) + "/IsNumberFormat",
+ OUString::Concat(rSubNodeName) + "/IsNumberFormatFromDataBase",
+ OUString::Concat(rSubNodeName) + "/NumberFormat",
+ OUString::Concat(rSubNodeName) + "/NumberFormatLocale"
+ };
}
static OUString lcl_CreateUniqueName(const Sequence<OUString>& aNames)
@@ -1472,19 +1472,14 @@ void SwInsertDBColAutoPilot::ImplCommit()
//remove entries that contain this data source + table at first
for(OUString const & nodeName : std::as_const(aNames))
{
- Sequence<OUString> aSourceNames(2);
- OUString* pSourceNames = aSourceNames.getArray();
- pSourceNames[0] = nodeName + "/DataSource";
- pSourceNames[1] = nodeName + "/Command";
- Sequence<Any> aSourceProperties = GetProperties(aSourceNames);
+ Sequence<Any> aSourceProperties = GetProperties({ nodeName + "/DataSource", nodeName + "/Command" });
const Any* pSourceProps = aSourceProperties.getArray();
OUString sSource, sCommand;
pSourceProps[0] >>= sSource;
pSourceProps[1] >>= sCommand;
if(sSource==aDBData.sDataSource && sCommand==aDBData.sCommand)
{
- Sequence<OUString> aElements { nodeName };
- ClearNodeElements(OUString(), aElements);
+ ClearNodeElements(OUString(), { nodeName });
}
}