[Libreoffice-commits] core.git: comphelper/source cui/source desktop/source extensions/source filter/source framework/source odk/examples sc/source sd/source sfx2/source svx/source toolkit/source xmloff/source
Noel Grandin
noel at peralex.com
Thu Oct 29 07:32:20 UTC 2015
comphelper/source/misc/mimeconfighelper.cxx | 24 -
cui/source/dialogs/hlmarkwn.cxx | 10
desktop/source/app/sofficemain.cxx | 4
desktop/source/deployment/registry/component/dp_component.cxx | 14
extensions/source/abpilot/unodialogabp.cxx | 4
extensions/source/update/check/updatehdl.cxx | 187 +++++-----
extensions/source/update/feed/updatefeed.cxx | 4
filter/source/config/cache/contenthandlerfactory.cxx | 4
filter/source/config/cache/filterfactory.cxx | 4
filter/source/config/cache/frameloaderfactory.cxx | 4
framework/source/jobs/shelljob.cxx | 5
framework/source/loadenv/loadenv.cxx | 16
framework/source/tabwin/tabwindow.cxx | 10
framework/source/uielement/comboboxtoolbarcontroller.cxx | 4
framework/source/uielement/complextoolbarcontroller.cxx | 4
framework/source/uielement/dropdownboxtoolbarcontroller.cxx | 4
framework/source/uielement/imagebuttontoolbarcontroller.cxx | 4
framework/source/uielement/togglebuttontoolbarcontroller.cxx | 8
odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx | 50 --
sc/source/filter/xml/xmlexprt.cxx | 13
sc/source/ui/docshell/docsh.cxx | 4
sd/source/core/CustomAnimationEffect.cxx | 15
sd/source/core/sdpage_animations.cxx | 5
sd/source/ui/animations/CustomAnimationPane.cxx | 5
sfx2/source/appl/childwin.cxx | 5
sfx2/source/bastyp/fltfnc.cxx | 25 -
sfx2/source/doc/guisaveas.cxx | 18
sfx2/source/doc/objstor.cxx | 13
sfx2/source/doc/templatedlg.cxx | 12
sfx2/source/view/viewsh.cxx | 9
svx/source/form/formcontrolling.cxx | 5
svx/source/sidebar/line/LineWidthPopup.cxx | 5
svx/source/sidebar/text/TextCharacterSpacingPopup.cxx | 5
toolkit/source/awt/vclxwindows.cxx | 16
xmloff/source/draw/sdxmlexp.cxx | 4
35 files changed, 217 insertions(+), 306 deletions(-)
New commits:
commit 7cdbde4867b14ae382262dc394ba83e609a8eecf
Author: Noel Grandin <noel at peralex.com>
Date: Wed Oct 28 13:55:01 2015 +0200
Initialize Sequence<beans::NamedValue> from initializer_lists
Change-Id: I216dcbd983dcf3df79df9fda371b93114540a9d8
diff --git a/comphelper/source/misc/mimeconfighelper.cxx b/comphelper/source/misc/mimeconfighelper.cxx
index 361cc00..e6ba4d3 100644
--- a/comphelper/source/misc/mimeconfighelper.cxx
+++ b/comphelper/source/misc/mimeconfighelper.cxx
@@ -231,9 +231,7 @@ OUString MimeConfigurationHelper::GetDocServiceNameFromMediaType( const OUString
try
{
// make query for all types matching the properties
- uno::Sequence < beans::NamedValue > aSeq( 1 );
- aSeq[0].Name = "MediaType";
- aSeq[0].Value <<= aMediaType;
+ uno::Sequence < beans::NamedValue > aSeq { { "MediaType", css::uno::makeAny(aMediaType) } };
uno::Reference < container::XEnumeration > xEnum = xTypeCFG->createSubSetEnumerationByProperties( aSeq );
while ( xEnum->hasMoreElements() )
@@ -723,11 +721,11 @@ OUString MimeConfigurationHelper::GetDefaultFilterFromServiceName( const OUStrin
GetFilterFactory(),
uno::UNO_QUERY_THROW );
- uno::Sequence< beans::NamedValue > aSearchRequest( 2 );
- aSearchRequest[0].Name = "DocumentService";
- aSearchRequest[0].Value <<= aServiceName;
- aSearchRequest[1].Name = "FileFormatVersion";
- aSearchRequest[1].Value <<= nVersion;
+ uno::Sequence< beans::NamedValue > aSearchRequest
+ {
+ { "DocumentService", css::uno::makeAny(aServiceName) },
+ { "FileFormatVersion", css::uno::makeAny(nVersion) }
+ };
uno::Reference< container::XEnumeration > xFilterEnum =
xFilterQuery->createSubSetEnumerationByProperties( aSearchRequest );
@@ -805,11 +803,11 @@ OUString MimeConfigurationHelper::GetExportFilterFromImportFilter( const OUStrin
OSL_ENSURE( !aDocumentServiceName.isEmpty() && !aTypeName.isEmpty(), "Incomplete filter data!" );
if ( !(aDocumentServiceName.isEmpty() || aTypeName.isEmpty()) )
{
- uno::Sequence< beans::NamedValue > aSearchRequest( 2 );
- aSearchRequest[0].Name = "Type";
- aSearchRequest[0].Value <<= aTypeName;
- aSearchRequest[1].Name = "DocumentService";
- aSearchRequest[1].Value <<= aDocumentServiceName;
+ uno::Sequence< beans::NamedValue > aSearchRequest
+ {
+ { "Type", css::uno::makeAny(aTypeName) },
+ { "DocumentService", css::uno::makeAny(aDocumentServiceName) }
+ };
uno::Sequence< beans::PropertyValue > aExportFilterProps = SearchForFilter(
uno::Reference< container::XContainerQuery >( xFilterFactory, uno::UNO_QUERY_THROW ),
diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx
index 71532bb..247cea9 100644
--- a/cui/source/dialogs/hlmarkwn.cxx
+++ b/cui/source/dialogs/hlmarkwn.cxx
@@ -610,11 +610,11 @@ IMPL_LINK_NOARG_TYPED(SvxHlinkDlgMarkWnd, ClickCloseHdl_Impl, Button*, void)
}
}
- uno::Sequence< beans::NamedValue > aSettings(2);
- aSettings[0].Name = TG_SETTING_LASTMARK;
- aSettings[0].Value <<= sLastSelectedMark;
- aSettings[1].Name = TG_SETTING_LASTPATH;
- aSettings[1].Value <<= comphelper::containerToSequence<OUString>(aLastSelectedPath);
+ uno::Sequence< beans::NamedValue > aSettings
+ {
+ { TG_SETTING_LASTMARK, css::uno::makeAny(sLastSelectedMark) },
+ { TG_SETTING_LASTPATH, css::uno::makeAny(comphelper::containerToSequence<OUString>(aLastSelectedPath)) }
+ };
// write
SvtViewOptions aViewSettings( E_DIALOG, TG_SETTING_MANAGER );
diff --git a/desktop/source/app/sofficemain.cxx b/desktop/source/app/sofficemain.cxx
index b567cc9..1758606 100644
--- a/desktop/source/app/sofficemain.cxx
+++ b/desktop/source/app/sofficemain.cxx
@@ -117,9 +117,7 @@ extern "C" void PtylTestEncryptionAndExport(const char *pathname)
utl::MediaDescriptor media;
media[utl::MediaDescriptor::PROP_FILTERNAME()] <<= OUString("MS Word 2007 XML");
OUString password("myPassword");
- css::uno::Sequence<css::beans::NamedValue> encryptionData(1);
- encryptionData[0].Name = "OOXPassword";
- encryptionData[0].Value = css::uno::makeAny(password);
+ css::uno::Sequence<css::beans::NamedValue> encryptionData { { "OOXPassword", css::uno::makeAny(password) } };
media[utl::MediaDescriptor::PROP_ENCRYPTIONDATA()] <<= encryptionData;
css::uno::Reference<css::frame::XModel> model(component, css::uno::UNO_QUERY);
diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx
index 35b0205..cf99606 100644
--- a/desktop/source/deployment/registry/component/dp_component.cxx
+++ b/desktop/source/deployment/registry/component/dp_component.cxx
@@ -1712,11 +1712,11 @@ void BackendImpl::ComponentsPackageImpl::processPackage_(
}
// This relies on the root component context's service manager
// supporting the extended XSet semantics:
- css::uno::Sequence< css::beans::NamedValue > args(2);
- args[0].Name = "uri";
- args[0].Value <<= expandUnoRcUrl(url);
- args[1].Name = "component-context";
- args[1].Value <<= context;
+ css::uno::Sequence< css::beans::NamedValue > args
+ {
+ { "uri", css::uno::makeAny(expandUnoRcUrl(url)) },
+ { "component-context", css::uno::makeAny(context) }
+ };
css::uno::Reference< css::container::XSet > smgr(
that->getRootContext()->getServiceManager(),
css::uno::UNO_QUERY_THROW);
@@ -1728,9 +1728,7 @@ void BackendImpl::ComponentsPackageImpl::processPackage_(
if (!startup) {
// This relies on the root component context's service manager
// supporting the extended XSet semantics:
- css::uno::Sequence< css::beans::NamedValue > args(1);
- args[0].Name = "uri";
- args[0].Value <<= expandUnoRcUrl(url);
+ css::uno::Sequence< css::beans::NamedValue > args { { "uri", css::uno::makeAny(expandUnoRcUrl(url)) } };
css::uno::Reference< css::container::XSet > smgr(
that->getRootContext()->getServiceManager(),
css::uno::UNO_QUERY_THROW);
diff --git a/extensions/source/abpilot/unodialogabp.cxx b/extensions/source/abpilot/unodialogabp.cxx
index 43ee209..d81eec0 100644
--- a/extensions/source/abpilot/unodialogabp.cxx
+++ b/extensions/source/abpilot/unodialogabp.cxx
@@ -165,9 +165,7 @@ namespace abp
// User has one chance to accept it or not.
// (or he can start it again by using wizard-menu!)
// So we should deregister it on our general job execution service by using right protocol parameters.
- css::uno::Sequence< css::beans::NamedValue > lProtocol(1);
- lProtocol[0].Name = "Deactivate";
- lProtocol[0].Value <<= sal_True;
+ css::uno::Sequence< css::beans::NamedValue > lProtocol { { "Deactivate", css::uno::makeAny( sal_True ) } };
return makeAny( lProtocol );
}
diff --git a/extensions/source/update/check/updatehdl.cxx b/extensions/source/update/check/updatehdl.cxx
index af66d3f9..189b35b 100644
--- a/extensions/source/update/check/updatehdl.cxx
+++ b/extensions/source/update/check/updatehdl.cxx
@@ -1088,9 +1088,7 @@ void UpdateHandler::createDialog()
xPropSet->setPropertyValue( "HelpURL", uno::makeAny<OUString>( INET_HID_SCHEME HID_CHECK_FOR_UPD_DLG ) );
}
{ // Label (fixed text) <status>
- uno::Sequence< beans::NamedValue > aProps(1);
-
- setProperty( aProps, 0, "Label", uno::Any( msStatusFL ) );
+ uno::Sequence< beans::NamedValue > aProps { { "Label", uno::Any( msStatusFL ) } };
insertControlModel( xControlModel, FIXED_TEXT_MODEL, "fixedLineStatus",
awt::Rectangle( DIALOG_BORDER+1, DIALOG_BORDER, EDIT_WIDTH-2, LABEL_HEIGHT ),
@@ -1104,15 +1102,16 @@ void UpdateHandler::createDialog()
aProps );
}
{ // Text (multiline edit) <status>
- uno::Sequence< beans::NamedValue > aProps(7);
-
- setProperty( aProps, 0, "Text", uno::Any( substVariables(msChecking) ) );
- setProperty( aProps, 1, "Border", uno::Any( sal_Int16( 0 ) ) );
- setProperty( aProps, 2, "PaintTransparent", uno::Any( true ) );
- setProperty( aProps, 3, "MultiLine", uno::Any( true ) );
- setProperty( aProps, 4, "ReadOnly", uno::Any( true ) );
- setProperty( aProps, 5, "AutoVScroll", uno::Any( true ) );
- setProperty( aProps, 6, "HelpURL", uno::makeAny<OUString>( INET_HID_SCHEME HID_CHECK_FOR_UPD_STATUS ) );
+ uno::Sequence< beans::NamedValue > aProps
+ {
+ { "Text", uno::Any( substVariables(msChecking) ) },
+ { "Border", uno::Any( sal_Int16( 0 ) ) },
+ { "PaintTransparent", uno::Any( true ) },
+ { "MultiLine", uno::Any( true ) },
+ { "ReadOnly", uno::Any( true ) },
+ { "AutoVScroll", uno::Any( true ) },
+ { "HelpURL", uno::makeAny<OUString>( INET_HID_SCHEME HID_CHECK_FOR_UPD_STATUS ) }
+ };
insertControlModel( xControlModel, EDIT_FIELD_MODEL, TEXT_STATUS,
awt::Rectangle( DIALOG_BORDER + TEXT_OFFSET,
@@ -1122,12 +1121,13 @@ void UpdateHandler::createDialog()
aProps );
}
{ // Text (edit) <percent>
- uno::Sequence< beans::NamedValue > aProps(4);
-
- setProperty( aProps, 0, "Text", uno::Any( msPercent ) );
- setProperty( aProps, 1, "Border", uno::Any( sal_Int16( 0 ) ) );
- setProperty( aProps, 2, "PaintTransparent", uno::Any( true ) );
- setProperty( aProps, 3, "ReadOnly", uno::Any( true ) );
+ uno::Sequence< beans::NamedValue > aProps
+ {
+ { "Text", uno::Any( msPercent ) },
+ { "Border", uno::Any( sal_Int16( 0 ) ) },
+ { "PaintTransparent", uno::Any( true ) },
+ { "ReadOnly", uno::Any( true ) },
+ };
insertControlModel( xControlModel, EDIT_FIELD_MODEL, TEXT_PERCENT,
awt::Rectangle( PROGRESS_X_POS + PROGRESS_WIDTH + DIALOG_BORDER,
@@ -1137,26 +1137,28 @@ void UpdateHandler::createDialog()
aProps );
}
{ // pause button
- uno::Sequence< beans::NamedValue > aProps(5);
-
- setProperty( aProps, 0, "DefaultButton", uno::Any( false ) );
- setProperty( aProps, 1, "Enabled", uno::Any( true ) );
- setProperty( aProps, 2, "PushButtonType", uno::Any( sal_Int16(awt::PushButtonType_STANDARD) ) );
- setProperty( aProps, 3, "Label", uno::Any( msPauseBtn ) );
- setProperty( aProps, 4, "HelpURL", uno::makeAny<OUString>( INET_HID_SCHEME HID_CHECK_FOR_UPD_PAUSE ) );
+ uno::Sequence< beans::NamedValue > aProps
+ {
+ { "DefaultButton", uno::Any( false ) },
+ { "Enabled", uno::Any( true ) },
+ { "PushButtonType", uno::Any( sal_Int16(awt::PushButtonType_STANDARD) ) },
+ { "Label", uno::Any( msPauseBtn ) },
+ { "HelpURL", uno::makeAny<OUString>( INET_HID_SCHEME HID_CHECK_FOR_UPD_PAUSE ) }
+ };
insertControlModel ( xControlModel, BUTTON_MODEL, msButtonIDs[PAUSE_BUTTON],
awt::Rectangle( BOX1_BTN_X, BOX1_BTN_Y, BUTTON_WIDTH, BUTTON_HEIGHT ),
aProps );
}
{ // resume button
- uno::Sequence< beans::NamedValue > aProps(5);
-
- setProperty( aProps, 0, "DefaultButton", uno::Any( false ) );
- setProperty( aProps, 1, "Enabled", uno::Any( true ) );
- setProperty( aProps, 2, "PushButtonType", uno::Any( sal_Int16(awt::PushButtonType_STANDARD) ) );
- setProperty( aProps, 3, "Label", uno::Any( msResumeBtn ) );
- setProperty( aProps, 4, "HelpURL", uno::makeAny<OUString>( INET_HID_SCHEME HID_CHECK_FOR_UPD_RESUME ) );
+ uno::Sequence< beans::NamedValue > aProps
+ {
+ { "DefaultButton", uno::Any( false ) },
+ { "Enabled", uno::Any( true ) },
+ { "PushButtonType", uno::Any( sal_Int16(awt::PushButtonType_STANDARD) ) },
+ { "Label", uno::Any( msResumeBtn ) },
+ { "HelpURL", uno::makeAny<OUString>( INET_HID_SCHEME HID_CHECK_FOR_UPD_RESUME ) }
+ };
insertControlModel ( xControlModel, BUTTON_MODEL, msButtonIDs[RESUME_BUTTON],
awt::Rectangle( BOX1_BTN_X,
@@ -1166,13 +1168,14 @@ void UpdateHandler::createDialog()
aProps );
}
{ // abort button
- uno::Sequence< beans::NamedValue > aProps(5);
-
- setProperty( aProps, 0, "DefaultButton", uno::Any( false ) );
- setProperty( aProps, 1, "Enabled", uno::Any( true ) );
- setProperty( aProps, 2, "PushButtonType", uno::Any( sal_Int16(awt::PushButtonType_STANDARD) ) );
- setProperty( aProps, 3, "Label", uno::Any( msCancelBtn ) );
- setProperty( aProps, 4, "HelpURL", uno::makeAny<OUString>( INET_HID_SCHEME HID_CHECK_FOR_UPD_CANCEL ) );
+ uno::Sequence< beans::NamedValue > aProps
+ {
+ { "DefaultButton", uno::Any( false ) },
+ { "Enabled", uno::Any( true ) },
+ { "PushButtonType", uno::Any( sal_Int16(awt::PushButtonType_STANDARD) ) },
+ { "Label", uno::Any( msCancelBtn ) },
+ { "HelpURL", uno::makeAny<OUString>( INET_HID_SCHEME HID_CHECK_FOR_UPD_CANCEL ) }
+ };
insertControlModel ( xControlModel, BUTTON_MODEL, msButtonIDs[CANCEL_BUTTON],
awt::Rectangle( BOX1_BTN_X,
@@ -1182,9 +1185,7 @@ void UpdateHandler::createDialog()
aProps );
}
{ // Label (FixedText) <description>
- uno::Sequence< beans::NamedValue > aProps(1);
-
- setProperty( aProps, 0, "Label", uno::Any( msDescription ) );
+ uno::Sequence< beans::NamedValue > aProps { { "Label", uno::Any( msDescription ) } };
insertControlModel( xControlModel, FIXED_TEXT_MODEL, "fixedTextDescription",
awt::Rectangle( DIALOG_BORDER+1, LABEL_Y_POS, EDIT_WIDTH-2, LABEL_HEIGHT ),
@@ -1198,15 +1199,16 @@ void UpdateHandler::createDialog()
aProps );
}
{ // Text (MultiLineEdit) <description>
- uno::Sequence< beans::NamedValue > aProps(7);
-
- setProperty( aProps, 0, "Text", uno::Any( OUString() ) );
- setProperty( aProps, 1, "Border", uno::Any( sal_Int16( 0 ) ) );
- setProperty( aProps, 2, "PaintTransparent", uno::Any( true ) );
- setProperty( aProps, 3, "MultiLine", uno::Any( true ) );
- setProperty( aProps, 4, "ReadOnly", uno::Any( true ) );
- setProperty( aProps, 5, "AutoVScroll", uno::Any( true ) );
- setProperty( aProps, 6, "HelpURL", uno::makeAny<OUString>( INET_HID_SCHEME HID_CHECK_FOR_UPD_DESCRIPTION ) );
+ uno::Sequence< beans::NamedValue > aProps
+ {
+ { "Text", uno::Any( OUString() ) },
+ { "Border", uno::Any( sal_Int16( 0 ) ) },
+ { "PaintTransparent", uno::Any( true ) },
+ { "MultiLine", uno::Any( true ) },
+ { "ReadOnly", uno::Any( true ) },
+ { "AutoVScroll", uno::Any( true ) },
+ { "HelpURL", uno::makeAny<OUString>( INET_HID_SCHEME HID_CHECK_FOR_UPD_DESCRIPTION ) }
+ };
insertControlModel( xControlModel, EDIT_FIELD_MODEL, TEXT_DESCRIPTION,
awt::Rectangle( DIALOG_BORDER + TEXT_OFFSET,
@@ -1216,64 +1218,66 @@ void UpdateHandler::createDialog()
aProps );
}
{ // @see awt/UnoControlFixedLineModel.idl
- uno::Sequence< beans::NamedValue > aProps(1);
-
- setProperty( aProps, 0, "Orientation", uno::Any( sal_Int32( 0 ) ) );
+ uno::Sequence< beans::NamedValue > aProps { { "Orientation", uno::Any( sal_Int32( 0 ) ) } };
insertControlModel( xControlModel, FIXED_LINE_MODEL, "fixedLine",
awt::Rectangle( 0, BUTTON_BAR_Y_POS, DIALOG_WIDTH, 5 ),
aProps );
}
{ // close button // @see awt/UnoControlButtonModel.idl
- uno::Sequence< beans::NamedValue > aProps(5);
-
- setProperty( aProps, 0, "DefaultButton", uno::Any( false ) );
- setProperty( aProps, 1, "Enabled", uno::Any( true ) );
- // [property] short PushButtonType
- // with own "ButtonActionListener"
- setProperty( aProps, 2, "PushButtonType", uno::Any( sal_Int16(awt::PushButtonType_STANDARD) ) );
- // with default ActionListener => endDialog().
- // setProperty( aProps, 2, "PushButtonType", uno::Any( sal_Int16(awt::PushButtonType_CANCEL) ) );
- // [property] string Label // only if PushButtonType_STANDARD
- setProperty( aProps, 3, "Label", uno::Any( msClose ) );
- setProperty( aProps, 4, "HelpURL", uno::makeAny<OUString>( INET_HID_SCHEME HID_CHECK_FOR_UPD_CLOSE ) );
+ uno::Sequence< beans::NamedValue > aProps
+ {
+ { "DefaultButton", uno::Any( false ) },
+ { "Enabled", uno::Any( true ) },
+ // [property] short PushButtonType
+ // with own "ButtonActionListener"
+ { "PushButtonType", uno::Any( sal_Int16(awt::PushButtonType_STANDARD) ) },
+ // with default ActionListener => endDialog().
+ // setProperty( aProps, 2, "PushButtonType", uno::Any( sal_Int16(awt::PushButtonType_CANCEL) ) );
+ // [property] string Label // only if PushButtonType_STANDARD
+ { "Label", uno::Any( msClose ) },
+ { "HelpURL", uno::makeAny<OUString>( INET_HID_SCHEME HID_CHECK_FOR_UPD_CLOSE ) }
+ };
insertControlModel ( xControlModel, BUTTON_MODEL, msButtonIDs[ CLOSE_BUTTON ],
awt::Rectangle( CLOSE_BTN_X, BUTTON_Y_POS, BUTTON_WIDTH, BUTTON_HEIGHT ),
aProps );
}
{ // install button
- uno::Sequence< beans::NamedValue > aProps(5);
-
- setProperty( aProps, 0, "DefaultButton", uno::Any( false ) );
- setProperty( aProps, 1, "Enabled", uno::Any( true ) );
- setProperty( aProps, 2, "PushButtonType", uno::Any( sal_Int16(awt::PushButtonType_STANDARD) ) );
- setProperty( aProps, 3, "Label", uno::Any( msInstall ) );
- setProperty( aProps, 4, "HelpURL", uno::makeAny<OUString>( INET_HID_SCHEME HID_CHECK_FOR_UPD_INSTALL ) );
+ uno::Sequence< beans::NamedValue > aProps
+ {
+ { "DefaultButton", uno::Any( false ) },
+ { "Enabled", uno::Any( true ) },
+ { "PushButtonType", uno::Any( sal_Int16(awt::PushButtonType_STANDARD) ) },
+ { "Label", uno::Any( msInstall ) },
+ { "HelpURL", uno::makeAny<OUString>( INET_HID_SCHEME HID_CHECK_FOR_UPD_INSTALL ) }
+ };
insertControlModel ( xControlModel, BUTTON_MODEL, msButtonIDs[INSTALL_BUTTON],
awt::Rectangle( INSTALL_BTN_X, BUTTON_Y_POS, BUTTON_WIDTH, BUTTON_HEIGHT ),
aProps );
}
{ // download button
- uno::Sequence< beans::NamedValue > aProps(5);
-
- setProperty( aProps, 0, "DefaultButton", uno::Any( false ) );
- setProperty( aProps, 1, "Enabled", uno::Any( true ) );
- setProperty( aProps, 2, "PushButtonType", uno::Any( sal_Int16(awt::PushButtonType_STANDARD) ) );
- setProperty( aProps, 3, "Label", uno::Any( msDownload ) );
- setProperty( aProps, 4, "HelpURL", uno::makeAny<OUString>( INET_HID_SCHEME HID_CHECK_FOR_UPD_DOWNLOAD ) );
+ uno::Sequence< beans::NamedValue > aProps
+ {
+ { "DefaultButton", uno::Any( false ) },
+ { "Enabled", uno::Any( true ) },
+ { "PushButtonType", uno::Any( sal_Int16(awt::PushButtonType_STANDARD) ) },
+ { "Label", uno::Any( msDownload ) },
+ { "HelpURL", uno::makeAny<OUString>( INET_HID_SCHEME HID_CHECK_FOR_UPD_DOWNLOAD ) }
+ };
insertControlModel ( xControlModel, BUTTON_MODEL, msButtonIDs[DOWNLOAD_BUTTON],
awt::Rectangle( DOWNLOAD_BTN_X, BUTTON_Y_POS, BUTTON_WIDTH, BUTTON_HEIGHT ),
aProps );
}
{ // help button
- uno::Sequence< beans::NamedValue > aProps(3);
-
- setProperty( aProps, 0, "DefaultButton", uno::Any( false ) );
- setProperty( aProps, 1, "Enabled", uno::Any( true ) );
- setProperty( aProps, 2, "PushButtonType", uno::Any( sal_Int16(awt::PushButtonType_HELP) ) );
+ uno::Sequence< beans::NamedValue > aProps
+ {
+ { "DefaultButton", uno::Any( false ) },
+ { "Enabled", uno::Any( true ) },
+ { "PushButtonType", uno::Any( sal_Int16(awt::PushButtonType_HELP) ) }
+ };
insertControlModel( xControlModel, BUTTON_MODEL, msButtonIDs[HELP_BUTTON],
awt::Rectangle( DIALOG_BORDER, BUTTON_Y_POS, BUTTON_WIDTH, BUTTON_HEIGHT ),
@@ -1287,12 +1291,13 @@ void UpdateHandler::createDialog()
aProps );
}
{ // @see awt/UnoControlProgressBarModel.idl
- uno::Sequence< beans::NamedValue > aProps(4);
- setProperty( aProps, 0, "Enabled", uno::Any( true ) );
- setProperty( aProps, 1, "ProgressValue", uno::Any( sal_Int32( 0 ) ) );
- setProperty( aProps, 2, "ProgressValueMax", uno::Any( sal_Int32( 100 ) ) );
- setProperty( aProps, 3, "ProgressValueMin", uno::Any( sal_Int32( 0 ) ) );
-
+ uno::Sequence< beans::NamedValue > aProps
+ {
+ { "Enabled", uno::Any( true ) },
+ { "ProgressValue", uno::Any( sal_Int32( 0 ) ) },
+ { "ProgressValueMax", uno::Any( sal_Int32( 100 ) ) },
+ { "ProgressValueMin", uno::Any( sal_Int32( 0 ) ) },
+ };
insertControlModel( xControlModel, "com.sun.star.awt.UnoControlProgressBarModel", CTRL_PROGRESS,
awt::Rectangle( PROGRESS_X_POS, PROGRESS_Y_POS, PROGRESS_WIDTH, PROGRESS_HEIGHT ),
aProps);
diff --git a/extensions/source/update/feed/updatefeed.cxx b/extensions/source/update/feed/updatefeed.cxx
index 9dfa4b5..918b861 100644
--- a/extensions/source/update/feed/updatefeed.cxx
+++ b/extensions/source/update/feed/updatefeed.cxx
@@ -442,9 +442,7 @@ UpdateInformationProvider::load(const OUString& rURL)
// Disable KeepAlive in webdav - don't want millions of office
// instances phone home & clog up servers
- uno::Sequence< beans::NamedValue > aProps( 1 );
- aProps[ 0 ] = beans::NamedValue(
- "KeepAlive", uno::makeAny(sal_False));
+ uno::Sequence< beans::NamedValue > aProps { { "KeepAlive", uno::makeAny(sal_False) } };
ucb::OpenCommandArgument3 aOpenArgument;
aOpenArgument.Mode = ucb::OpenMode::DOCUMENT;
diff --git a/filter/source/config/cache/contenthandlerfactory.cxx b/filter/source/config/cache/contenthandlerfactory.cxx
index 6f808fe..5cc7c27 100644
--- a/filter/source/config/cache/contenthandlerfactory.cxx
+++ b/filter/source/config/cache/contenthandlerfactory.cxx
@@ -86,9 +86,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL ContentHandlerFactory::crea
css::uno::Sequence< OUString > lTypes(1);
lTypes[0] = sHandler;
- css::uno::Sequence< css::beans::NamedValue > lQuery(1);
- lQuery[0].Name = PROPNAME_TYPES;
- lQuery[0].Value <<= lTypes;
+ css::uno::Sequence< css::beans::NamedValue > lQuery { { PROPNAME_TYPES, css::uno::makeAny(lTypes) } };
css::uno::Reference< css::container::XEnumeration > xSet = BaseContainer::createSubSetEnumerationByProperties(lQuery);
while(xSet->hasMoreElements())
diff --git a/filter/source/config/cache/filterfactory.cxx b/filter/source/config/cache/filterfactory.cxx
index 51f34f8..6c37d82 100644
--- a/filter/source/config/cache/filterfactory.cxx
+++ b/filter/source/config/cache/filterfactory.cxx
@@ -100,9 +100,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL FilterFactory::createInstan
OSL_FAIL("Who use this deprecated functionality?");
_FILTER_CONFIG_LOG_("FilterFactory::createInstanceWithArguments() ... simulate old type search functionality!\n");
- css::uno::Sequence< css::beans::NamedValue > lQuery(1);
- lQuery[0].Name = PROPNAME_TYPE;
- lQuery[0].Value <<= sFilter;
+ css::uno::Sequence< css::beans::NamedValue > lQuery { { PROPNAME_TYPE, css::uno::makeAny(sFilter) } };
css::uno::Reference< css::container::XEnumeration > xSet = createSubSetEnumerationByProperties(lQuery);
while(xSet->hasMoreElements())
diff --git a/filter/source/config/cache/frameloaderfactory.cxx b/filter/source/config/cache/frameloaderfactory.cxx
index f6e8489..8706172 100644
--- a/filter/source/config/cache/frameloaderfactory.cxx
+++ b/filter/source/config/cache/frameloaderfactory.cxx
@@ -83,9 +83,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL FrameLoaderFactory::createI
css::uno::Sequence< OUString > lTypes(1);
lTypes[0] = sLoader;
- css::uno::Sequence< css::beans::NamedValue > lQuery(1);
- lQuery[0].Name = PROPNAME_TYPES;
- lQuery[0].Value <<= lTypes;
+ css::uno::Sequence< css::beans::NamedValue > lQuery { { PROPNAME_TYPES, css::uno::makeAny(lTypes) } };
css::uno::Reference< css::container::XEnumeration > xSet = BaseContainer::createSubSetEnumerationByProperties(lQuery);
while(xSet->hasMoreElements())
diff --git a/framework/source/jobs/shelljob.cxx b/framework/source/jobs/shelljob.cxx
index 93a4f6a..9c955bb 100644
--- a/framework/source/jobs/shelljob.cxx
+++ b/framework/source/jobs/shelljob.cxx
@@ -117,10 +117,7 @@ css::uno::Any SAL_CALL ShellJob::execute(const css::uno::Sequence< css::beans::N
css::uno::Any ShellJob::impl_generateAnswer4Deactivation()
{
- css::uno::Sequence< css::beans::NamedValue > aAnswer(1);
- aAnswer[0].Name = JobConst::ANSWER_DEACTIVATE_JOB();
- aAnswer[0].Value = css::uno::makeAny(sal_True);
-
+ css::uno::Sequence< css::beans::NamedValue > aAnswer { { JobConst::ANSWER_DEACTIVATE_JOB(), css::uno::makeAny(sal_True) } };
return css::uno::makeAny(aAnswer);
}
diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx
index 4ffae06..967264b 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -870,17 +870,13 @@ bool LoadEnv::impl_handleContent()
css::uno::Sequence< OUString > lTypeReg(1);
lTypeReg[0] = sType;
- css::uno::Sequence< css::beans::NamedValue > lQuery(1);
- lQuery[0].Name = PROP_TYPES;
- lQuery[0].Value <<= lTypeReg;
-
- OUString sPROP_NAME(PROP_NAME);
+ css::uno::Sequence< css::beans::NamedValue > lQuery { { PROP_TYPES, css::uno::makeAny(lTypeReg) } };
css::uno::Reference< css::container::XEnumeration > xSet = xLoaderFactory->createSubSetEnumerationByProperties(lQuery);
while(xSet->hasMoreElements())
{
::comphelper::SequenceAsHashMap lProps (xSet->nextElement());
- OUString sHandler = lProps.getUnpackedValueOrDefault(sPROP_NAME, OUString());
+ OUString sHandler = lProps.getUnpackedValueOrDefault(OUString(PROP_NAME), OUString());
css::uno::Reference< css::frame::XNotifyingDispatch > xHandler;
try
@@ -1163,11 +1159,7 @@ css::uno::Reference< css::uno::XInterface > LoadEnv::impl_searchLoader()
css::uno::Sequence< OUString > lTypesReg(1);
lTypesReg[0] = sType;
- css::uno::Sequence< css::beans::NamedValue > lQuery(1);
- lQuery[0].Name = PROP_TYPES;
- lQuery[0].Value <<= lTypesReg;
-
- OUString sPROP_NAME(PROP_NAME);
+ css::uno::Sequence< css::beans::NamedValue > lQuery { { PROP_TYPES, css::uno::makeAny(lTypesReg) } };
css::uno::Reference< css::container::XEnumeration > xSet = xLoaderFactory->createSubSetEnumerationByProperties(lQuery);
while(xSet->hasMoreElements())
@@ -1177,7 +1169,7 @@ css::uno::Reference< css::uno::XInterface > LoadEnv::impl_searchLoader()
// try everyone ...
// Ignore any loader, which makes trouble :-)
::comphelper::SequenceAsHashMap lLoaderProps(xSet->nextElement());
- OUString sLoader = lLoaderProps.getUnpackedValueOrDefault(sPROP_NAME, OUString());
+ OUString sLoader = lLoaderProps.getUnpackedValueOrDefault(OUString(PROP_NAME), OUString());
css::uno::Reference< css::uno::XInterface > xLoader;
xLoader = xLoaderFactory->createInstance(sLoader);
diff --git a/framework/source/tabwin/tabwindow.cxx b/framework/source/tabwin/tabwindow.cxx
index ebf7d5a..bacd8f7 100644
--- a/framework/source/tabwin/tabwindow.cxx
+++ b/framework/source/tabwin/tabwindow.cxx
@@ -690,11 +690,11 @@ throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::ex
OUString aTitle = pTabControl->GetPageText( sal_uInt16( ID ));
nPos = pTabControl->GetPagePos( sal_uInt16( ID ));
- css::uno::Sequence< css::beans::NamedValue > aSeq( 2 );
- aSeq[0].Name = m_aTitlePropName;
- aSeq[0].Value = css::uno::makeAny( aTitle );
- aSeq[1].Name = m_aPosPropName;
- aSeq[1].Value = css::uno::makeAny( sal_Int32( nPos ));
+ css::uno::Sequence< css::beans::NamedValue > aSeq
+ {
+ { m_aTitlePropName, css::uno::makeAny( aTitle ) },
+ { m_aPosPropName, css::uno::makeAny( sal_Int32( nPos )) }
+ };
return aSeq;
}
}
diff --git a/framework/source/uielement/comboboxtoolbarcontroller.cxx b/framework/source/uielement/comboboxtoolbarcontroller.cxx
index a7ad8a3..5a8277f 100644
--- a/framework/source/uielement/comboboxtoolbarcontroller.cxx
+++ b/framework/source/uielement/comboboxtoolbarcontroller.cxx
@@ -284,9 +284,7 @@ void ComboboxToolbarController::executeControlCommand( const css::frame::Control
m_pComboBox->InsertEntry( aList[j] );
// send notification
- uno::Sequence< beans::NamedValue > aInfo( 1 );
- aInfo[0].Name = "List";
- aInfo[0].Value <<= aList;
+ uno::Sequence< beans::NamedValue > aInfo { { "List", css::uno::makeAny(aList) } };
addNotifyInfo( OUString( "ListChanged" ),
getDispatchFromCommand( m_aCommandURL ),
aInfo );
diff --git a/framework/source/uielement/complextoolbarcontroller.cxx b/framework/source/uielement/complextoolbarcontroller.cxx
index 6ff709d..62c7edb 100644
--- a/framework/source/uielement/complextoolbarcontroller.cxx
+++ b/framework/source/uielement/complextoolbarcontroller.cxx
@@ -320,9 +320,7 @@ void ComplexToolbarController::notifyFocusLost()
void ComplexToolbarController::notifyTextChanged( const OUString& aText )
{
// send text changed notification
- uno::Sequence< beans::NamedValue > aInfo( 1 );
- aInfo[0].Name = "Text";
- aInfo[0].Value <<= aText;
+ uno::Sequence< beans::NamedValue > aInfo { { "Text", css::uno::makeAny(aText) } };
addNotifyInfo( OUString( "TextChanged" ),
getDispatchFromCommand( m_aCommandURL ),
aInfo );
diff --git a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
index 4045384..82e0ad8 100644
--- a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
+++ b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
@@ -221,9 +221,7 @@ void DropdownToolbarController::executeControlCommand( const css::frame::Control
m_pListBoxControl->SelectEntryPos( 0 );
// send notification
- uno::Sequence< beans::NamedValue > aInfo( 1 );
- aInfo[0].Name = "List";
- aInfo[0].Value <<= aList;
+ uno::Sequence< beans::NamedValue > aInfo { { "List", css::uno::makeAny(aList) } };
addNotifyInfo( OUString( "ListChanged" ),
getDispatchFromCommand( m_aCommandURL ),
aInfo );
diff --git a/framework/source/uielement/imagebuttontoolbarcontroller.cxx b/framework/source/uielement/imagebuttontoolbarcontroller.cxx
index ac8840c..ddf97b0 100644
--- a/framework/source/uielement/imagebuttontoolbarcontroller.cxx
+++ b/framework/source/uielement/imagebuttontoolbarcontroller.cxx
@@ -112,9 +112,7 @@ void ImageButtonToolbarController::executeControlCommand( const css::frame::Cont
m_pToolbar->SetItemImage( m_nID, aImage );
// send notification
- uno::Sequence< beans::NamedValue > aInfo( 1 );
- aInfo[0].Name = "URL";
- aInfo[0].Value <<= aURL;
+ uno::Sequence< beans::NamedValue > aInfo { { "URL", css::uno::makeAny(aURL) } };
addNotifyInfo( OUString( "ImageChanged" ),
getDispatchFromCommand( m_aCommandURL ),
aInfo );
diff --git a/framework/source/uielement/togglebuttontoolbarcontroller.cxx b/framework/source/uielement/togglebuttontoolbarcontroller.cxx
index c4eef60..c590764 100644
--- a/framework/source/uielement/togglebuttontoolbarcontroller.cxx
+++ b/framework/source/uielement/togglebuttontoolbarcontroller.cxx
@@ -144,9 +144,7 @@ void ToggleButtonToolbarController::executeControlCommand( const css::frame::Con
m_aDropdownMenuList.push_back( aList[j] );
// send notification
- uno::Sequence< beans::NamedValue > aInfo( 1 );
- aInfo[0].Name = "List";
- aInfo[0].Value <<= aList;
+ uno::Sequence< beans::NamedValue > aInfo { { "List", css::uno::makeAny(aList) } };
addNotifyInfo( OUString( "ListChanged" ),
getDispatchFromCommand( m_aCommandURL ),
aInfo );
@@ -171,9 +169,7 @@ void ToggleButtonToolbarController::executeControlCommand( const css::frame::Con
m_aCurrentSelection = m_aDropdownMenuList[nPos];
// send notification
- uno::Sequence< beans::NamedValue > aInfo( 1 );
- aInfo[0].Name = "ItemChecked";
- aInfo[0].Value <<= nPos;
+ uno::Sequence< beans::NamedValue > aInfo { { "ItemChecked", css::uno::makeAny(nPos) } };
addNotifyInfo( OUString( "Pos" ),
getDispatchFromCommand( m_aCommandURL ),
aInfo );
diff --git a/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx b/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx
index 0700330..852a063 100644
--- a/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx
+++ b/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx
@@ -235,17 +235,15 @@ void SAL_CALL BaseDispatch::dispatch( const URL& aURL, const Sequence < Property
else if ( aURL.Path == "ComboboxCmd" )
{
// remove the text if it's in our list
- Sequence< NamedValue > aRemoveArgs( 1 );
- aRemoveArgs[0].Name = rtl::OUString( "Text" );
- aRemoveArgs[0].Value <<= maComboBoxText;
+ Sequence< NamedValue > aRemoveArgs { { "Text", css:uno::makeAny(maComboBoxText) } };
SendCommand( aURL, ::rtl::OUString( "RemoveEntryText" ), aRemoveArgs, sal_True );
// add the new text to the start of the list
- Sequence< NamedValue > aInsertArgs( 2 );
- aInsertArgs[0].Name = rtl::OUString( "Pos" );
- aInsertArgs[0].Value <<= sal_Int32( 0 );
- aInsertArgs[1].Name = rtl::OUString( "Text" );
- aInsertArgs[1].Value <<= maComboBoxText;
+ Sequence< NamedValue > aInsertArgs
+ {
+ { "Pos", css::uno::makeAny(sal_Int32( 0 )) },
+ { "Text", css::uno::makeAny(maComboBoxText)) },
+ };
SendCommand( aURL, ::rtl::OUString("InsertEntry"), aInsertArgs, sal_True );
}
else if ( aURL.Path == "InsertEntry" )
@@ -268,9 +266,7 @@ void SAL_CALL BaseDispatch::dispatch( const URL& aURL, const Sequence < Property
aCmdURL.Complete = aCmdURL.Path + aCmdURL.Protocol;
// set the selected item as text into the combobox
- Sequence< NamedValue > aArgs( 1 );
- aArgs[0].Name = "Text";
- aArgs[0].Value <<= aText;
+ Sequence< NamedValue > aArgs { { "Text", css::uno::makeAny(aText) } };
SendCommand( aCmdURL, ::rtl::OUString( "SetText" ), aArgs, sal_True );
}
else if ( aURL.Path == "DropdownButtonCmd" )
@@ -364,7 +360,6 @@ void SAL_CALL BaseDispatch::addStatusListener( const Reference< XStatusListener
// A toggle dropdown box is normally used for a group of commands
// where the user can select the last issued command easily.
// E.g. a typical command group would be "Insert shape"
- Sequence< NamedValue > aArgs( 1 );
// send command to set context menu content
Sequence< rtl::OUString > aContextMenu( 3 );
@@ -372,8 +367,7 @@ void SAL_CALL BaseDispatch::addStatusListener( const Reference< XStatusListener
aContextMenu[1] = "Command 2";
aContextMenu[2] = "Command 3";
- aArgs[0].Name = "List";
- aArgs[0].Value <<= aContextMenu;
+ Sequence< NamedValue > aArgs { { "List", css::uno::makeAny(aContextMenu) } };
SendCommandTo( xControl, aURL, rtl::OUString( "SetList" ), aArgs, sal_True );
// send command to check item on pos=0
@@ -386,15 +380,13 @@ void SAL_CALL BaseDispatch::addStatusListener( const Reference< XStatusListener
// A dropdown box is normally used for a group of dependent modes, where
// the user can only select one. The modes cannot be combined.
// E.g. a typical group would be left,right,center,block.
- Sequence< NamedValue > aArgs( 1 );
// send command to set context menu content
Sequence< rtl::OUString > aContextMenu( 2 );
aContextMenu[0] = "Button Enabled";
aContextMenu[1] = "Button Disabled";
- aArgs[0].Name = "List";
- aArgs[0].Value <<= aContextMenu;
+ Sequence< NamedValue > aArgs { { "List", css::uno::makeAny(aContextMenu) } };
SendCommandTo( xControl, aURL, rtl::OUString( "SetList" ), aArgs, sal_True );
// set position according to enable/disable state of button
@@ -408,27 +400,22 @@ void SAL_CALL BaseDispatch::addStatusListener( const Reference< XStatusListener
else if ( aURL.Path == "SpinfieldCmd" )
{
// A spin button
- Sequence< NamedValue > aArgs( 5 );
+ Sequence< NamedValue > aArgs
+ {
+ { "Value", css::uno::makeAny(double( 0.0 )) },
+ { "UpperLimit", css::uno::makeAny(double( 10.0 )) },
+ { "LowerLimit", css::uno::makeAny(double( 0.0 )) },
+ { "Step", css::uno::makeAny(double( 0.1 )) },
+ { "OutputFormat", css::uno::makeAny(OUString("%.2f cm")) }
+ };
// send command to initialize spin button
- aArgs[0].Name = "Value";
- aArgs[0].Value <<= double( 0.0 );
- aArgs[1].Name = "UpperLimit";
- aArgs[1].Value <<= double( 10.0 );
- aArgs[2].Name = "LowerLimit";
- aArgs[2].Value <<= double( 0.0 );
- aArgs[3].Name = "Step";
- aArgs[3].Value <<= double( 0.1 );
- aArgs[4].Name = "OutputFormat";
- aArgs[4].Value <<= rtl::OUString("%.2f cm");
-
SendCommandTo( xControl, aURL, rtl::OUString( "SetValues" ), aArgs, sal_True );
}
else if ( aURL.Path == "DropdownboxCmd" )
{
// A dropdown box is normally used for a group of commands
// where the user can select one of a defined set.
- Sequence< NamedValue > aArgs( 1 );
// send command to set context menu content
Sequence< rtl::OUString > aList( 10 );
@@ -443,8 +430,7 @@ void SAL_CALL BaseDispatch::addStatusListener( const Reference< XStatusListener
aList[8] = "Brown";
aList[9] = "Pink";
- aArgs[0].Name = "List";
- aArgs[0].Value <<= aList;
+ Sequence< NamedValue > aArgs { { "List", css::uno::makeAny(aList) } };
SendCommandTo( xControl, aURL, rtl::OUString( "SetList" ), aArgs, sal_True );
}
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index 6b13abc..d4a0552 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -657,13 +657,12 @@ void ScXMLExport::_ExportMeta()
GetAutoStylePool()->ClearEntries();
CollectSharedData(nTableCount, nShapesCount);
- uno::Sequence<beans::NamedValue> stats(3);
- stats[0] = beans::NamedValue(OUString("TableCount"),
- uno::makeAny((sal_Int32)nTableCount));
- stats[1] = beans::NamedValue(OUString("CellCount"),
- uno::makeAny(nCellCount));
- stats[2] = beans::NamedValue(OUString("ObjectCount"),
- uno::makeAny(nShapesCount));
+ uno::Sequence<beans::NamedValue> stats
+ {
+ { "TableCount", uno::makeAny((sal_Int32)nTableCount) },
+ { "CellCount", uno::makeAny(nCellCount) },
+ { "ObjectCount", uno::makeAny(nShapesCount) }
+ };
// update document statistics at the model
uno::Reference<document::XDocumentPropertiesSupplier> xPropSup(GetModel(),
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 0fb15fd..f1eadfd 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -724,15 +724,13 @@ void ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint )
if ( xFactory.is() )
{
uno::Reference< task::XJob > xJob( xFactory->createInstanceWithContext( xContext ), uno::UNO_QUERY_THROW );
- uno::Sequence< beans::NamedValue > aArgsForJob(1);
ScViewData* pViewData = GetViewData();
SfxViewShell* pViewShell = ( pViewData ? pViewData->GetViewShell() : NULL );
SfxViewFrame* pViewFrame = ( pViewShell ? pViewShell->GetViewFrame() : NULL );
SfxFrame* pFrame = ( pViewFrame ? &pViewFrame->GetFrame() : NULL );
uno::Reference< frame::XController > xController = ( pFrame ? pFrame->GetController() : 0 );
uno::Reference< sheet::XSpreadsheetView > xSpreadsheetView( xController, uno::UNO_QUERY_THROW );
- aArgsForJob[0] = beans::NamedValue( OUString( "SpreadsheetView" ),
- uno::makeAny( xSpreadsheetView ) );
+ uno::Sequence< beans::NamedValue > aArgsForJob { { "SpreadsheetView", uno::makeAny( xSpreadsheetView ) } };
xJob->execute( aArgsForJob );
}
}
diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx
index 87df6e0..d8092bb 100644
--- a/sd/source/core/CustomAnimationEffect.cxx
+++ b/sd/source/core/CustomAnimationEffect.cxx
@@ -3002,9 +3002,8 @@ MainSequence::MainSequence()
{
if( mxTimingRootNode.is() )
{
- Sequence< ::com::sun::star::beans::NamedValue > aUserData( 1 );
- aUserData[0].Name = "node-type";
- aUserData[0].Value <<= ::com::sun::star::presentation::EffectNodeType::MAIN_SEQUENCE;
+ Sequence< ::com::sun::star::beans::NamedValue > aUserData
+ { { "node-type", css::uno::makeAny(css::presentation::EffectNodeType::MAIN_SEQUENCE) } };
mxTimingRootNode->setUserData( aUserData );
}
init();
@@ -3090,9 +3089,8 @@ void MainSequence::createMainSequence()
{
mxSequenceRoot = SequenceTimeContainer::create( ::comphelper::getProcessComponentContext() );
- uno::Sequence< ::com::sun::star::beans::NamedValue > aUserData( 1 );
- aUserData[0].Name = "node-type";
- aUserData[0].Value <<= ::com::sun::star::presentation::EffectNodeType::MAIN_SEQUENCE;
+ uno::Sequence< ::com::sun::star::beans::NamedValue > aUserData
+ { { "node-type", css::uno::makeAny(css::presentation::EffectNodeType::MAIN_SEQUENCE) } };
mxSequenceRoot->setUserData( aUserData );
// empty sequence until now, set duration to 0.0
@@ -3149,9 +3147,8 @@ InteractiveSequencePtr MainSequence::createInteractiveSequence( const ::com::sun
// create a new interactive sequence container
Reference< XTimeContainer > xISRoot = SequenceTimeContainer::create( ::comphelper::getProcessComponentContext() );
- uno::Sequence< ::com::sun::star::beans::NamedValue > aUserData( 1 );
- aUserData[0].Name = "node-type";
- aUserData[0].Value <<= ::com::sun::star::presentation::EffectNodeType::INTERACTIVE_SEQUENCE ;
+ uno::Sequence< ::com::sun::star::beans::NamedValue > aUserData
+ { { "node-type", css::uno::makeAny(css::presentation::EffectNodeType::INTERACTIVE_SEQUENCE) } };
xISRoot->setUserData( aUserData );
Reference< XChild > xChild( mxSequenceRoot, UNO_QUERY_THROW );
diff --git a/sd/source/core/sdpage_animations.cxx b/sd/source/core/sdpage_animations.cxx
index 6b7aa96..55ff97f 100644
--- a/sd/source/core/sdpage_animations.cxx
+++ b/sd/source/core/sdpage_animations.cxx
@@ -54,9 +54,8 @@ Reference< XAnimationNode > SdPage::getAnimationNode() throw (RuntimeException)
if( !mxAnimationNode.is() )
{
mxAnimationNode.set( ParallelTimeContainer::create( ::comphelper::getProcessComponentContext() ), UNO_QUERY_THROW );
- Sequence< ::com::sun::star::beans::NamedValue > aUserData( 1 );
- aUserData[0].Name = "node-type";
- aUserData[0].Value <<= ::com::sun::star::presentation::EffectNodeType::TIMING_ROOT;
+ Sequence< ::com::sun::star::beans::NamedValue > aUserData
+ { { "node-type", css::uno::makeAny(css::presentation::EffectNodeType::TIMING_ROOT) } };
mxAnimationNode->setUserData( aUserData );
}
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index 35abbbc..8797c2e 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -2202,9 +2202,8 @@ void CustomAnimationPane::onPreview( bool bForcePreview )
void CustomAnimationPane::preview( const Reference< XAnimationNode >& xAnimationNode )
{
Reference< XParallelTimeContainer > xRoot = ParallelTimeContainer::create( ::comphelper::getProcessComponentContext() );
- Sequence< ::com::sun::star::beans::NamedValue > aUserData( 1 );
- aUserData[0].Name = "node-type";
- aUserData[0].Value <<= ::com::sun::star::presentation::EffectNodeType::TIMING_ROOT;
+ Sequence< ::com::sun::star::beans::NamedValue > aUserData
+ { { "node-type", css::uno::makeAny(css::presentation::EffectNodeType::TIMING_ROOT) } };
xRoot->setUserData( aUserData );
xRoot->appendChild( xAnimationNode );
diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx
index 7c5d308..fbac0dc 100644
--- a/sfx2/source/appl/childwin.cxx
+++ b/sfx2/source/appl/childwin.cxx
@@ -319,9 +319,8 @@ void SfxChildWindow::SaveStatus(const SfxChildWinInfo& rInfo)
SvtViewOptions aWinOpt(E_WINDOW, sName);
aWinOpt.SetWindowState(OStringToOUString(rInfo.aWinState, RTL_TEXTENCODING_UTF8));
- css::uno::Sequence < css::beans::NamedValue > aSeq(1);
- aSeq[0].Name = "Data";
- aSeq[0].Value <<= aWinData.makeStringAndClear();
+ css::uno::Sequence < css::beans::NamedValue > aSeq
+ { { "Data", css::uno::makeAny(aWinData.makeStringAndClear()) } };
aWinOpt.SetUserData( aSeq );
// ... but save status at runtime!
diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx
index 7ed2c6e..580de68 100644
--- a/sfx2/source/bastyp/fltfnc.cxx
+++ b/sfx2/source/bastyp/fltfnc.cxx
@@ -506,9 +506,7 @@ sal_uInt32 SfxFilterMatcher::GuessFilterControlDefaultUI( SfxMedium& rMedium, c
// If there is no acceptable type for this document at all, the type detection has possibly returned something else.
// The DocumentService property is only a preselection, and all preselections are considered as optional!
// This "wrong" type will be sorted out now because we match only allowed filters to the detected type
- uno::Sequence< beans::NamedValue > lQuery(1);
- lQuery[0].Name = "Name";
- lQuery[0].Value <<= sTypeName;
+ uno::Sequence< beans::NamedValue > lQuery { { "Name", css::uno::makeAny(sTypeName) } };
pFilter = GetFilterForProps(lQuery, nMust, nDont);
}
@@ -699,9 +697,7 @@ const SfxFilter* SfxFilterMatcher::GetFilter4Mime( const OUString& rMediaType, S
return 0;
}
- css::uno::Sequence < css::beans::NamedValue > aSeq(1);
- aSeq[0].Name = "MediaType";
- aSeq[0].Value <<= rMediaType;
+ css::uno::Sequence < css::beans::NamedValue > aSeq { { "MediaType", css::uno::makeAny(rMediaType) } };
return GetFilterForProps( aSeq, nMust, nDont );
}
@@ -728,9 +724,7 @@ const SfxFilter* SfxFilterMatcher::GetFilter4EA( const OUString& rType, SfxFilte
return 0;
}
- css::uno::Sequence < css::beans::NamedValue > aSeq(1);
- aSeq[0].Name = "Name";
- aSeq[0].Value <<= OUString( rType );
+ css::uno::Sequence < css::beans::NamedValue > aSeq { { "Name", css::uno::makeAny(rType) } };
return GetFilterForProps( aSeq, nMust, nDont );
}
@@ -767,11 +761,8 @@ const SfxFilter* SfxFilterMatcher::GetFilter4Extension( const OUString& rExt, Sf
if ( sExt.startsWith(".") )
sExt = sExt.copy(1);
- css::uno::Sequence < css::beans::NamedValue > aSeq(1);
- aSeq[0].Name = "Extensions";
- uno::Sequence < OUString > aExts(1);
- aExts[0] = sExt;
- aSeq[0].Value <<= aExts;
+ css::uno::Sequence < css::beans::NamedValue > aSeq
+ { { "Extensions", css::uno::makeAny(uno::Sequence < OUString > { sExt } ) } };
return GetFilterForProps( aSeq, nMust, nDont );
}
@@ -780,10 +771,8 @@ const SfxFilter* SfxFilterMatcher::GetFilter4ClipBoardId( SotClipboardFormatId n
if (nId == SotClipboardFormatId::NONE)
return 0;
- css::uno::Sequence < css::beans::NamedValue > aSeq(1);
- OUString aName = SotExchange::GetFormatName( nId );
- aSeq[0].Name = "ClipboardFormat";
- aSeq[0].Value <<= aName;
+ css::uno::Sequence < css::beans::NamedValue > aSeq
+ { { "ClipboardFormat", css::uno::makeAny(SotExchange::GetFormatName( nId )) } };
return GetFilterForProps( aSeq, nMust, nDont );
}
diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx
index c85cbab..f872753 100644
--- a/sfx2/source/doc/guisaveas.cxx
+++ b/sfx2/source/doc/guisaveas.cxx
@@ -534,9 +534,7 @@ uno::Sequence< beans::PropertyValue > ModelData_Impl::GetDocServiceDefaultFilter
uno::Sequence< beans::PropertyValue > ModelData_Impl::GetDocServiceAnyFilter( SfxFilterFlags nMust, SfxFilterFlags nDont )
{
- uno::Sequence< beans::NamedValue > aSearchRequest( 1 );
- aSearchRequest[0].Name = "DocumentService";
- aSearchRequest[0].Value <<= GetDocServiceName();
+ uno::Sequence< beans::NamedValue > aSearchRequest { { "DocumentService", css::uno::makeAny(GetDocServiceName()) } };
return ::comphelper::MimeConfigurationHelper::SearchForFilter( m_pOwner->GetFilterQuery(), aSearchRequest, nMust, nDont );
}
@@ -555,11 +553,11 @@ uno::Sequence< beans::PropertyValue > ModelData_Impl::GetPreselectedFilter_Impl(
if ( ( nStoreMode != SAVEASREMOTE_REQUESTED ) && ( nStoreMode & PDFEXPORT_REQUESTED ) )
{
// Preselect PDF-Filter for EXPORT
- uno::Sequence< beans::NamedValue > aSearchRequest( 2 );
- aSearchRequest[0].Name = "Type";
- aSearchRequest[0].Value <<= OUString("pdf_Portable_Document_Format");
- aSearchRequest[1].Name = "DocumentService";
- aSearchRequest[1].Value <<= GetDocServiceName();
+ uno::Sequence< beans::NamedValue > aSearchRequest
+ {
+ { "Type", css::uno::makeAny(OUString("pdf_Portable_Document_Format")) },
+ { "DocumentService", css::uno::makeAny(GetDocServiceName()) }
+ };
aFilterProps = ::comphelper::MimeConfigurationHelper::SearchForFilter( m_pOwner->GetFilterQuery(), aSearchRequest, nMust, nDont );
}
@@ -802,9 +800,7 @@ sal_Int8 ModelData_Impl::CheckFilter( const OUString& aFilterName )
bool ModelData_Impl::CheckFilterOptionsDialogExistence()
{
- uno::Sequence< beans::NamedValue > aSearchRequest( 1 );
- aSearchRequest[0].Name = "DocumentService";
- aSearchRequest[0].Value <<= GetDocServiceName();
+ uno::Sequence< beans::NamedValue > aSearchRequest { { "DocumentService", css::uno::makeAny(GetDocServiceName()) } };
uno::Reference< container::XEnumeration > xFilterEnum =
m_pOwner->GetFilterQuery()->createSubSetEnumerationByProperties( aSearchRequest );
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 778f51b..8b2916c 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -381,14 +381,13 @@ void SfxObjectShell::SetupStorage( const uno::Reference< embed::XStorage >& xSto
bUseBlowfishInODF12 = aSaveOpt.IsUseBlowfishInODF12();
}
- uno::Sequence< beans::NamedValue > aEncryptionAlgs( 3 );
- aEncryptionAlgs[0].Name = "StartKeyGenerationAlgorithm";
- aEncryptionAlgs[1].Name = "EncryptionAlgorithm";
- aEncryptionAlgs[2].Name = "ChecksumAlgorithm";
// the default values, that should be used for ODF1.1 and older formats
- aEncryptionAlgs[0].Value <<= xml::crypto::DigestID::SHA1;
- aEncryptionAlgs[1].Value <<= xml::crypto::CipherID::BLOWFISH_CFB_8;
- aEncryptionAlgs[2].Value <<= xml::crypto::DigestID::SHA1_1K;
+ uno::Sequence< beans::NamedValue > aEncryptionAlgs
+ {
+ { "StartKeyGenerationAlgorithm", css::uno::makeAny(xml::crypto::DigestID::SHA1) },
+ { "EncryptionAlgorithm", css::uno::makeAny(xml::crypto::CipherID::BLOWFISH_CFB_8) },
+ { "ChecksumAlgorithm", css::uno::makeAny(xml::crypto::DigestID::SHA1_1K) }
+ };
if ( nDefVersion >= SvtSaveOptions::ODFVER_012 )
{
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 731e3a8..e87cc5c 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -432,19 +432,17 @@ void SfxTemplateManagerDlg::readSettings ()
void SfxTemplateManagerDlg::writeSettings ()
{
- Sequence< NamedValue > aSettings(2);
-
OUString aLastFolder;
if (mpCurView == mpLocalView && mpLocalView->getCurRegionId())
aLastFolder = mpLocalView->getRegionName(mpLocalView->getCurRegionId()-1);
// last folder
- aSettings[0].Name = TM_SETTING_LASTFOLDER;
- aSettings[0].Value <<= aLastFolder;
-
- aSettings[1].Name = TM_SETTING_FILTER;
- aSettings[1].Value <<= sal_uInt16(getCurrentFilter());
+ Sequence< NamedValue > aSettings
+ {
+ { TM_SETTING_LASTFOLDER, css::uno::makeAny(aLastFolder) },
+ { TM_SETTING_FILTER, css::uno::makeAny(sal_uInt16(getCurrentFilter())) }
+ };
// write
SvtViewOptions aViewSettings(E_DIALOG, TM_SETTING_MANAGER);
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index cfd9e90..d2061e3 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -342,11 +342,10 @@ static OUString impl_retrieveFilterNameFromTypeAndModule(
const sal_Int32 nFlags )
{
// Retrieve filter from type
- css::uno::Sequence< css::beans::NamedValue > aQuery( 2 );
- aQuery[0].Name = "Type";
- aQuery[0].Value = css::uno::makeAny( rType );
- aQuery[1].Name = "DocumentService";
- aQuery[1].Value = css::uno::makeAny( rModuleIdentifier );
+ css::uno::Sequence< css::beans::NamedValue > aQuery {
+ { "Type", css::uno::makeAny( rType ) },
+ { "DocumentService", css::uno::makeAny( rModuleIdentifier ) }
+ };
css::uno::Reference< css::container::XEnumeration > xEnumeration =
rContainerQuery->createSubSetEnumerationByProperties( aQuery );
diff --git a/svx/source/form/formcontrolling.cxx b/svx/source/form/formcontrolling.cxx
index 6fcf0a7..d04b2c5 100644
--- a/svx/source/form/formcontrolling.cxx
+++ b/svx/source/form/formcontrolling.cxx
@@ -309,10 +309,7 @@ namespace svx
void FormControllerHelper::execute( sal_Int32 _nSlotId, const OUString& _rParamName, const Any& _rParamValue ) const
{
- Sequence< NamedValue > aArguments(1);
- aArguments[0].Name = _rParamName;
- aArguments[0].Value = _rParamValue;
-
+ Sequence< NamedValue > aArguments { { _rParamName, _rParamValue } };
impl_operateForm_nothrow( EXECUTE_ARGS, FeatureSlotTranslation::getFormFeatureForSlotId( _nSlotId ), aArguments );
}
diff --git a/svx/source/sidebar/line/LineWidthPopup.cxx b/svx/source/sidebar/line/LineWidthPopup.cxx
index dcef64e..2dfb136 100644
--- a/svx/source/sidebar/line/LineWidthPopup.cxx
+++ b/svx/source/sidebar/line/LineWidthPopup.cxx
@@ -59,9 +59,8 @@ void LineWidthPopup::PopupModeEndCallback()
if (pControl->IsCloseByEdit())
{
SvtViewOptions aWinOpt( E_WINDOW, SIDEBAR_LINE_WIDTH_GLOBAL_VALUE );
- ::com::sun::star::uno::Sequence < ::com::sun::star::beans::NamedValue > aSeq(1);
- aSeq[0].Name = "LineWidth";
- aSeq[0].Value <<= ::rtl::OUString::number(pControl->GetTmpCustomWidth());
+ css::uno::Sequence < css::beans::NamedValue > aSeq
+ { { "LineWidth", css::uno::makeAny(OUString::number(pControl->GetTmpCustomWidth())) } };
aWinOpt.SetUserData( aSeq );
}
}
diff --git a/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx b/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx
index b8840b0..c32de30 100644
--- a/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx
+++ b/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx
@@ -57,9 +57,8 @@ void TextCharacterSpacingPopup::PopupModeEndCallback()
if( pControl->GetLastCustomState() == SPACING_CLOSE_BY_CUS_EDIT)
{
SvtViewOptions aWinOpt( E_WINDOW, SIDEBAR_SPACING_GLOBAL_VALUE );
- ::com::sun::star::uno::Sequence < ::com::sun::star::beans::NamedValue > aSeq(1);
- aSeq[0].Name = "Spacing";
- aSeq[0].Value <<= ::rtl::OUString::number(pControl->GetLastCustomValue());
+ css::uno::Sequence < css::beans::NamedValue > aSeq
+ { { "Spacing", css::uno::makeAny(OUString::number(pControl->GetLastCustomValue())) } };
aWinOpt.SetUserData( aSeq );
}
diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx
index e733efa..ac93082 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -2672,17 +2672,11 @@ uno::Sequence< beans::NamedValue > SAL_CALL VCLXMultiPage::getTabProps( sal_Int3
if ( pTabControl->GetTabPage( sal::static_int_cast< sal_uInt16 >( ID ) ) == NULL )
throw lang::IndexOutOfBoundsException();
-#define ADD_PROP( seq, i, name, val ) { \
- beans::NamedValue value; \
- value.Name = name; \
- value.Value = uno::makeAny( val ); \
- seq[i] = value; \
- }
-
- uno::Sequence< beans::NamedValue > props( 2 );
- ADD_PROP( props, 0, "Title", OUString( pTabControl->GetPageText( sal::static_int_cast< sal_uInt16 >( ID ) ) ) );
- ADD_PROP( props, 1, "Position", pTabControl->GetPagePos( sal::static_int_cast< sal_uInt16 >( ID ) ) );
-#undef ADD_PROP
+ uno::Sequence< beans::NamedValue > props
+ {
+ { "Title", css::uno::makeAny(pTabControl->GetPageText( sal::static_int_cast< sal_uInt16 >( ID ) )) },
+ { "Position", css::uno::makeAny(pTabControl->GetPagePos( sal::static_int_cast< sal_uInt16 >( ID ) )) }
+ };
return props;
}
void VCLXMultiPage::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index b778bfa..51d536f 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -1741,9 +1741,7 @@ void SdXMLExport::SetProgress(sal_Int32 nProg)
void SdXMLExport::_ExportMeta()
{
- uno::Sequence<beans::NamedValue> stats(1);
- stats[0] = beans::NamedValue(OUString( "ObjectCount" ),
- uno::makeAny(mnObjectCount));
+ uno::Sequence<beans::NamedValue> stats { { "ObjectCount", uno::makeAny(mnObjectCount) } };
// update document statistics at the model
uno::Reference<document::XDocumentPropertiesSupplier> xPropSup(GetModel(),
More information about the Libreoffice-commits
mailing list