diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-06-09 13:43:00 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-06-09 14:24:00 +0200 |
commit | 027b25ecd54ac97ea2471ca73e3ba89ce052fe76 (patch) | |
tree | fe8923a13998a96a865027c897273d0edb4d7c62 /vcl | |
parent | f59e802478e35e7b6f561f24806bca47b604529b (diff) |
use comphelper::InitPropertySequence in more places
Change-Id: I72d7b13a23ce306b752b39187a0e9fbb7028643a
Reviewed-on: https://gerrit.libreoffice.org/38606
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/qa/cppunit/pdfexport/pdfexport.cxx | 7 | ||||
-rw-r--r-- | vcl/unx/gtk/salprn-gtk.cxx | 18 |
2 files changed, 11 insertions, 14 deletions
diff --git a/vcl/qa/cppunit/pdfexport/pdfexport.cxx b/vcl/qa/cppunit/pdfexport/pdfexport.cxx index 2b3db2584ea5..fe3e60fe65f9 100644 --- a/vcl/qa/cppunit/pdfexport/pdfexport.cxx +++ b/vcl/qa/cppunit/pdfexport/pdfexport.cxx @@ -152,10 +152,9 @@ void PdfExportTest::testTdf106059() utl::MediaDescriptor aMediaDescriptor; aMediaDescriptor["FilterName"] <<= OUString("writer_pdf_Export"); // Explicitly enable the usage of the reference XObject markup. - uno::Sequence<beans::PropertyValue> aFilterData = - { - comphelper::makePropertyValue("UseReferenceXObject", true) - }; + uno::Sequence<beans::PropertyValue> aFilterData( comphelper::InitPropertySequence({ + {"UseReferenceXObject", uno::Any(true) } + })); aMediaDescriptor["FilterData"] <<= aFilterData; xStorable->storeToURL(aTempFile.GetURL(), aMediaDescriptor.getAsConstPropertyValueList()); diff --git a/vcl/unx/gtk/salprn-gtk.cxx b/vcl/unx/gtk/salprn-gtk.cxx index 5dd511b4046b..310af20af8d3 100644 --- a/vcl/unx/gtk/salprn-gtk.cxx +++ b/vcl/unx/gtk/salprn-gtk.cxx @@ -912,11 +912,10 @@ void GtkPrintDialog::ExportAsPDF(const OUString &rFileURL, GtkPrintSettings *pSe uno::Reference< XExporter > xExport(xFilter, UNO_QUERY); xExport->setSourceDocument(xDoc); - uno::Sequence<beans::PropertyValue> aFilterData(2); - aFilterData[0].Name = "PageLayout"; - aFilterData[0].Value <<= sal_Int32(0); - aFilterData[1].Name = "FirstPageOnLeft"; - aFilterData[1].Value <<= sal_False; + uno::Sequence<beans::PropertyValue> aFilterData( comphelper::InitPropertySequence({ + { "PageLayout", Any(sal_Int32(0)) }, + { "FirstPageOnLeft", Any(false) } + })); const gchar *pStr = gtk_print_settings_get(pSettings, GTK_PRINT_SETTINGS_PRINT_PAGES); if (pStr && !strcmp(pStr, "ranges")) @@ -1006,11 +1005,10 @@ void GtkPrintDialog::ExportAsPDF(const OUString &rFileURL, GtkPrintSettings *pSe aFilterData[aFilterData.getLength()-1].Value <<= aSelection; } } - uno::Sequence<beans::PropertyValue> aArgs(2); - aArgs[0].Name = "FilterData"; - aArgs[0].Value <<= aFilterData; - aArgs[1].Name = "OutputStream"; - aArgs[1].Value <<= xOStm; + uno::Sequence<beans::PropertyValue> aArgs( comphelper::InitPropertySequence({ + { "FilterData", Any(aFilterData) }, + { "OutputStream", Any(xOStm) } + })); xFilter->filter(aArgs); } } |