| blob | 7ebbc8a849ed7206377b8eb7c52b722cabc02cc2 |
1 diff -u -r source/pristine.filter/html/htmlpars.cxx source/filter/html/htmlpars.cxx
2 --- sc/source/filter/html/htmlpars.cxx
3 +++ sc/source/filter/html/htmlpars.cxx
4 @@ -72,6 +72,100 @@
6 using namespace ::com::sun::star;
8 +/*
9 + * Table to track which cells are used, and hence locked,
10 + * replacing old, horribly slow ScRangeList with N^2 behavior.
11 + */
12 +class ScHTMLLockTable {
13 +protected:
14 + struct ScAddressHashFunc : public std::unary_function< const ScAddress &, size_t >
15 + {
16 + size_t operator() (const ScAddress &addr) const
17 + {
18 + return static_cast< UINT16 >( addr.Row() ) ^ (static_cast< UINT8 >( addr.Col() ) << 16);
19 + }
20 + };
21 + std::hash_map<ScAddress, bool, ScAddressHashFunc> maIndividualCells;
22 + ScRangeList maRangeList;
23 +public:
24 + ScHTMLLockTable()
25 + { }
26 + ~ScHTMLLockTable()
27 + { }
28 +
29 + bool IsEmpty( const ScAddress &rAddr ) const
30 + {
31 + if( maIndividualCells.find( rAddr ) != maIndividualCells.end() )
32 + return false;
33 + return maRangeList.Find( rAddr ) == NULL;
34 + }
35 +
36 + void AddRange( const ScRange &rRange )
37 + {
38 + if( rRange.aStart == rRange.aEnd )
39 + {
40 +#if 0
41 + fprintf( stderr, "Single cell\n");
42 +#endif
43 + maIndividualCells.insert( std::pair<ScAddress, bool>( rRange.aStart, true ) );
44 + }
45 + else
46 + {
47 +#if 0
48 + fprintf (stderr, "Multi-cell: %d, %d -> %d, %d\n",
49 + (int) rRange.aStart.Col(), (int) rRange.aStart.Row(),
50 + (int) rRange.aEnd.Col(), (int) rRange.aEnd.Row()); */
51 +#endif
52 + maRangeList.Append( rRange );
53 + }
54 + }
55 + ScHTMLSize GetSpan( const ScAddress &rAddr ) const
56 + {
57 + if( maIndividualCells.find( rAddr ) != maIndividualCells.end() )
58 + return ScHTMLSize (1, 1);
59 +
60 + ScRange *pRange = maRangeList.Find( rAddr );
61 + if( pRange == NULL )
62 + return ScHTMLSize (1, 1);
63 +
64 + return ScHTMLSize( pRange->aEnd.Col() - pRange->aStart.Col() + 1,
65 + pRange->aEnd.Row() - pRange->aStart.Row() + 1 );
66 + }
67 + sal_uInt32 Count() const
68 + {
69 + return maRangeList.Count();
70 + }
71 + void AppendRange( ScAddress aPos, const ScHTMLSize &rSpanSize,
72 + ScRange &rInsertedRange)
73 + {
74 + while( !IsEmpty( aPos ) )
75 + aPos.IncCol();
76 +
77 + rInsertedRange = ScRange( aPos );
78 + rInsertedRange.aEnd.Move( rSpanSize.mnCols - 1, rSpanSize.mnRows - 1, 0 );
79 +
80 + // Scan horizontally to find ranges that vertically overlap with us
81 + // and shrink them to move them up - this applies only to ranges,
82 + // individual cells will be to the left and/or above us and can't
83 + // be handled here...
84 + if( maRangeList.Intersects( rInsertedRange ) )
85 + {
86 + // This is a highly uncommon case:
87 + // we care only about ranges above us, thus use a lame algorithm:
88 + // check each cell in the first row, and shrink upwards.
89 + for( ScAddress aAddr( aPos ); aAddr.Col() < rInsertedRange.aEnd.Col(); aAddr.IncCol() )
90 + {
91 + ScRange *pRange;
92 + if( ( pRange = maRangeList.Find( aAddr ) ) != NULL )
93 + pRange->aEnd.SetRow( aPos.Row() - 1 );
94 + }
95 +
96 + }
97 +
98 + AddRange (rInsertedRange);
99 + }
100 +};
101 +
103 SV_IMPL_VARARR_SORT( ScHTMLColOffset, ULONG );
105 @@ -1971,6 +2061,7 @@
106 mpParentTable( &rParentTable ),
107 maTableId( rParentTable.maTableId.mrnUnusedId ),
108 maTableItemSet( rParentTable.GetCurrItemSet() ),
109 + mpLockTable( new ScHTMLLockTable() ),
110 mrEditEngine( rParentTable.mrEditEngine ),
111 mrEEParseList( rParentTable.mrEEParseList ),
112 mpCurrEntryList( 0 ),
113 @@ -2010,6 +2101,7 @@
114 mpParentTable( 0 ),
115 maTableId( rnUnusedId ),
116 maTableItemSet( rPool ),
117 + mpLockTable( new ScHTMLLockTable() ),
118 mrEditEngine( rEditEngine ),
119 mrEEParseList( rEEParseList ),
120 mpCurrEntryList( 0 ),
121 @@ -2028,6 +2120,7 @@
123 ScHTMLTable::~ScHTMLTable()
124 {
125 + delete mpLockTable;
126 }
128 const SfxItemSet& ScHTMLTable::GetCurrItemSet() const
129 @@ -2038,10 +2131,7 @@
131 ScHTMLSize ScHTMLTable::GetSpan( const ScHTMLPos& rCellPos ) const
132 {
133 - ScHTMLSize aSpan( 1, 1 );
134 - if( ScRange* pRange = maLockList.Find( rCellPos.MakeAddr() ) )
135 - aSpan.Set( pRange->aEnd.Col() - pRange->aStart.Col() + 1, pRange->aEnd.Row() - pRange->aStart.Row() + 1 );
136 - return aSpan;
137 + return mpLockTable->GetSpan( rCellPos.MakeAddr() );
138 }
140 ScHTMLTable* ScHTMLTable::FindNestedTable( ScHTMLTableId nTableId ) const
141 @@ -2435,24 +2525,12 @@
143 void ScHTMLTable::InsertNewCell( const ScHTMLSize& rSpanSize )
144 {
145 - ScRange* pRange;
146 + ScRange aNewRange;
147 + mpLockTable->AppendRange( maCurrCell.MakeAddr(), rSpanSize, aNewRange );
149 - // find an unused cell
150 - while( (pRange = maLockList.Find( maCurrCell.MakeAddr() )) != 0 )
151 - maCurrCell.mnCol = pRange->aEnd.Col() + 1;
152 + maCurrCell.mnCol = aNewRange.aStart.Col();
153 mpCurrEntryList = &maEntryMap[ maCurrCell ];
155 - // try to find collisions, shrink existing ranges
156 - SCCOL nColEnd = maCurrCell.mnCol + rSpanSize.mnCols;
157 - for( ScAddress aAddr( maCurrCell.MakeAddr() ); aAddr.Col() < nColEnd; aAddr.IncCol() )
158 - if( (pRange = maLockList.Find( aAddr )) != 0 )
159 - pRange->aEnd.SetRow( maCurrCell.mnRow - 1 );
160 -
161 - // insert the new range into the lock list
162 - ScRange aNewRange( maCurrCell.MakeAddr() );
163 - aNewRange.aEnd.Move( rSpanSize.mnCols - 1, rSpanSize.mnRows - 1, 0 );
164 - maLockList.Append( aNewRange );
165 -
166 // adjust table size
167 maSize.mnCols = ::std::max< SCCOL >( maSize.mnCols, aNewRange.aEnd.Col() + 1 );
168 maSize.mnRows = ::std::max< SCROW >( maSize.mnRows, aNewRange.aEnd.Row() + 1 );
169 @@ -2474,6 +2552,35 @@
170 ImplDataOff();
171 if( mbRowOn )
172 {
173 +#if 0
174 + if (maCurrCell.mnRow > 0) {
175 + // Try and back-merge the lock-list to avoid N^2 lookups
176 + SCCOL nColIdx = Min (0, maCurrCell.mnCol - 1);
177 + ScAddress aLastAddr = maCurrCell.MakeAddr();
178 + ScAddress aThisAddr = maCurrCell.MakeAddr();
179 + aLastAddr.IncRow( -1 );
180 + aLastAddr.SetCol( nColIdx );
181 + aThisAddr.SetCol( nColIdx );
182 + ScRange *pLastRange = maLockList.Find (aLastAddr);
183 + ScRange *pThisRange = maLockList.Find (aThisAddr);
184 + if (!pLastRange)
185 + fprintf (stderr, "Last : null\n");
186 + else
187 + fprintf (stderr, "Last: %d, %d -> %d, %d\n",
188 + pLastRange->aStart.Col(), pLastRange->aStart.Row(),
189 + pLastRange->aEnd.Col(), pLastRange->aEnd.Row());
190 + if (!pThisRange)
191 + fprintf (stderr, "This : null\n");
192 + else
193 + fprintf (stderr, "This: %d, %d -> %d, %d\n",
194 + pThisRange->aStart.Col(), pThisRange->aStart.Row(),
195 + pThisRange->aEnd.Col(), pThisRange->aEnd.Row());
196 + fprintf (stderr, "Lock list: %d long\n", maLockList.Count());
197 + }
198 + if (mpLockTable->Count() > 0)
199 + fprintf (stderr, "Lock list: %d long\n", (int)mpLockTable->Count());
200 +#endif
201 +
202 mpRowItemSet.reset();
203 ++maCurrCell.mnRow;
204 mbRowOn = mbDataOn = false;
205 @@ -2594,15 +2699,15 @@
206 {
207 for( aAddr.SetCol( 0 ); aAddr.Col() < maSize.mnCols; aAddr.IncCol() )
208 {
209 - if( !maLockList.Find( aAddr ) )
210 + if( mpLockTable->IsEmpty( aAddr ) )
211 {
212 // create a range for the lock list (used to calc. cell span)
213 ScRange aRange( aAddr );
214 do
215 aRange.aEnd.IncCol();
216 - while( (aRange.aEnd.Col() < maSize.mnCols) && !maLockList.Find( aRange.aEnd ) );
217 + while( (aRange.aEnd.Col() < maSize.mnCols) && mpLockTable->IsEmpty( aRange.aEnd ) );
218 aRange.aEnd.IncCol( -1 );
219 - maLockList.Append( aRange );
220 + mpLockTable->AddRange( aRange );
222 // insert a dummy entry
223 ScHTMLEntryPtr pEntry = CreateEntry();
226 diff -u -r source/pristine.filter/inc/htmlpars.hxx source/filter/inc/htmlpars.hxx
227 --- sc/source/filter/inc/htmlpars.hxx
228 +++ sc/source/filter/inc/htmlpars.hxx
229 @@ -334,6 +334,8 @@
231 // ----------------------------------------------------------------------------
233 +class ScHTMLLockTable;
234 +
235 class ScHTMLTableMap;
237 /** Stores data for one table in an HTML document.
238 @@ -543,7 +545,7 @@
239 SfxItemSet maTableItemSet; /// Items for the entire table.
240 SfxItemSetPtr mpRowItemSet; /// Items for the current table row.
241 SfxItemSetPtr mpDataItemSet; /// Items for the current cell.
242 - ScRangeList maLockList; /// Locked cells (needed for merged cells).
243 + ScHTMLLockTable *mpLockTable; /// Locked cells (needed for merged cells).
244 EditEngine& mrEditEngine; /// Edit engine (from ScEEParser).
245 ScEEParseList& mrEEParseList; /// List that owns the parse entries (from ScEEParser).
246 ScHTMLEntryMap maEntryMap; /// List of entries for each cell.