sc/qa/unit/subsequent_export-test.cxx | 4 ++--
sd/qa/unit/export-tests.cxx | 8 ++++----
sw/qa/extras/globalfilter/globalfilter.cxx | 4 ++--
3 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit aeebbec4e8fb77a24b231362844d5a3f0f05e3c2
Author: Zolnai Tamás <tamas.zol...@collabora.com>
Date: Fri Nov 7 15:16:59 2014 +0100
Build fix: back to C++98
Change-Id: I5aa74c17f3274a130f76a25fc7bbb184b3f5c69b
diff --git a/sc/qa/unit/subsequent_export-test.cxx
b/sc/qa/unit/subsequent_export-test.cxx
index 7c1de6b..2d74ed5 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -2265,7 +2265,7 @@ void ScExportTest::testFunctionsExcel2010ODS()
void ScExportTest::testSwappedOutImageExport()
{
- std::vector<OUString> aFilterNames = {
+ const OUString aFilterNames[] = {
"calc8",
"MS Excel 97",
"Calc Office Open XML",
@@ -2277,7 +2277,7 @@ void ScExportTest::testSwappedOutImageExport()
officecfg::Office::Common::Cache::GraphicManager::TotalCacheSize::set(sal_Int32(1),
xBatch);
xBatch->commit();
- for( size_t nFilter = 0; nFilter < aFilterNames.size(); ++nFilter )
+ for( size_t nFilter = 0; nFilter < 4; ++nFilter )
{
// Check whether the export code swaps in the image which was swapped
out before.
ScDocShellRef xDocSh = loadDoc("document_with_two_images.", ODS);
diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx
index e907e47..c1caa46 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();
diff --git a/sw/qa/extras/globalfilter/globalfilter.cxx
b/sw/qa/extras/globalfilter/globalfilter.cxx
index 6a28692..af5b2fa 100644
--- a/sw/qa/extras/globalfilter/globalfilter.cxx
+++ b/sw/qa/extras/globalfilter/globalfilter.cxx
@@ -33,14 +33,14 @@ public:
void Test::testSwappedOutImageExport()
{
- std::vector<OUString> aFilterNames = {
+ const OUString aFilterNames[] = {
"writer8",
"Rich Text Format",
"MS Word 97",
"Office Open XML Text",
};
- for( size_t nFilter = 0; nFilter < aFilterNames.size(); ++nFilter )
+ for( size_t nFilter = 0; nFilter < 4; ++nFilter )
{
// Check whether the export code swaps in the image which was swapped
out before by auto mechanism
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
