diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:23:52 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:23:52 +0200 |
commit | ed41260b25bbb72c3afc173c3950e4db6586aae5 (patch) | |
tree | a1e1f6e9e7c7152281500b4f2885db86de114299 /sw/source/ui/dialog/swdlgfact.cxx | |
parent | cce335a211fc31158cc2c257c03fa602dd89e19f (diff) |
recreated tag OOO_BUILD_3_2_98_1 which had these commits:
commit f4e134e37cd1c6bcdf821aea38aa549c9ea1c46b (tag: refs/tags/OOO_BUILD_3_2_98_1)
Author: Petr Mladek <pmladek@walk.suse.cz>
Date: Wed Sep 15 19:03:29 2010 +0200
Release ooo-build-3.2.98.1, tag OOO_BUILD_3_2_98_1 (3.3-alpha1)
commit 11ab1028c5e354ac40ee58ace0dc84989eae8a27
Author: Jiao Jianhua <jjiao@novell.com>
Date: Tue Sep 14 17:14:11 2010 +0200
sw-default-cjk-fontsize.diff: default CJK font fontsize as 10.5pt
i#72010
sw/source/ui/config/fontcfg.cxx | 5 ++++-
sw/source/ui/inc/fontcfg.hxx | 1 +
2 files changed, 5 insertions(+), 1 deletions(-)
commit 216f84e4b0933612276690a7f69f264e9ded5c71
Author: Florian Reuter <freuter@novell.com>
Date: Tue Sep 14 17:11:44 2010 +0200
sw-graphic-save-problem.diff:
n240770
sw/source/core/graphic/ndgrf.cxx | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
commit 9ec22325aba338803a96a373db97f3f4e2bc2b12
Author: Michel Loiseleur <mloiseleur@linagora.com>
Date: Tue Sep 14 17:04:28 2010 +0200
sw-html-insert-unknown-tags.diff: paste html text between 2 unknown tags
i#59064
sw/source/filter/html/swhtml.cxx | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
commit 4b3a488ecb4e6810735825973bb9433249a19fb6
Author: Cédric Bosdonnat <cedricbosdo@openoffice.org>
Date: Tue Sep 14 16:54:36 2010 +0200
sw-paste-table.diff: Refresh the cell formatting after pasting in it
n#564789
sw/source/filter/basflt/shellio.cxx | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
commit d4ad757a11eb662f853ea78fefd6d11ea1df2119
Author: Fong Lin <pflin@novell.com>
Date: Tue Sep 14 16:42:39 2010 +0200
sw-changes-format-fix.diff: show insertion change first
n#545815
sw/source/core/doc/docredln.cxx | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
commit 33370870cc133b7cb7f470f752526cdd4a4339ab
Author: Fong Lin <pflin@novell.com>
Date: Tue Sep 14 16:39:57 2010 +0200
sw-ww8-import-list-fix.diff:fix bullet indent issue
n#547308
sw/source/filter/ww8/ww8par6.cxx | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
commit 0589e7f8eb08119cee8ff1a186bfbb887d3838e4
Author: Fong Lin <pflin@novell.com>
Date: Tue Sep 14 16:35:20 2010 +0200
sw-ww8-textframe-background-fix.diff
n#547308
sw/source/filter/ww8/ww8graf.cxx | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
commit b7551ace7e57ba3a4dbacf5d8906000600a43467
Author: Amelia Wang <amwang@novell.com>
Date: Tue Sep 14 16:23:16 2010 +0200
sw-insert-pagebreak-in-numbered-paragraph.diff
n#396648
sw/inc/doc.hxx | 1 +
sw/source/core/docnode/ndtbl.cxx | 43 ++++++++++++++++++++++++++++++++++++++
sw/source/ui/wrtsh/wrtsh1.cxx | 2 +
3 files changed, 46 insertions(+), 0 deletions(-)
commit edbd32ded9f6dddb75ebb57d03a10ac10d0fa107
Author: Amelia Wang <amwang@novell.com>
Date: Tue Sep 14 16:20:45 2010 +0200
sw-outline-numbering-broken-fix.diff: outline numbering fix in master docs
i#96092, n#445536
sw/source/core/docnode/ndcopy.cxx | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit 7dd2e230f9de2676be07d094a837a0167e275194
Author: Florian Reuter <freuter@novell.com>
Date: Tue Sep 14 16:12:59 2010 +0200
sw-import-html-controls.diff:
n#485609
sw/source/filter/ww8/ww8par.hxx | 2 ++
sw/source/filter/ww8/ww8par3.cxx | 8 ++++++++
sw/source/filter/ww8/ww8par5.cxx | 2 +-
3 files changed, 11 insertions(+), 1 deletions(-)
commit 8208802eed76b29302c132dd0a0608cc71dd396f
Author: Cédric Bosdonnat <cedricbosdo@openoffice.org>
Date: Tue Sep 14 16:00:07 2010 +0200
field-patch-lock.diff: enhanced fields lock fix
sw/source/core/crsr/pam.cxx | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 deletions(-)
commit 7bd9bc8377047629a69450bf7d4c7dee67af517b
Author: Cédric Bosdonnat <cedricbosdo@openoffice.org>
Date: Tue Sep 14 15:58:16 2010 +0200
field-patch-uno-fix.diff: enhanced fields UNO fix
sw/source/core/unocore/unocoll.cxx | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
commit d19c7c96ee03fccc41fb5a74128304bd432eac81
Author: Florian Reuter <freuter@novell.com>
Date: Tue Sep 14 15:00:33 2010 +0200
sw-table-join-fix-i99267.diff:
n#417814
sw/source/core/layout/tabfrm.cxx | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
commit 47472e8e70c1ae3dc55a5b00ef69eaa85f651a7f
Author: Florian Reuter <freuter@novell.com>
Date: Tue Sep 14 14:40:15 2010 +0200
sw-collapse-empty-table-par-like-html.diff:
n#376690
sw/inc/IDocumentSettingAccess.hxx | 1 +
sw/inc/doc.hxx | 1 +
sw/inc/ndtxt.hxx | 2 +
sw/source/core/crsr/callnk.cxx | 50 ++++++++++++++++++++++++++++++
sw/source/core/doc/doc.cxx | 4 ++
sw/source/core/doc/docnew.cxx | 1 +
sw/source/core/inc/frame.hxx | 4 ++
sw/source/core/layout/calcmove.cxx | 43 +++++++++++++++++++++++++
sw/source/core/layout/findfrm.cxx | 9 +++++
sw/source/core/text/frmpaint.cxx | 34 +++++++++++---------
sw/source/core/text/porrst.cxx | 16 +++++++++
sw/source/filter/ww8/ww8par.cxx | 1 +
sw/source/filter/ww8/ww8par2.cxx | 14 --------
sw/source/ui/uno/SwXDocumentSettings.cxx | 16 +++++++++-
14 files changed, 166 insertions(+), 30 deletions(-)
commit 440bab6daea191ddf18b019fb88600b82e11a0ed
Author: Florian Reuter <freuter@novell.com>
Date: Tue Sep 14 14:36:01 2010 +0200
sw-invert-border-spacing.diff:
n#391591
sw/inc/IDocumentSettingAccess.hxx | 1 +
sw/inc/doc.hxx | 1 +
sw/source/core/doc/doc.cxx | 4 ++++
sw/source/core/doc/docnew.cxx | 1 +
sw/source/core/layout/frmtool.cxx | 9 +++++++--
sw/source/core/layout/paintfrm.cxx | 2 +-
sw/source/filter/rtf/swparrtf.cxx | 2 +-
sw/source/filter/ww8/ww8par.cxx | 2 ++
sw/source/filter/ww8/ww8par6.cxx | 17 +++++++++++++----
sw/source/ui/uno/SwXDocumentSettings.cxx | 18 +++++++++++++++---
10 files changed, 46 insertions(+), 11 deletions(-)
commit 70597695b23b5c45dfc735a7afd175f034428195
Author: Florian Reuter <freuter@novell.com>
Date: Tue Sep 14 14:32:01 2010 +0200
sw-allow-negative-spacing.diff: correctly display linespacing < 100%
n#364534
sw/source/core/text/itrform2.cxx | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 deletions(-)
commit 998c642599c9196e2249fe35cf1450711fdd5d75
Author: Florian Reuter <freuter@novell.com>
Date: Tue Sep 14 14:28:15 2010 +0200
sw-section-import-fix.diff: Additional paragraph imported from ww8
n#364533
sw/source/filter/ww8/ww8par.cxx | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
commit 70561fdb1c47bc0bcfdbb97ffed28fe13ab556f8
Author: Cédric Bosdonnat <cedricbosdo@openoffice.org>
Date: Tue Sep 14 14:16:21 2010 +0200
g++44-debug.diff: Fixed some imports for debug more
sw/source/core/text/inftxt.cxx | 4 ++++
sw/source/filter/ww8/WW8Sttbf.cxx | 4 ++++
sw/source/filter/ww8/wrtww8gr.cxx | 4 ++++
3 files changed, 12 insertions(+), 0 deletions(-)
commit 10c10ffa04a952c81e0a85e0606b46e2433705c3
Author: Thorsten Behrens <tbehrens@novell.com>
Date: Tue Sep 14 13:12:33 2010 +0200
win32-vs2005-compat.diff: Fix build with Visual Studio 2005
sw/source/filter/ww8/wrtw8nds.cxx | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
commit 985b180a2fae4ffeaac83ead0a71e1e128db0f79
Author: Octavio Alvarez <alvarezp@alvarezp.ods.org>
Date: Mon Sep 13 17:30:41 2010 +0200
sw-preserve-char-style-on-reset-format.diff:Perserve character style on links
i#47893
sw/source/ui/shells/textsh1.cxx | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
commit 46c042512344d9e714ea716efc8f707ede5e179b
Author: Octavio Alvarez <alvarezp@alvarezp.ods.org>
Date: Mon Sep 13 17:26:19 2010 +0200
sw-show-Remove-Hyperlink-even-with-selection.diff:
sw/source/ui/shells/textsh1.cxx | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
commit 1ccbb5d782056eeaf0c50333eed49ded73acfc5f
Author: Cédric Bosdonnat <cedricbosdo@openoffice.org>
Date: Mon Sep 13 17:15:50 2010 +0200
sw-rtf-num-fix.diff:Fixes for RTF numbering export
n#569266
sw/source/filter/rtf/rtfatr.cxx | 12 +++---
sw/source/filter/rtf/rtfnum.cxx | 78 ++++++++++++--------------------------
2 files changed, 31 insertions(+), 59 deletions(-)
commit 934cea09a95d7d638d09f881629579c568a30621
Author: Amelia Wang <amwang@novell.com>
Date: Mon Sep 13 14:46:36 2010 +0200
cjk-character-units-in-pggrid-fix.diff: add a new character unit
sw/source/ui/inc/pggrid.hxx | 1 +
sw/source/ui/misc/pggrid.cxx | 42 ++++++++++++++++++++++++++----------------
2 files changed, 27 insertions(+), 16 deletions(-)
commit dae07c66db3014b7f0eefada5e4ff8af8556e768
Author: Amelia Wang <amwang@novell.com>
Date: Mon Sep 13 14:45:00 2010 +0200
cjk-character-units-fix-376788.diff: add a new character unit
i#376788
sw/source/ui/app/swmodul1.cxx | 14 ++++++++++----
sw/source/ui/config/optload.cxx | 8 +++++---
sw/source/ui/misc/pggrid.cxx | 4 ++--
sw/source/ui/uiview/view.cxx | 36 ++++++++++++++++++++++++++++++------
4 files changed, 47 insertions(+), 15 deletions(-)
commit 6321ca557a2a188a3a3f8f6eeb2881f8e7eacce8
Author: Amelia Wang <amwang@novell.com>
Date: Mon Sep 13 14:43:46 2010 +0200
cjk-character-units-fix.diff: add a new unit 'character unit'
i#356101
sw/source/ui/app/appopt.cxx | 1 +
sw/source/ui/app/swmodul1.cxx | 6 ++++--
sw/source/ui/config/optload.cxx | 3 +++
sw/source/ui/config/optload.src | 3 +--
sw/source/ui/config/usrpref.cxx | 3 ++-
sw/source/ui/misc/pggrid.cxx | 6 +++---
sw/source/ui/uiview/view.cxx | 6 ++++--
7 files changed, 18 insertions(+), 10 deletions(-)
commit 723b3fc153061b39604a032d578409d7f22d708f
Author: Amelia Wang <amwang@novell.com>
Date: Mon Sep 13 14:42:44 2010 +0200
cjk-character-units-rulers-sync-with-pggrid-fix.diff:
sw/source/ui/inc/pggrid.hxx | 2 ++
sw/source/ui/misc/pggrid.cxx | 24 ++++++++++++++++++++----
2 files changed, 22 insertions(+), 4 deletions(-)
commit baf4316376191dce3a3d070a07e745e0286b7bac
Author: Amelia Wang <amwang@novell.com>
Date: Mon Sep 13 14:40:57 2010 +0200
cjk-character-units-ui.diff: add a new unit 'character unit'
sw/source/ui/config/optload.cxx | 6 ++++++
sw/source/ui/config/optload.hrc | 1 +
sw/source/ui/config/optload.src | 12 ++++++++++++
sw/source/ui/config/optpage.cxx | 23 +++++++++++++++++------
sw/source/ui/inc/optload.hxx | 1 +
sw/source/ui/inc/pggrid.hxx | 2 ++
sw/source/ui/misc/pggrid.cxx | 3 +++
sw/source/ui/misc/pggrid.hrc | 2 ++
sw/source/ui/misc/pggrid.src | 12 ++++++++++++
9 files changed, 56 insertions(+), 6 deletions(-)
commit 4cd64c0c68b4c81406d0075ac9d846014538840b
Author: Amelia Wang <amwang@novell.com>
Date: Mon Sep 13 14:37:51 2010 +0200
cjk-character-units-imp.diff: add a new unit 'character unit'
sw/inc/swmodule.hxx | 2 +
sw/source/ui/app/appopt.cxx | 10 +++++++
sw/source/ui/app/swmodul1.cxx | 57 +++++++++++++++++++++++++++++++++++++++
sw/source/ui/config/optload.cxx | 17 +++++++++++
sw/source/ui/config/usrpref.cxx | 11 +++++---
sw/source/ui/inc/pggrid.hxx | 2 +-
sw/source/ui/inc/uitool.hxx | 3 ++
sw/source/ui/inc/usrpref.hxx | 12 ++++++++
sw/source/ui/misc/pggrid.cxx | 32 ++++++++++++++++++---
sw/source/ui/shells/textsh1.cxx | 4 +++
sw/source/ui/uiview/view.cxx | 17 ++++++++++-
sw/source/ui/utlui/uitool.cxx | 13 +++++++++
12 files changed, 168 insertions(+), 12 deletions(-)
commit 825b1706ab0a71d86812cbb95ac056e78f6a5864
Author: Jiao Jianhua <jjiao@novell.com>
Date: Mon Sep 13 14:07:35 2010 +0200
plus-minus-sw-navigator2.diff: Folding for each heading in Navigator
i#64886, n#129410i
sw/source/ui/inc/conttree.hxx | 5 +++
sw/source/ui/utlui/content.cxx | 74 +++++++++++++++++++++++++++++++++++++--
2 files changed, 75 insertions(+), 4 deletions(-)
commit c2b6b1ab7a949fb80fd98f506486d45a1166fbc5
Author: Jiao Jianhua <jjiao@novell.com>
Date: Mon Sep 13 14:06:16 2010 +0200
plus-minus-sw-navigator.diff: folding for each heading in Navigator
i#64886, n#129410
sw/source/ui/utlui/content.cxx | 134 +++++++++++++++++++++++++++++++---------
1 files changed, 105 insertions(+), 29 deletions(-)
commit 290f7aba51f626e259764487fec8795ef6b4043a
Merge: d3ae4c6 4937fcb
Author: Jan Holesovsky <kendy@suse.cz>
Date: Wed Sep 8 11:34:21 2010 +0200
Merge commit 'ooo/OOO330_m7'
commit d3ae4c683dda23722661cad8b5992586d2883bd0
Merge: e0b0ca3 17b62cb
Author: Jan Holesovsky <kendy@suse.cz>
Date: Tue Sep 7 09:33:10 2010 +0200
Merge commit 'ooo/OOO330_m6'
commit 4937fcb1c4fa15194c01a79c57523d9a9333c710 (tag: refs/tags/ooo/OOO330_m7)
Merge: 17b62cb 3274d37
Author: Kurt Zenker <kz@openoffice.org>
Date: Fri Sep 3 14:39:55 2010 +0200
CWS-TOOLING: integrate CWS fs33a
commit 17b62cb5acad25dc82a95a40d545e6af6a185f55 (tag: refs/tags/ooo/OOO330_m6)
Author: obo <obo@openoffice.org>
Date: Fri Aug 27 13:02:34 2010 +0200
masterfix OOO330: #i10000# new exception file unovwr.cxx
sw/source/core/undo/makefile.mk | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
commit a3019ec68acb22c8f590ee104fd6e7aad20c4778
Merge: aa24f45 631d42d
Author: Ivo Hinkelmann <ihi@openoffice.org>
Date: Wed Aug 25 14:19:19 2010 +0200
CWS-TOOLING: integrate CWS sw33bf08
commit 631d42da043d690b931e3750176a3a295b376c7e
Author: Thomas Lange [tl] <tl@openoffice.org>
Date: Tue Aug 17 16:46:36 2010 +0200
cws sw33bf08: #i113584#, #i113587# transliteration fixed
sw/inc/undobj.hxx | 6 +-
sw/source/core/doc/docedt.cxx | 33 +++--
sw/source/core/txtnode/txtedt.cxx | 271 ++++++++++++++++++++++++++++++++-----
sw/source/core/undo/unovwr.cxx | 136 +++++++++----------
4 files changed, 326 insertions(+), 120 deletions(-)
commit 3274d37826fc2613aa5061a985d1aab476e3a6fc
Author: Frank Schoenheit [fs] <frank.schoenheit@oracle.com>
Date: Fri Aug 13 23:34:21 2010 +0200
fs33a: make compile in non-pro build (removed seemingly dead assertion)
sw/source/ui/lingu/olmenu.cxx | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit 013feef7fc5add0b3468b2c3d11bea8d4f830174
Merge: db3cc71 aa24f45
Author: Frank Schoenheit [fs] <frank.schoenheit@oracle.com>
Date: Fri Aug 13 12:04:35 2010 +0200
fs33a: merge after pulling OOO330.m4's change sets
commit db3cc711f90a781bc8cd82a90d872f6e281ae205
Merge: e1a0f88 80200b9
Author: Frank Schoenheit [fs] <frank.schoenheit@oracle.com>
Date: Tue Aug 10 14:53:21 2010 +0200
merging in latest changes from OOO330(m3)
Notes
split repo tag: writer_OOO_BUILD_3_2_98_1
Diffstat (limited to 'sw/source/ui/dialog/swdlgfact.cxx')
-rw-r--r-- | sw/source/ui/dialog/swdlgfact.cxx | 76 |
1 files changed, 38 insertions, 38 deletions
diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx index 8447489e5b03..9af9dfbd0b5c 100644 --- a/sw/source/ui/dialog/swdlgfact.cxx +++ b/sw/source/ui/dialog/swdlgfact.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -73,7 +73,7 @@ #include "pattern.hxx" //add for SwBackgroundDlg #include "rowht.hxx" //add for SwTableHeightDlg #include "selglos.hxx" //add for SwSelGlossaryDlg -#include "splittbl.hxx" //add for SwSplitTblDlg +#include "splittbl.hxx" //add for SwSplitTblDlg #include "srtdlg.hxx" //add for SwSortDlg #include "tautofmt.hxx" //add for SwAutoFormatDlg #include "tblnumfm.hxx" //add for SwNumFmtDlg @@ -385,7 +385,7 @@ Window* AbstractSwFldDlg_Impl::GetWindow() { return (Window*)pDlg; } -void AbstractSwFldDlg_Impl::ShowPage( USHORT nId ) +void AbstractSwFldDlg_Impl::ShowPage( USHORT nId ) { pDlg->ShowPage(nId); } @@ -398,7 +398,7 @@ void AbstractSwRenameXNamedDlg_Impl::SetForbiddenChars( const String& rSet ) pDlg->SetForbiddenChars( rSet ); } -void AbstractSwRenameXNamedDlg_Impl::SetAlternativeAccess( +void AbstractSwRenameXNamedDlg_Impl::SetAlternativeAccess( STAR_REFERENCE( container::XNameAccess ) & xSecond, STAR_REFERENCE( container::XNameAccess ) & xThird ) { @@ -408,7 +408,7 @@ void AbstractSwRenameXNamedDlg_Impl::SetAlternativeAccess( //add for SwModalRedlineAcceptDlg begin -void AbstractSwModalRedlineAcceptDlg_Impl::AcceptAll( BOOL bAccept ) +void AbstractSwModalRedlineAcceptDlg_Impl::AcceptAll( BOOL bAccept ) { pDlg->AcceptAll( bAccept); } @@ -481,7 +481,7 @@ void AbstractInsTableDlg_Impl::GetValues( String& rName, USHORT& rRow, USHORT& r SwInsertTableOptions& rInsTblFlags, String& rTableAutoFmtName, SwTableAutoFmt *& prTAFmt ) { - pDlg->GetValues( rName, rRow, rCol, rInsTblFlags, rTableAutoFmtName, prTAFmt); + pDlg->GetValues( rName, rRow, rCol, rInsTblFlags, rTableAutoFmtName, prTAFmt); } // AbstractInsTableDlg_Impl end @@ -727,8 +727,8 @@ AbstractSwAsciiFilterDlg* SwAbstractDialogFactory_Impl::CreateSwAsciiFilterDlg( // add for SwInsertBookmarkDlg begin VclAbstractDialog* SwAbstractDialogFactory_Impl::CreateSwInsertBookmarkDlg( Window *pParent, - SwWrtShell &rSh, - SfxRequest& rReq, + SwWrtShell &rSh, + SfxRequest& rReq, int nResId ) { Dialog* pDlg=NULL; @@ -773,7 +773,7 @@ AbstractSwBreakDlg * SwAbstractDialogFactory_Impl::CreateSwBreakDlg ( Window *pP //add for SwBreakDlg end // add for SwChangeDBDlg begin -VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateSwChangeDBDlg( SwView& rVw, int nResId ) +VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateSwChangeDBDlg( SwView& rVw, int nResId ) { Dialog* pDlg=NULL; switch ( nResId ) @@ -816,7 +816,7 @@ SfxAbstractTabDialog * SwAbstractDialogFactory_Impl::CreateSwCharDlg(Window* pP // add for SwCharDlg end //add for SwConvertTableDlg begin -AbstractSwConvertTableDlg* SwAbstractDialogFactory_Impl::CreateSwConvertTableDlg ( +AbstractSwConvertTableDlg* SwAbstractDialogFactory_Impl::CreateSwConvertTableDlg ( SwView& rView,int nResId, bool bToTable ) { SwConvertTableDlg* pDlg=NULL; @@ -924,7 +924,7 @@ AbstractDropDownFieldDialog * SwAbstractDialogFactory_Impl::CreateDropDownField //add for SwEnvDlg begin SfxAbstractTabDialog* SwAbstractDialogFactory_Impl::CreateSwEnvDlg ( Window* pParent, const SfxItemSet& rSet, - SwWrtShell* pWrtSh, Printer* pPrt, + SwWrtShell* pWrtSh, Printer* pPrt, BOOL bInsert,int nResId ) //add for SwEnvDlg { SfxTabDialog* pDlg=NULL; @@ -974,7 +974,7 @@ SwLabDlgMethod SwAbstractDialogFactory_Impl::GetSwLabDlgStaticMethod () //add for SwParaDlg begin SfxAbstractTabDialog* SwAbstractDialogFactory_Impl::CreateSwParaDlg ( Window *pParent, SwView& rVw, - const SfxItemSet& rCoreSet , + const SfxItemSet& rCoreSet , BYTE nDialogMode, int nResId, const String *pCollName, @@ -1055,7 +1055,7 @@ AbstarctSwSelGlossaryDlg * SwAbstractDialogFactory_Impl::CreateSwSelGlossaryDlg //add for SwSelGlossaryDlg end //add for SwAutoFormatDlg begin -AbstractSwAutoFormatDlg * SwAbstractDialogFactory_Impl::CreateSwAutoFormatDlg( Window* pParent, SwWrtShell* pShell, +AbstractSwAutoFormatDlg * SwAbstractDialogFactory_Impl::CreateSwAutoFormatDlg( Window* pParent, SwWrtShell* pShell, int nResId, BOOL bSetAutoFmt, const SwTableAutoFmt* pSelFmt ) @@ -1097,7 +1097,7 @@ SfxAbstractDialog * SwAbstractDialogFactory_Impl::CreateSwBorderDlg (Window* pPa //add for SwBorderDlg end //add for SwWrapDlg begin -SfxAbstractDialog* SwAbstractDialogFactory_Impl::CreateSwWrapDlg ( Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, BOOL bDrawMode, int nResId ) +SfxAbstractDialog* SwAbstractDialogFactory_Impl::CreateSwWrapDlg ( Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, BOOL bDrawMode, int nResId ) { SfxModalDialog* pDlg=NULL; switch ( nResId ) @@ -1137,7 +1137,7 @@ VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateSwTableWidthDlg ( Window //add for SwTableTabDlg begin SfxAbstractTabDialog* SwAbstractDialogFactory_Impl::CreateSwTableTabDlg( Window* pParent, SfxItemPool& Pool, - const SfxItemSet* pItemSet, SwWrtShell* pSh,int nResId ) + const SfxItemSet* pItemSet, SwWrtShell* pSh,int nResId ) { SfxTabDialog* pDlg=NULL; switch ( nResId ) @@ -1177,7 +1177,7 @@ AbstractSwFldDlg * SwAbstractDialogFactory_Impl::CreateSwFldDlg ( SfxBindings* p //add for SwFldDlg end //add for SwFldEditDlg begin -SfxAbstractDialog* SwAbstractDialogFactory_Impl::CreateSwFldEditDlg ( SwView& rVw, int nResId ) +SfxAbstractDialog* SwAbstractDialogFactory_Impl::CreateSwFldEditDlg ( SwView& rVw, int nResId ) { SfxModalDialog* pDlg=NULL; switch ( nResId ) @@ -1236,7 +1236,7 @@ AbstractSwModalRedlineAcceptDlg * SwAbstractDialogFactory_Impl::CreateSwModalRed } //add for SwModalRedlineAcceptDlg end -VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateSwVclDialog( int nResId, +VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateSwVclDialog( int nResId, Window* pParent, BOOL& rWithPrev ) //add for SwMergeTblDlg { Dialog* pDlg=NULL; @@ -1255,11 +1255,11 @@ VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateSwVclDialog( int nResId, SfxAbstractTabDialog* SwAbstractDialogFactory_Impl::CreateFrmTabDialog( int nResId, SfxViewFrame *pFrame, Window *pParent, const SfxItemSet& rCoreSet, - BOOL bNewFrm, - USHORT nResType, - BOOL bFmt, - UINT16 nDefPage, - const String* pFmtStr ) //add for SwFrmDlg + BOOL bNewFrm, + USHORT nResType, + BOOL bFmt, + UINT16 nDefPage, + const String* pFmtStr ) //add for SwFrmDlg { SfxTabDialog* pDlg=NULL; switch ( nResId ) @@ -1282,9 +1282,9 @@ SfxAbstractTabDialog* SwAbstractDialogFactory_Impl::CreateTemplateDialog( int nR Window* pParent, SfxStyleSheetBase& rBase, USHORT nRegion, - BOOL bColumn, - SwWrtShell* pActShell, - BOOL bNew ) //add for SwTemplateDlg + BOOL bColumn, + SwWrtShell* pActShell, + BOOL bNew ) //add for SwTemplateDlg { SfxTabDialog* pDlg=NULL; switch ( nResId ) @@ -1302,8 +1302,8 @@ SfxAbstractTabDialog* SwAbstractDialogFactory_Impl::CreateTemplateDialog( int nR } AbstractGlossaryDlg* SwAbstractDialogFactory_Impl::CreateGlossaryDlg( int nResId, - SfxViewFrame* pViewFrame, - SwGlossaryHdl* pGlosHdl, + SfxViewFrame* pViewFrame, + SwGlossaryHdl* pGlosHdl, SwWrtShell *pWrtShell) //add for SwGlossaryDlg { SwGlossaryDlg* pDlg=NULL; @@ -1355,7 +1355,7 @@ AbstractInsFootNoteDlg* SwAbstractDialogFactory_Impl::CreateInsFootNoteDlg( int return 0; } -VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateVclSwViewDialog( int nResId, +VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateVclSwViewDialog( int nResId, SwView& rView, BOOL /*bCol*/ ) //add for SwInsRowColDlg, SwLineNumberingDlg { Dialog* pDlg=NULL; @@ -1373,7 +1373,7 @@ VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateVclSwViewDialog( int nRe return 0; } -AbstractInsertGrfRulerDlg * SwAbstractDialogFactory_Impl::CreateInsertGrfRulerDlg( int nResId, +AbstractInsertGrfRulerDlg * SwAbstractDialogFactory_Impl::CreateInsertGrfRulerDlg( int nResId, Window * pParent ) //add for SwInsertGrfRulerDlg { SwInsertGrfRulerDlg* pDlg=NULL; @@ -1479,7 +1479,7 @@ AbstractMailMergeFieldConnectionsDlg * SwAbstractDialogFactory_Impl::CreateMailM return 0; } -VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateMultiTOXMarkDlg( int nResId, +VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateMultiTOXMarkDlg( int nResId, Window* pParent, SwTOXMgr &rTOXMgr ) //add for SwMultiTOXMarkDlg { Dialog* pDlg=NULL; @@ -1517,7 +1517,7 @@ SfxAbstractTabDialog* SwAbstractDialogFactory_Impl::CreateSwTabDialog( int nResI return new AbstractTabDialog_Impl( pDlg ); return 0; } -AbstractMultiTOXTabDialog * SwAbstractDialogFactory_Impl::CreateMultiTOXTabDialog( int nResId, +AbstractMultiTOXTabDialog * SwAbstractDialogFactory_Impl::CreateMultiTOXTabDialog( int nResId, Window* pParent, const SfxItemSet& rSet, SwWrtShell &rShell, SwTOXBase* pCurTOX, USHORT nToxType, @@ -1536,7 +1536,7 @@ AbstractMultiTOXTabDialog * SwAbstractDialogFactory_Impl::CreateMultiTOXTabDialo return new AbstractMultiTOXTabDialog_Impl( pDlg ); return 0; } -AbstractEditRegionDlg * SwAbstractDialogFactory_Impl::CreateEditRegionDlg( int nResId, +AbstractEditRegionDlg * SwAbstractDialogFactory_Impl::CreateEditRegionDlg( int nResId, Window* pParent, SwWrtShell& rWrtSh ) //add for SwEditRegionDlg { SwEditRegionDlg* pDlg=NULL; @@ -1552,7 +1552,7 @@ AbstractEditRegionDlg * SwAbstractDialogFactory_Impl::CreateEditRegionDlg( int n return new AbstractEditRegionDlg_Impl( pDlg ); return 0; } -AbstractInsertSectionTabDialog * SwAbstractDialogFactory_Impl::CreateInsertSectionTabDialog( int nResId, +AbstractInsertSectionTabDialog * SwAbstractDialogFactory_Impl::CreateInsertSectionTabDialog( int nResId, Window* pParent, const SfxItemSet& rSet, SwWrtShell& rSh) //add for SwInsertSectionTabDialog { SwInsertSectionTabDialog* pDlg=NULL; @@ -1569,7 +1569,7 @@ AbstractInsertSectionTabDialog * SwAbstractDialogFactory_Impl::CreateInsertSecti return 0; } -AbstractMarkFloatDlg * SwAbstractDialogFactory_Impl::CreateIndexMarkFloatDlg( int nResId, +AbstractMarkFloatDlg * SwAbstractDialogFactory_Impl::CreateIndexMarkFloatDlg( int nResId, SfxBindings* pBindings, SfxChildWindow* pChild, Window *pParent, @@ -1591,7 +1591,7 @@ AbstractMarkFloatDlg * SwAbstractDialogFactory_Impl::CreateIndexMarkFloatDlg( in return 0; } -AbstractMarkFloatDlg * SwAbstractDialogFactory_Impl::CreateAuthMarkFloatDlg( int nResId, +AbstractMarkFloatDlg * SwAbstractDialogFactory_Impl::CreateAuthMarkFloatDlg( int nResId, SfxBindings* pBindings, SfxChildWindow* pChild, Window *pParent, @@ -1613,7 +1613,7 @@ AbstractMarkFloatDlg * SwAbstractDialogFactory_Impl::CreateAuthMarkFloatDlg( int } //add for SwIndexMarkModalDlg begin -VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateIndexMarkModalDlg( int nResId, +VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateIndexMarkModalDlg( int nResId, Window *pParent, SwWrtShell& rSh, SwTOXMark* pCurTOXMark ) //add for SwIndexMarkModalDlg { Dialog* pDlg=NULL; @@ -1640,7 +1640,7 @@ AbstractMailMergeWizard* SwAbstractDialogFactory_Impl::CreateMailMergeWizard( } //add for static func in SwGlossaryDlg -GlossaryGetCurrGroup SwAbstractDialogFactory_Impl::GetGlossaryCurrGroupFunc( USHORT nId ) +GlossaryGetCurrGroup SwAbstractDialogFactory_Impl::GetGlossaryCurrGroupFunc( USHORT nId ) { switch ( nId ) { @@ -1651,7 +1651,7 @@ GlossaryGetCurrGroup SwAbstractDialogFactory_Impl::GetGlossaryCurrGroupFunc( } return 0; } -GlossarySetActGroup SwAbstractDialogFactory_Impl::SetGlossaryActGroupFunc( USHORT nId ) +GlossarySetActGroup SwAbstractDialogFactory_Impl::SetGlossaryActGroupFunc( USHORT nId ) { switch ( nId ) { |