summaryrefslogtreecommitdiff
path: root/filter
diff options
context:
space:
mode:
authorNoel Grandin <noelgrandin@gmail.com>2015-11-15 13:17:00 +0200
committerNoel Grandin <noelgrandin@gmail.com>2015-11-15 12:20:39 +0000
commit96c26b0d9d10fa9bac3695222980d7145f0342d7 (patch)
treed2d2b4e60e8ec98ff4025abfad42be06d29b3c13 /filter
parent25aec383f95fded43b3fe5fc588b4ebdc6d7d272 (diff)
use initialiser for Sequence<OUString>
using variations of: git grep -lP 'Sequence.*OUString.*\(\s*1\s*\)' | xargs perl -0777 -pi -e "s/Sequence<OUString> (\w+)\(1\)\; \s*OUString\* pArray.*; .*\[0\]\s*=\s*(\S+)\;/Sequence<OUString> \1 { \2 };/g" Change-Id: I03c64334ff30ee14dce0d17b67f5122a3893bbe3 Reviewed-on: https://gerrit.libreoffice.org/19971 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'filter')
-rw-r--r--filter/source/flash/swfdialog.cxx4
-rw-r--r--filter/source/flash/swffilter.cxx4
-rw-r--r--filter/source/msfilter/mstoolbar.cxx6
-rw-r--r--filter/source/msfilter/msvbahelper.cxx3
-rw-r--r--filter/source/pdf/pdfdialog.cxx4
-rw-r--r--filter/source/pdf/pdffilter.cxx4
-rw-r--r--filter/source/pdf/pdfinteract.cxx4
-rw-r--r--filter/source/placeware/filter.cxx4
-rw-r--r--filter/source/t602/t602filter.cxx4
9 files changed, 10 insertions, 27 deletions
diff --git a/filter/source/flash/swfdialog.cxx b/filter/source/flash/swfdialog.cxx
index ec79ca4134ea..5d8f26914288 100644
--- a/filter/source/flash/swfdialog.cxx
+++ b/filter/source/flash/swfdialog.cxx
@@ -55,9 +55,7 @@ OUString SWFDialog_getImplementationName ()
Sequence< OUString > SAL_CALL SWFDialog_getSupportedServiceNames()
throw (RuntimeException)
{
- Sequence < OUString > aRet(1);
- OUString* pArray = aRet.getArray();
- pArray[0] = SERVICE_NAME;
+ Sequence<OUString> aRet { SERVICE_NAME };
return aRet;
}
diff --git a/filter/source/flash/swffilter.cxx b/filter/source/flash/swffilter.cxx
index 2975e08c4812..37b9a30c1a34 100644
--- a/filter/source/flash/swffilter.cxx
+++ b/filter/source/flash/swffilter.cxx
@@ -506,9 +506,7 @@ OUString FlashExportFilter_getImplementationName ()
Sequence< OUString > SAL_CALL FlashExportFilter_getSupportedServiceNames( )
throw (RuntimeException)
{
- Sequence < OUString > aRet(1);
- OUString* pArray = aRet.getArray();
- pArray[0] = "com.sun.star.document.ExportFilter";
+ Sequence<OUString> aRet { "com.sun.star.document.ExportFilter" };
return aRet;
}
diff --git a/filter/source/msfilter/mstoolbar.cxx b/filter/source/msfilter/mstoolbar.cxx
index be74c017f0cf..f0e6fd2c3f5b 100644
--- a/filter/source/msfilter/mstoolbar.cxx
+++ b/filter/source/msfilter/mstoolbar.cxx
@@ -52,8 +52,7 @@ void CustomToolBarImportHelper::applyIcons()
{
for ( std::vector< iconcontrolitem >::iterator it = iconcommands.begin(); it != iconcommands.end(); ++it )
{
- uno::Sequence< OUString > commands(1);
- commands[ 0 ] = it->sCommand;
+ uno::Sequence<OUString> commands { it->sCommand };
uno::Sequence< uno::Reference< graphic::XGraphic > > images(1);
images[ 0 ] = it->image;
@@ -314,8 +313,7 @@ bool TBCData::ImportToolBarControl( CustomToolBarImportHelper& helper, std::vect
OUString sBuiltInCmd = helper.MSOTCIDToOOCommand( *pSpecificInfo->getBtnFace() );
if ( !sBuiltInCmd.isEmpty() )
{
- uno::Sequence< OUString> sCmds(1);
- sCmds[ 0 ] = sBuiltInCmd;
+ uno::Sequence<OUString> sCmds { sBuiltInCmd };
uno::Reference< ui::XImageManager > xImageManager( helper.getAppCfgManager()->getImageManager(), uno::UNO_QUERY_THROW );
// 0 = default image size
uno::Sequence< uno::Reference< graphic::XGraphic > > sImages = xImageManager->getImages( 0, sCmds );
diff --git a/filter/source/msfilter/msvbahelper.cxx b/filter/source/msfilter/msvbahelper.cxx
index b55eadd69029..278112b4ef9e 100644
--- a/filter/source/msfilter/msvbahelper.cxx
+++ b/filter/source/msfilter/msvbahelper.cxx
@@ -509,8 +509,7 @@ bool executeMacro( SfxObjectShell* pShell, const OUString& sMacroName, uno::Sequ
uno::Sequence< OUString > VBAMacroResolver_getSupportedServiceNames()
{
- uno::Sequence< OUString > aServiceNames( 1 );
- aServiceNames[ 0 ] = "com.sun.star.script.vba.VBAMacroResolver";
+ uno::Sequence<OUString> aServiceNames { "com.sun.star.script.vba.VBAMacroResolver" };
return aServiceNames;
}
diff --git a/filter/source/pdf/pdfdialog.cxx b/filter/source/pdf/pdfdialog.cxx
index febe61f7c656..4c517cd3ead9 100644
--- a/filter/source/pdf/pdfdialog.cxx
+++ b/filter/source/pdf/pdfdialog.cxx
@@ -47,9 +47,7 @@ OUString PDFDialog_getImplementationName ()
Sequence< OUString > SAL_CALL PDFDialog_getSupportedServiceNames()
throw (RuntimeException)
{
- Sequence < OUString > aRet(1);
- OUString* pArray = aRet.getArray();
- pArray[0] = SERVICE_NAME;
+ Sequence<OUString> aRet { SERVICE_NAME };
return aRet;
}
diff --git a/filter/source/pdf/pdffilter.cxx b/filter/source/pdf/pdffilter.cxx
index 86af0bba5e05..6d24356ff934 100644
--- a/filter/source/pdf/pdffilter.cxx
+++ b/filter/source/pdf/pdffilter.cxx
@@ -199,9 +199,7 @@ OUString PDFFilter_getImplementationName ()
Sequence< OUString > SAL_CALL PDFFilter_getSupportedServiceNames( ) throw (RuntimeException)
{
- Sequence < OUString > aRet(1);
- OUString* pArray = aRet.getArray();
- pArray[0] = "com.sun.star.document.PDFFilter";
+ Sequence<OUString> aRet { "com.sun.star.document.PDFFilter" };
return aRet;
}
diff --git a/filter/source/pdf/pdfinteract.cxx b/filter/source/pdf/pdfinteract.cxx
index bb01fc6db46e..bae82a81d3ab 100644
--- a/filter/source/pdf/pdfinteract.cxx
+++ b/filter/source/pdf/pdfinteract.cxx
@@ -68,9 +68,7 @@ OUString PDFInteractionHandler_getImplementationName ()
Sequence< OUString > SAL_CALL PDFInteractionHandler_getSupportedServiceNames( ) throw (RuntimeException)
{
- Sequence < OUString > aRet(1);
- OUString* pArray = aRet.getArray();
- pArray[0] = "com.sun.star.filter.pdfexport.PDFExportInteractionHandler";
+ Sequence<OUString> aRet { "com.sun.star.filter.pdfexport.PDFExportInteractionHandler" };
return aRet;
}
diff --git a/filter/source/placeware/filter.cxx b/filter/source/placeware/filter.cxx
index 78caa2f6be14..2c257f1b53e3 100644
--- a/filter/source/placeware/filter.cxx
+++ b/filter/source/placeware/filter.cxx
@@ -151,9 +151,7 @@ OUString PlaceWareExportFilter_getImplementationName ()
Sequence< OUString > SAL_CALL PlaceWareExportFilter_getSupportedServiceNames( )
throw (RuntimeException)
{
- Sequence < OUString > aRet(1);
- OUString* pArray = aRet.getArray();
- pArray[0] = "com.sun.star.document.ExportFilter";
+ Sequence<OUString> aRet { "com.sun.star.document.ExportFilter" };
return aRet;
}
diff --git a/filter/source/t602/t602filter.cxx b/filter/source/t602/t602filter.cxx
index 715dc912309d..86ff3a5ad769 100644
--- a/filter/source/t602/t602filter.cxx
+++ b/filter/source/t602/t602filter.cxx
@@ -1188,9 +1188,7 @@ OUString T602ImportFilterDialog_getImplementationName ()
Sequence< OUString > SAL_CALL T602ImportFilterDialog_getSupportedServiceNames( )
throw (RuntimeException)
{
- Sequence < OUString > aRet(1);
- OUString* pArray = aRet.getArray();
- pArray[0] = "com.sun.star.ui.dialogs.FilterOptionsDialog";
+ Sequence<OUString> aRet { "com.sun.star.ui.dialogs.FilterOptionsDialog" };
return aRet;
}