1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
|
diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx b/sd/qa/unit/tiledrendering/tiledrendering.cxx
index 18b213e99abf..3a26f9493a7f 100644
--- a/sd/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx
@@ -2794,8 +2794,8 @@ CPPUNIT_TEST_FIXTURE(SdTiledRenderingTest, testSlideshowLayeredRendering)
sal_Int32 nViewWidth = 2000;
sal_Int32 nViewHeight = 2000;
CPPUNIT_ASSERT(pXImpressDocument->createSlideRenderer(0, nViewWidth, nViewHeight, true, true));
- CPPUNIT_ASSERT_EQUAL(2000, nViewWidth);
- CPPUNIT_ASSERT_EQUAL(1125, nViewHeight);
+ CPPUNIT_ASSERT_EQUAL(2000, static_cast<int>(nViewWidth));
+ CPPUNIT_ASSERT_EQUAL(1125, static_cast<int>(nViewHeight));
const Color aTransparentColor(ColorAlpha, 0x00000000);
@@ -2873,8 +2873,8 @@ CPPUNIT_TEST_FIXTURE(SdTiledRenderingTest, testSlideshowLayeredRendering_WithFie
sal_Int32 nViewWidth = 2000;
sal_Int32 nViewHeight = 2000;
CPPUNIT_ASSERT(pXImpressDocument->createSlideRenderer(0, nViewWidth, nViewHeight, true, true));
- CPPUNIT_ASSERT_EQUAL(2000, nViewWidth);
- CPPUNIT_ASSERT_EQUAL(1125, nViewHeight);
+ CPPUNIT_ASSERT_EQUAL(2000, static_cast<int>(nViewWidth));
+ CPPUNIT_ASSERT_EQUAL(1125, static_cast<int>(nViewHeight));
const Color aTransparentColor(ColorAlpha, 0x00000000);
@@ -2970,8 +2970,8 @@ CPPUNIT_TEST_FIXTURE(SdTiledRenderingTest, testSlideshowLayeredRendering_Animati
sal_Int32 nViewWidth = 2000;
sal_Int32 nViewHeight = 2000;
CPPUNIT_ASSERT(pXImpressDocument->createSlideRenderer(0, nViewWidth, nViewHeight, true, true));
- CPPUNIT_ASSERT_EQUAL(2000, nViewWidth);
- CPPUNIT_ASSERT_EQUAL(1125, nViewHeight);
+ CPPUNIT_ASSERT_EQUAL(2000, static_cast<int>(nViewWidth));
+ CPPUNIT_ASSERT_EQUAL(1125, static_cast<int>(nViewHeight));
{
std::vector<sal_uInt8> pBuffer(nViewWidth * nViewHeight * 4);
@@ -2982,8 +2982,8 @@ CPPUNIT_TEST_FIXTURE(SdTiledRenderingTest, testSlideshowLayeredRendering_Animati
CPPUNIT_ASSERT(rJsonMsg.indexOf(u"\"group\": \"Background\"") >= 0);
CPPUNIT_ASSERT(rJsonMsg.indexOf(u"\"index\": 0") >= 0);
- CPPUNIT_ASSERT_EQUAL(-1, rJsonMsg.indexOf(u"\"hash\""));
- CPPUNIT_ASSERT_EQUAL(-1, rJsonMsg.indexOf(u"\"initVisible\""));
+ CPPUNIT_ASSERT_EQUAL(-1, static_cast<int>(rJsonMsg.indexOf(u"\"hash\"")));
+ CPPUNIT_ASSERT_EQUAL(-1, static_cast<int>(rJsonMsg.indexOf(u"\"initVisible\"")));
CPPUNIT_ASSERT(rJsonMsg.indexOf(u"\"type\": \"bitmap\"") >= 0);
CPPUNIT_ASSERT(rJsonMsg.indexOf(u"\"content\": { \"type\": \"%IMAGETYPE%\", \"checksum\": \"%IMAGECHECKSUM%\"}") >= 0);
@@ -2999,8 +2999,8 @@ CPPUNIT_TEST_FIXTURE(SdTiledRenderingTest, testSlideshowLayeredRendering_Animati
CPPUNIT_ASSERT(rJsonMsg.indexOf(u"\"group\": \"MasterPage\"") >= 0);
CPPUNIT_ASSERT(rJsonMsg.indexOf(u"\"index\": 0") >= 0);
- CPPUNIT_ASSERT_EQUAL(-1, rJsonMsg.indexOf(u"\"hash\""));
- CPPUNIT_ASSERT_EQUAL(-1, rJsonMsg.indexOf(u"\"initVisible\""));
+ CPPUNIT_ASSERT_EQUAL(-1, static_cast<int>(rJsonMsg.indexOf(u"\"hash\"")));
+ CPPUNIT_ASSERT_EQUAL(-1, static_cast<int>(rJsonMsg.indexOf(u"\"initVisible\"")));
CPPUNIT_ASSERT(rJsonMsg.indexOf(u"\"type\": \"bitmap\"") >= 0);
CPPUNIT_ASSERT(rJsonMsg.indexOf(u"\"content\": { \"type\": \"%IMAGETYPE%\", \"checksum\": \"%IMAGECHECKSUM%\"}") >= 0);
@@ -3016,8 +3016,8 @@ CPPUNIT_TEST_FIXTURE(SdTiledRenderingTest, testSlideshowLayeredRendering_Animati
CPPUNIT_ASSERT(rJsonMsg.indexOf(u"\"group\": \"MasterPage\"") >= 0);
CPPUNIT_ASSERT(rJsonMsg.indexOf(u"\"index\": 1") >= 0);
- CPPUNIT_ASSERT_EQUAL(-1, rJsonMsg.indexOf(u"\"hash\""));
- CPPUNIT_ASSERT_EQUAL(-1, rJsonMsg.indexOf(u"\"initVisible\""));
+ CPPUNIT_ASSERT_EQUAL(-1, static_cast<int>(rJsonMsg.indexOf(u"\"hash\"")));
+ CPPUNIT_ASSERT_EQUAL(-1, static_cast<int>(rJsonMsg.indexOf(u"\"initVisible\"")));
CPPUNIT_ASSERT(rJsonMsg.indexOf(u"\"type\": \"bitmap\"") >= 0);
CPPUNIT_ASSERT(rJsonMsg.indexOf(u"\"content\": { \"type\": \"%IMAGETYPE%\", \"checksum\": \"%IMAGECHECKSUM%\"}") >= 0);
@@ -3079,8 +3079,8 @@ CPPUNIT_TEST_FIXTURE(SdTiledRenderingTest, testSlideshowLayeredRendering_Animati
sal_Int32 nViewWidth = 2000;
sal_Int32 nViewHeight = 2000;
CPPUNIT_ASSERT(pXImpressDocument->createSlideRenderer(0, nViewWidth, nViewHeight, true, true));
- CPPUNIT_ASSERT_EQUAL(2000, nViewWidth);
- CPPUNIT_ASSERT_EQUAL(1125, nViewHeight);
+ CPPUNIT_ASSERT_EQUAL(2000, static_cast<int>(nViewWidth));
+ CPPUNIT_ASSERT_EQUAL(1125, static_cast<int>(nViewHeight));
{
std::vector<sal_uInt8> pBuffer(nViewWidth * nViewHeight * 4);
@@ -3091,9 +3091,9 @@ CPPUNIT_TEST_FIXTURE(SdTiledRenderingTest, testSlideshowLayeredRendering_Animati
CPPUNIT_ASSERT(rJsonMsg.indexOf(u"\"group\": \"Background\"") >= 0);
CPPUNIT_ASSERT(rJsonMsg.indexOf(u"\"index\": 0") >= 0);
- CPPUNIT_ASSERT_EQUAL(-1, rJsonMsg.indexOf(u"\"hash\""));
- CPPUNIT_ASSERT_EQUAL(-1, rJsonMsg.indexOf(u"\"initVisible\""));
- CPPUNIT_ASSERT_EQUAL(-1, rJsonMsg.indexOf(u"\"bounds\""));
+ CPPUNIT_ASSERT_EQUAL(-1, static_cast<int>(rJsonMsg.indexOf(u"\"hash\"")));
+ CPPUNIT_ASSERT_EQUAL(-1, static_cast<int>(rJsonMsg.indexOf(u"\"initVisible\"")));
+ CPPUNIT_ASSERT_EQUAL(-1, static_cast<int>(rJsonMsg.indexOf(u"\"bounds\"")));
CPPUNIT_ASSERT(rJsonMsg.indexOf(u"\"type\": \"bitmap\"") >= 0);
CPPUNIT_ASSERT(rJsonMsg.indexOf(u"\"content\": { \"type\": \"%IMAGETYPE%\", \"checksum\": \"%IMAGECHECKSUM%\"}") >= 0);
@@ -3109,7 +3109,7 @@ CPPUNIT_TEST_FIXTURE(SdTiledRenderingTest, testSlideshowLayeredRendering_Animati
CPPUNIT_ASSERT(rJsonMsg.indexOf(u"\"group\": \"MasterPage\"") >= 0);
CPPUNIT_ASSERT(rJsonMsg.indexOf(u"\"index\": 0") >= 0);
- CPPUNIT_ASSERT_EQUAL(-1, rJsonMsg.indexOf(u"\"bounds\""));
+ CPPUNIT_ASSERT_EQUAL(-1, static_cast<int>(rJsonMsg.indexOf(u"\"bounds\"")));
CPPUNIT_ASSERT(rJsonMsg.indexOf(u"\"type\": \"bitmap\"") >= 0);
debugWriteImageToFile(1, pBuffer, nViewWidth, nViewHeight, rJsonMsg.toUtf8().getStr());
@@ -3124,7 +3124,7 @@ CPPUNIT_TEST_FIXTURE(SdTiledRenderingTest, testSlideshowLayeredRendering_Animati
CPPUNIT_ASSERT(rJsonMsg.indexOf(u"\"group\": \"MasterPage\"") >= 0);
CPPUNIT_ASSERT(rJsonMsg.indexOf(u"\"index\": 1") >= 0);
- CPPUNIT_ASSERT_EQUAL(-1, rJsonMsg.indexOf(u"\"bounds\""));
+ CPPUNIT_ASSERT_EQUAL(-1, static_cast<int>(rJsonMsg.indexOf(u"\"bounds\"")));
CPPUNIT_ASSERT(rJsonMsg.indexOf(u"\"type\": \"bitmap\"") >= 0);
debugWriteImageToFile(2, pBuffer, nViewWidth, nViewHeight, rJsonMsg.toUtf8().getStr());
@@ -3139,8 +3139,8 @@ CPPUNIT_TEST_FIXTURE(SdTiledRenderingTest, testSlideshowLayeredRendering_Animati
CPPUNIT_ASSERT(rJsonMsg.indexOf(u"\"group\": \"DrawPage\"") >= 0);
CPPUNIT_ASSERT(rJsonMsg.indexOf(u"\"index\": 0") >= 0);
- CPPUNIT_ASSERT_EQUAL(-1, rJsonMsg.indexOf(u"\"initVisible\""));
- CPPUNIT_ASSERT_EQUAL(-1, rJsonMsg.indexOf(u"\"bounds\""));
+ CPPUNIT_ASSERT_EQUAL(-1, static_cast<int>(rJsonMsg.indexOf(u"\"initVisible\"")));
+ CPPUNIT_ASSERT_EQUAL(-1, static_cast<int>(rJsonMsg.indexOf(u"\"bounds\"")));
CPPUNIT_ASSERT(rJsonMsg.indexOf(u"\"type\": \"bitmap\"") >= 0);
debugWriteImageToFile(3, pBuffer, nViewWidth, nViewHeight, rJsonMsg.toUtf8().getStr());
@@ -3188,8 +3188,8 @@ CPPUNIT_TEST_FIXTURE(SdTiledRenderingTest, testSlideshowLayeredRendering_Animati
CPPUNIT_ASSERT(rJsonMsg.indexOf(u"\"group\": \"DrawPage\"") >= 0);
CPPUNIT_ASSERT(rJsonMsg.indexOf(u"\"index\": 3") >= 0);
- CPPUNIT_ASSERT_EQUAL(-1, rJsonMsg.indexOf(u"\"initVisible\""));
- CPPUNIT_ASSERT_EQUAL(-1, rJsonMsg.indexOf(u"\"bounds\""));
+ CPPUNIT_ASSERT_EQUAL(-1, static_cast<int>(rJsonMsg.indexOf(u"\"initVisible\"")));
+ CPPUNIT_ASSERT_EQUAL(-1, static_cast<int>(rJsonMsg.indexOf(u"\"bounds\"")));
CPPUNIT_ASSERT(rJsonMsg.indexOf(u"\"type\": \"bitmap\"") >= 0);
debugWriteImageToFile(6, pBuffer, nViewWidth, nViewHeight, rJsonMsg.toUtf8().getStr());
|
