| blob | 5bde7bc576290c2a352717b1c517d968eaea78fa |
1 diff --git sc/inc/table.hxx sc/inc/table.hxx
2 index 62207fb..192ca18 100644
3 --- sc/inc/table.hxx
4 +++ sc/inc/table.hxx
5 @@ -826,6 +826,8 @@ private:
6 // also invalidates script type, broadcasts for "calc as shown"
7 void InvalidateTextWidth( const ScAddress* pAdrFrom, const ScAddress* pAdrTo,
8 BOOL bNumFormatChanged, BOOL bBroadcast );
9 +
10 + void SkipFilteredRows(SCROW& rRow, SCROW& rLastNonFilteredRow, bool bForward);
11 };
14 diff --git sc/source/core/data/table6.cxx sc/source/core/data/table6.cxx
15 index 272e049..be44ff1 100644
16 --- sc/source/core/data/table6.cxx
17 +++ sc/source/core/data/table6.cxx
18 @@ -251,6 +251,42 @@ BOOL ScTable::SearchCell(const SvxSearchItem& rSearchItem, SCCOL nCol, SCROW nRo
19 return bFound;
20 }
22 +void ScTable::SkipFilteredRows(SCROW& rRow, SCROW& rLastNonFilteredRow, bool bForward)
23 +{
24 + if (bForward)
25 + {
26 + // forward search
27 +
28 + if (rRow <= rLastNonFilteredRow)
29 + return;
30 +
31 + SCROW nLastRow = rRow;
32 + if (RowFiltered(rRow, NULL, &nLastRow))
33 + // move to the first non-filtered row.
34 + rRow = nLastRow + 1;
35 + else
36 + // record the last non-filtered row to avoid checking
37 + // the filtered state for each and every row.
38 + rLastNonFilteredRow = nLastRow;
39 + }
40 + else
41 + {
42 + // backward search
43 +
44 + if (rRow >= rLastNonFilteredRow)
45 + return;
46 +
47 + SCROW nFirstRow = rRow;
48 + if (RowFiltered(rRow, &nFirstRow, NULL))
49 + // move to the first non-filtered row.
50 + rRow = nFirstRow - 1;
51 + else
52 + // record the last non-filtered row to avoid checking
53 + // the filtered state for each and every row.
54 + rLastNonFilteredRow = nFirstRow;
55 + }
56 +}
57 +
58 BOOL ScTable::Search(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow,
59 const ScMarkData& rMark, String& rUndoStr, ScDocument* pUndoDoc)
60 {
61 @@ -264,6 +300,7 @@ BOOL ScTable::Search(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow,
62 GetLastDataPos(nLastCol, nLastRow);
63 if (!bAll && rSearchItem.GetBackward())
64 {
65 + SCROW nLastNonFilteredRow = MAXROW + 1;
66 nCol = Min(nCol, (SCCOL)(nLastCol + 1));
67 nRow = Min(nRow, (SCROW)(nLastRow + 1));
68 if (rSearchItem.GetRowDirection())
69 @@ -271,6 +308,8 @@ BOOL ScTable::Search(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow,
70 nCol--;
71 while (!bFound && ((SCsROW)nRow >= 0))
72 {
73 + SkipFilteredRows(nRow, nLastNonFilteredRow, false);
74 +
75 while (!bFound && ((SCsCOL)nCol >= 0))
76 {
77 bFound = SearchCell(rSearchItem, nCol, nRow, rMark, rUndoStr, pUndoDoc);
78 @@ -302,6 +341,8 @@ BOOL ScTable::Search(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow,
79 {
80 while (!bFound && ((SCsROW)nRow >= 0))
81 {
82 + SkipFilteredRows(nRow, nLastNonFilteredRow, false);
83 +
84 bFound = SearchCell(rSearchItem, nCol, nRow, rMark, rUndoStr, pUndoDoc);
85 if (!bFound)
86 {
87 @@ -311,8 +352,10 @@ BOOL ScTable::Search(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow,
88 }
89 if (!bFound)
90 {
91 + // Not found in this column. Move to the next column.
92 BOOL bIsEmpty;
93 nRow = nLastRow;
94 + nLastNonFilteredRow = MAXROW + 1;
95 do
96 {
97 nCol--;
98 @@ -328,11 +371,14 @@ BOOL ScTable::Search(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow,
99 }
100 else
101 {
102 + SCROW nLastNonFilteredRow = -1;
103 if (!bAll && rSearchItem.GetRowDirection())
104 {
105 nCol++;
106 while (!bFound && (nRow <= nLastRow))
107 {
108 + SkipFilteredRows(nRow, nLastNonFilteredRow, true);
109 +
110 while (!bFound && (nCol <= nLastCol))
111 {
112 bFound = SearchCell(rSearchItem, nCol, nRow, rMark, rUndoStr, pUndoDoc);
113 @@ -356,6 +402,8 @@ BOOL ScTable::Search(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow,
114 {
115 while (!bFound && (nRow <= nLastRow))
116 {
117 + SkipFilteredRows(nRow, nLastNonFilteredRow, true);
118 +
119 bFound = SearchCell(rSearchItem, nCol, nRow, rMark, rUndoStr, pUndoDoc);
120 if (!bFound)
121 {
122 @@ -365,7 +413,9 @@ BOOL ScTable::Search(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow,
123 }
124 if (!bFound)
125 {
126 + // Not found in this column. Move to the next column.
127 nRow = 0;
128 + nLastNonFilteredRow = -1;
129 nCol++;
130 while ((nCol <= nLastCol) && aCol[nCol].IsEmptyData()) nCol++;
131 }
132 @@ -770,6 +820,30 @@ bool ScTable::SearchAndReplaceEmptyCells(
133 return false;
134 }
136 +namespace {
137 +
138 +bool lcl_maybeReplaceCellString(
139 + ScColumn& rColObj, SCCOL& rCol, SCROW& rRow, String& rUndoStr, SCCOL nCol, SCROW nRow, const SvxSearchItem& rSearchItem)
140 +{
141 + ScBaseCell* pCell = rColObj.GetCell(nRow);
142 + if (!pCell || pCell->GetCellType() == CELLTYPE_NOTE)
143 + {
144 + // empty cell found.
145 + rCol = nCol;
146 + rRow = nRow;
147 + if (rSearchItem.GetCommand() == SVX_SEARCHCMD_REPLACE &&
148 + rSearchItem.GetReplaceString().Len())
149 + {
150 + rColObj.Insert(nRow, new ScStringCell(rSearchItem.GetReplaceString()));
151 + rUndoStr = String();
152 + }
153 + return true;
154 + }
155 + return false;
156 +}
157 +
158 +}
159 +
160 bool ScTable::SearchRangeForEmptyCell(
161 const ScRange& rRange, const SvxSearchItem& rSearchItem,
162 SCCOL& rCol, SCROW& rRow, String& rUndoStr, ScDocument* /*pUndoDoc*/)
163 @@ -781,9 +855,14 @@ bool ScTable::SearchRangeForEmptyCell(
164 if (rSearchItem.GetRowDirection())
165 {
166 // row direction.
167 + SCROW nLastNonFilteredRow = MAXROW + 1;
168 SCROW nBeginRow = rRange.aEnd.Row() > rRow ? rRow : rRange.aEnd.Row();
169 for (SCROW nRow = nBeginRow; nRow >= rRange.aStart.Row(); --nRow)
170 {
171 + SkipFilteredRows(nRow, nLastNonFilteredRow, false);
172 + if (nRow < rRange.aStart.Row())
173 + break;
174 +
175 SCCOL nBeginCol = rRange.aEnd.Col();
176 if (nRow == rRow && nBeginCol >= rCol)
177 // always start from one cell before the cursor.
178 @@ -791,20 +870,8 @@ bool ScTable::SearchRangeForEmptyCell(
180 for (SCCOL nCol = nBeginCol; nCol >= rRange.aStart.Col(); --nCol)
181 {
182 - ScBaseCell* pCell = aCol[nCol].GetCell(nRow);
183 - if (!pCell)
184 - {
185 - // empty cell found.
186 - rCol = nCol;
187 - rRow = nRow;
188 - if (rSearchItem.GetCommand() == SVX_SEARCHCMD_REPLACE &&
189 - rSearchItem.GetReplaceString().Len())
190 - {
191 - aCol[nCol].Insert(nRow, new ScStringCell(rSearchItem.GetReplaceString()));
192 - rUndoStr = String();
193 - }
194 + if (lcl_maybeReplaceCellString(aCol[nCol], rCol, rRow, rUndoStr, nCol, nRow, rSearchItem))
195 return true;
196 - }
197 }
198 }
199 }
200 @@ -814,26 +881,19 @@ bool ScTable::SearchRangeForEmptyCell(
201 SCCOL nBeginCol = rRange.aEnd.Col() > rCol ? rCol : rRange.aEnd.Col();
202 for (SCCOL nCol = nBeginCol; nCol >= rRange.aStart.Col(); --nCol)
203 {
204 + SCROW nLastNonFilteredRow = MAXROW + 1;
205 SCROW nBeginRow = rRange.aEnd.Row();
206 if (nCol == rCol && nBeginRow >= rRow)
207 // always start from one cell before the cursor.
208 nBeginRow = rRow - (nCmd == SVX_SEARCHCMD_FIND ? 1 : 0);
209 for (SCROW nRow = nBeginRow; nRow >= rRange.aStart.Row(); --nRow)
210 {
211 - ScBaseCell* pCell = aCol[nCol].GetCell(nRow);
212 - if (!pCell)
213 - {
214 - // empty cell found.
215 - rCol = nCol;
216 - rRow = nRow;
217 - if (rSearchItem.GetCommand() == SVX_SEARCHCMD_REPLACE &&
218 - rSearchItem.GetReplaceString().Len())
219 - {
220 - aCol[nCol].Insert(nRow, new ScStringCell(rSearchItem.GetReplaceString()));
221 - rUndoStr = String();
222 - }
223 + SkipFilteredRows(nRow, nLastNonFilteredRow, false);
224 + if (nRow < rRange.aStart.Row())
225 + break;
226 +
227 + if (lcl_maybeReplaceCellString(aCol[nCol], rCol, rRow, rUndoStr, nCol, nRow, rSearchItem))
228 return true;
229 - }
230 }
231 }
232 }
233 @@ -844,29 +904,22 @@ bool ScTable::SearchRangeForEmptyCell(
234 if (rSearchItem.GetRowDirection())
235 {
236 // row direction.
237 + SCROW nLastNonFilteredRow = -1;
238 SCROW nBeginRow = rRange.aStart.Row() < rRow ? rRow : rRange.aStart.Row();
239 for (SCROW nRow = nBeginRow; nRow <= rRange.aEnd.Row(); ++nRow)
240 {
241 + SkipFilteredRows(nRow, nLastNonFilteredRow, true);
242 + if (nRow > rRange.aEnd.Row())
243 + break;
244 +
245 SCCOL nBeginCol = rRange.aStart.Col();
246 if (nRow == rRow && nBeginCol <= rCol)
247 // always start from one cell past the cursor.
248 nBeginCol = rCol + (nCmd == SVX_SEARCHCMD_FIND ? 1 : 0);
249 for (SCCOL nCol = nBeginCol; nCol <= rRange.aEnd.Col(); ++nCol)
250 {
251 - ScBaseCell* pCell = aCol[nCol].GetCell(nRow);
252 - if (!pCell)
253 - {
254 - // empty cell found.
255 - rCol = nCol;
256 - rRow = nRow;
257 - if (rSearchItem.GetCommand() == SVX_SEARCHCMD_REPLACE &&
258 - rSearchItem.GetReplaceString().Len())
259 - {
260 - aCol[nCol].Insert(nRow, new ScStringCell(rSearchItem.GetReplaceString()));
261 - rUndoStr = String();
262 - }
263 + if (lcl_maybeReplaceCellString(aCol[nCol], rCol, rRow, rUndoStr, nCol, nRow, rSearchItem))
264 return true;
265 - }
266 }
267 }
268 }
269 @@ -876,26 +929,19 @@ bool ScTable::SearchRangeForEmptyCell(
270 SCCOL nBeginCol = rRange.aStart.Col() < rCol ? rCol : rRange.aStart.Col();
271 for (SCCOL nCol = nBeginCol; nCol <= rRange.aEnd.Col(); ++nCol)
272 {
273 + SCROW nLastNonFilteredRow = -1;
274 SCROW nBeginRow = rRange.aStart.Row();
275 if (nCol == rCol && nBeginRow <= rRow)
276 // always start from one cell past the cursor.
277 nBeginRow = rRow + (nCmd == SVX_SEARCHCMD_FIND ? 1 : 0);
278 for (SCROW nRow = nBeginRow; nRow <= rRange.aEnd.Row(); ++nRow)
279 {
280 - ScBaseCell* pCell = aCol[nCol].GetCell(nRow);
281 - if (!pCell)
282 - {
283 - // empty cell found.
284 - rCol = nCol;
285 - rRow = nRow;
286 - if (rSearchItem.GetCommand() == SVX_SEARCHCMD_REPLACE &&
287 - rSearchItem.GetReplaceString().Len())
288 - {
289 - aCol[nCol].Insert(nRow, new ScStringCell(rSearchItem.GetReplaceString()));
290 - rUndoStr = String();
291 - }
292 + SkipFilteredRows(nRow, nLastNonFilteredRow, true);
293 + if (nRow > rRange.aEnd.Row())
294 + break;
295 +
296 + if (lcl_maybeReplaceCellString(aCol[nCol], rCol, rRow, rUndoStr, nCol, nRow, rSearchItem))
297 return true;
298 - }
299 }
300 }
301 }
302 @@ -913,32 +959,44 @@ bool ScTable::SearchRangeForAllEmptyCells(
304 for (SCCOL nCol = rRange.aStart.Col(); nCol <= rRange.aEnd.Col(); ++nCol)
305 {
306 + SCROW nLastNonFilteredRow = -1;
307 if (aCol[nCol].IsEmptyData())
308 {
309 - // The entire column is empty. Add the whole column and move on.
310 - rMark.SetMultiMarkArea(
311 - ScRange(nCol, rRange.aStart.Row(), nTab, nCol, rRange.aEnd.Row(), nTab));
312 - bFound = true;
313 -
314 - if (bReplace)
315 + // The entire column is empty.
316 + for (SCROW nRow = rRange.aStart.Row(); nRow <= rRange.aEnd.Row(); ++nRow)
317 {
318 - const String& rNewStr = rSearchItem.GetReplaceString();
319 - for (SCROW nRow = rRange.aStart.Row(); nRow <= rRange.aEnd.Row(); ++nRow)
320 + SCROW nLastRow;
321 + if (!RowFiltered(nRow, NULL, &nLastRow))
322 {
323 - aCol[nCol].Insert(nRow, new ScStringCell(rNewStr));
324 - if (pUndoDoc)
325 - // TODO: I'm using a string cell with empty content to
326 - // trigger deletion of cell instance on undo. Maybe I
327 - // should create a new cell type for this?
328 - pUndoDoc->PutCell(nCol, nRow, nTab, new ScStringCell(String()));
329 + rMark.SetMultiMarkArea(ScRange(nCol, nRow, nTab, nCol, nLastRow, nTab));
330 + if (bReplace)
331 + {
332 + const String& rNewStr = rSearchItem.GetReplaceString();
333 + for (SCROW i = nRow; i <= nLastRow; ++i)
334 + {
335 + aCol[nCol].Insert(i, new ScStringCell(rNewStr));
336 + if (pUndoDoc)
337 + // TODO: I'm using a string cell with empty content to
338 + // trigger deletion of cell instance on undo. Maybe I
339 + // should create a new cell type for this?
340 + pUndoDoc->PutCell(nCol, i, nTab, new ScStringCell(String()));
341 + }
342 + rUndoStr = String();
343 + }
344 }
345 - rUndoStr = String();
346 +
347 + nRow = nLastRow; // move to the last filtered row.
348 }
349 + bFound = true;
350 continue;
351 }
353 for (SCROW nRow = rRange.aStart.Row(); nRow <= rRange.aEnd.Row(); ++nRow)
354 {
355 + SkipFilteredRows(nRow, nLastNonFilteredRow, true);
356 + if (nRow > rRange.aEnd.Row())
357 + break;
358 +
359 ScBaseCell* pCell = aCol[nCol].GetCell(nRow);
360 if (!pCell)
361 {
362 @@ -956,6 +1014,21 @@ bool ScTable::SearchRangeForAllEmptyCells(
363 pUndoDoc->PutCell(nCol, nRow, nTab, new ScStringCell(String()));
364 }
365 }
366 + else if (pCell->GetCellType() == CELLTYPE_NOTE)
367 + {
368 + rMark.SetMultiMarkArea(ScRange(nCol, nRow, nTab));
369 + bFound = true;
370 +
371 + if (bReplace)
372 + {
373 + if (pUndoDoc)
374 + {
375 + ScAddress aCellPos(nCol, nRow, nTab);
376 + pUndoDoc->PutCell(nCol, nRow, nTab, pCell->CloneWithNote(aCellPos, *pUndoDoc, aCellPos));
377 + }
378 + aCol[nCol].SetString(nRow, nTab, rSearchItem.GetReplaceString());
379 + }
380 + }
381 }
382 }
383 return bFound;