dbaccess/source/core/dataaccess/datasource.cxx | 4 +---
filter/source/t602/t602filter.cxx | 12 +++++++-----
fpicker/source/win32/VistaFilePicker.cxx | 4 +---
sfx2/source/appl/appopen.cxx | 5 +----
sfx2/source/doc/sfxbasemodel.cxx | 4 +---
sot/source/sdstor/ucbstorage.cxx | 6 +-----
svtools/source/config/extcolorcfg.cxx | 4 +---
7 files changed, 13 insertions(+), 26 deletions(-)
New commits:
commit c384c7d7ae39495a9cfd55c3d610133f97db1304
Author: Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Fri Jun 11 16:02:26 2021 +0200
Commit: Julien Nabet <serval2...@yahoo.fr>
CommitDate: Fri Jun 11 18:55:00 2021 +0200
Simplify Sequence/vector initializations
Change-Id: Ib02e25b4600666185cf0f8d0cc8d5c64186789c5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117064
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
diff --git a/dbaccess/source/core/dataaccess/datasource.cxx
b/dbaccess/source/core/dataaccess/datasource.cxx
index 9ce895bae875..83a45afa3e2d 100644
--- a/dbaccess/source/core/dataaccess/datasource.cxx
+++ b/dbaccess/source/core/dataaccess/datasource.cxx
@@ -240,10 +240,8 @@ void SAL_CALL OAuthenticationContinuation::setAccount(
const OUString& )
Sequence< RememberAuthentication > SAL_CALL
OAuthenticationContinuation::getRememberAccountModes( RememberAuthentication&
_reDefault )
{
- Sequence < RememberAuthentication > aReturn(1);
- aReturn[0] = RememberAuthentication_NO;
_reDefault = RememberAuthentication_NO;
- return aReturn;
+ return { RememberAuthentication_NO };
}
void SAL_CALL OAuthenticationContinuation::setRememberAccount(
RememberAuthentication /*Remember*/ )
diff --git a/filter/source/t602/t602filter.cxx
b/filter/source/t602/t602filter.cxx
index 9f96f18c1a96..f71d1c681af6 100644
--- a/filter/source/t602/t602filter.cxx
+++ b/filter/source/t602/t602filter.cxx
@@ -950,11 +950,13 @@ bool T602ImportFilterDialog::OptionsDlg()
propBool_(xPSetCodeLB,"Dropdown",true);
propBool_(xPSetCodeLB,"MultiSelection",false);
- Sequence< OUString > ous(4);
- ous[0] = getResStr(T602FILTER_STR_ENCODING_AUTO);
- ous[1] = getResStr(T602FILTER_STR_ENCODING_CP852);
- ous[2] = getResStr(T602FILTER_STR_ENCODING_CP895);
- ous[3] = getResStr(T602FILTER_STR_ENCODING_KOI8CS2);
+ Sequence< OUString > ous
+ {
+ getResStr(T602FILTER_STR_ENCODING_AUTO),
+ getResStr(T602FILTER_STR_ENCODING_CP852),
+ getResStr(T602FILTER_STR_ENCODING_CP895),
+ getResStr(T602FILTER_STR_ENCODING_KOI8CS2)
+ };
any <<= ous;
xPSetCodeLB->setPropertyValue("StringItemList", any);
diff --git a/fpicker/source/win32/VistaFilePicker.cxx
b/fpicker/source/win32/VistaFilePicker.cxx
index 367f938dd3a6..0c360f1bc33d 100644
--- a/fpicker/source/win32/VistaFilePicker.cxx
+++ b/fpicker/source/win32/VistaFilePicker.cxx
@@ -210,9 +210,7 @@ void VistaFilePicker::ensureInit()
}
else
{
- css::uno::Sequence < css::uno::Any > aInitArguments(1);
- aInitArguments[0] <<=
css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE;
- initialize(aInitArguments);
+ initialize( {
css::uno::Any(css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE) });
}
}
}
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index 03a94e0811b1..08431c29eaaa 100644
--- a/sfx2/source/appl/appopen.cxx
+++ b/sfx2/source/appl/appopen.cxx
@@ -866,11 +866,8 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
else
{
// check for "internal" protocols that should not be
forwarded to the system
- std::vector < OUString > aProtocols(2);
-
// add special protocols that always should be treated as
internal
- aProtocols[0] = "private:*";
- aProtocols[1] = "vnd.sun.star.*";
+ std::vector < OUString > aProtocols { "private:*",
"vnd.sun.star.*" };
// get registered protocol handlers from configuration
Reference < XNameAccess >
xAccess(officecfg::Office::ProtocolHandler::HandlerSet::get());
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 35e4bd106635..c95c068463cd 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -3876,9 +3876,7 @@ void SfxBaseModel::impl_getPrintHelper()
return;
m_pData->m_xPrintable = new SfxPrintHelper();
Reference < lang::XInitialization > xInit( m_pData->m_xPrintable,
UNO_QUERY );
- Sequence < Any > aValues(1);
- aValues[0] <<= Reference < frame::XModel > (static_cast< frame::XModel*
>(this), UNO_QUERY );
- xInit->initialize( aValues );
+ xInit->initialize( { Any(Reference < frame::XModel > (static_cast<
frame::XModel* >(this), UNO_QUERY )) } );
Reference < view::XPrintJobBroadcaster > xBrd( m_pData->m_xPrintable,
UNO_QUERY );
xBrd->addPrintJobListener( new SfxPrintHelperListener_Impl( m_pData.get()
) );
}
diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx
index 460b3c650fe3..683ceada14b8 100644
--- a/sot/source/sdstor/ucbstorage.cxx
+++ b/sot/source/sdstor/ucbstorage.cxx
@@ -1939,12 +1939,8 @@ bool UCBStorage_Impl::Insert( ::ucbhelper::Content
*pContent )
if ( rProps[ 0 ].Name != "Title" )
continue;
- Sequence < OUString > aNames { "Title" };
- Sequence < Any > aValues(1);
- aValues[0] <<= m_aName;
-
Content aNewFolder;
- if ( !pContent->insertNewContent( rCurr.Type, aNames, aValues,
aNewFolder ) )
+ if ( !pContent->insertNewContent( rCurr.Type, { "Title" }, {
Any(m_aName) }, aNewFolder ) )
continue;
// remove old content, create an "empty" new one and
initialize it with the new inserted
diff --git a/svtools/source/config/extcolorcfg.cxx
b/svtools/source/config/extcolorcfg.cxx
index 45bf2a1f18fe..499c41f4324e 100644
--- a/svtools/source/config/extcolorcfg.cxx
+++ b/svtools/source/config/extcolorcfg.cxx
@@ -235,9 +235,7 @@ void ExtendedColorConfig_Impl::Load(const OUString& rScheme)
OUString sDisplayName("/DisplayName");
for(OUString & componentName : aComponentNames)
{
- uno::Sequence < OUString > aComponentDisplayNames(1);
- aComponentDisplayNames[0] = componentName + sDisplayName;
- uno::Sequence< uno::Any > aComponentDisplayNamesValue = GetProperties(
aComponentDisplayNames );
+ uno::Sequence< uno::Any > aComponentDisplayNamesValue = GetProperties(
{ componentName + sDisplayName } );
OUString sComponentDisplayName;
if ( aComponentDisplayNamesValue.hasElements() &&
(aComponentDisplayNamesValue[0] >>= sComponentDisplayName) )
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
