sc/qa/unit/subsequent_export-test.cxx | 2 +-
sd/qa/unit/export-tests.cxx | 2 +-
sw/qa/extras/globalfilter/globalfilter.cxx | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit b6a41916f351fd2d6c8934a9f35ec72159ee5009
Author: Zolnai Tamás <tamas.zol...@collabora.com>
Date: Fri Nov 7 17:01:08 2014 +0100
Use SAL_N_ELEMENTS
Change-Id: I3d26823a93fd0925ef5e71affd941cd51219ab9e
diff --git a/sc/qa/unit/subsequent_export-test.cxx
b/sc/qa/unit/subsequent_export-test.cxx
index 2d74ed5..87a5f21 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -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 < 4; ++nFilter )
+ for( size_t nFilter = 0; nFilter < SAL_N_ELEMENTS(aFilterNames); ++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 244c4e8..dfa2edc 100644
--- a/sd/qa/unit/export-tests.cxx
+++ b/sd/qa/unit/export-tests.cxx
@@ -509,7 +509,7 @@ void SdExportTest::testSwappedOutImageExport()
officecfg::Office::Common::Cache::GraphicManager::TotalCacheSize::set(sal_Int32(1),
xBatch);
xBatch->commit();
- for( size_t nExportFormat = 0; nExportFormat < 3; ++nExportFormat )
+ for( size_t nExportFormat = 0; nExportFormat < SAL_N_ELEMENTS(vFormats);
++nExportFormat )
{
// Load the original file with one image
::sd::DrawDocShellRef xDocShRef =
loadURL(getURLFromSrc("/sd/qa/unit/data/odp/document_with_two_images.odp"),
ODP);
diff --git a/sw/qa/extras/globalfilter/globalfilter.cxx
b/sw/qa/extras/globalfilter/globalfilter.cxx
index af5b2fa..9f7d603 100644
--- a/sw/qa/extras/globalfilter/globalfilter.cxx
+++ b/sw/qa/extras/globalfilter/globalfilter.cxx
@@ -40,7 +40,7 @@ void Test::testSwappedOutImageExport()
"Office Open XML Text",
};
- for( size_t nFilter = 0; nFilter < 4; ++nFilter )
+ for( size_t nFilter = 0; nFilter < SAL_N_ELEMENTS(aFilterNames); ++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
