diff options
| author | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-11-07 15:16:59 +0100 |
|---|---|---|
| committer | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-11-07 15:18:15 +0100 |
| commit | aeebbec4e8fb77a24b231362844d5a3f0f05e3c2 (patch) | |
| tree | 1963c09900cadd45e50e593fb78840bfb8638aba /sd | |
| parent | c7ae999bb7cfc03652ab7368f54c6e751f22b53f (diff) | |
Build fix: back to C++98
Change-Id: I5aa74c17f3274a130f76a25fc7bbb184b3f5c69b
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/qa/unit/export-tests.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx index e907e4702a73..c1caa46cd7c2 100644 --- a/sd/qa/unit/export-tests.cxx +++ b/sd/qa/unit/export-tests.cxx @@ -498,7 +498,7 @@ void SdExportTest::testFdo79731() void SdExportTest::testSwappedOutImageExport() { // Problem was with the swapped out images, which were not swapped in during export. - static const std::vector<sal_Int32> vFormats = { + const sal_Int32 vFormats[] = { ODP, PPT, PPTX, @@ -509,17 +509,17 @@ void SdExportTest::testSwappedOutImageExport() officecfg::Office::Common::Cache::GraphicManager::TotalCacheSize::set(sal_Int32(1), xBatch); xBatch->commit(); - for( size_t nExportFormat = 0; nExportFormat < vFormats.size(); ++nExportFormat ) + for( size_t nExportFormat = 0; nExportFormat < 3; ++nExportFormat ) { // Load the original file with one image ::sd::DrawDocShellRef xDocShRef = loadURL(getURLFromSrc("/sd/qa/unit/data/odp/document_with_two_images.odp"), ODP); - const OString sFailedMessage = OString("Failed on filter: ") + OString(aFileFormats[nExportFormat].pFilterName); + const OString sFailedMessage = OString("Failed on filter: ") + OString(aFileFormats[nExportFormat]].pFilterName); // Export the document and import again for a check uno::Reference< lang::XComponent > xComponent(xDocShRef->GetModel(), uno::UNO_QUERY); uno::Reference<frame::XStorable> xStorable(xComponent, uno::UNO_QUERY); utl::MediaDescriptor aMediaDescriptor; - aMediaDescriptor["FilterName"] <<= OStringToOUString(OString(aFileFormats[nExportFormat].pFilterName), RTL_TEXTENCODING_UTF8); + aMediaDescriptor["FilterName"] <<= OStringToOUString(OString(aFileFormats[vFormats[nExportFormat]].pFilterName), RTL_TEXTENCODING_UTF8); utl::TempFile aTempFile; aTempFile.EnableKillingFile(); |