| blob | d14ca6b9fbb1a7ef417b578f1a6ea18261393fe0 |
1 diff --git sc/inc/document.hxx sc/inc/document.hxx
2 index bae5aea..5b3fb82 100644
3 --- sc/inc/document.hxx
4 +++ sc/inc/document.hxx
5 @@ -880,8 +880,10 @@ public:
6 SCCOL nEndCol, SCTAB nEndTab,
7 SCROW nStartRow, SCSIZE nSize,
8 ScDocument* pRefUndoDoc = NULL, BOOL* pUndoOutline = NULL );
9 - void DeleteRow( const ScRange& rRange,
10 + //for dataform
11 + SC_DLLPUBLIC void DeleteRow( const ScRange& rRange,
12 ScDocument* pRefUndoDoc = NULL, BOOL* pUndoOutline = NULL );
13 +
14 BOOL InsertCol( SCROW nStartRow, SCTAB nStartTab,
15 SCROW nEndRow, SCTAB nEndTab,
16 SCCOL nStartCol, SCSIZE nSize, ScDocument* pRefUndoDoc = NULL );
17 diff --git sc/inc/sc.hrc sc/inc/sc.hrc
18 index 3bcc4f3..7c62d8d 100644
19 --- sc/inc/sc.hrc
20 +++ sc/inc/sc.hrc
21 @@ -1647,7 +1647,12 @@
23 #define SC_OOO_BUILD_START (SC_DIALOGS_END)
25 +// Data Form
26 +#define SID_DATAFORM_NEW (SC_OOO_BUILD_START + 1) // message
27 +#define SID_DATA_FORM (SC_OOO_BUILD_START + 2) // menu (in Data menu)
28 +#define RID_SCDLG_DATAFORM (SC_OOO_BUILD_START + 3) // dialog
29 +
30 #endif
34 diff --git sc/inc/scabstdlg.hxx sc/inc/scabstdlg.hxx
35 index 3403c2d..dfdf0ba 100644
36 --- sc/inc/scabstdlg.hxx
37 +++ sc/inc/scabstdlg.hxx
38 @@ -42,6 +42,8 @@
39 #include "global.hxx"
40 #include "pivot.hxx"
42 +#include <tabvwsh.hxx>
43 +
44 class ScAsciiOptions;
45 class ScAutoFormat;
46 class ScAutoFormatData;
47 @@ -111,6 +113,12 @@ public:
48 virtual DelCellCmd GetDelCellCmd() const = 0;
49 };
51 +//for dataform
52 +class AbstractScDataFormDlg : public VclAbstractDialog //add for ScDeleteCellDlg
53 +{
54 +
55 +};
56 +
57 class AbstractScDeleteContentsDlg: public VclAbstractDialog //add for ScDeleteContentsDlg
58 {
59 public:
60 @@ -324,6 +332,9 @@ public:
62 virtual AbstractScDeleteCellDlg * CreateScDeleteCellDlg( Window* pParent, int nId, BOOL bDisallowCellMove = FALSE ) = 0 ; //add for ScDeleteCellDlg
64 + //for dataform
65 + virtual AbstractScDataFormDlg * CreateScDataFormDlg( Window* pParent, int nId, ScTabViewShell* pTabViewShell ) = 0 ; //add for ScDataFormDlg
66 +
67 virtual AbstractScDeleteContentsDlg * CreateScDeleteContentsDlg(Window* pParent,int nId, //add for ScDeleteContentsDlg
68 USHORT nCheckDefaults = 0 ) = 0;
69 virtual AbstractScFillSeriesDlg * CreateScFillSeriesDlg( Window* pParent, //add for ScFillSeriesDlg
70 diff --git sc/sdi/cellsh.sdi sc/sdi/cellsh.sdi
71 index 5e99223..baec475 100644
72 --- sc/sdi/cellsh.sdi
73 +++ sc/sdi/cellsh.sdi
74 @@ -60,6 +60,7 @@ interface CellSelection
75 SID_SBA_BRW_INSERT [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ]
76 SID_SELECT_DB [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ]
77 SID_SORT [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ]
78 + SID_DATA_FORM [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ]
79 FID_FILTER_OK [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ]
80 SID_AUTO_FILTER [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ]
81 SID_AUTOFILTER_HIDE [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ]
82 diff --git sc/sdi/scalc.sdi sc/sdi/scalc.sdi
83 index 2ff50a0..ecc0921 100644
84 --- sc/sdi/scalc.sdi
85 +++ sc/sdi/scalc.sdi
86 @@ -1601,6 +1601,31 @@ SfxVoidItem DataSort SID_SORT
87 ]
89 //--------------------------------------------------------------------------
90 +SfxVoidItem DataForm SID_DATA_FORM
91 +()
92 +[
93 + /* flags: */
94 + AutoUpdate = FALSE,
95 + Cachable = Cachable,
96 + FastCall = FALSE,
97 + HasCoreId = FALSE,
98 + HasDialog = TRUE,
99 + ReadOnlyDoc = TRUE,
100 + Toggle = FALSE,
101 + Container = FALSE,
102 + RecordAbsolute = FALSE,
103 + RecordPerSet;
104 + Synchron;
105 +
106 + /* config: */
107 + AccelConfig = TRUE,
108 + MenuConfig = TRUE,
109 + StatusBarConfig = FALSE,
110 + ToolBoxConfig = FALSE,
111 + GroupId = GID_DATA;
112 +]
113 +
114 +//--------------------------------------------------------------------------
115 SfxVoidItem DataSubTotals SID_SUBTOTALS
116 ()
117 [
118 diff --git sc/source/ui/attrdlg/scdlgfact.cxx sc/source/ui/attrdlg/scdlgfact.cxx
119 index aeb4786..de9b284 100644
120 --- sc/source/ui/attrdlg/scdlgfact.cxx
121 +++ sc/source/ui/attrdlg/scdlgfact.cxx
122 @@ -76,6 +76,8 @@
123 #include "tpstat.hxx" //add for ScDocStatPage
124 #include "tpusrlst.hxx" //add for ScTpUserLists
125 #include "tpview.hxx" //add for ScTpContentOptions
126 +//for dataform
127 +#include "datafdlg.hxx" //add for ScDataFormDlg
129 // ause
130 #include "editutil.hxx"
131 @@ -88,6 +90,8 @@ IMPL_ABSTDLG_BASE(AbstractScDataPilotDatabaseDlg_Impl); //add for ScDataPilotDat
132 IMPL_ABSTDLG_BASE(AbstractScDataPilotSourceTypeDlg_Impl); //add for ScDataPilotSourceTypeDlg
133 IMPL_ABSTDLG_BASE(AbstractScDataPilotServiceDlg_Impl); //add for ScDataPilotServiceDlg
134 IMPL_ABSTDLG_BASE(AbstractScDeleteCellDlg_Impl); //add for ScDeleteCellDlg
135 +//for dataform
136 +IMPL_ABSTDLG_BASE(AbstractScDataFormDlg_Impl); //add for ScDataFormDlg
137 IMPL_ABSTDLG_BASE(AbstractScDeleteContentsDlg_Impl); //add for ScDeleteContentsDlg
138 IMPL_ABSTDLG_BASE(AbstractScFillSeriesDlg_Impl); //add for ScFillSeriesDlg
139 IMPL_ABSTDLG_BASE(AbstractScGroupDlg_Impl); //add for ScGroupDlg
140 @@ -761,6 +765,26 @@ AbstractScDeleteCellDlg* ScAbstractDialogFactory_Impl::CreateScDeleteCellDlg( Wi
142 //add for ScDeleteCellDlg end
144 +//add for ScDataFormDlg begin
145 +AbstractScDataFormDlg* ScAbstractDialogFactory_Impl::CreateScDataFormDlg( Window* pParent, int nId, ScTabViewShell* pTabViewShell )
146 +{
147 + ScDataFormDlg * pDlg=NULL;
148 + switch ( nId )
149 + {
150 + case RID_SCDLG_DATAFORM :
151 + pDlg = new ScDataFormDlg( pParent, pTabViewShell);
152 + break;
153 + default:
154 + break;
155 + }
156 +
157 + if ( pDlg )
158 + return new AbstractScDataFormDlg_Impl( pDlg );
159 + return 0;
160 +}
161 +
162 +//add for ScDataFormDlg end
163 +
164 //add for ScDeleteContentsDlg begin
165 AbstractScDeleteContentsDlg* ScAbstractDialogFactory_Impl::CreateScDeleteContentsDlg(Window* pParent,int nId, //add for ScDeleteContentsDlg
166 USHORT nCheckDefaults )
167 diff --git sc/source/ui/attrdlg/scdlgfact.hxx sc/source/ui/attrdlg/scdlgfact.hxx
168 index 463898c..526a1ec 100644
169 --- sc/source/ui/attrdlg/scdlgfact.hxx
170 +++ sc/source/ui/attrdlg/scdlgfact.hxx
171 @@ -40,6 +40,7 @@ class ScDataPilotDatabaseDlg;
172 class ScDataPilotSourceTypeDlg;
173 class ScDataPilotServiceDlg;
174 class ScDeleteCellDlg;
175 +class ScDataFormDlg;
176 class ScDeleteContentsDlg;
177 class ScFillSeriesDlg;
178 class ScGroupDlg;
179 @@ -163,6 +164,12 @@ class AbstractScDeleteCellDlg_Impl : public AbstractScDeleteCellDlg //add for S
180 virtual DelCellCmd GetDelCellCmd() const;
181 };
183 +//for dataform
184 +class AbstractScDataFormDlg_Impl : public AbstractScDataFormDlg //add for ScDataFormDlg
185 +{
186 + DECL_ABSTDLG_BASE(AbstractScDataFormDlg_Impl,ScDataFormDlg);
187 +};
188 +
189 class AbstractScDeleteContentsDlg_Impl : public AbstractScDeleteContentsDlg //add for ScDeleteContentsDlg
190 {
191 DECL_ABSTDLG_BASE( AbstractScDeleteContentsDlg_Impl,ScDeleteContentsDlg)
192 @@ -391,6 +398,9 @@ public:
193 virtual AbstractScDeleteCellDlg * CreateScDeleteCellDlg( Window* pParent, int nId,
194 BOOL bDisallowCellMove = FALSE ); //add for ScDeleteCellDlg
196 + //for dataform
197 + virtual AbstractScDataFormDlg * CreateScDataFormDlg( Window* pParent, int nId, ScTabViewShell* pTabViewShell); //add for ScDeleteCellDlg
198 +
199 virtual AbstractScDeleteContentsDlg * CreateScDeleteContentsDlg(Window* pParent,int nId, //add for ScDeleteContentsDlg
200 USHORT nCheckDefaults = 0 );
202 diff --git sc/source/ui/inc/datafdlg.hrc sc/source/ui/inc/datafdlg.hrc
203 new file mode 100644
204 index 0000000..8fa8999
205 --- /dev/null
206 +++ sc/source/ui/inc/datafdlg.hrc
207 @@ -0,0 +1,49 @@
208 +/*************************************************************************
209 + *
210 + * OpenOffice.org - a multi-platform office productivity suite
211 + *
212 + * $RCSfile: datafdlg.hrc,v $
213 + *
214 + * $Revision: 1.00 $
215 + *
216 + * last change: $Author: rt $ $Date: 2005/09/08 21:37:12 $
217 + *
218 + * The Contents of this file are made available subject to
219 + * the terms of GNU Lesser General Public License Version 2.1.
220 + *
221 + *
222 + * GNU Lesser General Public License Version 2.1
223 + * =============================================
224 + * Copyright 2005 by Sun Microsystems, Inc.
225 + * 901 San Antonio Road, Palo Alto, CA 94303, USA
226 + *
227 + * This library is free software; you can redistribute it and/or
228 + * modify it under the terms of the GNU Lesser General Public
229 + * License version 2.1, as published by the Free Software Foundation.
230 + *
231 + * This library is distributed in the hope that it will be useful,
232 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
233 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
234 + * Lesser General Public License for more details.
235 + *
236 + * You should have received a copy of the GNU Lesser General Public
237 + * License along with this library; if not, write to the Free Software
238 + * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
239 + * MA 02111-1307 USA
240 + *
241 + ************************************************************************/
242 +
243 +#include "sc.hrc" // -> RID_SCDLG_DATAFORM
244 +
245 +//dataform
246 +#define BTN_DATAFORM_NEW 1001
247 +#define BTN_DATAFORM_DELETE 1002
248 +#define BTN_DATAFORM_RESTORE 1003
249 +#define BTN_DATAFORM_LAST 1004
250 +#define BTN_DATAFORM_NEXT 1005
251 +#define BTN_DATAFORM_CLOSE 1007
252 +#define WND_DATAFORM_SCROLLBAR 1008
253 +#define LAB_DATAFORM_RECORDNO 1009
254 +
255 +#define FT_DATAFORM_FIXEDTEXT1 2001
256 +#define ED_DATAFORM_EDIT1 2002
257 \ No newline at end of file
258 diff --git sc/source/ui/inc/datafdlg.hxx sc/source/ui/inc/datafdlg.hxx
259 new file mode 100644
260 index 0000000..3e6d8e3
261 --- /dev/null
262 +++ sc/source/ui/inc/datafdlg.hxx
263 @@ -0,0 +1,121 @@
264 +/*************************************************************************
265 + *
266 + * OpenOffice.org - a multi-platform office productivity suite
267 + *
268 + * $RCSfile: datafdlg.hxx,v $
269 + *
270 + * $Revision: 1.00 $
271 + *
272 + * last change: $Author: rt $ $Date: 2005/09/08 21:20:35 $
273 + *
274 + * The Contents of this file are made available subject to
275 + * the terms of GNU Lesser General Public License Version 2.1.
276 + *
277 + *
278 + * GNU Lesser General Public License Version 2.1
279 + * =============================================
280 + * Copyright 2005 by Sun Microsystems, Inc.
281 + * 901 San Antonio Road, Palo Alto, CA 94303, USA
282 + *
283 + * This library is free software; you can redistribute it and/or
284 + * modify it under the terms of the GNU Lesser General Public
285 + * License version 2.1, as published by the Free Software Foundation.
286 + *
287 + * This library is distributed in the hope that it will be useful,
288 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
289 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
290 + * Lesser General Public License for more details.
291 + *
292 + * You should have received a copy of the GNU Lesser General Public
293 + * License along with this library; if not, write to the Free Software
294 + * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
295 + * MA 02111-1307 USA
296 + *
297 + ************************************************************************/
298 +
299 +#ifndef SC_DATAFDLG_HXX
300 +#define SC_DATAFDLG_HXX
301 +
302 +
303 +#ifndef _SV_DIALOG_HXX //autogen
304 +#include <vcl/dialog.hxx>
305 +#endif
306 +
307 +#ifndef _SV_BUTTON_HXX //autogen
308 +#include <vcl/imagebtn.hxx>
309 +#endif
310 +
311 +#ifndef _SV_FIXED_HXX //autogen
312 +#include <vcl/fixed.hxx>
313 +#endif
314 +
315 +
316 +#include "global.hxx"
317 +
318 +#include <tabvwsh.hxx>
319 +#include <sfx2/bindings.hxx>
320 +#include <sfx2/dispatch.hxx>
321 +
322 +#define MAX_DATAFORM_COLS 256
323 +#define MAX_DATAFORM_ROWS 32000
324 +#define CTRL_HEIGHT 22
325 +#define FIXED_WIDTH 60
326 +#define EDIT_WIDTH 140
327 +#define FIXED_LEFT 12
328 +#define EDIT_LEFT 78
329 +#define LINE_HEIGHT 30
330 +
331 +//zhangyun
332 +class ScDataFormDlg : public ModalDialog
333 +{
334 +private:
335 +
336 + PushButton aBtnNew;
337 + PushButton aBtnDelete;
338 + PushButton aBtnRestore;
339 + PushButton aBtnLast;
340 + PushButton aBtnNext;
341 + PushButton aBtnClose;
342 + ScrollBar aSlider;
343 + FixedText aFixedText;
344 + //FixedText aFixedText1;
345 + //Edit aEdit1;
346 +
347 + ScTabViewShell* pTabViewShell;
348 + ScDocument* pDoc;
349 + sal_uInt16 aColLength;
350 + SCROW aCurrentRow;
351 + SCCOL nStartCol;
352 + SCCOL nEndCol;
353 + SCROW nStartRow;
354 + SCROW nEndRow;
355 + SCTAB nTab;
356 + BOOL bNoSelection;
357 +
358 + FixedText** pFixedTexts;
359 + Edit** pEdits;
360 +
361 +public:
362 + ScDataFormDlg( Window* pParent, ScTabViewShell* pTabViewShell);
363 + ~ScDataFormDlg();
364 +
365 + void FillCtrls(SCROW nCurrentRow);
366 +private:
367 +
368 + void SetButtonState();
369 +
370 + // Handler:
371 + DECL_LINK( Impl_NewHdl, PushButton* );
372 + DECL_LINK( Impl_LastHdl, PushButton* );
373 + DECL_LINK( Impl_NextHdl, PushButton* );
374 +
375 + DECL_LINK( Impl_RestoreHdl, PushButton* );
376 + DECL_LINK( Impl_DeleteHdl, PushButton* );
377 + DECL_LINK( Impl_CloseHdl, PushButton* );
378 +
379 + DECL_LINK( Impl_ScrollHdl, ScrollBar* );
380 + DECL_LINK( Impl_DataModifyHdl, Edit* );
381 +};
382 +#endif // SC_DATAFDLG_HXX
383 +
384 +
385 diff --git sc/source/ui/inc/undodat.hxx sc/source/ui/inc/undodat.hxx
386 index 3b65ba1..3487442 100644
387 --- sc/source/ui/inc/undodat.hxx
388 +++ sc/source/ui/inc/undodat.hxx
389 @@ -530,7 +530,43 @@ private:
390 void Init();
391 };
393 +// amelia
394 +class ScUndoDataForm: public ScBlockUndo
395 +{
396 +public:
397 + TYPEINFO();
398 + ScUndoDataForm( ScDocShell* pNewDocShell,
399 + SCCOL nStartX, SCROW nStartY, SCTAB nStartZ,
400 + SCCOL nEndX, SCROW nEndY, SCTAB nEndZ,
401 + const ScMarkData& rMark,
402 + ScDocument* pNewUndoDoc, ScDocument* pNewRedoDoc,
403 + USHORT nNewFlags,
404 + ScRefUndoData* pRefData, void* pFill1, void* pFill2, void* pFill3,
405 + BOOL bRedoIsFilled = TRUE
406 + );
407 + virtual ~ScUndoDataForm();
408 +
409 + virtual void Undo();
410 + virtual void Redo();
411 + virtual void Repeat(SfxRepeatTarget& rTarget);
412 + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
413 +
414 + virtual String GetComment() const;
416 +private:
417 + ScMarkData aMarkData;
418 + ScDocument* pUndoDoc;
419 + ScDocument* pRedoDoc;
420 + USHORT nFlags;
421 + ScRefUndoData* pRefUndoData;
422 + ScRefUndoData* pRefRedoData;
423 + ULONG nStartChangeAction;
424 + ULONG nEndChangeAction;
425 + BOOL bRedoFilled;
426 +
427 + void DoChange( const BOOL bUndo );
428 + void SetChangeTrack();
429 +};
432 #endif
433 diff --git sc/source/ui/inc/viewfunc.hxx sc/source/ui/inc/viewfunc.hxx
434 index acaea7e..0c1fa9e 100644
435 --- sc/source/ui/inc/viewfunc.hxx
436 +++ sc/source/ui/inc/viewfunc.hxx
437 @@ -328,6 +328,13 @@ public:
438 void ForgetFormatArea() { bFormatValid = FALSE; }
439 BOOL SelectionEditable( BOOL* pOnlyNotBecauseOfMatrix = NULL );
441 + // Amelia Wang
442 + SC_DLLPUBLIC void DataFormPutData( SCROW nCurrentRow ,
443 + SCROW nStartRow , SCCOL nStartCol ,
444 + SCROW nEndRow , SCCOL nEndCol ,
445 + Edit** pEdits ,
446 + sal_uInt16 aColLength );
447 +
448 // interne Hilfsfunktionen
449 protected:
450 void UpdateLineAttrs( SvxBorderLine& rLine,
451 diff --git sc/source/ui/miscdlgs/datafdlg.cxx sc/source/ui/miscdlgs/datafdlg.cxx
452 new file mode 100644
453 index 0000000..2249c57
454 --- /dev/null
455 +++ sc/source/ui/miscdlgs/datafdlg.cxx
456 @@ -0,0 +1,422 @@
457 +/*************************************************************************
458 + *
459 + * OpenOffice.org - a multi-platform office productivity suite
460 + *
461 + * $RCSfile: datafdlg.cxx,v $
462 + *
463 + * $Revision: 1.00 $
464 + *
465 + * last change: $Author: kz $ $Date: 2006/07/21 14:04:33 $
466 + *
467 + * The Contents of this file are made available subject to
468 + * the terms of GNU Lesser General Public License Version 2.1.
469 + *
470 + *
471 + * GNU Lesser General Public License Version 2.1
472 + * =============================================
473 + * Copyright 2005 by Sun Microsystems, Inc.
474 + * 901 San Antonio Road, Palo Alto, CA 94303, USA
475 + *
476 + * This library is free software; you can redistribute it and/or
477 + * modify it under the terms of the GNU Lesser General Public
478 + * License version 2.1, as published by the Free Software Foundation.
479 + *
480 + * This library is distributed in the hope that it will be useful,
481 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
482 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
483 + * Lesser General Public License for more details.
484 + *
485 + * You should have received a copy of the GNU Lesser General Public
486 + * License along with this library; if not, write to the Free Software
487 + * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
488 + * MA 02111-1307 USA
489 + *
490 + ************************************************************************/
491 +
492 +// MARKER(update_precomp.py): autogen include statement, do not remove
493 +#include "precompiled_sc.hxx"
494 +
495 +#undef SC_DLLIMPLEMENTATION
496 +
497 +//------------------------------------------------------------------
498 +
499 +#include "datafdlg.hxx"
500 +#include "scresid.hxx"
501 +#include "datafdlg.hrc"
502 +#include "viewdata.hxx"
503 +//#include "document.hxx"
504 +#include "docsh.hxx"
505 +#include "refundo.hxx"
506 +#include "undodat.hxx"
507 +
508 +#define HDL(hdl) LINK( this, ScDataFormDlg, hdl )
509 +
510 +//zhangyun
511 +ScDataFormDlg::ScDataFormDlg( Window* pParent, ScTabViewShell* pTabViewShellOri) :
512 + ModalDialog ( pParent, ScResId( RID_SCDLG_DATAFORM ) ),
513 + //
514 + aBtnNew ( this, ScResId( BTN_DATAFORM_NEW ) ),
515 + aBtnDelete ( this, ScResId( BTN_DATAFORM_DELETE ) ),
516 + aBtnRestore ( this, ScResId( BTN_DATAFORM_RESTORE ) ),
517 + aBtnLast ( this, ScResId( BTN_DATAFORM_LAST ) ),
518 + aBtnNext ( this, ScResId( BTN_DATAFORM_NEXT ) ),
519 + aBtnClose ( this, ScResId( BTN_DATAFORM_CLOSE ) ),
520 + aSlider ( this, ScResId( WND_DATAFORM_SCROLLBAR ) ),
521 + aFixedText ( this, ScResId( LAB_DATAFORM_RECORDNO ) )
522 +{
523 + pTabViewShell = pTabViewShellOri;
524 + FreeResource();
525 + //read header form current document, and add new controls
526 + DBG_ASSERT( pTabViewShell, "pTabViewShell is NULL! :-/" );
527 + ScViewData* pViewData = pTabViewShell->GetViewData();
528 +
529 + pDoc = pViewData->GetDocument();
530 + if (pDoc)
531 + {
532 + ScRange aRange;
533 + pViewData->GetSimpleArea( aRange );
534 + ScAddress aStart = aRange.aStart;
535 + ScAddress aEnd = aRange.aEnd;
536 +
537 + nStartCol = aStart.Col();
538 + nEndCol = aEnd.Col();
539 + nStartRow = aStart.Row();
540 + nEndRow = aEnd.Row();
541 +
542 + nTab = pViewData->GetTabNo();
543 + //if there is no selection
544 + if ((nStartCol == nEndCol) && (nStartRow == nEndRow))
545 + bNoSelection = TRUE;
546 +
547 + if (bNoSelection)
548 + {
549 + //find last not blank cell in row
550 + for (int i=1;i<=MAX_DATAFORM_COLS;i++)
551 + {
552 + String aColName;
553 + nEndCol++;
554 + pDoc->GetString( nEndCol, nStartRow, nTab, aColName );
555 + int nColWidth = pDoc->GetColWidth( nEndCol, nTab );
556 + if ( aColName.Len() == 0 && nColWidth)
557 + {
558 + nEndCol--;
559 + break;
560 + }
561 + }
562 +
563 + //find first not blank cell in row
564 + for (int i=1;i<=MAX_DATAFORM_COLS;i++)
565 + {
566 + String aColName;
567 + if (nStartCol <= 0)
568 + break;
569 + nStartCol--;
570 +
571 + pDoc->GetString( nStartCol, nStartRow, nTab, aColName );
572 + int nColWidth = pDoc->GetColWidth( nEndCol, nTab );
573 + if ( aColName.Len() == 0 && nColWidth)
574 + {
575 + nStartCol++;
576 + break;
577 + }
578 + }
579 +
580 + //skip leading hide column
581 + for (int i=1;i<=MAX_DATAFORM_COLS;i++)
582 + {
583 + String aColName;
584 + int nColWidth = pDoc->GetColWidth( nStartCol, nTab );
585 + if (nColWidth)
586 + break;
587 + nStartCol++;
588 + }
589 +
590 + if (nEndCol < nStartCol)
591 + nEndCol = nStartCol;
592 +
593 + //find last not blank cell in row
594 + for (int i=1;i<=MAX_DATAFORM_ROWS;i++)
595 + {
596 + String aColName;
597 + nEndRow++;
598 + pDoc->GetString( nStartCol, nEndRow, nTab, aColName );
599 + if ( aColName.Len() == 0 )
600 + {
601 + nEndRow--;
602 + break;
603 + }
604 + }
605 +
606 + //find first not blank cell in row
607 + for (int i=1;i<=MAX_DATAFORM_ROWS;i++)
608 + {
609 + String aColName;
610 + if (nStartRow <= 0)
611 + break;
612 + nStartRow--;
613 +
614 + pDoc->GetString( nStartCol, nStartRow, nTab, aColName );
615 + if ( aColName.Len() == 0 )
616 + {
617 + nStartRow++;
618 + break;
619 + }
620 + }
621 +
622 + if (nEndRow < nStartRow)
623 + nEndRow = nStartRow;
624 + }
625 +
626 + aCurrentRow = nStartRow + 1;
627 +
628 + String aFieldName;
629 +
630 + int nTop = 12;
631 +
632 + Size nFixedSize(FIXED_WIDTH, CTRL_HEIGHT );
633 + Size nEditSize(EDIT_WIDTH, CTRL_HEIGHT );
634 +
635 + //pFtArray = new FixedText(this);
636 + aColLength = nEndCol - nStartCol + 1;
637 +
638 + //new the controls
639 + pFixedTexts = new FixedText*[aColLength];
640 + pEdits = new Edit*[aColLength];
641 +
642 + for(sal_uInt16 nIndex = 0; nIndex < aColLength; nIndex++)
643 + {
644 + pDoc->GetString( nIndex + nStartCol, nStartRow, nTab, aFieldName );
645 + int nColWidth = pDoc->GetColWidth( nIndex + nStartCol, nTab );
646 + if (nColWidth)
647 + {
648 + pFixedTexts[nIndex] = new FixedText(this);
649 + pEdits[nIndex] = new Edit(this, WB_BORDER);
650 +
651 + pFixedTexts[nIndex]->SetSizePixel(nFixedSize);
652 + pEdits[nIndex]->SetSizePixel(nEditSize);
653 + pFixedTexts[nIndex]->SetPosPixel(Point(FIXED_LEFT, nTop));
654 + pEdits[nIndex]->SetPosPixel(Point(EDIT_LEFT, nTop));
655 + //pFixedTexts[nIndex]->SetText(String::CreateFromAscii("W4W-Filter Nr. "));
656 + pFixedTexts[nIndex]->SetText(aFieldName);
657 + pFixedTexts[nIndex]->Show();
658 + pEdits[nIndex]->Show();
659 +
660 + nTop += LINE_HEIGHT;
661 + }
662 + else
663 + {
664 + pFixedTexts[nIndex] = NULL;
665 + pEdits[nIndex] = NULL;
666 + }
667 + pEdits[nIndex]->SetModifyHdl( HDL(Impl_DataModifyHdl) );
668 + }
669 +
670 + Size nDialogSize = this->GetSizePixel();
671 + if (nTop > nDialogSize.Height())
672 + {
673 + nDialogSize.setHeight(nTop);
674 + this->SetSizePixel(nDialogSize);
675 + }
676 + Size nScrollSize = aSlider.GetSizePixel();
677 + nScrollSize.setHeight(nDialogSize.Height()-20);
678 + aSlider.SetSizePixel(nScrollSize);
679 + }
680 +
681 + FillCtrls(aCurrentRow);
682 +
683 + aSlider.SetPageSize( 10 );
684 + aSlider.SetVisibleSize( 1 );
685 + aSlider.SetLineSize( 1 );
686 + aSlider.SetRange( Range( 0, nEndRow - nStartRow + 1) );
687 + aSlider.Show();
688 +
689 + aBtnNew.SetClickHdl ( HDL(Impl_NewHdl) );
690 + aBtnLast.SetClickHdl ( HDL(Impl_LastHdl) );
691 + aBtnNext.SetClickHdl ( HDL(Impl_NextHdl) );
692 +
693 + aBtnRestore.SetClickHdl ( HDL(Impl_RestoreHdl) );
694 + aBtnDelete.SetClickHdl ( HDL(Impl_DeleteHdl) );
695 + aBtnClose.SetClickHdl ( HDL(Impl_CloseHdl) );
696 +
697 + aSlider.SetEndScrollHdl( HDL( Impl_ScrollHdl ) );
698 +
699 + SetButtonState();
700 +
701 + //end
702 + //FreeResource();
703 +}
704 +
705 +ScDataFormDlg::~ScDataFormDlg()
706 +{
707 + for(sal_uInt16 i = 0; i < aColLength; i++)
708 + {
709 + if (pEdits[i])
710 + delete pEdits[i];
711 + if (pFixedTexts[i])
712 + delete pFixedTexts[i];
713 + }
714 + if (pEdits)
715 + delete pEdits;
716 + if (pFixedTexts)
717 + delete pFixedTexts;
718 +}
719 +
720 +void ScDataFormDlg::FillCtrls(SCROW /*nCurrentRow*/)
721 +{
722 + //ScViewData* pViewData = pTabViewShell->GetViewData();
723 +
724 + //pDoc = pViewData->GetDocument();
725 + String aFieldName;
726 + int nRecordNum = nEndRow - nStartRow;
727 + for(sal_uInt16 i = 0; i < aColLength; i++)
728 + {
729 + if (pEdits[i])
730 + {
731 + if (aCurrentRow<=nEndRow)
732 + {
733 + pDoc->GetString( i + nStartCol, aCurrentRow, nTab, aFieldName );
734 + pEdits[i]->SetText(aFieldName);
735 + }
736 + else
737 + pEdits[i]->SetText(String());
738 + }
739 + }
740 + char sRecordStr[256];
741 + if (aCurrentRow<=nEndRow)
742 + aFixedText.SetText(String::CreateFromAscii(sRecordStr));
743 + else
744 + aFixedText.SetText(String::CreateFromAscii("New Record"));
745 +
746 + aSlider.SetThumbPos(aCurrentRow-nStartRow-1);
747 +}
748 +
749 +IMPL_LINK( ScDataFormDlg, Impl_DataModifyHdl, Edit*, pEdit)
750 +{
751 + if ( pEdit->IsModified() )
752 + aBtnRestore.Enable( TRUE );
753 + return 0;
754 +}
755 +
756 +IMPL_LINK( ScDataFormDlg, Impl_NewHdl, PushButton*, EMPTYARG )
757 +{
758 + ScViewData* pViewData = pTabViewShell->GetViewData();
759 + ScDocShell* pDocSh = pViewData->GetDocShell();
760 + if ( pDoc )
761 + {
762 + sal_Bool bHasData = sal_False;
763 + for(sal_uInt16 i = 0; i < aColLength; i++)
764 + if (pEdits[i])
765 + if ( pEdits[i]->GetText().Len() != 0 )
766 + {
767 + bHasData = sal_True;
768 + break;
769 + }
770 +
771 + if ( bHasData )
772 + {
773 + pTabViewShell->DataFormPutData( aCurrentRow , nStartRow , nStartCol , nEndRow , nEndCol , pEdits , aColLength );
774 + aCurrentRow++;
775 + if (aCurrentRow >= nEndRow + 2)
776 + {
777 + nEndRow ++ ;
778 + aSlider.SetRange( Range( 0, nEndRow - nStartRow + 1) );
779 + }
780 + SetButtonState();
781 + FillCtrls(aCurrentRow);
782 + pDocSh->SetDocumentModified();
783 + pDocSh->PostPaintGridAll();
784 + }
785 + }
786 + return 0;
787 +}
788 +
789 +IMPL_LINK( ScDataFormDlg, Impl_LastHdl, PushButton*, EMPTYARG )
790 +{
791 + if (pDoc)
792 + {
793 + if ( aCurrentRow > nStartRow +1 )
794 + aCurrentRow--;
795 +
796 + SetButtonState();
797 + FillCtrls(aCurrentRow);
798 + }
799 + return 0;
800 +}
801 +
802 +IMPL_LINK( ScDataFormDlg, Impl_NextHdl, PushButton*, EMPTYARG )
803 +{
804 + if (pDoc)
805 + {
806 + if ( aCurrentRow <= nEndRow)
807 + aCurrentRow++;
808 +
809 + SetButtonState();
810 + FillCtrls(aCurrentRow);
811 + }
812 + return 0;
813 +}
814 +
815 +IMPL_LINK( ScDataFormDlg, Impl_RestoreHdl, PushButton*, EMPTYARG )
816 +{
817 + if (pDoc)
818 + {
819 + FillCtrls(aCurrentRow);
820 + }
821 + return 0;
822 +}
823 +
824 +IMPL_LINK( ScDataFormDlg, Impl_DeleteHdl, PushButton*, EMPTYARG )
825 +{
826 + ScViewData* pViewData = pTabViewShell->GetViewData();
827 + ScDocShell* pDocSh = pViewData->GetDocShell();
828 + if (pDoc)
829 + {
830 + ScRange aRange(nStartCol, aCurrentRow, nTab, nEndCol, aCurrentRow, nTab);
831 + pDoc->DeleteRow(aRange);
832 + nEndRow--;
833 +
834 + SetButtonState();
835 + pDocSh->GetUndoManager()->Clear();
836 +
837 + FillCtrls(aCurrentRow);
838 + pDocSh->SetDocumentModified();
839 + pDocSh->PostPaintGridAll();
840 + }
841 + return 0;
842 +}
843 +
844 +IMPL_LINK( ScDataFormDlg, Impl_CloseHdl, PushButton*, EMPTYARG )
845 +{
846 + EndDialog( );
847 + return 0;
848 +}
849 +
850 +IMPL_LINK( ScDataFormDlg, Impl_ScrollHdl, ScrollBar*, EMPTYARG )
851 +{
852 + long nOffset = aSlider.GetThumbPos();
853 + aCurrentRow = nStartRow + nOffset + 1;
854 + SetButtonState();
855 + FillCtrls(aCurrentRow);
856 + return 0;
857 +}
858 +
859 +void ScDataFormDlg::SetButtonState()
860 +{
861 + if ( aCurrentRow > nEndRow )
862 + {
863 + aBtnDelete.Enable( FALSE );
864 + aBtnLast.Enable( TRUE );
865 + aBtnNext.Enable( FALSE );
866 + }
867 + else
868 + {
869 + aBtnDelete.Enable( TRUE );
870 + aBtnNext.Enable( TRUE );
871 + }
872 + if ( 1 == aCurrentRow )
873 + aBtnLast.Enable( FALSE );
874 +
875 + aBtnRestore.Enable( FALSE );
876 + if ( pEdits )
877 + pEdits[0]->GrabFocus();
878 +}
879 diff --git sc/source/ui/miscdlgs/makefile.mk sc/source/ui/miscdlgs/makefile.mk
880 index 90f3afe..3569ccf 100644
881 --- sc/source/ui/miscdlgs/makefile.mk
882 +++ sc/source/ui/miscdlgs/makefile.mk
883 @@ -45,6 +45,7 @@ LIBTARGET=no
884 # --- Files --------------------------------------------------------
886 SLOFILES = \
887 + $(SLO)$/datafdlg.obj \
888 $(SLO)$/delcldlg.obj \
889 $(SLO)$/inscldlg.obj \
890 $(SLO)$/delcodlg.obj \
891 diff --git sc/source/ui/src/datafdlg.src sc/source/ui/src/datafdlg.src
892 new file mode 100644
893 index 0000000..535ec66
894 --- /dev/null
895 +++ sc/source/ui/src/datafdlg.src
896 @@ -0,0 +1,108 @@
897 +/*************************************************************************
898 + *
899 + * OpenOffice.org - a multi-platform office productivity suite
900 + *
901 + * $RCSfile: datafdlg.src,v $
902 + *
903 + * $Revision: 1.00 $
904 + *
905 + * last change: $Author: hr $ $Date: 2005/09/23 15:07:30 $
906 + *
907 + * The Contents of this file are made available subject to
908 + * the terms of GNU Lesser General Public License Version 2.1.
909 + *
910 + *
911 + * GNU Lesser General Public License Version 2.1
912 + * =============================================
913 + * Copyright 2005 by Sun Microsystems, Inc.
914 + * 901 San Antonio Road, Palo Alto, CA 94303, USA
915 + *
916 + * This library is free software; you can redistribute it and/or
917 + * modify it under the terms of the GNU Lesser General Public
918 + * License version 2.1, as published by the Free Software Foundation.
919 + *
920 + * This library is distributed in the hope that it will be useful,
921 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
922 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
923 + * Lesser General Public License for more details.
924 + *
925 + * You should have received a copy of the GNU Lesser General Public
926 + * License along with this library; if not, write to the Free Software
927 + * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
928 + * MA 02111-1307 USA
929 + *
930 + ************************************************************************/
931 +
932 +#include "datafdlg.hrc"
933 +
934 +//zhangyun, dataform
935 +ModalDialog RID_SCDLG_DATAFORM
936 +{
937 + OutputSize = TRUE ;
938 + SVLook = TRUE ;
939 + Size = MAP_APPFONT ( 191 , 180 ) ;
940 + Text [ en-US ] = "Data Form" ;
941 + Moveable = TRUE ;
942 + Closeable = TRUE ;
943 + FixedText LAB_DATAFORM_RECORDNO
944 + {
945 + Pos = MAP_APPFONT ( 136 , 6 ) ;
946 + Size = MAP_APPFONT ( 50 , 12 ) ;
947 + Text [ en-US ] = "/" ;
948 + };
949 + PushButton BTN_DATAFORM_NEW
950 + {
951 + Pos = MAP_APPFONT ( 135 , 23 ) ;
952 + Size = MAP_APPFONT ( 50 , 14 ) ;
953 + TabStop = TRUE ;
954 + DefButton = TRUE ;
955 + Text [ en-US ] = "New" ;
956 + };
957 + PushButton BTN_DATAFORM_DELETE
958 + {
959 + Pos = MAP_APPFONT ( 135 , 40 ) ;
960 + Size = MAP_APPFONT ( 50 , 14 ) ;
961 + TabStop = TRUE ;
962 + Text [ en-US ] = "Delete" ;
963 + };
964 + PushButton BTN_DATAFORM_RESTORE
965 + {
966 + Pos = MAP_APPFONT ( 135 , 57 ) ;
967 + Size = MAP_APPFONT ( 50 , 14 ) ;
968 + TabStop = TRUE ;
969 + Text [ en-US ] = "Restore" ;
970 + };
971 + PushButton BTN_DATAFORM_LAST
972 + {
973 + Pos = MAP_APPFONT ( 135 , 82 ) ;
974 + Size = MAP_APPFONT ( 50 , 14 ) ;
975 + TabStop = TRUE ;
976 + Text [ en-US ] = "Last Record" ;
977 + };
978 + PushButton BTN_DATAFORM_NEXT
979 + {
980 + Pos = MAP_APPFONT ( 135 , 99 ) ;
981 + Size = MAP_APPFONT ( 50 , 14 ) ;
982 + TabStop = TRUE ;
983 + Text [ en-US ] = "Next Record" ;
984 + };
985 + PushButton BTN_DATAFORM_CLOSE
986 + {
987 + Pos = MAP_APPFONT ( 135 , 116 ) ;
988 + Size = MAP_APPFONT ( 50 , 14 ) ;
989 + TabStop = TRUE ;
990 + Text [ en-US ] = "Close" ;
991 + };
992 + ScrollBar WND_DATAFORM_SCROLLBAR
993 + {
994 + Pos = MAP_APPFONT ( 124 , 6 ) ;
995 + Size = MAP_APPFONT ( 8 , 135 ) ;
996 + HScroll = FALSE ;
997 + TabStop = FALSE ;
998 + };
999 +};
1000 +//end
1001 +
1002 +
1003 +
1004 +
1005 diff --git sc/source/ui/src/makefile.mk sc/source/ui/src/makefile.mk
1006 index af0e906..8f33ac9 100644
1007 --- sc/source/ui/src/makefile.mk
1008 +++ sc/source/ui/src/makefile.mk
1009 @@ -57,6 +57,7 @@ SRC1FILES = \
1010 dbnamdlg.src \
1011 subtdlg.src \
1012 miscdlgs.src \
1013 + datafdlg.src \
1014 autofmt.src \
1015 solvrdlg.src \
1016 optsolver.src \
1017 diff --git sc/source/ui/undo/undodat.cxx sc/source/ui/undo/undodat.cxx
1018 index 4ea4a0a..9aea0eb 100644
1019 --- sc/source/ui/undo/undodat.cxx
1020 +++ sc/source/ui/undo/undodat.cxx
1021 @@ -58,6 +58,8 @@
1022 #include "dpobject.hxx"
1023 #include "attrib.hxx"
1024 #include "sc.hrc"
1025 +#include "chgtrack.hxx" // Amelia Wang
1026 +#include "refundo.hxx" // Amelia Wang
1028 // -----------------------------------------------------------------------
1030 @@ -74,6 +74,7 @@ TYPEINIT1(ScUndoRepeatDB, ScSi
1031 TYPEINIT1(ScUndoDataPilot, ScSimpleUndo);
1032 TYPEINIT1(ScUndoConsolidate, ScSimpleUndo);
1033 TYPEINIT1(ScUndoChartData, ScSimpleUndo);
1034 +TYPEINIT1(ScUndoDataForm, SfxUndoAction); // amelia
1036 // -----------------------------------------------------------------------
1038 @@ -2182,8 +2185,210 @@ BOOL __EXPORT ScUndoChartData::CanRepeat(SfxRepeatTarget& /* rTarget */) const
1039 return FALSE;
1040 }
1042 +// Amelia Wang
1043 +ScUndoDataForm::ScUndoDataForm( ScDocShell* pNewDocShell,
1044 + SCCOL nStartX, SCROW nStartY, SCTAB nStartZ,
1045 + SCCOL nEndX, SCROW nEndY, SCTAB nEndZ,
1046 + const ScMarkData& rMark,
1047 + ScDocument* pNewUndoDoc, ScDocument* pNewRedoDoc,
1048 + USHORT nNewFlags,
1049 + ScRefUndoData* pRefData,
1050 + void* /*pFill1*/, void* /*pFill2*/, void* /*pFill3*/,
1051 + BOOL bRedoIsFilled ) :
1052 + ScBlockUndo( pNewDocShell, ScRange( nStartX, nStartY, nStartZ, nEndX, nEndY, nEndZ ), SC_UNDO_SIMPLE ),
1053 + aMarkData( rMark ),
1054 + pUndoDoc( pNewUndoDoc ),
1055 + pRedoDoc( pNewRedoDoc ),
1056 + nFlags( nNewFlags ),
1057 + pRefUndoData( pRefData ),
1058 + pRefRedoData( NULL ),
1059 + bRedoFilled( bRedoIsFilled )
1060 +{
1061 + // pFill1,pFill2,pFill3 are there so the ctor calls for simple paste (without cutting)
1062 + // don't have to be changed and branched for 641.
1063 + // They can be removed later.
1064 +
1065 + if ( !aMarkData.IsMarked() ) // no cell marked:
1066 + aMarkData.SetMarkArea( aBlockRange ); // mark paste block
1068 + if ( pRefUndoData )
1069 + pRefUndoData->DeleteUnchanged( pDocShell->GetDocument() );
1071 + SetChangeTrack();
1072 +}
1074 +ScUndoDataForm::~ScUndoDataForm()
1075 +{
1076 + delete pUndoDoc;
1077 + delete pRedoDoc;
1078 + delete pRefUndoData;
1079 + delete pRefRedoData;
1080 +}
1082 +String ScUndoDataForm::GetComment() const
1083 +{
1084 + return ScGlobal::GetRscString( STR_UNDO_PASTE );
1085 +}
1086 +
1087 +void ScUndoDataForm::SetChangeTrack()
1088 +{
1089 + ScChangeTrack* pChangeTrack = pDocShell->GetDocument()->GetChangeTrack();
1090 + if ( pChangeTrack && (nFlags & IDF_CONTENTS) )
1091 + pChangeTrack->AppendContentRange( aBlockRange, pUndoDoc,
1092 + nStartChangeAction, nEndChangeAction, SC_CACM_PASTE );
1093 + else
1094 + nStartChangeAction = nEndChangeAction = 0;
1095 +}
1096 +
1097 +
1098 +void ScUndoDataForm::Undo()
1099 +{
1100 + BeginUndo();
1101 + DoChange( TRUE );
1102 + ShowTable( aBlockRange );
1103 + EndUndo();
1104 + SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) );
1105 +}
1106 +
1107 +void ScUndoDataForm::Redo()
1108 +{
1109 + BeginRedo();
1110 + ScDocument* pDoc = pDocShell->GetDocument();
1111 + EnableDrawAdjust( pDoc, FALSE ); //! include in ScBlockUndo?
1112 + DoChange( FALSE );
1113 + EnableDrawAdjust( pDoc, TRUE ); //! include in ScBlockUndo?
1114 + EndRedo();
1115 + SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) );
1116 +}
1117 +
1118 +void ScUndoDataForm::Repeat(SfxRepeatTarget& /*rTarget*/)
1119 +{
1120 +}
1122 +BOOL ScUndoDataForm::CanRepeat(SfxRepeatTarget& rTarget) const
1123 +{
1124 + return (rTarget.ISA(ScTabViewTarget));
1125 +}
1126 +
1127 +void ScUndoDataForm::DoChange( const BOOL bUndo )
1128 +{
1129 + ScDocument* pDoc = pDocShell->GetDocument();
1130 +
1131 + // RefUndoData for redo is created before first undo
1132 + // (with DeleteUnchanged after the DoUndo call)
1133 + BOOL bCreateRedoData = ( bUndo && pRefUndoData && !pRefRedoData );
1134 + if ( bCreateRedoData )
1135 + pRefRedoData = new ScRefUndoData( pDoc );
1136 +
1137 + ScRefUndoData* pWorkRefData = bUndo ? pRefUndoData : pRefRedoData;
1138 +
1139 + // fuer Undo immer alle oder keine Inhalte sichern
1140 + USHORT nUndoFlags = IDF_NONE;
1141 + if (nFlags & IDF_CONTENTS)
1142 + nUndoFlags |= IDF_CONTENTS;
1143 + if (nFlags & IDF_ATTRIB)
1144 + nUndoFlags |= IDF_ATTRIB;
1145 +
1146 + BOOL bPaintAll = FALSE;
1147 +
1148 + ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
1149 +
1150 + // marking is in ScBlockUndo...
1151 + //ScUndoUtil::MarkSimpleBlock( pDocShell, aBlockRange );
1152 +
1153 + SCTAB nTabCount = pDoc->GetTableCount();
1154 + if ( bUndo && !bRedoFilled )
1155 + {
1156 + if (!pRedoDoc)
1157 + {
1158 + BOOL bColInfo = ( aBlockRange.aStart.Row()==0 && aBlockRange.aEnd.Row()==MAXROW );
1159 + BOOL bRowInfo = ( aBlockRange.aStart.Col()==0 && aBlockRange.aEnd.Col()==MAXCOL );
1160 +
1161 + pRedoDoc = new ScDocument( SCDOCMODE_UNDO );
1162 + pRedoDoc->InitUndoSelected( pDoc, aMarkData, bColInfo, bRowInfo );
1163 + }
1164 + // read "redo" data from the document in the first undo
1165 + // all sheets - CopyToDocument skips those that don't exist in pRedoDoc
1166 + ScRange aCopyRange = aBlockRange;
1167 + aCopyRange.aStart.SetTab(0);
1168 + aCopyRange.aEnd.SetTab(nTabCount-1);
1169 + pDoc->CopyToDocument( aCopyRange, 1, FALSE, pRedoDoc );
1170 + bRedoFilled = TRUE;
1171 + }
1172 +
1173 + USHORT nExtFlags = 0;
1174 + pDocShell->UpdatePaintExt( nExtFlags, aBlockRange );
1175 +
1176 + for ( sal_uInt16 i=0; i <= ( aBlockRange.aEnd.Col() - aBlockRange.aStart.Col() ); i++ )
1177 + {
1178 + String aOldString;
1179 + pUndoDoc->GetString( aBlockRange.aStart.Col()+i , aBlockRange.aStart.Row() , aBlockRange.aStart.Tab() , aOldString );
1180 + pDoc->SetString( aBlockRange.aStart.Col()+i , aBlockRange.aStart.Row() , aBlockRange.aStart.Tab() , aOldString );
1181 + }
1182 +
1183 + //ScRange aTabSelectRange = aBlockRange;
1184 +
1185 + if (pWorkRefData)
1186 + {
1187 + pWorkRefData->DoUndo( pDoc, TRUE ); // TRUE = bSetChartRangeLists for SetChartListenerCollection
1188 + if ( pDoc->RefreshAutoFilter( 0,0, MAXCOL,MAXROW, aBlockRange.aStart.Tab() ) )
1189 + bPaintAll = TRUE;
1190 + }
1191 +
1192 + if ( bCreateRedoData && pRefRedoData )
1193 + pRefRedoData->DeleteUnchanged( pDoc );
1194 +
1195 + if ( bUndo )
1196 + {
1197 + ScChangeTrack* pChangeTrack = pDoc->GetChangeTrack();
1198 + if ( pChangeTrack )
1199 + pChangeTrack->Undo( nStartChangeAction, nEndChangeAction );
1200 + }
1201 + else
1202 + SetChangeTrack();
1203 +
1204 + ScRange aDrawRange( aBlockRange );
1205 + pDoc->ExtendMerge( aDrawRange, TRUE ); // only needed for single sheet (text/rtf etc.)
1206 + USHORT nPaint = PAINT_GRID;
1207 + if (bPaintAll)
1208 + {
1209 + aDrawRange.aStart.SetCol(0);
1210 + aDrawRange.aStart.SetRow(0);
1211 + aDrawRange.aEnd.SetCol(MAXCOL);
1212 + aDrawRange.aEnd.SetRow(MAXROW);
1213 + nPaint |= PAINT_TOP | PAINT_LEFT;
1214 +/*A*/ if (pViewShell)
1215 + pViewShell->AdjustBlockHeight(FALSE);
1216 + }
1217 + else
1218 + {
1219 + if ( aBlockRange.aStart.Row() == 0 && aBlockRange.aEnd.Row() == MAXROW ) // ganze Spalte
1220 + {
1221 + nPaint |= PAINT_TOP;
1222 + aDrawRange.aEnd.SetCol(MAXCOL);
1223 + }
1224 + if ( aBlockRange.aStart.Col() == 0 && aBlockRange.aEnd.Col() == MAXCOL ) // ganze Zeile
1225 + {
1226 + nPaint |= PAINT_LEFT;
1227 + aDrawRange.aEnd.SetRow(MAXROW);
1228 + }
1229 +/*A*/ if ((pViewShell) && pViewShell->AdjustBlockHeight(FALSE))
1230 + {
1231 + aDrawRange.aStart.SetCol(0);
1232 + aDrawRange.aStart.SetRow(0);
1233 + aDrawRange.aEnd.SetCol(MAXCOL);
1234 + aDrawRange.aEnd.SetRow(MAXROW);
1235 + nPaint |= PAINT_LEFT;
1236 + }
1237 + pDocShell->UpdatePaintExt( nExtFlags, aDrawRange );
1238 + }
1239 +
1240 + if ( !bUndo ) // draw redo after updating row heights
1241 + RedoSdrUndoAction( pDrawUndo ); //! include in ScBlockUndo?
1242 +
1243 + pDocShell->PostPaint( aDrawRange, nPaint, nExtFlags );
1244 +
1245 + pDocShell->PostDataChanged();
1246 + if (pViewShell)
1247 + pViewShell->CellContentChanged();
1248 +}
1249 diff --git sc/source/ui/view/cellsh2.cxx sc/source/ui/view/cellsh2.cxx
1250 index 7dee7cc..231e71e 100644
1251 --- sc/source/ui/view/cellsh2.cxx
1252 +++ sc/source/ui/view/cellsh2.cxx
1253 @@ -265,6 +265,20 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
1254 }
1255 break;
1257 + case SID_DATA_FORM:
1258 + {
1259 + ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
1260 + DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
1261 +
1262 + AbstractScDataFormDlg* pDlg = pFact->CreateScDataFormDlg( pTabViewShell->GetDialogParent(),RID_SCDLG_DATAFORM, pTabViewShell);
1263 + DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
1264 +
1265 + pDlg->Execute();
1266 +
1267 + rReq.Done();
1268 + }
1269 + break;
1270 +
1271 case SID_SUBTOTALS:
1272 {
1273 const SfxItemSet* pArgs = rReq.GetArgs();
1274 diff --git sc/source/ui/view/viewfun3.cxx sc/source/ui/view/viewfun3.cxx
1275 index 1cb5400..9c2ef97 100644
1276 --- sc/source/ui/view/viewfun3.cxx
1277 +++ sc/source/ui/view/viewfun3.cxx
1278 @@ -208,6 +208,7 @@
1279 #include "transobj.hxx"
1280 #include "drwtrans.hxx"
1281 #include "docuno.hxx"
1282 +#include "undodat.hxx" // Amelia Wang
1284 using namespace com::sun::star;
1286 @@ -1414,6 +1415,85 @@ BOOL ScViewFunc::LinkBlock( const ScRange& rSource, const ScAddress& rDestPos, B
1287 return TRUE;
1288 }
1290 +void ScViewFunc::DataFormPutData( SCROW nCurrentRow ,
1291 + SCROW nStartRow , SCCOL nStartCol ,
1292 + SCROW nEndRow , SCCOL nEndCol ,
1293 + Edit** pEdits ,
1294 + sal_uInt16 aColLength )
1295 +{
1296 + ScDocument* pDoc = GetViewData()->GetDocument();
1297 + ScDocShell* pDocSh = GetViewData()->GetDocShell();
1298 + ScMarkData& rMark = GetViewData()->GetMarkData();
1299 + ScDocShellModificator aModificator( *pDocSh );
1300 + SfxUndoManager* pUndoMgr = pDocSh->GetUndoManager();
1301 + if ( pDoc )
1302 + {
1303 + const BOOL bRecord( pDoc->IsUndoEnabled());
1304 + ScDocument* pUndoDoc = NULL;
1305 + ScDocument* pRedoDoc = NULL;
1306 + ScDocument* pRefUndoDoc = NULL;
1307 + ScRefUndoData* pUndoData = NULL;
1308 + SCTAB nTab = GetViewData()->GetTabNo();
1309 + SCTAB nStartTab = nTab;
1310 + SCTAB nEndTab = nTab;
1311 +
1312 + {
1313 + ScChangeTrack* pChangeTrack = pDoc->GetChangeTrack();
1314 + if ( pChangeTrack )
1315 + pChangeTrack->ResetLastCut(); // kein CutMode mehr
1316 + }
1317 + ScRange aUserRange( nStartCol, nCurrentRow, nStartTab, nEndCol, nCurrentRow, nEndTab );
1318 + BOOL bColInfo = ( nStartRow==0 && nEndRow==MAXROW );
1319 + BOOL bRowInfo = ( nStartCol==0 && nEndCol==MAXCOL );
1320 + SCCOL nUndoEndCol = nStartCol+aColLength-1;
1321 + SCROW nUndoEndRow = nCurrentRow;
1322 + USHORT nUndoFlags = IDF_NONE;
1323 +
1324 + if ( bRecord )
1325 + {
1326 + pUndoDoc = new ScDocument( SCDOCMODE_UNDO );
1327 + pUndoDoc->InitUndoSelected( pDoc , rMark , bColInfo , bRowInfo );
1328 + pDoc->CopyToDocument( aUserRange , 1 , FALSE , pUndoDoc );
1329 + }
1330 + USHORT nExtFlags = 0;
1331 + pDocSh->UpdatePaintExt( nExtFlags, nStartCol, nStartRow, nStartTab , nEndCol, nEndRow, nEndTab ); // content before the change
1332 + //rMark.SetMarkArea( aUserRange );
1333 + pDoc->BeginDrawUndo();
1334 +
1335 + for(sal_uInt16 i = 0; i < aColLength; i++)
1336 + {
1337 + if (pEdits[i])
1338 + {
1339 + String aFieldName=pEdits[i]->GetText();
1340 + pDoc->SetString( nStartCol + i, nCurrentRow, nTab, aFieldName );
1341 + }
1342 + }
1343 + //pDoc->ExtendMergeSel( nStartCol, nStartRow, nEndCol, nEndRow, rMark, TRUE ); // Refresh
1344 + pDocSh->UpdatePaintExt( nExtFlags, nStartCol, nCurrentRow, nStartTab, nEndCol, nCurrentRow, nEndTab ); // content after the change
1345 + SfxUndoAction* pUndo = new ScUndoDataForm( pDocSh,
1346 + nStartCol, nCurrentRow, nStartTab,
1347 + nUndoEndCol, nUndoEndRow, nEndTab, rMark,
1348 + pUndoDoc, pRedoDoc, nUndoFlags,
1349 + pUndoData, NULL, NULL, NULL,
1350 + FALSE ); // FALSE = Redo data not yet copied
1351 + pUndoMgr->AddUndoAction( new ScUndoWrapper( pUndo ), TRUE );
1352 +
1353 + USHORT nPaint = PAINT_GRID;
1354 + if (bColInfo)
1355 + {
1356 + nPaint |= PAINT_TOP;
1357 + nUndoEndCol = MAXCOL; // nur zum Zeichnen !
1358 + }
1359 + if (bRowInfo)
1360 + {
1361 + nPaint |= PAINT_LEFT;
1362 + nUndoEndRow = MAXROW; // nur zum Zeichnen !
1363 + }
1365 + pDocSh->PostPaint( nStartCol, nCurrentRow, nStartTab,
1366 + nUndoEndCol, nUndoEndRow, nEndTab, nPaint, nExtFlags );
1367 + pDocSh->UpdateOle(GetViewData());
1368 + }
1369 +}
1372 diff --git sc/uiconfig/scalc/menubar/menubar.xml sc/uiconfig/scalc/menubar/menubar.xml
1373 index 938f00b..06dfc6f 100644
1374 --- sc/uiconfig/scalc/menubar/menubar.xml
1375 +++ sc/uiconfig/scalc/menubar/menubar.xml
1376 @@ -391,6 +391,7 @@
1377 <menu:menuitem menu:id=".uno:DataFilterHideAutoFilter"/>
1378 </menu:menupopup>
1379 </menu:menu>
1380 + <menu:menuitem menu:id=".uno:DataForm"/>
1381 <menu:menuitem menu:id=".uno:DataSubTotals"/>
1382 <menu:menuitem menu:id=".uno:Validation"/>
1383 <menu:menuseparator/>
1384 diff --git sc/util/makefile.mk sc/util/makefile.mk
1385 index a051bb8..9d2706a 100644
1386 --- sc/util/makefile.mk
1387 +++ sc/util/makefile.mk
1388 @@ -273,6 +273,7 @@ LIB8OBJFILES = \
1389 $(SLO)$/filldlg.obj \
1390 $(SLO)$/delcodlg.obj \
1391 $(SLO)$/delcldlg.obj \
1392 + $(SLO)$/datafdlg.obj \
1393 $(SLO)$/dapitype.obj \
1394 $(SLO)$/dapidata.obj \
1395 $(SLO)$/crdlg.obj \